* finish task #2252.

This commit is contained in:
wangyidong
2015-05-12 11:15:33 +08:00
parent ff8ac1f30f
commit d00f899b21
5 changed files with 111 additions and 72 deletions
+1 -2
View File
@@ -81,8 +81,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
{
$deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '<i class="icon-remove"></i>', '', "title='{$lang->user->delete}' class='btn-icon'");
echo html::a($this->createLink('user', 'delete', "userID= $user->id"), '<i class="icon-remove"></i>', '', "title='{$lang->user->delete}' class='btn-icon iframe'");
}
if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
{
+70 -70
View File
@@ -1,72 +1,72 @@
<?php
/**
* The export view file of file module of ZenTaoPMS.
*
<?php
/**
* The export view file of file module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Congzhi Chen <congzhi@cnezsoft.com>
* @package file
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<script>
function setDownloading()
{
if($.browser.opera) return true; // Opera don't support, omit it.
$.cookie('downloading', 0);
time = setInterval("closeWindow()", 300);
return true;
}
function closeWindow()
{
if($.cookie('downloading') == 1)
{
parent.$.closeModal();
$.cookie('downloading', null);
clearInterval(time);
}
}
function switchEncode(fileType)
{
$('#encode').removeAttr('disabled');
if(fileType != 'csv')
{
$('#encode').val('utf-8');
$('#encode').attr('disabled', 'disabled');
}
}
$(document).ready(function(){$('#fileType').change();});
</script>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['export']);?></span>
<strong><?php echo $lang->export;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5% 50px'>
<table class='w-p100'>
<tr>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->setFileName;?></span>
<?php echo html::input('fileName', '', 'class=form-control');?>
</div>
</td>
<td class='w-80px'>
<?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?>
</td>
<td class='w-90px'>
<?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?>
</td>
<td class='w-100px'>
<?php echo html::select('exportType', $lang->exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all', "class='form-control'");?>
</td>
<td><?php echo html::submitButton($lang->export);?></td>
</tr>
</table>
</form>
<?php include '../../common/view/footer.lite.html.php';?>
* @author Congzhi Chen <congzhi@cnezsoft.com>
* @package file
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<script>
function setDownloading()
{
if($.browser.opera) return true; // Opera don't support, omit it.
$.cookie('downloading', 0);
time = setInterval("closeWindow()", 300);
return true;
}
function closeWindow()
{
if($.cookie('downloading') == 1)
{
parent.$.closeModal();
$.cookie('downloading', null);
clearInterval(time);
}
}
function switchEncode(fileType)
{
$('#encode').removeAttr('disabled');
if(fileType != 'csv')
{
$('#encode').val('utf-8');
$('#encode').attr('disabled', 'disabled');
}
}
$(document).ready(function(){$('#fileType').change();});
</script>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['export']);?></span>
<strong><?php echo $lang->export;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5% 50px'>
<table class='w-p100'>
<tr>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->setFileName;?></span>
<?php echo html::input('fileName', '', 'class=form-control');?>
</div>
</td>
<td class='w-80px'>
<?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?>
</td>
<td class='w-90px'>
<?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?>
</td>
<td class='w-100px'>
<?php echo html::select('exportType', $lang->exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all', "class='form-control'");?>
</td>
<td><?php echo html::submitButton($lang->export);?></td>
</tr>
</table>
</form>
<?php include '../../common/view/footer.lite.html.php';?>
+4
View File
@@ -57,6 +57,10 @@
</td>
</tr>
<?php endfor;?>
<tr>
<th colspan='2'><?php echo $lang->user->verifyPwd?></th>
<td colspan='7'><?php echo html::password('verifyPwd', '', "class='form-control' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?></td>
</tr>
<tr><td colspan='9' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
+4
View File
@@ -53,6 +53,10 @@
<td><?php echo html::input("join[$user->id]", $user->join, "class='form-control form-date'");?></td>
</tr>
<?php endforeach;?>
<tr>
<th colspan='2'><?php echo $lang->user->verifyPwd?></th>
<td colspan='6'><?php echo html::password('verifyPwd', '', "class='form-control' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?></td>
</tr>
<tr><td colspan='8' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
+32
View File
@@ -0,0 +1,32 @@
<?php
/**
* The delete view file of user module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package user
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div id='titlebar'>
<div class='heading'>
<strong><?php echo $lang->user->delete;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' style='padding: 20px 5% 40px'>
<table class='w-p100 table-form'>
<tr>
<th class='w-100px text-right'>
<?php echo $lang->user->verifyPwd;?>
</th>
<td>
<?php echo html::input('verifyPwd', '', "class='form-control' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
<td class='w-100px'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
<?php include '../../common/view/footer.lite.html.php';?>