From 1266a30bbc9fbba1058a5a33d1a29748ef5ecf92 Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 17 May 2018 13:35:56 +0800 Subject: [PATCH 1/2] * Remove class btn-default. * Merge conflicts. --- lib/base/front/front.class.php | 10 +++++----- lib/front/front.class.php | 4 ++-- module/block/view/dashboard.html.php | 2 +- module/block/view/todoblock.html.php | 2 +- module/bug/view/create.html.php | 4 ++-- module/bug/view/edit.html.php | 4 ++-- module/build/view/linkbug.html.php | 4 ---- module/build/view/linkstory.html.php | 4 ---- module/message/view/setting.html.php | 2 +- module/project/view/all.html.php | 2 +- module/project/view/importbug.html.php | 2 +- module/project/view/importtask.html.php | 2 +- module/project/view/taskheader.html.php | 4 ++-- module/release/view/linkbug.html.php | 9 --------- module/release/view/linkstory.html.php | 5 ----- module/release/view/view.html.php | 6 +++--- module/story/view/view.html.php | 2 +- module/testcase/view/importfromlib.html.php | 2 +- module/testtask/view/runcase.html.php | 2 +- module/webhook/view/create.html.php | 5 ++++- module/webhook/view/edit.html.php | 5 ++++- www/js/zui/min.js | 4 ++-- 22 files changed, 35 insertions(+), 51 deletions(-) diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php index 3e880b2626..e60d59800b 100644 --- a/lib/base/front/front.class.php +++ b/lib/base/front/front.class.php @@ -392,7 +392,7 @@ class baseHTML { $html = "
"; $html .= "\n"; - $html .= "
"; + $html .= ""; return $html; } @@ -412,7 +412,7 @@ class baseHTML { $html = "
"; $html .= "\n"; - $html .= "
"; + $html .= ""; return $html; } @@ -507,7 +507,7 @@ class baseHTML * @access public * @return string the common button tag. */ - public static function commonButton($label = '', $class = 'btn btn-default', $misc = '', $icon = '') + public static function commonButton($label = '', $class = 'btn', $misc = '', $icon = '') { if($icon) $label = " " . $label; return " "; @@ -526,7 +526,7 @@ class baseHTML * @access public * @return string */ - public static function linkButton($label = '', $link = '', $class='btn btn-default', $misc = '', $target = 'self') + public static function linkButton($label = '', $link = '', $class='btn', $misc = '', $target = 'self') { global $config, $lang; @@ -650,7 +650,7 @@ function selectReverse(scope) EOT; global $lang; - $string .= ""; + $string .= ""; return $string; } diff --git a/lib/front/front.class.php b/lib/front/front.class.php index de49d752d9..b0a8954b3d 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -92,12 +92,12 @@ class html extends baseHTML return parent::submitButton($label, $class, $misc); } - public static function commonButton($label = '', $misc = '', $class = 'btn btn-default', $icon = '') + public static function commonButton($label = '', $misc = '', $class = 'btn', $icon = '') { return parent::commonButton($label, $class, $misc, $icon); } - public static function linkButton($label = '', $link = '', $target = 'self', $misc = '', $class = 'btn btn-default') + public static function linkButton($label = '', $link = '', $target = 'self', $misc = '', $class = 'btn') { return parent::linkButton($label, $link, $class, $misc, $target); } diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 31f78811af..530728f437 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -105,7 +105,7 @@ config.confirmRemoveBlock = 'block->confirmRemoveBlock; ?>'; var module = ''; var useGuest = ; -$('#subHeader #pageActions .btn-toolbar:last').append(createLink("block", "admin", "id=0&module=$module"), " {$lang->block->createBlock}", '', "class='btn btn-default' data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'"))?>); +$('#subHeader #pageActions .btn-toolbar:last').append(createLink("block", "admin", "id=0&module=$module"), " {$lang->block->createBlock}", '', "class='btn' data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'"))?>); getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index ffc690f1e0..8079836ece 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -59,7 +59,7 @@
save, "onclick='ajaxCreateTodo(this)'", "btn btn-primary btn-wide");?> - +
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 6aa50dbfe9..3650a765ea 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -77,7 +77,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
-
bug->allBuilds, "class='btn btn-default' data-toggle='tooltip' onclick='loadAllBuilds()'")?>
+
bug->allBuilds, "class='btn' data-toggle='tooltip' onclick='loadAllBuilds()'")?>
@@ -86,7 +86,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
- bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?> + bug->allUsers, "class='btn' onclick='loadAllUsers()' data-toggle='tooltip'");?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 94944fdb1e..0ea5159e3f 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -218,7 +218,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?> - bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?> + bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?>
@@ -235,7 +235,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
resolvedBuild, "class='form-control chosen'");?> - bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?> + bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?>
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index b644e7552b..b98295749b 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -62,11 +62,7 @@
-<<<<<<< HEAD - build->linkBug, '', 'btn btn-default');?> -======= build->linkBug, '', 'btn');?> ->>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
id}&type=bug"), $lang->goback, '', "class='btn'");?> diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 3eb59c2180..6104ac1f14 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -66,11 +66,7 @@
-<<<<<<< HEAD - build->linkStory, '', 'btn btn-default');?> -======= build->linkStory, '', 'btn');?> ->>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
id}&type=story"), $lang->goback, '', "class='btn'");?> diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php index a14f257991..6568907b7a 100644 --- a/module/message/view/setting.html.php +++ b/module/message/view/setting.html.php @@ -70,7 +70,7 @@ - + diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index 937e7fce92..1537b30b95 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -108,7 +108,7 @@