Merge pull request #34 from mariez/master

styles for buttons on top. Mantis related: #0018788

functions.php

@@ -1,5 +1,9 @@
 <?php
+if ($page_title =='userclicks') $page_title = s('Click Statistics'); /* REMOVE AFTER RESOLVE MANTIS #18945 */
+
+
 /* This array is to add third level to phpList menu, adding orphan items to a menulink */
+
 $GLOBALS['subcat'] = array(
 	'import' => array ('import1','import2','import3','import4','importsimple'),
 	'users' => array('user','userhistory'),

js/dist/phpList_ui_bootlist.js

@@ -2035,9 +2035,9 @@ $('body.fixed li.list').each(function(){
     $('button, #prev.prevtab, #next.nexttab').addClass('btn');
     $('.submit, input[type=submit]').not('p.submit,body.import2 div.submit').addClass('btn btn-primary');
     $('button[type=submit]').addClass('btn-primary');
-    $('.button').addClass('btn btn-default');
+    $('.button').not('#wrapp > p.button.pull-right, form.spageEdit >.button.pull-right').addClass('btn btn-default');
     $('table .button').addClass('btn-xs');
-    $('.action-button').addClass('btn btn-lg btn-primary');
+    $('.action-button, form[name="categoryedit"] .pull-right > .button, form.spageEdit > .button.pull-right > a, .actions .pull-right .button, .statsoverview .pull-right > .button, .actions.pull-right > .button, .actions .pull-right > .confirm,  #wrapp .pull-right > .confirm, #wrapp > .button.pull-right > a, #wrapp >#contentdiv > .pull-right > a.button,#wrapp > .pull-right > a.button').addClass('btn btn-lg btn-primary');
     $('.reset').addClass('btn btn-link');
     $('span.button a.opendialog span.view').parent().parent().parent().find('span.button').removeClass('btn-default');
     $('.actions .fright').addClass('pull-right');

js/phpList3ToBootstrap.js

@@ -49,9 +49,9 @@ $('body.fixed li.list').each(function(){
     $('button, #prev.prevtab, #next.nexttab').addClass('btn');
     $('.submit, input[type=submit]').not('p.submit,body.import2 div.submit').addClass('btn btn-primary');
     $('button[type=submit]').addClass('btn-primary');
-    $('.button').addClass('btn btn-default');
+    $('.button').not('#wrapp > p.button.pull-right, form.spageEdit >.button.pull-right').addClass('btn btn-default');
     $('table .button').addClass('btn-xs');
-    $('.action-button').addClass('btn btn-lg btn-primary');
+    $('.action-button, form[name="categoryedit"] .pull-right > .button, form.spageEdit > .button.pull-right > a, .actions .pull-right .button, .statsoverview .pull-right > .button, .actions.pull-right > .button, .actions .pull-right > .confirm,  #wrapp .pull-right > .confirm, #wrapp > .button.pull-right > a, #wrapp >#contentdiv > .pull-right > a.button,#wrapp > .pull-right > a.button').addClass('btn btn-lg btn-primary');
     $('.reset').addClass('btn btn-link');
     $('span.button a.opendialog span.view').parent().parent().parent().find('span.button').removeClass('btn-default');
     $('.actions .fright').addClass('pull-right');

less/legacy.less

@@ -282,7 +282,7 @@ body.importadmin table.table tr td:first-child{
 
 /* ## user && userclicks && uclicks*/
 body.uclicks span.viewusers, body.userclicks span.viewusers,body.user table.userAdd .btn-xs{margin-left:10px}
-
+body.userclick .panel > .header > h2{display:none}
 /* ## send */
 body.send #sendtabs .btn {margin:0px;padding:5px}
 body.send form, body.send #testpanel{margin-bottom:0}

mainmenu.php

@@ -3,6 +3,8 @@
 // functions for theme bootstrap
 include_once dirname(__FILE__).'/functions.php';
 
+if ($page_title == 'userclicks') $page_title = s('Click Statistics'); /* REMOVE AFTER RESOLVE MANTIS #18945 */
+
 /* fix sections not opening submenues on first click */
 $GLOBALS['pagecategories']['statistics']['toplink'] = 'statsoverview';
 $GLOBALS['pagecategories']['develop']['toplink'] = 'tests';