diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index b9b6240d34..1586adaa5c 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -37,7 +37,7 @@ common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe', true); common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']); - common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'usecase'); + common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'sitemap'); echo ''; echo "
"; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index a219b2cff4..42cc13e0df 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -432,7 +432,7 @@ $lang->icons['company'] = 'building'; $lang->icons['user'] = 'user'; $lang->icons['dept'] = 'sitemap'; $lang->icons['tree'] = 'sitemap'; -$lang->icons['usecase'] = 'usecase'; +$lang->icons['usecase'] = 'sitemap'; $lang->icons['testcase'] = 'smile'; $lang->icons['result'] = 'flag-checkered'; $lang->icons['mail'] = 'envelope'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 94d22d1db3..3a33128c9d 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -432,7 +432,7 @@ $lang->icons['company'] = 'building'; $lang->icons['user'] = 'user'; $lang->icons['dept'] = 'sitemap'; $lang->icons['tree'] = 'sitemap'; -$lang->icons['usecase'] = 'usecase'; +$lang->icons['usecase'] = 'sitemap'; $lang->icons['testcase'] = 'smile'; $lang->icons['result'] = 'flag-checkered'; $lang->icons['mail'] = 'envelope'; diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index e926e55223..9889c6ee1e 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -11,7 +11,7 @@ moduleName, isset($position) ? $position : ''); ?>
- zentaoPMS . $config->version;?>   + zentaoPMS . $config->version;?>   proVersion;?> diff --git a/module/editor/css/index.css b/module/editor/css/index.css index da14cab0b4..e64278da1b 100644 --- a/module/editor/css/index.css +++ b/module/editor/css/index.css @@ -1 +1,7 @@ -.container table td {padding: 0 10px; vertical-align: top;} +table td {padding: 0 10px; vertical-align: top;} +table tr > td:first-child {padding-left: 0;} +table tr > td:last-child {padding-right: 0;} +.panel.with-list {border: none} +.panel.with-list .panel-heading {border: 1px solid #ddd; border-bottom: none} +.panel.with-list .list-group {margin: 0} +.list-group-item.active {color: #1A4F85} diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php index 4c290b3486..05f9d538e4 100644 --- a/module/editor/view/index.html.php +++ b/module/editor/view/index.html.php @@ -11,11 +11,10 @@ */ ?> -
-
+
editor->moduleList?>
@@ -24,6 +23,5 @@
-
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 814b0473fc..9261bf8dea 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -48,7 +48,7 @@ function switchEncode(fileType) export;?>
-
+ diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 8207aa8e7f..8615869240 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -113,7 +113,7 @@ common::printIcon('story', 'review', $vars, $story, 'list', 'search'); common::printIcon('story', 'close', $vars, $story, 'list', 'off'); common::printIcon('story', 'edit', $vars, $story, 'list', 'pencil'); - common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=¶m=0&$vars", $story, 'list', 'usecase'); + common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); ?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 3ca97922e1..da59f67036 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -87,7 +87,7 @@ common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack'); $lang->testcase->batchCreate = $lang->testcase->create; - if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'usecase'); + if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap'); if(common::hasPriv('project', 'unlinkStory')) { diff --git a/module/release/css/edit.css b/module/release/css/edit.css new file mode 100644 index 0000000000..023ea5948c --- /dev/null +++ b/module/release/css/edit.css @@ -0,0 +1 @@ +.table-form > tbody > tr > td > .row > [class*="col-"] .panel-heading {line-height: 16px} diff --git a/module/story/css/common.css b/module/story/css/common.css index 9e5799cb16..e8428733e8 100644 --- a/module/story/css/common.css +++ b/module/story/css/common.css @@ -1 +1,2 @@ .linkbox{height:180px; overflow-y:auto} +.tab-pane .table-borderless {border: 1px solid #ddd!important} diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index e9e85f59c5..9e9138f21c 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -44,7 +44,7 @@ common::printIcon('story', 'review', "storyID=$story->id", $story); common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe text-danger', true); common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe text-success', true); - common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'button', 'usecase'); + common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'button', 'sitemap'); echo ''; echo "
"; diff --git a/module/task/css/common.css b/module/task/css/common.css index c8f1cfb54e..e69de29bb2 100644 --- a/module/task/css/common.css +++ b/module/task/css/common.css @@ -1 +0,0 @@ -.text-6{width:75%;} diff --git a/www/theme/default/images/main/icon.png b/www/theme/default/images/main/icon.png new file mode 100644 index 0000000000..4ccca5ff45 Binary files /dev/null and b/www/theme/default/images/main/icon.png differ diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 904df220ae..a7573a43dc 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -99,9 +99,9 @@ hr.small {margin: 10px 0} .table.table-condensed caption {padding: 6px 15px;} /* Datepicker */ -.datepicker-wrapper {position: relative;} -.datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 8px; color: #808080; font-size: 14px; top: 5px} -.datepicker-wrapper > .form-control {padding-right: 30px;} +.datepicker-wrapper {position: relative; cursor: pointer;} +.datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 8px; color: #808080; font-size: 14px; top: 5px;} +.datepicker-wrapper > .form-control {padding-right: 30px; cursor: pointer;} .datepicker-wrapper.datepicker-date:before {content: '\e66c'} .datepicker-wrapper:hover:before {color: #145CCD} @@ -232,6 +232,11 @@ fieldset > .form-group {margin-bottom: 0;} .form-condensed .chosen-container-single .chosen-single abbr {top: 5px; right: 18px} .form-condensed .chosen-container-single .chosen-search:before {top: 10px} +@-moz-document url-prefix(){.form-condensed textarea.form-control {height: 30px;min-height: 30px;}} + +/* chosen container in col-side */ +.col-side .chosen-single {max-width: 218px} + /* help in form */ .help-block {margin-bottom: 5px;} @@ -369,6 +374,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #footer #poweredby {float: right; margin-right: 20px;} #qrcodePopover.show {display: block; position: fixed; right: 5px; bottom: 40px; left: inherit; top: inherit; max-width: 300px} #qrcodePopover.popover.top .arrow {left: inherit; right: 10px} +.icon-zentao, a .icon-zentao {background: url(images/main/icon.png) center no-repeat; display: inline-block; width: 14px; height: 14px; position: relative; top: 2px} /* Feature bar. */ #featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0;}
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 4de3bd6209..05ab2dcb92 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -66,7 +66,7 @@ common::printIcon('story', 'review', "storyID=$story->id", $story, 'list', 'search'); common::printIcon('story', 'close', "storyID=$story->id", $story, 'list', 'off', 'text-danger'); common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list', 'pencil'); - common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'list', 'usecase'); + common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'list', 'sitemap'); ?>