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
This commit is contained in:
daitingting
2018-05-15 17:32:22 +08:00
parent 81d06711b1 517aa12411
commit 5f91f480cc
20 changed files with 143 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/dashboard.html.php
+1 -1
View File
@@ -17,7 +17,7 @@ if(isset($pageCSS)) css::internal($pageCSS);
$useGuest = $this->app->user->account == 'guest';
?>
<?php include '../../common/view/tablesorter.html.php';?>
<div class='dashboard row' id='dashboard' data-confirm-remove-block='<?php echo $lang->block->confirmRemoveBlock;?>'>
<div class='dashboard' id='dashboard' data-confirm-remove-block='<?php echo $lang->block->confirmRemoveBlock;?>'>
<div>
<div class='col-md-8 col-main'>
<?php foreach($longBlocks as $index => $block):?>
module/block/view/storyblock.html.php
+1 -2
View File
@@ -38,8 +38,7 @@
<?php if($longBlock):?>
<td class="c-id"><?php echo $story->id;?></td>
<?php endif;?>
<?php $pri = zget($lang->story->priList, $story->pri, $story->pri);?>
<td class="c-pri"><span class="label-pri label-pri-<?php echo $pri?>"><?php echo $pri?></span></td>
<td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center'><?php echo $story->estimate?></td>
module/company/view/browse.html.php
+24 -22
View File
@@ -58,21 +58,21 @@ js::set('confirmDelete', $lang->user->confirmDelete);
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th><?php common::printorderlink('realname', $orderBy, $vars, $lang->user->realname);?></th>
<th><?php common::printOrderLink('account', $orderBy, $vars, $lang->user->account);?></th>
<th><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
<th><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
<th><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
<th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
<th><?php common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?></th>
<th><?php common::printOrderLink('last', $orderBy, $vars, $lang->user->last);?></th>
<th><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
<th class='w-90px'><?php echo $lang->actions;?></th>
<th><?php common::printOrderLink('account', $orderBy, $vars, $lang->user->account);?></th>
<th class="c-type"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
<th class="c-url"><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
<th class="c-type"><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
<th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
<th><?php common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?></th>
<th class="c-date"><?php common::printOrderLink('last', $orderBy, $vars, $lang->user->last);?></th>
<th class="c-num"><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
<th class='c-actions-2'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($users as $user):?>
<tr>
<td class='cell-id'>
<td class='c-id'>
<?php if($canBatchEdit):?>
<?php echo html::checkbox('users', array($user->account => sprintf('%03d', $user->id)));?>
<?php else:?>
@@ -81,26 +81,28 @@ js::set('confirmDelete', $lang->user->confirmDelete);
</td>
<td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
<td><?php echo $user->account;?></td>
<td><?php echo zget($lang->user->roleList, $user->role, '');?></td>
<td><?php echo html::mailto($user->email);?></td>
<td><?php if(isset($lang->user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?></td>
<td class="c-type"><?php echo zget($lang->user->roleList, $user->role, '');?></td>
<td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>
<td class="c-type"<?php if(isset($lang->user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?></td>
<td><?php echo $user->phone;?></td>
<td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
<td><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
<td><?php echo $user->visits;?></td>
<td class='c-date'><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
<td class='c-num text-center'><?php echo $user->visits;?></td>
<td class='c-actions'>
<div class='more'>
<?php if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin", 'btn-link');?>
<?php
if($user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
{
common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin");
}
?>
</div>
<?php
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'button');
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
{
echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '<i class="icon-trash"></i>', '', "title='{$lang->user->delete}' class='btn btn-link iframe'");
}
if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
{
common::printIcon('user', 'unlock', "userID=$user->account", '', 'button', '', "hiddenwin");
echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '<i class="icon-trash"></i>', '', "title='{$lang->user->delete}' class='btn iframe'");
}
?>
</td>
module/datatable/view/ajaxcustom.html.php
+1 -1
View File
@@ -71,7 +71,7 @@
<?php if(isset($col['name'])) echo html::hidden('name', $col['name'])?>
<span><span class='text-muted'><?php echo $lang->datatable->width?></span> <input type='text' id='width' class='form-control' value='<?php echo $col['width']?>'><?php echo $autoWidth ? '&nbsp;' : 'px' ?></span>
</div>
<div class="checkbox-primary"><label></label></div>
<div class="checkbox-primary<?php echo $required ? ' disabled' : '';?>"><label></label></div>
<span class='title'><span class='title-bar'><strong><?php echo $col['title']?></strong><i class='icon-move'></i></span></span> <?php if($required) echo "<span class='text-muted'>({$lang->datatable->required})</span>"?>
</div>
<?php endforeach;?>
module/group/view/browse.html.php
+3 -3
View File
@@ -44,10 +44,10 @@
<td title='<?php echo $users;?>'><?php echo $users;?></td>
<td class='c-actions'>
<?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
<?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'pencil');?>
<?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'pencil');?>
<?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye');?>
<?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
<?php $lang->group->managemember = $lang->group->manageMember;?>
<?php common::printIcon('group', 'managemember', "groupID=$group->id", $group, 'list', 'pencil', '', 'iframe', 'yes');?>
<?php common::printIcon('group', 'managemember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?>
<?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
<?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
<?php
module/group/view/edit.html.php
+1 -1
View File
@@ -14,7 +14,7 @@
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span><?php echo $group->id;?></span>
<span class='label label-id'><?php echo $group->id;?></span>
<?php echo $group->name;?>
<small><?php echo $lang->arrow . $lang->group->edit;?></small>
</h2>
module/group/view/managemember.html.php
+2 -2
View File
@@ -14,12 +14,12 @@
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span class='label label-id' title='GROUP'><?php echo $group->id;?></span>
<span class='label label-id'><?php echo $group->id;?></span>
<?php echo $group->name;?>
</h2>
</div>
<div class='main-row'>
<div class="side-col col-3">
<div class="side-col">
<div class='side-body'>
<div class='panel panel-sm'>
<div class='panel-heading nobr'><?php echo html::icon($lang->icons['company']);?> <strong><?php echo $lang->dept->common;?></strong></div>
module/testtask/css/cases.css
-2
View File
@@ -9,5 +9,3 @@ tbody > tr > td .icon-bug {margin-left: -8px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single{height:28px;padding:3px 6px}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
#pageActions {top: -60px;}
module/testtask/js/cases.js
-1
View File
@@ -1,6 +1,5 @@
$(document).ready(function()
{
setModal4List('runCase', 'caseList', function(){$(".iframe").modalTrigger({width:1024, type:'iframe'});}, 1024);
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
});
module/testtask/model.php
+5 -1
View File
@@ -28,7 +28,7 @@ class testtaskModel extends model
if($testtask)
{
$testtasks = $this->getProductTasks($productID, $branch, 'id_desc', null, array('local', 'totalStatus'));
$testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
$selectHtml .= "<div class='btn-group angle-btn'>";
$selectHtml .= "<div class='btn-group'>";
@@ -38,6 +38,10 @@ class testtaskModel extends model
$selectHtml .= "</ul>";
$selectHtml .= "</div>";
$selectHtml .= "</div>";
$this->lang->modulePageActions = '';
if(common::hasPriv('testtask', 'view')) $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $this->lang->testtask->view, '', "class='btn'");
if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
}
$this->app->loadLang('qa');
module/testtask/view/caseheader.html.php
-4
View File
@@ -1,7 +1,3 @@
<div id='pageActions'>
<?php common::printLink('testtask', 'view', "taskID=$taskID", "<i class='icon icon-file-text'> </i>" . $lang->testtask->view, '', "class='btn'");?>
<?php common::printLink('testreport', 'browse', "objectID=$productID&objectType=product&extra=$taskID", "<i class='icon icon-flag'> </i>" . $lang->testtask->reportField, '', "class='btn'");?>
</div>
<div id='mainMenu' class='clearfix'>
<div id='sidebarHeader'>
<?php echo html::commonButton('<i class="icon icon-caret-left"></i>', '', 'btn btn-icon btn-sm btn-info sidebar-toggle');?>
module/testtask/view/cases.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
</div>
<div class='main-col'>
<div class="cell" id="queryBox"></div>
<form class='main-table table-cases' data-ride='table' method='post' name='casesform' id='casesForm'>
<form class='main-table table-cases' data-ride='table' data-hot='true' method='post' name='casesform' id='casesForm'>
<?php
$vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
$datatableId = $this->moduleName . ucfirst($this->methodName);
module/testtask/view/groupcase.html.php
+70 -48
View File
@@ -14,52 +14,74 @@
<?php include '../../common/view/treetable.html.php';?>
<?php include './caseheader.html.php';?>
<?php js::set('browseType', $browseType);?>
<table class='table table-fixed' id='treetable'>
<thead>
<tr>
<th class='w-<?php echo $groupBy == 'story' ? '50' : '100';?>px'></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-80px'> <?php echo $lang->typeAB;?></th>
<th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
<th class='w-80px'> <?php echo $lang->testtask->lastRunAccount;?></th>
<th class='w-120px'><?php echo $lang->testtask->lastRunTime;?></th>
<th class='w-80px'> <?php echo $lang->testtask->lastRunResult;?></th>
<th class='w-80px'> <?php echo $lang->testtask->status;?></th>
<th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
<th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
<th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
<th class='w-80px'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<?php $i = 0;?>
<?php foreach($cases as $groupKey => $groupCases):?>
<?php $groupClass = ($i % 2 == 0) ? 'even' : 'highlight-warning'; $i++;?>
<tr id='node-<?php echo $groupKey;?>' class='actie-disabled group-title'>
<td class='text-right <?php echo $groupClass;?> large strong group-name'><?php echo $groupKey;?></td>
<td colspan='12' class='text-left'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
</tr>
<?php foreach($groupCases as $run):?>
<tr id='<?php echo $run->id;?>' class='text-center child-of-node-<?php echo $groupKey;?>'>
<td class='<?php echo $groupClass;?>'></td>
<td class='text-left'>&nbsp;<?php echo $run->case . $lang->colon; if(!common::printLink('testcase', 'view', "case=$run->case", $run->title)) echo $run->title;?></td>
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $run->pri, $run->pri)?>'><?php echo zget($lang->testcase->priList, $run->pri, $run->pri);?></span></td>
<td><?php echo $lang->testcase->typeList[$run->type];?></td>
<td><?php echo $users[$run->assignedTo];?></td>
<td><?php echo $users[$run->lastRunner];?></td>
<td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
<td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
<td><?php echo (common::hasPriv('testcase', 'bugs') and $run->bugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs;?></td>
<td><?php echo (common::hasPriv('testtask', 'results') and $run->results) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->results, '', "class='iframe'") : $run->results;?></td>
<td><?php echo $run->stepNumber;?></td>
<td>
<?php common::printIcon('testtask', 'runCase', "runID=$run->id&caseID=$run->case&version=$run->caseVersion", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?>
<?php common::printIcon('testcase', 'edit', "caseID=$run->case", '', 'list');?>
<?php common::printIcon('testcase', 'delete', "caseID=$run->case", '', 'list', '', 'hiddenwin');?>
</td>
</tr>
<?php endforeach;?>
<?php endforeach;?>
</table>
<div class="main-table" data-ride="table" data-checkable="false" data-group="true">
<table class='table table-grouped text-center' id='treetable'>
<thead>
<tr class="divider">
<th class="c-side text-left has-btn group-menu">
<div class="table-group-btns">
<button type="button" class="btn btn-block btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-caret-up"></i></button>
<button type="button" class="btn btn-block btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-caret-down"></i></button>
</div>
</th>
<th class='c-id-sm'><?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-80px'> <?php echo $lang->typeAB;?></th>
<th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
<th class='w-80px'> <?php echo $lang->testtask->lastRunAccount;?></th>
<th class='w-120px'><?php echo $lang->testtask->lastRunTime;?></th>
<th class='w-80px'> <?php echo $lang->testtask->lastRunResult;?></th>
<th class='w-80px'> <?php echo $lang->testtask->status;?></th>
<th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
<th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
<th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
<th class='w-130px'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php $groupIndex = 0;?>
<?php foreach($cases as $groupKey => $groupCases):?>
<?php
$i = 0;
$groupName = $groupByList ? $groupByList[$groupKey] : '';
if(empty($groupName) and $groupBy == 'story') $groupName = $lang->task->noStory;
if(empty($groupName) and $groupBy == 'assignedTo') $groupName = $lang->task->noAssigned;
?>
<?php foreach($groupCases as $run):?>
<tr data-id='<?php echo $groupIndex;?>' <?php if($i == 0) echo "class='divider-top'";?>>
<?php if($i == 0):?>
<td rowspan='<?php echo count($groupCases);?>' class='c-side text-left group-toggle text-top'>
<?php echo html::a('###', "<i class='icon-caret-down'></i> $groupName", '', "class='text-primary'");?>
</td>
<?php endif;?>
<td class='c-id-sm'><?php echo $run->case;?></td>
<td><span class='label-pri <?php echo 'label-pri-' . $run->pri;?>'><?php echo zget($lang->testcase->priList, $run->pri, $run->pri);?></span></td>
<td class='text-left'><?php if(!common::printLink('testcase', 'view', "case=$run->case", $run->title)) echo $run->title;?></td>
<td><?php echo zget($lang->testcase->typeList, $run->type, '');?></td>
<td><?php echo zget($users, $run->assignedTo);?></td>
<td><?php echo zget($users, $run->lastRunner);?></td>
<td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
<td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
<td><?php echo (common::hasPriv('testcase', 'bugs') and $run->bugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs;?></td>
<td><?php echo (common::hasPriv('testtask', 'results') and $run->results) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->results, '', "class='iframe'") : $run->results;?></td>
<td><?php echo $run->stepNumber;?></td>
<td class='c-actions'>
<?php common::printIcon('testtask', 'runCase', "runID=$run->id&caseID=$run->case&version=$run->caseVersion", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?>
<?php common::printIcon('testcase', 'edit', "caseID=$run->case", '', 'list');?>
<?php common::printIcon('testcase', 'delete', "caseID=$run->case", '', 'list', '', 'hiddenwin');?>
</td>
</tr>
<?php $i++;?>
<?php endforeach;?>
<tr data-id='<?php echo $groupIndex;?>' class='group-toggle group-summary hidden divider-top'>
<td class='c-side text-left'><?php echo html::a('###', "<i class='icon-caret-right'></i> $groupName");?></td>
<td colspan='13'></td>
</tr>
<?php $groupIndex++;?>
<?php endforeach;?>
</tbody>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>
module/testtask/view/view.html.php
+9 -7
View File
@@ -15,11 +15,13 @@
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
<span class='label label-id'><?php echo $task->id;?></span>
<?php echo $task->name;?>
<?php if($task->deleted):?>
<span class='label label-danger'><?php echo $lang->task->deleted;?></span>
<?php endif; ?>
<h2>
<span class='label label-id'><?php echo $task->id;?></span>
<?php echo $task->name;?>
<?php if($task->deleted):?>
<span class='label label-danger'><?php echo $lang->task->deleted;?></span>
<?php endif; ?>
</h2>
</div>
<div class="main-row">
<div class="col-8 main-col">
@@ -87,9 +89,9 @@
</div>
</div>
<div class='mainActions'>
<div id='mainActions'>
<?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");?>
<?php common::printRPN($browseLink);?>
<?php common::printPreAndNext($browseLink);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$task->deleted):?>
module/user/view/delete.html.php
+20 -17
View File
@@ -12,24 +12,27 @@
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php js::import($jsRoot . 'md5.js');?>
<div id='titlebar'>
<div class='heading'>
<strong><?php echo $lang->user->delete;?></strong>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->user->delete;?></h2>
</div>
<form method='post' id='dataform' target='hiddenwin' style='padding: 20px 5% 40px'>
<table class='w-p100 table-form'>
<tr>
<th class='w-120px text-right'>
<?php echo $lang->user->verifyPassword;?>
</th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton($lang->delete, '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
</div>
<form class='form-condensed' method='post' id='dataform' target='hiddenwin' style='padding: 20px 5% 40px'>
<table class='w-p100 table-form'>
<tr>
<th class='w-120px text-right'>
<?php echo $lang->user->verifyPassword;?>
</th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' placeholder='{$lang->user->placeholder->verify}'");?>
</td>
<td class='w-100px'><?php echo html::submitButton($lang->delete);?></td>
</tr>
</table>
</form>
<?php echo html::hidden('verifyRand', $rand);?>
<?php include '../../common/view/footer.lite.html.php';?>
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+4
View File
@@ -92,6 +92,10 @@
<glyph unicode="&#xe94a;" glyph-name="star-empty" d="M470.699 732.995l0.544-0.792c-0.184 0.262-0.365 0.526-0.544 0.792zM77.153 423.114l0.508-0.728c-0.167 0.244-0.336 0.487-0.508 0.728zM200.729-145.098l0.941 0.325c-0.315-0.105-0.629-0.213-0.941-0.325zM824.385-145.389c-0.338 0.12-0.676 0.237-1.014 0.35l1.014-0.35zM757.134-190.319l-0.003 0.953c-0.003-0.318-0.002-0.636 0.003-0.953zM644.954 479.437l-132.36 192.597-148.368-215.689-251.154-84.722 155.067-222.304-0.080-26.96-0.725-244.475 244.818 84.478 244.785-84.475-0.794 271.434 155.064 222.292-250.146 84.389zM841.552 122.612l0.915-312.681c0.18-12.182-5.080-22.937-13.389-29.807-11.038-7.887-22.398-9.799-33.372-5.883l-283.557 97.851-283.585-97.855c-10.969-3.918-22.318-2.005-31.082 4.146-10.595 8.595-15.848 19.364-15.681 31.547l0.923 312.681-175.56 251.683c-6.94 9.732-8.716 21.66-5.859 32.304 4.526 13.219 12.658 21.795 23.75 25.386l284.967 96.134 173.667 252.467c6.679 9.949 16.966 15.422 27.534 15.858 13.34-0.428 23.602-5.89 30.286-15.831l173.77-252.844 283.926-95.786c11.092-3.585 19.228-12.167 22.879-22.577 3.737-13.442 1.965-25.367-4.973-35.116l-175.56-251.68z" />
<glyph unicode="&#xe94b;" glyph-name="star" d="M841.552 122.612l0.915-312.681c0.18-12.182-5.080-22.937-13.389-29.807-11.038-7.887-22.398-9.799-33.372-5.883l-283.557 97.851-283.585-97.855c-10.969-3.918-22.318-2.005-31.082 4.146-10.595 8.595-15.848 19.364-15.681 31.547l0.923 312.681-175.56 251.683c-6.94 9.732-8.716 21.66-5.859 32.304 4.526 13.219 12.658 21.795 23.75 25.386l284.967 96.134 173.667 252.467c6.679 9.949 16.966 15.422 27.534 15.858 13.34-0.428 23.602-5.89 30.286-15.831l173.77-252.844 283.926-95.786c11.092-3.585 19.228-12.167 22.879-22.577 3.737-13.442 1.965-25.367-4.973-35.116l-175.56-251.68z" />
<glyph unicode="&#xe94c;" glyph-name="move" d="M963.488 267.876c4.142 8.283 4.142 20.711 0 33.136-4.142 4.142-4.142 8.283-8.283 12.426l-124.263 124.263c-16.568 16.568-41.421 16.568-57.99 0s-16.568-41.421 0-57.99l53.848-53.848h-273.378v273.378l53.848-53.848c8.283-8.283 16.568-12.426 28.995-12.426s20.711 4.142 28.995 12.426c16.568 16.568 16.568 41.421 0 57.99l-124.263 124.263c-4.142 4.142-8.283 8.283-12.426 8.283-8.283 4.142-20.711 4.142-33.136 0-4.142-4.142-8.283-4.142-12.426-8.283l-124.263-124.263c-16.568-16.568-16.568-41.421 0-57.99s41.421-16.568 57.99 0l53.848 53.848v-273.378h-273.378l53.848 53.848c16.568 16.568 16.568 41.421 0 57.99s-41.421 16.568-57.99 0l-124.263-124.263c-4.142-4.142-8.283-8.283-8.283-12.426-4.142-8.283-4.142-20.711 0-33.136 4.142-4.142 4.142-8.283 8.283-12.426l124.263-124.263c8.283-8.283 16.568-12.426 28.995-12.426s20.711 4.142 28.995 12.426c16.568 16.568 16.568 41.421 0 57.99l-53.848 53.848h273.378v-273.378l-53.848 53.848c-16.568 16.568-41.421 16.568-57.99 0s-16.568-41.421 0-57.99l124.263-124.263c4.142-4.142 8.283-8.283 12.426-8.283 4.142-4.142 12.426-4.142 16.568-4.142s12.426 0 16.568 4.142c4.142 4.142 8.283 4.142 12.426 8.283l124.263 124.263c16.568 16.568 16.568 41.421 0 57.99s-41.421 16.568-57.99 0l-53.848-53.848v273.378h273.378l-53.848-53.848c-16.568-16.568-16.568-41.421 0-57.99 8.283-8.283 20.711-12.426 28.995-12.426s20.711 4.142 28.995 12.426l124.263 124.263c4.142 4.142 8.283 8.283 8.283 12.426z" />
<glyph unicode="&#xe94d;" glyph-name="persons" d="M721.454 540.446c51.2 0 93.091-41.891 93.091-93.091s-41.891-93.091-93.091-93.091c-51.2 0-93.091 41.891-93.091 93.091s41.891 93.091 93.091 93.091zM721.454 284.445c89.832 0 162.909 73.077 162.909 162.909s-73.077 162.909-162.909 162.909c-89.832 0-162.909-73.077-162.909-162.909s73.077-162.909 162.909-162.909zM302.545 540.446c51.2 0 93.091-41.891 93.091-93.091s-41.891-93.091-93.091-93.091c-51.2 0-93.091 41.891-93.091 93.091s41.891 93.091 93.091 93.091zM302.545 284.445c89.832 0 162.909 73.077 162.909 162.909s-73.077 162.909-162.909 162.909c-89.832 0-162.909-73.077-162.909-162.909s73.077-162.909 162.909-162.909zM954.181 28.445h-349.092v58.181c0 21.411-9.309 40.028-23.272 56.786 40.028 13.964 90.298 24.669 139.637 24.669 113.571 0 232.728-56.32 232.728-81.455zM535.271 28.445h-465.456v58.181c0 25.135 119.156 81.455 232.728 81.455s232.728-56.32 232.728-81.455zM721.454 237.897c-55.855 0-142.895-15.826-209.454-46.547-66.56 31.184-153.6 46.547-209.454 46.547-101.004 0-302.544-50.267-302.544-151.274v-127.999h1024v127.999c0 101.004-201.542 151.274-302.544 151.274z" />
<glyph unicode="&#xe94e;" glyph-name="eye" d="M512 424.079c77.265 0 139.635-62.371 139.635-139.635s-62.371-139.635-139.635-139.635c-77.265 0-139.635 62.371-139.635 139.635s62.371 139.635 139.635 139.635zM512 633.536c232.727 0 431.478-144.756 512-349.092-80.523-204.335-279.272-349.092-512-349.092s-431.478 144.756-512 349.092c80.523 204.335 279.272 349.092 512 349.092zM101.47 284.444c76.799-156.393 235.52-256.002 410.53-256.002s333.731 99.608 410.53 256.002c-76.799 156.393-235.52 256.002-410.53 256.002s-333.731-99.608-410.53-256.002z" />
<glyph unicode="&#xe94f;" glyph-name="unlock" d="M804.572-130.033v487.62h-585.142v-487.62h585.142zM804.572 455.111c53.638 0 97.524-43.886 97.524-97.524v-487.62c0-53.638-43.886-97.524-97.524-97.524h-585.142c-54.126 0-97.524 43.886-97.524 97.524v487.62c0 53.638 43.886 97.524 97.524 97.524h438.858v97.524c0 80.945-65.341 146.286-146.286 146.286s-146.286-65.341-146.286-146.286h-97.524c0 134.583 109.226 243.809 243.809 243.809s243.809-109.226 243.809-243.809v-97.524h48.762zM512 16.253c-53.638 0-97.524 43.886-97.524 97.524s43.886 97.524 97.524 97.524c53.638 0 97.524-43.886 97.524-97.524s-43.886-97.524-97.524-97.524z" />
<glyph unicode="&#xe950;" glyph-name="lock" d="M512 16.254c-54.126 0-97.524 43.886-97.524 97.524 0 54.126 43.398 97.524 97.524 97.524 53.638 0 97.524-43.886 97.524-97.524s-43.886-97.524-97.524-97.524zM804.572-130.032v487.62h-585.142v-487.62h585.142zM804.572 455.11c53.638 0 97.524-43.886 97.524-97.524v-487.62c0-53.638-43.886-97.524-97.524-97.524h-585.142c-54.126 0-97.524 43.886-97.524 97.524v487.62c0 54.126 43.398 97.524 97.524 97.524h48.762v97.524c0 134.583 109.226 243.809 243.809 243.809s243.809-109.226 243.809-243.809v-97.524h48.762zM512 698.92c-80.945 0-146.286-65.341-146.286-146.286v-97.524h292.572v97.524c0 80.945-65.341 146.286-146.286 146.286z" />
<glyph unicode="&#xe952;" glyph-name="arrow-left" d="M810.667 327.111h-494.933l226.133 226.133c17.067 17.067 17.067 42.667 0 59.733s-42.667 17.067-59.733 0l-298.667-298.667c-4.267-4.267-8.533-8.533-8.533-12.8-4.267-8.533-4.267-21.333 0-34.133 4.267-4.267 4.267-8.533 8.533-12.8l298.667-298.667c8.533-8.533 21.333-12.8 29.867-12.8s21.333 4.267 29.867 12.8c17.067 17.067 17.067 42.667 0 59.733l-226.133 226.133h494.933c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667z" />
<glyph unicode="&#xe957;" glyph-name="code" d="M632.794 70.731l213.713 213.713-213.713 213.713 65.043 65.043 278.756-278.756-278.756-278.756-65.043 65.043zM391.206 70.731l-213.713 213.713 213.713 213.713-65.043 65.043-278.756-278.756 278.756-278.756 65.043 65.043z" />
<glyph unicode="&#xe958;" glyph-name="home" d="M426.667-56.889v256h170.667v-256h213.333v341.333h128l-426.667 384-426.667-384h128v-341.333h213.333z" />
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 82 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.