diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index f80a8b8594..5664bbcfe3 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -44,6 +44,7 @@ $lang->save = '保存'; $lang->confirm = '確認'; $lang->preview = '查看'; $lang->goback = '返回'; +$lang->goPC = 'PC版'; $lang->go = 'GO'; $lang->more = '更多'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index dc394061d2..2553661dc3 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -63,7 +63,7 @@ EOT;
- + diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index c50e6cd619..ae18ca818b 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -46,5 +46,6 @@ $lang->misc->zentao->service['install'] = '禪道安裝服務'; $lang->misc->zentao->service['fixissue'] = '禪道問題解決'; $lang->misc->zentao->service['servicemore']= '更多服務...'; -$lang->misc->noGDLib = "請用手機瀏覽器直接訪問：%s"; +$lang->misc->mobile = "手機訪問"; +$lang->misc->noGDLib = "請用手機瀏覽器訪問：%s"; $lang->misc->copyright = "版權所有 ©2009-2013 青島易軟天創網絡科技有限公司"; diff --git a/module/project/css/story.css b/module/project/css/story.css deleted file mode 100644 index 0302007abd..0000000000 --- a/module/project/css/story.css +++ /dev/null @@ -1,8 +0,0 @@ -.icon-green-task-create {width: 22px;height: 18px; background:url(theme/default/images/main/zt-icons.png) 0px -582px;} -.icon-green-task-create:before{display: none;} - -.icon-green-task-batchCreate {width: 22px;height: 18px; background:url(theme/default/images/main/zt-icons.png) -44px -582px;} -.icon-green-task-batchCreate:before {display: none;} - -.icon-green-testcase-batchCreate {width: 22px;height: 18px; background:url(theme/default/images/main/zt-icons.png) -22px -582px;} -.icon-green-testcase-batchCreate:before{display: none;} \ No newline at end of file diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index e15f82e1e5..352f94d4a7 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -76,3 +76,4 @@ $lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; $lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; $lang->upgrade->fromVersions['5_0'] = '5.0'; +$lang->upgrade->fromVersions['5_1'] = '5.1'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index 996b45656f..4815d3b372 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -69,7 +69,7 @@ $lang->user->asGuest = "遊客訪問"; $lang->user->goback = "返回前一頁"; $lang->user->allUsers = '全部用戶'; $lang->user->deleted = '(已刪除)'; -$lang->user->select = '--請選擇用戶--'; +$lang->user->select = '請選擇用戶'; $lang->user->profile = '檔案'; $lang->user->project = '項目'; diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 9c3a08b9a5..8e999969d8 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -117,9 +117,6 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disabled:hover,i[class*=" icon-"].disabled:hover,i[class^="icon-"].disabled:before,i[class*=" icon-"].disabled:before{color: #ccc;} -.icon-green-testcase-createCase,.icon-green-story-createCase{width: 22px; height: 18px; background:url(images/main/zt-icons.png) -22px -582px;} -.icon-gray-testcase-createCase,.icon-gray-story-createCase{width: 22px; height: 18px; background:url(images/main/zt-icons.png) -22px -604px;} - .change-show,.change-hide,.log-desc,.log-asc,.diff-all,.diff-sort{display: inline-block; font-family: FontAwesome;border: 1px solid #555;color: #555; font-size: 13px;font-weight: lighter; width: 14px;height: 13px;line-height: 13px;text-align: center;} .change-show:hover,.change-hide:hover,.log-desc:hover,.log-asc:hover,.diff-all:hover,.diff-sort:hover{background-color: #333;color: #fff} .change-show:before{content: "\f067";} @@ -129,6 +126,21 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable .diff-all:before{content: "\f0b2";} .diff-sort:before{content: "\f036";} +/* zenicon */ +@font-face {font-family: 'zenicon';src:url('../fontawesome/font/zenicon.eot');src:url('../fontawesome/font/zenicon.eot?#iefix') format('embedded-opentype'),url('../fontawesome/font/zenicon.ttf') format('truetype'),url('../fontawesome/font/zenicon.woff') format('woff'),url('../fontawesome/font/zenicon.svg#zenicon') format('svg');font-weight: normal;font-style: normal;} +.icon-green-testcase-createCase:before,.icon-green-story-createCase:before,.icon-green-task-create:before, +.icon-green-task-batchCreate:before,.icon-green-testcase-batchCreate:before,.icon-gray-testcase-createCase:before, +.icon-insert-template:before,.icon-stack:before,.icon-share2:before,.icon-usecases:before,.icon-tasks:before{font-family: 'zenicon';speak: none;font-style: normal;font-weight: normal;font-variant: normal;text-transform: none;line-height: 1;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;} +.icon-insert-template:before {content: "\e768";} +.icon-stack:before, +.icon-green-task-batchCreate:before {content: "\e769";} +.icon-share2:before {content: "\e76a";} +.icon-green-testcase-batchCreate:before, +.icon-gray-testcase-createCase:before, +.icon-usecases:before,.icon-green-testcase-createCase,.icon-green-story-createCase {content: "\e600";} +.icon-tasks:before,.icon-green-task-create:before {content: "\e601";} + + /*-----------------------BUTTONS -----------------------------------*/ .btn,a.btn,.button-s,.button-c,.button-b,#reversechecker,#allchecker,#goto{padding: 4px 15px;background-color: #f8f8f8;-webkit-transition: border-color .3s;-moz-transition: border-color .3s;-o-transition: border-color .3s;transition: border-color .3s;-webkit-border-radius: 2px;-moz-border-radius: 2px;border-radius: 2px;border: 1px solid #dcdcdc;margin: 0 10px 0 0;position: relative;display: inline-block;*display: inline;*zoom: 1;cursor: pointer;text-shadow: 0 1px 0 #fff;text-decoration: none;line-height: 1.5;font-size: 14px;color: #444;transition-delay: 0,0;transition-duration: .5s,.5s;transition-property: all;} .btn-primary,a.btn-primary {background-color: #114F8E;border: 1px solid #036;text-shadow: none;color: #fff;} diff --git a/www/theme/default/style.ie7.css b/www/theme/default/style.ie7.css index e8aa5f3e92..39c4d0f5fe 100644 --- a/www/theme/default/style.ie7.css +++ b/www/theme/default/style.ie7.css @@ -168,4 +168,15 @@ .diff-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .diff-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-green-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gray-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} \ No newline at end of file +.icon-gray-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-insert-template:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-stack:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-green-task-batchCreate:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-share2:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-green-testcase-batchCreate:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gray-testcase-createCase:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-usecases:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-green-testcase-createCase{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-green-story-createCase {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tasks:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-green-task-create:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} \ No newline at end of file diff --git a/www/theme/fontawesome/font/zenicon.eot b/www/theme/fontawesome/font/zenicon.eot new file mode 100644 index 0000000000..8ea9972b7e Binary files /dev/null and b/www/theme/fontawesome/font/zenicon.eot differ diff --git a/www/theme/fontawesome/font/zenicon.svg b/www/theme/fontawesome/font/zenicon.svg new file mode 100644 index 0000000000..5165144424 --- /dev/null +++ b/www/theme/fontawesome/font/zenicon.svg @@ -0,0 +1,15 @@ + + + +Generated by IcoMoon + + + + + + + + + + + \ No newline at end of file diff --git a/www/theme/fontawesome/font/zenicon.ttf b/www/theme/fontawesome/font/zenicon.ttf new file mode 100644 index 0000000000..7d481fe0b0 Binary files /dev/null and b/www/theme/fontawesome/font/zenicon.ttf differ diff --git a/www/theme/fontawesome/font/zenicon.woff b/www/theme/fontawesome/font/zenicon.woff new file mode 100644 index 0000000000..73f29e319b Binary files /dev/null and b/www/theme/fontawesome/font/zenicon.woff differ
custom->object[$module] . ' >> ' . $lang->custom->$module->fields[$field]?>custom->object[$module] . ' >> ' . $lang->custom->$module->fields[$field]?>
custom->key;?> custom->value;?>