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

* finish task #5441.

Browse Source
This commit is contained in:
wangyidong
2019-04-29 15:44:17 +08:00
parent 5c90c57f46
commit f08d1deb40
5 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/en.php
-7
View File
@@ -94,13 +94,6 @@ $lang->preShortcutKey = '[Shortcut:←]';
$lang->nextShortcutKey = '[Shortcut:→]';
$lang->backShortcutKey = '[Shortcut:Alt+↑]';
$lang->saveTemplate = 'Save as Template';
$lang->setPublic = 'Set as Public Template';
$lang->deleteTemplate = 'Delete Template';
$lang->setTemplateTitle = 'Please enter the title of template.';
$lang->applyTemplate = 'Template';
$lang->confirmDeleteTemplate = 'Do you want to delete this template?';
$lang->select = 'Select';
$lang->selectAll = 'Select All';
$lang->selectReverse = 'Select Inverse';
module/common/lang/zh-cn.php
-7
View File
@@ -94,13 +94,6 @@ $lang->preShortcutKey = '[快捷键:←]';
$lang->nextShortcutKey = '[快捷键:→]';
$lang->backShortcutKey = '[快捷键:Alt+↑]';
$lang->saveTemplate = '保存模板';
$lang->setPublic = '设为公共模板';
$lang->deleteTemplate = '删除模板';
$lang->setTemplateTitle = '请输入模板标题';
$lang->applyTemplate = '应用模板';
$lang->confirmDeleteTemplate = '您确认要删除该模板吗？';
$lang->select = '选择';
$lang->selectAll = '全选';
$lang->selectReverse = '反选';
module/user/lang/en.php
+29 -22
View File
@@ -48,28 +48,35 @@ $lang->user->originalPassword = 'Old Password';
$lang->user->verifyPassword = 'Your Login Password';
$lang->user->resetPassword = 'Forgot Password?';
$lang->user->index = "Home";
$lang->user->view = "Overview";
$lang->user->create = "Add User";
$lang->user->batchCreate = "Batch Add";
$lang->user->edit = "Edit";
$lang->user->batchEdit = "Batch Edit";
$lang->user->unlock = "Unlock";
$lang->user->delete = "Delete";
$lang->user->unbind = "Unbind Zdoo";
$lang->user->login = "Login";
$lang->user->mobileLogin = "Mobile";
$lang->user->editProfile = "Edit Profile";
$lang->user->deny = "Your access is denied.";
$lang->user->confirmDelete = "Do you want to delete this user?";
$lang->user->confirmUnlock = "Do you want to unlock this user?";
$lang->user->confirmUnbind = "Do you want to unbind this user from Zdoo?";
$lang->user->relogin = "Login Again";
$lang->user->asGuest = "Guest";
$lang->user->goback = "Back";
$lang->user->deleted = '(Deleted)';
$lang->user->search = 'Search';
$lang->user->setPublicTemplate = 'Set as Public Template';
$lang->user->index = "Home";
$lang->user->view = "Overview";
$lang->user->create = "Add User";
$lang->user->batchCreate = "Batch Add";
$lang->user->edit = "Edit";
$lang->user->batchEdit = "Batch Edit";
$lang->user->unlock = "Unlock";
$lang->user->delete = "Delete";
$lang->user->unbind = "Unbind Zdoo";
$lang->user->login = "Login";
$lang->user->mobileLogin = "Mobile";
$lang->user->editProfile = "Edit Profile";
$lang->user->deny = "Your access is denied.";
$lang->user->confirmDelete = "Do you want to delete this user?";
$lang->user->confirmUnlock = "Do you want to unlock this user?";
$lang->user->confirmUnbind = "Do you want to unbind this user from Zdoo?";
$lang->user->relogin = "Login Again";
$lang->user->asGuest = "Guest";
$lang->user->goback = "Back";
$lang->user->deleted = '(Deleted)';
$lang->user->search = 'Search';
$lang->user->saveTemplate = 'Save as Template';
$lang->user->setPublic = 'Set as Public Template';
$lang->user->deleteTemplate = 'Delete Template';
$lang->user->setTemplateTitle = 'Please enter the title of template.';
$lang->user->applyTemplate = 'Template';
$lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
$lang->user->setPublicTemplate = 'Set as Public Template';
$lang->user->profile = 'Profile';
$lang->user->project = $lang->projectCommon;
module/user/lang/zh-cn.php
+29 -22
View File
@@ -48,28 +48,35 @@ $lang->user->originalPassword = '原密码';
$lang->user->verifyPassword = '您的系统登录密码';
$lang->user->resetPassword = '忘记密码';
$lang->user->index = "用户视图首页";
$lang->user->view = "用户详情";
$lang->user->create = "添加用户";
$lang->user->batchCreate = "批量添加用户";
$lang->user->edit = "编辑用户";
$lang->user->batchEdit = "批量编辑";
$lang->user->unlock = "解锁用户";
$lang->user->delete = "删除用户";
$lang->user->unbind = "解除然之绑定";
$lang->user->login = "用户登录";
$lang->user->mobileLogin = "手机访问";
$lang->user->editProfile = "修改档案";
$lang->user->deny = "访问受限";
$lang->user->confirmDelete = "您确定删除该用户吗？";
$lang->user->confirmUnlock = "您确定解除该用户的锁定状态吗？";
$lang->user->confirmUnbind = "您确定解除该用户跟然之的绑定吗？";
$lang->user->relogin = "重新登录";
$lang->user->asGuest = "游客访问";
$lang->user->goback = "返回前一页";
$lang->user->deleted = '(已删除)';
$lang->user->search = '搜索';
$lang->user->setPublicTemplate = '设为公共模板';
$lang->user->index = "用户视图首页";
$lang->user->view = "用户详情";
$lang->user->create = "添加用户";
$lang->user->batchCreate = "批量添加用户";
$lang->user->edit = "编辑用户";
$lang->user->batchEdit = "批量编辑";
$lang->user->unlock = "解锁用户";
$lang->user->delete = "删除用户";
$lang->user->unbind = "解除然之绑定";
$lang->user->login = "用户登录";
$lang->user->mobileLogin = "手机访问";
$lang->user->editProfile = "修改档案";
$lang->user->deny = "访问受限";
$lang->user->confirmDelete = "您确定删除该用户吗？";
$lang->user->confirmUnlock = "您确定解除该用户的锁定状态吗？";
$lang->user->confirmUnbind = "您确定解除该用户跟然之的绑定吗？";
$lang->user->relogin = "重新登录";
$lang->user->asGuest = "游客访问";
$lang->user->goback = "返回前一页";
$lang->user->deleted = '(已删除)';
$lang->user->search = '搜索';
$lang->user->saveTemplate = '保存模板';
$lang->user->setPublic = '设为公共模板';
$lang->user->deleteTemplate = '删除模板';
$lang->user->setTemplateTitle = '请输入模板标题';
$lang->user->applyTemplate = '应用模板';
$lang->user->confirmDeleteTemplate = '您确认要删除该模板吗？';
$lang->user->setPublicTemplate = '设为公共模板';
$lang->user->profile = '档案';
$lang->user->project = $lang->projectCommon;
module/user/view/ajaxprinttemplates.html.php
+8 -8
View File
@@ -3,8 +3,8 @@
foreach($templates as $key => $template)
{
echo "<li id='tplBox$template->id' onmouseover='displayXIcon($template->id)' onmouseout='hideXIcon($template->id)'>";
echo "<a title='{$lang->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
echo "<a title='{$lang->user->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
if($template->public) echo "<span class='label label-info label-badge'>{$lang->user->public}</span> ";
echo $template->title . "</a>";
if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='templateID$template->id' class='btn-delete hidden'><i class='icon-close'></i></a>";
echo "<span id='template$template->id' class='hidden'>$template->content</span>";
@@ -25,15 +25,15 @@ foreach($templates as $key => $template)
<div id='tplBoxWrapper'>
<div class='btn-toolbar'>
<div class='btn-group'>
<button id='saveTplBtn' type='button' class='btn btn-mini' data-toggle='saveTplModal'><?php echo $lang->saveTemplate?></button>
<button id='applyTplBtn' type='button' class='btn btn-mini dropdown-toggle' data-toggle='dropdown'><?php echo $lang->applyTemplate?> <span class='caret'></span></button>
<button id='saveTplBtn' type='button' class='btn btn-mini' data-toggle='saveTplModal'><?php echo $lang->user->saveTemplate?></button>
<button id='applyTplBtn' type='button' class='btn btn-mini dropdown-toggle' data-toggle='dropdown'><?php echo $lang->user->applyTemplate?> <span class='caret'></span></button>
<ul id='tplBox' class='dropdown-menu pull-right'>
<?php
foreach($templates as $key => $template)
{
echo "<li id='tplBox$template->id' onmouseover='displayXIcon($template->id)' onmouseout='hideXIcon($template->id)'>";
echo "<a title='{$lang->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
echo "<a title='{$lang->user->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
if($template->public) echo "<span class='label label-info label-badge'>{$lang->user->public}</span> ";
echo $template->title . "</a>";
if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='templateID$template->id' class='btn-delete hidden'><i class='icon-close'></i></a>";
echo "<span id='template$template->id' class='hidden'>$template->content</span>";
@@ -49,7 +49,7 @@ foreach($templates as $key => $template)
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
<h4 class="modal-title"><?php echo $lang->setTemplateTitle;?></h4>
<h4 class="modal-title"><?php echo $lang->user->setTemplateTitle;?></h4>
</div>
<div class="modal-body">
<div class='input-group'>
@@ -82,7 +82,7 @@ function setTemplate(templateID)
function deleteTemplate(templateID)
{
if(!templateID) return;
if(confirm(<?php echo json_encode($lang->confirmDeleteTemplate);?>))
if(confirm(<?php echo json_encode($lang->user->confirmDeleteTemplate);?>))
{
hiddenwin.location.href = createLink('user', 'ajaxDeleteTemplate', 'templateID=' + templateID);
$('#tplBox' + templateID).addClass('hidden');