[Xoops-svn] SF.net SVN: xoops-svn:[12987] XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/ modules/system

[<txm...@us...>]

Revision: 12987
          http://sourceforge.net/p/xoops/svn/12987
Author:   txmodxoops
Date:     2015-02-16 22:27:26 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
Pagination with bootstrap 3.3.2 in ul tag and not in div tag

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/users/main.php
    XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_pagenav.html
    XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/system_pagenav.html

Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/users/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/users/main.php	2015-02-16 19:20:02 UTC (rev 12986)
+++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/users/main.php	2015-02-16 22:27:26 UTC (rev 12987)
@@ -47,6 +47,8 @@
 $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
 $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
 // Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.min.js');
+$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery-ui.min.js');
 $xoTheme->addScript('modules/system/js/admin.js');
 // Define Breadcrumb and tips
 $xoBreadCrumb->addLink( _AM_SYSTEM_USERS_NAV_MAIN, system_adminVersion('users', 'adminpath') );
@@ -321,11 +323,11 @@
     default:
         // Search and Display
         // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+        //$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+        //$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
         //table sorting does not work with select boxes
         //$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.tablesorter.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
+        //$xoTheme->addScript('modules/system/js/admin.js');
         //Recherche approfondie
 
         if (isset($_REQUEST['complet_search'])) {

Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_pagenav.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_pagenav.html	2015-02-16 19:20:02 UTC (rev 12986)
+++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_pagenav.html	2015-02-16 22:27:26 UTC (rev 12987)
@@ -1,6 +1,6 @@
 <{if $pagination_nav}>
-<div class="pagination<{$size}><{$align}>">
-    <ul>
+<div class="pull-right">
+    <ul class="pagination">
         <{if $prev_text}>
         <li class="previous"><a href="<{$prev_url}>"><{$prev_text}></a></li>
         <{/if}>
@@ -26,7 +26,7 @@
 </div>
 <{/if}>
 <{if $pagination_select}>
-<div class="pagination<{$align}>">
+<div class="pull-right">
     <form class="form-inline" action="" name="pagenavform">
         <{if $showbutton == 1}>
         <div class="input-append">

Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/system_pagenav.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/system_pagenav.html	2015-02-16 19:20:02 UTC (rev 12986)
+++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/system_pagenav.html	2015-02-16 22:27:26 UTC (rev 12987)
@@ -1,6 +1,6 @@
 <{if $pagination_nav}>
-<div class="pagination<{$size}><{$align}>">
-    <ul>
+<div class="pull-right">
+    <ul class="pagination">
         <{if $prev_text}>
         <li class="previous"><a href="<{$prev_url}>"><{$prev_text}></a></li>
         <{/if}>
@@ -26,7 +26,7 @@
 </div>
 <{/if}>
 <{if $pagination_select}>
-<div class="pagination<{$align}>">
+<div class="pull-right">
     <form class="form-inline" action="" name="pagenavform">
         <{if $showbutton == 1}>
         <div class="input-append">