Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wyd621
2013-11-05 00:19:12 +00:00
parent 850dcb1c65 b8081bd6f1
commit 335ff87b88
12 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-tw.php
+1
View File
@@ -44,6 +44,7 @@ $lang->save = '保存';
$lang->confirm = '確認';
$lang->preview = '查看';
$lang->goback = '返回';
$lang->goPC = 'PC版';
$lang->go = 'GO';
$lang->more = '更多';
module/custom/view/set.html.php
+1 -1
View File
@@ -63,7 +63,7 @@ EOT;
<td>
<form method='post'>
<table class='table-1'>
<caption><?echo $lang->custom->object[$module] . ' >> ' . $lang->custom->$module->fields[$field]?></caption>
<caption><?php echo $lang->custom->object[$module] . ' >> ' . $lang->custom->$module->fields[$field]?></caption>
<tr>
<th class='w-100px'><?php echo $lang->custom->key;?></th>
<th><?php echo $lang->custom->value;?></th>
module/misc/lang/zh-tw.php
+2 -1
View File
@@ -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 = "請用手機瀏覽器訪問：<strong>%s</strong>";
$lang->misc->copyright = "版權所有 &copy;2009-2013 <a href='http://www.cnezsoft.com' target='_blank'>青島易軟天創網絡科技有限公司</a>";
module/project/css/story.css
-8
View File
@@ -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;}
module/upgrade/lang/zh-tw.php
+1
View File
@@ -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';
module/user/lang/zh-tw.php
+1 -1
View File
@@ -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 = '項目';
www/theme/default/style.css
+15 -3
View File
@@ -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;}
www/theme/default/style.ie7.css
+12 -1
View File
@@ -168,4 +168,15 @@
.diff-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b2;');}
.diff-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf036;');}
.icon-green-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09C;');}
.icon-gray-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09C;');}
.icon-gray-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09C;');}
.icon-insert-template:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe768;');}
.icon-stack:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe769;');}
.icon-green-task-batchCreate:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe769;');}
.icon-share2:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe76a;');}
.icon-green-testcase-batchCreate:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe600;');}
.icon-gray-testcase-createCase:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe600;');}
.icon-usecases:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe600;');}
.icon-green-testcase-createCase{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe600;');}
.icon-green-story-createCase {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe600;');}
.icon-tasks:before{*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe601;');}
.icon-green-task-create:before {*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe601;');}
www/theme/fontawesome/font/zenicon.eot
BIN
View File
Binary file not shown.
www/theme/fontawesome/font/zenicon.svg
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="zenicon" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
<missing-glyph horiz-adv-x="1024" />
<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
<glyph unicode="&#xe600;" d="M781.198 3.537c-129.722 0-231.354 69.004-231.354 157.066 0 45.995 27.706 86.797 72.64 115.248-75.123 21.383-136.044 53.718-175.107 93.074-34.547-56.789-116.174-95.762-213.674-95.762-129.722 0-231.354 69.027-231.354 157.111s101.61 157.111 231.354 157.111c86.707 0 160.859-30.822 200.51-77.585 38.612 47.034 107.255 85.488 194.323 109.332-41.502 28.247-66.837 67.469-66.837 111.455 0 88.084 101.632 157.111 231.354 157.111s231.331-69.004 231.331-157.111-101.61-157.111-231.331-157.111c-9.958 0-19.757 0.406-29.354 1.197-154.605-14.203-264.276-70.54-290.401-128.073 26.848-58.934 141.35-116.58 301.961-128.954 15.693 0.158 31.522-0.542 46.56-2.281 5.871-0.113 11.764-0.181 17.748-0.181v-2.348c100.594-17.138 173.007-77.878 173.007-152.256-0.023-88.062-101.655-157.043-231.377-157.043zM773.724 249.884c-92.42-2.348-156.14-48.118-156.14-89.281 0-42.247 67.198-89.326 163.614-89.326s163.614 47.079 163.614 89.326c0 36.873-51.098 77.404-128.096 87.159-14.564 0.361-28.88 1.084-42.992 2.123zM233.68 519.646c-96.416 0-163.614-47.079-163.614-89.371s67.198-89.371 163.614-89.371 163.614 47.102 163.614 89.371-67.198 89.371-163.614 89.371zM793.030 819.959c-96.439 0-163.614-47.079-163.614-89.371 0-37.889 54.011-79.662 134.667-87.904 24.454 2.077 49.676 3.161 75.485 3.161v-0.79c70.833 12.058 117.077 50.444 117.077 85.533-0.023 42.27-67.198 89.371-163.614 89.371z" />
<glyph unicode="&#xe601;" d="M1023.21 505.082h-363.56v363.582h363.582v-363.582zM727.39 572.822h228.102v228.102h-228.102v-228.102zM1023.21-37.288h-363.56v363.582h363.582v-363.582zM727.39 30.452h228.102v228.102h-228.102v-228.102zM366.54 247.129h-363.56v363.56h363.582v-363.56zM70.72 314.869h228.102v228.080h-228.102v-228.080zM672.008 744.401l43.028-52.322-351.867-289.365-43.028 52.322 351.867 289.365zM364.173 454.198l351.864-313.548-45.082-50.591-351.864 313.548 45.082 50.591z" />
<glyph unicode="&#xe768;" d="M384 768h128v-64h-128zM576 768h128v-64h-128zM896 768v-256h-192v64h128v128h-64v64zM320 576h128v-64h-128zM512 576h128v-64h-128zM192 704v-128h64v-64h-128v256h192v-64zM384 384h128v-64h-128zM576 384h128v-64h-128zM896 384v-256h-192v64h128v128h-64v64zM320 192h128v-64h-128zM512 192h128v-64h-128zM192 320v-128h64v-64h-128v256h192v-64zM960 896h-896v-896h896v896zM1024 960v0-1024h-1024v1024h1024z" />
<glyph unicode="&#xe769;" d="M1024 640l-512 256-512-256 512-256 512 256zM512 811.030l342.058-171.030-342.058-171.030-342.058 171.030 342.058 171.030zM921.444 499.278l102.556-51.278-512-256-512 256 102.556 51.278 409.444-204.722zM921.444 307.278l102.556-51.278-512-256-512 256 102.556 51.278 409.444-204.722z" />
<glyph unicode="&#xe76a;" d="M864 256c-45.16 0-85.92-18.738-115.012-48.83l-431.004 215.502c1.314 8.252 2.016 16.706 2.016 25.328s-0.702 17.076-2.016 25.326l431.004 215.502c29.092-30.090 69.852-48.828 115.012-48.828 88.366 0 160 71.634 160 160s-71.634 160-160 160-160-71.634-160-160c0-8.622 0.704-17.076 2.016-25.326l-431.004-215.504c-29.092 30.090-69.852 48.83-115.012 48.83-88.366 0-160-71.636-160-160 0-88.368 71.634-160 160-160 45.16 0 85.92 18.738 115.012 48.828l431.004-215.502c-1.312-8.25-2.016-16.704-2.016-25.326 0-88.368 71.634-160 160-160s160 71.632 160 160c0 88.364-71.634 160-160 160z" />
</font></defs></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

www/theme/fontawesome/font/zenicon.ttf
BIN
View File
Binary file not shown.
www/theme/fontawesome/font/zenicon.woff
BIN
View File
Binary file not shown.