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
2014-05-02 05:49:10 +00:00
parent 13e635c8bf c5a3cf0be7
commit f53c16f336
16 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/view.html.php
+1 -1
View File
@@ -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 '</div>';
echo "<div class='btn-group'>";
module/common/lang/en.php
+1 -1
View File
@@ -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';
module/common/lang/zh-cn.php
+1 -1
View File
@@ -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';
module/common/view/footer.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
<?php commonModel::printBreadMenu($this->moduleName, isset($position) ? $position : ''); ?>
</div>
<div id="poweredby">
<a href='http://www.zentao.net' target='_blank' class='text-primary'><i class='icon-globe'></i> <?php echo $lang->zentaoPMS . $config->version;?></a> &nbsp;
<a href='http://www.zentao.net' target='_blank' class='text-primary'><i class='icon-zentao'></i> <?php echo $lang->zentaoPMS . $config->version;?></a> &nbsp;
<?php echo $lang->proVersion;?>
<?php commonModel::printNotifyLink();?>
<?php commonModel::printQRCodeLink();?>
module/editor/css/index.css
+7 -1
View File
@@ -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}
module/editor/view/index.html.php
+1 -3
View File
@@ -11,11 +11,10 @@
*/
?>
<?php include '../../extension/view/header.html.php';?>
<div class='container bd-0'>
<table class='w-p100'>
<tr>
<td class='w-200px'>
<div class='panel panel-sm'>
<div class='panel panel-sm with-list'>
<div class='panel-heading'><i class='icon-list'></i> <strong><?php echo $lang->editor->moduleList?></strong></div>
<?php echo $moduleList?>
</div>
@@ -24,6 +23,5 @@
<td><iframe frameborder='0' name='editWin' id='editWin' width='100%'></iframe></td>
</tr>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>
module/file/view/export.html.php
+1 -1
View File
@@ -48,7 +48,7 @@ function switchEncode(fileType)
<strong><?php echo $lang->export;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5% 50px'>
<table class='w-p100'>
<tr>
<td>
module/my/view/story.html.php
+1 -1
View File
@@ -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=&param=0&storyID=$story->id", '', 'list', 'usecase');
common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", '', 'list', 'sitemap');
?>
</td>
</tr>
module/product/view/browse.html.php
+1 -1
View File
@@ -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=&param=0&$vars", $story, 'list', 'usecase');
common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
?>
</td>
</tr>
module/project/view/story.html.php
+1 -1
View File
@@ -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'))
{
module/release/css/edit.css
+1
View File
@@ -0,0 +1 @@
.table-form > tbody > tr > td > .row > [class*="col-"] .panel-heading {line-height: 16px}
module/story/css/common.css
+1
View File
@@ -1 +1,2 @@
.linkbox{height:180px; overflow-y:auto}
.tab-pane .table-borderless {border: 1px solid #ddd!important}
module/story/view/view.html.php
+1 -1
View File
@@ -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=&param=0&storyID=$story->id", '', 'button', 'usecase');
common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", '', 'button', 'sitemap');
echo '</div>';
echo "<div class='btn-group'>";
module/task/css/common.css
-1
View File
@@ -1 +0,0 @@
.text-6{width:75%;}
www/theme/default/images/main/icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

www/theme/default/style.css
+9 -3
View File
@@ -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;}