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

* finish task #2558.

Browse Source 
* add manage contacts and refresh button for task and testtask module.
This commit is contained in:
chenfeiCF
2016-03-28 16:05:03 +08:00
parent 7767e14eb5
commit 2306be7eaf
9 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/create.html.php
+1 -1
View File
@@ -171,7 +171,7 @@ js::set('refresh', $lang->refresh);
if(empty($contactLists))
{
echo '<span class="input-group-btn">';
echo '<a href="' . $this->createLink('company', 'browse') . '" target="_blank" data-toggle="tooltip" class="btn" title="' . $lang->user->contacts->manage . '"><i class="icon icon-cog"></i></a>';
echo '<a href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" data-toggle="tooltip" class="btn" title="' . $lang->user->contacts->manage . '"><i class="icon icon-cog"></i></a>';
echo '<a href="###" onclick="ajaxGetContacts(this)" data-toggle="tooltip" class="btn" title="' . $lang->refresh . '"><i class="icon icon-refresh"></i></a>';
echo '</span>';
}
module/company/js/browse.js
-4
View File
@@ -2,10 +2,6 @@ function batchEdit()
{
$('#userListForm').attr('action', createLink('user', 'batchEdit', 'dept=' + deptID));
}
function manageContacts()
{
$('#userListForm').attr('action', createLink('user', 'manageContacts'));
}
$(function()
{
setTimeout(function(){fixedTfootAction('#userListForm')}, '100');
module/company/view/browse.html.php
+1 -3
View File
@@ -54,8 +54,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
<tbody>
<?php
$canBatchEdit = common::hasPriv('user', 'batchEdit');
$canManageContacts = common::hasPriv('user', 'manageContacts');
$canBatchEdit = common::hasPriv('user', 'batchEdit');
?>
<?php foreach($users as $user):?>
<tr class='text-center'>
@@ -99,7 +98,6 @@ js::set('confirmDelete', $lang->user->confirmDelete);
<?php
if($canBatchEdit or $canManageContacts) echo html::selectButton();
if($canBatchEdit) echo html::submitButton($lang->edit, 'onclick=batchEdit()', 'btn btn-default');
if($canManageContacts) echo html::submitButton($lang->user->contacts->manage, 'onclick=manageContacts()');
?>
</div>
<?php echo $pager->show();?>
module/story/view/create.html.php
+1 -1
View File
@@ -127,8 +127,8 @@
if(empty($contactLists))
{
echo '<span class="input-group-btn">';
echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
echo '<a data-toggle="tooltip" title="' . $lang->refresh . '" href="###" class="btn" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></a>';
echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('company', 'browse') . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
echo '</span>';
}
?>
module/task/css/create.css
+2
View File
@@ -1,6 +1,8 @@
.dropdown-pris > .btn {background-color: #fff;}
#mailto + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0}
#mailtoGroup .input-group-btn > .btn {margin-left: -1px!important;}
.chosen-container {max-width: 980px}
.minw-80px {min-width: 80px;}
module/task/view/create.html.php
+10 -1
View File
@@ -94,10 +94,19 @@
</div>
</td>
<td colspan='2'>
<div class='input-group'>
<div id='mailtoGroup' class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->mailto;?></span>
<?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?>
<?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?>
<?php
if(empty($contactLists))
{
echo '<span class="input-group-btn">';
echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
echo '<a data-toggle="tooltip" title="' . $lang->refresh . '" href="###" class="btn" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></a>';
echo '</span>';
}
?>
</div>
</td>
</tr>
module/testtask/css/create.css
+1
View File
@@ -0,0 +1 @@
#mailtoGroup .input-group-btn > .btn {margin-left: -1px!important;}
module/testtask/js/create.js
+6
View File
@@ -58,3 +58,9 @@ function suitEndDate()
endDate = endDate.toString('yyyy-M-dd');
$('#end').val(endDate);
}
/* If the mouse hover over the manage contacts button, give tip. */
$(function()
{
$('[data-toggle=tooltip]').tooltip();
});
module/testtask/view/create.html.php
+10 -1
View File
@@ -73,9 +73,18 @@
<tr>
<th><?php echo $lang->testtask->mailto;?></th>
<td colspan='2'>
<div class='input-group'>
<div id='mailtoGroup' class='input-group'>
<?php echo html::select('mailto[]', $users, '', "multiple class='form-control'");?>
<?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?>
<?php
if(empty($contactLists))
{
echo '<span class="input-group-btn">';
echo '<a href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" data-toggle="tooltip" class="btn" title="' . $lang->user->contacts->manage . '"><i class="icon icon-cog"></i></a>';
echo '<a href="###" onclick="ajaxGetContacts(this)" data-toggle="tooltip" class="btn" title="' . $lang->refresh . '"><i class="icon icon-refresh"></i></a>';
echo '</span>';
}
?>
</div>
</td>
</tr>