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

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

Browse Source 
Conflicts:
	module/task/css/create.css
This commit is contained in:
daitingting
2018-05-18 09:37:56 +08:00
parent 6c6601ae46 9ebca72c86
commit 2bc846055c
9 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
10.0.beta
10.0.alpha
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '10.0.beta'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '10.0.alpha'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
$config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
db/update10.0.beta.sql → db/update9.8.3.sql
View File
module/project/js/managemembers.js
+3 -3
View File
@@ -13,11 +13,11 @@ function setRole(account, roleID)
roleOBJ.val(role) // set the role.
}
function addItem()
function addItem(obj)
{
var item = $('#addItem').html().replace(/%i%/g, i);
$('#teamForm table tbody').append('<tr class="addedItem">' + item + '</tr>');
var accounts = $('#submit').closest('table').find('tr.addedItem:last').find('select:first')
$(obj).closest('tr').after('<tr class="addedItem">' + item + '</tr>');
var accounts = $('#hours' + i).closest('tr').find('select:first')
accounts.trigger('liszt:updated');
accounts.chosen();
i ++;
module/project/view/managemembers.html.php
+6 -7
View File
@@ -58,8 +58,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, $member->limited);?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem()' class='disabled btn btn-link'><i class='icon icon-trash'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
</td>
</tr>
<?php $i ++; $memberCount ++;?>
@@ -76,7 +75,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
@@ -95,7 +94,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
@@ -114,15 +113,15 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endfor;?>
</tbody>
<tfoot><tr><td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
</table>
<div class='table-footer text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></div>
<?php js::set('i', $i);?>
</form>
</div>
@@ -139,7 +138,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, $member->realname ? $member->limited : 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
module/project/view/team.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
</div>
<div id='mainContent'>
<form class='main-table' data-ride='table'>
<form class='main-table'>
<table class='table' id='memberList'>
<thead>
<tr>
module/task/css/create.css
+4
View File
@@ -1 +1,5 @@
<<<<<<< HEAD
#copyButton{width: 50px;}
=======
#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/
>>>>>>> 9ebca72c8626aefa35f2f966d11a3989fb2d6503
module/task/js/create.js
+2
View File
@@ -75,6 +75,7 @@ function setPreview()
{
$('#preview').addClass('hidden');
$('#copyButton').addClass('hidden');
$('div.colorpicker').css('right', '1px');//Adjust for task #4151;
}
else
{
@@ -84,6 +85,7 @@ function setPreview()
$('#preview').removeClass('hidden');
$('#preview a').attr('href', storyLink);
$('#copyButton').removeClass('hidden');
$('div.colorpicker').css('right', '57px');//Adjust for task #4151;
}
setAfter();
module/task/view/edit.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<div class='main-col col-8'>
<div class='cell'>
<div class='form-group'>
<div class='input-group'>
<div class='<?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair') echo 'input-group';?>'>
<div class="input-control has-icon-right">
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>