From 6480d853e48f86034e023d12de96e8f2939476ad Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 11:21:26 +0800 Subject: [PATCH 1/3] * ajusted style of 'editor/view'. * changed icon of usecase. * added border to the table in tab pane. --- module/bug/view/view.html.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/editor/css/index.css | 8 +++++++- module/editor/view/index.html.php | 4 +--- module/my/view/story.html.php | 2 +- module/product/view/browse.html.php | 2 +- module/project/view/story.html.php | 2 +- module/release/css/edit.css | 1 + module/story/css/common.css | 1 + module/story/view/view.html.php | 2 +- www/theme/default/style.css | 3 +++ 12 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 module/release/css/edit.css 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/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/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'); ?> 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/www/theme/default/style.css b/www/theme/default/style.css index 904df220ae..86fc7f8bc6 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -232,6 +232,9 @@ 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} +/* chosen container in col-side */ +.col-side .chosen-single {max-width: 218px} + /* help in form */ .help-block {margin-bottom: 5px;} From f2cf943007b43de1b866c3ee5b0a2f911e87d1d3 Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 11:40:54 +0800 Subject: [PATCH 2/3] * update zentao icon with image on footer. --- module/common/view/footer.html.php | 2 +- www/theme/default/images/main/icon.png | Bin 0 -> 3419 bytes www/theme/default/style.css | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 www/theme/default/images/main/icon.png diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 038ea53919..b03db3b17d 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/www/theme/default/images/main/icon.png b/www/theme/default/images/main/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4ccca5ff454ac0cb77f72c7ffc33fda7ad301c1f GIT binary patch literal 3419 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 literal 0 HcmV?d00001 diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 86fc7f8bc6..802c876c11 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -372,6 +372,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;} From c5a3cf0be7e65be3c210633f1a79989eaa9e9e76 Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 13:39:32 +0800 Subject: [PATCH 3/3] * ajusted form padding of 'file/export'. * fixed size of textarea for firefox. * removed unused code from common.css. --- module/file/view/export.html.php | 2 +- module/task/css/common.css | 1 - www/theme/default/style.css | 8 +++++--- 3 files changed, 6 insertions(+), 5 deletions(-) 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/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/style.css b/www/theme/default/style.css index 802c876c11..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,8 @@ 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}