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/css/dashboard.css b/module/block/css/dashboard.css index 880b1090f8..e443f33083 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -1,2 +1,4 @@ .block-statistic .nav-stacked {overflow: auto; max-height: 220px;} -.nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;} \ No newline at end of file +.nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;} +.dashboard .panel-body {max-height: 400px;overflow: auto;} + \ No newline at end of file diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index 75c8284144..e85293651c 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -10,11 +10,21 @@ * @link http://www.ranzhi.org */ ?> +
'> - + @@ -30,7 +40,7 @@ $viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}"); ?> > - + diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index 07d21fda50..ba770f6163 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -25,7 +25,7 @@ - + @@ -44,7 +44,7 @@ ?> > - + 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/dynamic.html.php b/module/block/view/dynamic.html.php index 8d94c25759..cd462a7778 100644 --- a/module/block/view/dynamic.html.php +++ b/module/block/view/dynamic.html.php @@ -1,5 +1,5 @@
-
idAB?>idAB?> priAB?>
id;?>id;?> bug->priList, $bug->pri)?>
idAB?>idAB?> priAB?> case->title;?>
id;?>id;?> case->priList, $case->pri, $case->pri)?> title?>
diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php index 2c20d9e85a..592898198d 100644 --- a/module/block/view/printassigntomeblock.html.php +++ b/module/block/view/printassigntomeblock.html.php @@ -17,3 +17,7 @@ + \ No newline at end of file diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 50a86080f1..92ac619a35 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -10,6 +10,13 @@ * @link http://www.zentao.net */ ?> +
diff --git a/module/block/view/projectoverviewblock.html.php b/module/block/view/projectoverviewblock.html.php index 7b9334ba28..d1b298ad98 100644 --- a/module/block/view/projectoverviewblock.html.php +++ b/module/block/view/projectoverviewblock.html.php @@ -25,8 +25,7 @@ - + diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 4fc01c215e..52087c9b82 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -10,12 +10,23 @@ * @link http://www.ranzhi.org */ ?> +
idAB?>idAB?> release->product;?> release->name;?>
'> - + @@ -36,7 +47,7 @@ ?> > - + diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 4eb9be2df6..c76ca75af1 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -10,11 +10,22 @@ * @link http://www.ranzhi.org */ ?> +
idAB?>idAB?> priAB?> story->title;?>
id;?>id;?> story->priList, $story->pri, $story->pri)?> title?>
'> - + @@ -31,7 +42,7 @@ $viewLink = $this->createLink('task', 'view', "taskID={$task->id}"); ?> > - + diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index ffc690f1e0..94d7310df0 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -10,6 +10,29 @@ * @link http://www.ranzhi.org */ ?> +
@@ -56,10 +79,10 @@
-
+
save, "onclick='ajaxCreateTodo(this)'", "btn btn-primary btn-wide");?> - +
diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php index 73333c6b8e..6c61bb0cde 100644 --- a/module/block/view/welcome.html.php +++ b/module/block/view/welcome.html.php @@ -10,6 +10,19 @@ * @link http://www.zentao.net */ ?> +
diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php index 34a55f8d1e..3beb63991d 100644 --- a/module/bug/view/batchactivate.html.php +++ b/module/bug/view/batchactivate.html.php @@ -15,22 +15,22 @@

bug->common . $lang->colon . $lang->bug->batchActivate;?>

-
-
idAB;?>idAB;?> priAB?> task->name;?>
id;?>id;?> task->priList, $task->pri, $task->pri)?> name?>
+ +
- - - - - + + + + + - + 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); 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); @@ -235,7 +235,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index b644e7552b..46c86e6ab0 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -58,19 +58,15 @@
idAB;?>bug->title;?>bug->assignedTo;?>bug->openedBuild;?>bug->legendComment;?>idAB;?>bug->title;?>bug->assignedTo;?>bug->openedBuild;?>bug->legendComment;?>
id . html::hidden("bugIDList[$bug->id]", $bug->id);?>title . html::hidden("statusList[$bug->id]", $bug->status);?>title . html::hidden("statusList[$bug->id]", $bug->status);?> id]", $users, $bug->resolvedBy, "class='form-control chosen'");?> id]", $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?> id]", '', "class='form-control'");?>
- bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?> + bug->allUsers, "class='btn' onclick='loadAllUsers()' data-toggle='tooltip'");?>
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)'")?>
resolvedBuild, "class='form-control chosen'");?> - bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?> + bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?>
+ +