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:
wangyidong
2018-05-23 14:56:03 +08:00
parent b1bbcb7c22 1d325061fd
commit b17beb30c8
13 changed files with 58 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/create.css
-4
View File
@@ -27,13 +27,9 @@
#contactListGroup .input-group-btn > .btn {margin-left: -1px!important;}
#contactListGroup .chosen-container-single a {border-left-width: 0px;}
.chosen-container {max-width: 580px;}
.minw-80px {min-width: 80px;}
.colorpicker.input-group-btn > .btn {border-right: none}
#branch {border-left-width: 0;}
.input-group-addon.w-90px{min-width:90px;}
.input-group .input-group-btn .btn{padding: 6px 12px;}
module/bug/model.php
+1 -1
View File
@@ -2537,7 +2537,7 @@ class bugModel extends model
if($bug->assignedTo == $account) $btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-icon-left{$btnClass}'");
echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'");
break;
case 'assignedDate':
echo substr($bug->assignedDate, 5, 11);
module/bug/view/create.html.php
+1 -2
View File
@@ -39,7 +39,6 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<div class='input-group'>
<?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen control-product' autocomplete='off'");?>
<?php if($this->session->currentProductType != 'normal'):?>
<span class='input-group-addon'></span>
<?php echo html::select('branch', $branches, $branch, "onchange='loadBranch()' class='form-control chosen control-branch'");?>
<?php endif;?>
</div>
@@ -67,7 +66,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<?php if($showProject):?>
<tr>
<th><?php echo $lang->bug->project;?></th>
<td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProjectRelated(this.value)' autocomplete='off'");?></span></td>
<td><div id='projectIdBox'><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProjectRelated(this.value)' autocomplete='off'");?></div></td>
</tr>
<?php endif;?>
<tr>
module/doc/view/showfiles.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<?php foreach($files as $file):?>
<?php if(empty($file->pathname)) continue;?>
<tr>
<td><?php echo $file->id;?></td>
<td><?php echo sprintf('%03d', $file->id);?></td>
<td>
<a href='<?php echo $this->createLink($file->objectType, 'view', "objectID=$file->objectID");?>'><?php echo $file->title . ' [' . strtoupper($file->objectType) . ' #' . $file->objectID . ']';?></a>
</td>
module/misc/css/changelog.css
+9 -1
View File
@@ -1,9 +1,17 @@
#versionMenu {margin-left: 20px;}
#versionMenu .dropdown-menu {min-width: 130px; max-height:180px;overflow-y:auto;}
#featureList {padding: 0 20px 20px; min-height:200px;}
#mainContent {min-height: 240px;}
#featureList {padding: 0 10px;}
#featureList > .item {padding: 0 0 10px 0;}
#featureList > .item > h3 {color: #114f8e; font-size: 16px; margin: 0; padding: 10px 0}
#featureList > .item > .desc {color: #666; padding-left: 18px;}
#featureList > .item > .more-link {color: #666; padding-left: 18px;}
#featureList > .item > .more {display: none}
#featureList + #details {padding: 0;}
#details .details-list {display: none; padding: 10px; background: #f1f1f1; border-radius: 4px;}
#details.show-details .details-list {display: block;}
#details > .btn > .icon-angle-right {transition: transform .2s; display: inline-block;}
#details.show-details > .btn > .icon-angle-right {transform: rotate(90deg)}
#details.show-details > .btn:focus {border-radius: 4px 4px 0 0;}
#details.show-details > .btn:focus + .details-list {border-radius: 0 0 4px 4px;}
module/misc/view/changelog.html.php
+35 -29
View File
@@ -1,35 +1,41 @@
<?php include '../../common/view/header.lite.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px'>
<div class='main-header clearfix'>
<h2 class='pull-left'><?php echo $lang->changeLog ?></h2>
<div class='btn-toolbar pull-left'>
<div class='dropdown' id='versionMenu'>
<button class='btn dropdown-toggle' type='button' data-toggle='dropdown'><?php echo $version === 'latest' ? $lang->misc->feature->lastest : ($lang->misc->releaseDate[$versionName] . ' ' . $version) ?> <span class='caret'></span></button>
<ul class='dropdown-menu'>
<?php foreach(array_keys($lang->misc->feature->all) as $versionName):?>
<li<?php echo $versionName === $version ? " class='active'" : '' ?>>
<?php echo html::a(helper::createLink('misc', 'changeLog', "version=$versionName"), $versionName === 'latest' ? $lang->misc->feature->lastest : ($lang->misc->releaseDate[$versionName] . ' ' . $versionName));?>
</li>
<?php endforeach; ?>
</ul>
<main id="main">
<div class="container">
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px'>
<div class='main-header clearfix'>
<h2 class='pull-left'><?php echo $lang->changeLog ?></h2>
<div class='btn-toolbar pull-left'>
<div class='dropdown' id='versionMenu'>
<button class='btn dropdown-toggle' type='button' data-toggle='dropdown'><?php echo $version === 'latest' ? $lang->misc->feature->lastest : ($lang->misc->releaseDate[$versionName] . ' ' . $version) ?> <span class='caret'></span></button>
<ul class='dropdown-menu'>
<?php foreach(array_keys($lang->misc->feature->all) as $versionName):?>
<li<?php echo $versionName === $version ? " class='active'" : '' ?>>
<?php echo html::a(helper::createLink('misc', 'changeLog', "version=$versionName"), $versionName === 'latest' ? $lang->misc->feature->lastest : ($lang->misc->releaseDate[$versionName] . ' ' . $versionName));?>
</li>
<?php endforeach; ?>
</ul>
</div>
</div>
</div>
<div id='featureList' class='article-content'>
<?php $idx = count($features) == 1 ? '' : 1; ?>
<?php foreach ($features as $feature):?>
<div class='item'>
<h3><?php echo $idx . ($idx == '' ? '' : '. ') . $feature['title'] ?></h3>
<div class='desc'><?php echo $feature['desc'] ?></div>
</div>
<?php $idx++; ?>
<?php endforeach; ?>
</div>
<?php if($detailed and $this->app->getClientLang() != 'en'):?>
<div id="details" class='article-content'>
<a href='###' class="btn btn-link text-primary btn-block text-left" onclick="$('#details').toggleClass('show-details')"><i class="icon icon-angle-right"></i> <?php echo $lang->misc->feature->detailed;?></a>
<div class='details-list'><?php echo $detailed;?></div>
</div>
<?php endif;?>
</div>
</div>
<div id='featureList' class='article-content'>
<?php $idx = count($features) == 1 ? '' : 1; ?>
<?php foreach ($features as $feature):?>
<div class='item'>
<h3><?php echo $idx . ($idx == '' ? '' : '. ') . $feature['title'] ?></h3>
<div class='desc'><?php echo $feature['desc'] ?></div>
</div>
<?php $idx++; ?>
<?php endforeach; ?>
<?php if($detailed and $this->app->getClientLang() != 'en'):?>
<div> <a href='###' onclick="$('.detailed').toggle()"><?php echo $lang->misc->feature->detailed;?></a></div>
<div class='detailed hide'><?php echo $detailed;?></div>
<?php endif;?>
</div>
</div>
</div>
</main>
<?php include '../../common/view/footer.lite.html.php';?>
module/my/view/buildcontactlists.html.php
+3 -1
View File
@@ -25,5 +25,7 @@ else
?>
<style>
#contactListMenu + .chosen-container {min-width: 100px;}
#contactListMenu_chosen > a {border-top: 0px;}
td > #mailto + .chosen-container .chosen-choices {border-radius: 2px 2px 0 0;}
td > #mailto + .chosen-container + #contactListMenu + .chosen-container > .chosen-single {border-radius: 0 0 2px 2px; border-top-width: 0; padding-top: 6px;}
#contactListMenu + .chosen-container.chosen-container-active > .chosen-single {border-top-width: 1px!important; padding-top: 5px!important;}
</style>
module/project/view/create.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
</tr>
<tr>
<th><?php echo $lang->project->type;?></th>
<td><?php echo html::select('type', $lang->project->typeList, '', "class='form-control chosen' onchange='showTypeTips()'");?></td>
<td><?php echo html::select('type', $lang->project->typeList, '', "class='form-control chosen-simple' onchange='showTypeTips()'");?></td>
<td class='muted' colspan='2'><div class='type-tips'><?php echo $lang->project->typeDesc;?></div></td>
</tr>
<tr <?php if($this->config->global->flow == 'onlyTask') echo "class='hidden'";?>>
module/todo/css/edit.css
+1
View File
@@ -1,2 +1,3 @@
.todoType {margin-top: 6px;}
.dateSwitcher {margin-top: 6px;}
.form-horizontal .required::after{right: -10px;}
module/todo/view/edit.html.php
+1 -1
View File
@@ -91,7 +91,7 @@
<div class="row form-group">
<label class="col-sm-1"><?php echo $lang->todo->name;?></label>
<div class="col-sm-10">
<div id='nameBox'>
<div id='nameBox' class='required'>
<?php
$readType = ($todo->type == 'bug' or $todo->type == 'task') ? 'readonly' : '';
echo html::input('name', $todo->name, "$readType class='form-control' autocomplete='off'");
module/todo/view/view.html.php
+3 -3
View File
@@ -161,9 +161,9 @@
unset($_GET['onlybody']);
echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
echo "<ul class='dropdown-menu pull-right' role='menu'>";
if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-moveable='true' data-position='193px' id='toStoryLink'") . '</li>';
if($createTaskPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-moveable='true' data-position='193px' id='toTaskLink'") . '</li>';
if($createBugPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-moveable='true' data-position='193px' id='toBugLink'") . '</li>';
if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
if($createTaskPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
if($createBugPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
echo "</ul>";
if($isonlybody) $_GET['onlybody'] = 'yes';
}
www/js/zui/min.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long