diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 828011be0b..6f0c218974 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -15,6 +15,7 @@ $lang->comma = ','; $lang->dot = '.'; $lang->at = ' at '; $lang->downArrow = '↓'; +$lang->null = '空'; $lang->zentaoPMS = 'ZenTaoPMS'; $lang->welcome = "Welcome to『%s』{$lang->colon} {$lang->zentaoPMS}"; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index f700dee6ef..e9406a873d 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -15,6 +15,7 @@ $lang->comma = ','; $lang->dot = '。'; $lang->at = ' 于 '; $lang->downArrow = '↓'; +$lang->null = '空'; $lang->zentaoPMS = '禅道管理'; $lang->welcome = "欢迎使用『%s』{$lang->colon} {$lang->zentaoPMS}"; diff --git a/module/product/css/browse.css b/module/product/css/browse.css index b300db4250..55bc283ac7 100644 --- a/module/product/css/browse.css +++ b/module/product/css/browse.css @@ -57,7 +57,7 @@ display:inline-block; } -.groupButton > input[type='button'], #allchecker, #reversechecker +.groupButton > input[type='button'], .groupButton > button, #allchecker, #reversechecker { -moz-border-bottom-colors: none; -moz-border-left-colors: none; @@ -68,43 +68,54 @@ background-repeat: repeat-x; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) #B3B3B3; border-image: none; - border-radius: 4px 4px 4px 4px; + border-radius: 0px; border-style: solid; border-width: 1px; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); - color: #333333; cursor: pointer; display: inline-block; font-size: 14px; line-height: 20px; + height: 30px; margin-bottom: 0; - padding: 4px 12px; - margin-right:5px; + padding: 4px 8px; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; } -.groupButton > input[type='button'] -{ - border-radius: 0px; -} - -.groupButton > input[type='button']:first-child +.groupButton > input[type='button']:first-child, .groupButton #allchecker { border-bottom-left-radius: 4px; border-top-left-radius: 4px; - margin-right: 0; } -.groupButton > input[type='button'] + input[type='button'] +.groupButton > input[type='button'] + input[type='button'], .groupButton > input[type='button'] + button, .groupButton #reversechecker { box-shadow: 1px 0 0 rgba(255, 255, 255, 0.125) inset, 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); border-bottom-right-radius: 4px; border-top-right-radius: 4px; - padding-left: 8px; - padding-right: 8px; + margin-left:-1px; + margin-right:5px; +} + +.groupButton > input[type='button'] + button +{ margin-left:-5px; + padding:10px 5px; +} + +.groupButton button .caret +{ + border-bottom: 4px solid #000000; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 0 none; + content: ""; + display: inline-block; + height: 0; + width: 0; + vertical-align: top; } /* Disabled button and disabled link. */ diff --git a/module/product/view/storylist.html.php b/module/product/view/storylist.html.php index 23ef22db4a..7c51aa6a0c 100644 --- a/module/product/view/storylist.html.php +++ b/module/product/view/storylist.html.php @@ -55,7 +55,9 @@ "; echo html::selectAll() . html::selectReverse(); + echo ""; $canBatchEdit = common::hasPriv('story', 'batchEdit'); $disabled = $canBatchEdit ? '' : "disabled='disabled'"; @@ -63,7 +65,7 @@ echo "
"; echo html::commonButton($lang->edit, "onclick=\"changeAction('$actionLink')\" $disabled"); - echo html::commonButton($lang->more, "onclick=\"toggleSubMenu(this.id, 'top', 0)\" id='moreAction'"); + echo ""; echo "
"; } @@ -143,7 +145,7 @@