diff --git a/module/common/control.php b/module/common/control.php index e6b3328759..4e32adda21 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -314,16 +314,14 @@ class common extends control } if($type == 'button') { - echo ""; if($method != 'edit' and $method != 'copy' and $method != 'delete') { - echo html::a($link, " " . $title, $target, "class='$extraClass'", true); + echo html::a($link, " " . $title, $target, "class='btn $extraClass'", true); } else { - echo html::a($link, "", $target, "class='link-icon $extraClass' title='$title'", false); + echo html::a($link, "", $target, "class='btn $extraClass' title='$title'", false); } - echo ""; } else { diff --git a/module/my/css/index.css b/module/my/css/index.css index 1d4a32b87b..b1c2a5919d 100644 --- a/module/my/css/index.css +++ b/module/my/css/index.css @@ -1,4 +1,4 @@ -.panel-block {height: 207px;overflow: auto; padding: 0} +.panel-block {height: 208px;overflow: auto; padding: 0} .panel-block.dynamic {height: 435px;} .panel-block .panel-heading {padding: 6px 10px; margin: 0;} .panel-block .panel-actions {line-height: 36px; margin-right: -5px;} @@ -9,3 +9,4 @@ .panel-block td .progressbar {display: inline-block; height: 16px; background: #229F24;} .panel-block .icon {color: #666; display: inline-block; margin-right: 2px;} #wrap .outer {padding: 20px 20px 0} +.outer .panel-block .table tbody > tr:last-child td {border-bottom: none} diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 25f032c957..94bcb39954 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -12,45 +12,46 @@ ?> - -
-
- inlink('browse', "productID=$productID&browseType=allStory"), $lang->product->allStory);?> - inlink('browse', "productID=$productID&browseType=assignedtome"), $lang->product->assignedToMe);?> - inlink('browse', "productID=$productID&browseType=openedByMe"), $lang->product->openedByMe);?> - inlink('browse', "productID=$productID&browseType=reviewedByMe"), $lang->product->reviewedByMe);?> - inlink('browse', "productID=$productID&browseType=closedByMe"), $lang->product->closedByMe);?> - inlink('browse', "productID=$productID&browseType=draftStory"), $lang->product->draftStory);?> - inlink('browse', "productID=$productID&browseType=activeStory"), $lang->product->activeStory);?> - inlink('browse', "productID=$productID&browseType=changedStory"), $lang->product->changedStory);?> - inlink('browse', "productID=$productID&browseType=closedStory"), $lang->product->closedStory);?> -  product->searchStory;?> -
-
+ +
+
+
+ + +
+ +
+
'; - echo html::a("#", " " . $lang->export, '', "id='exportAction' onclick='toggleSubMenu(this.id,\"bottom\",0)' title='{$lang->export}'"); - echo ''; - - common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID"); - common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID"); - common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID"); + common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID", '', 'button', 'plus-sign'); + common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID", '', 'button', 'plus'); ?> +
+
'>
- - -
'>
 
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index b60480783d..fc58a0e89a 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -13,14 +13,20 @@