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

* ajusted views.

Browse Source
This commit is contained in:
Catouse
2014-04-15 16:19:33 +08:00
parent 61770a9ce1
commit 23cbb7c9f3
24 changed files with 367 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/lang/zh-cn.php
+1
View File
@@ -13,6 +13,7 @@ $lang->build->common = "Build";
$lang->build->create = "创建版本";
$lang->build->edit = "编辑版本";
$lang->build->delete = "删除版本";
$lang->build->deleted = "已删除";
$lang->build->view = "版本详情";
$lang->build->ajaxGetProductBuilds = '接口:产品版本列表';
$lang->build->ajaxGetProjectBuilds = '接口:项目版本列表';
module/build/view/view.html.php
+104 -64
View File
@@ -11,17 +11,25 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<table class='cont-rt5'>
<caption class='<?php if($build->deleted) echo 'deleted';?>'>BUILD #<?php echo $build->id . ' ' . $build->name;?></caption>
<tr valign='top'>
<td>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['build']) . ' #' . $build->id;?></span>
<strong><?php echo $build->name;?></strong>
<?php if($build->deleted):?>
<span class='label label-danger'><?php echo $lang->build->deleted;?></span>
<?php endif; ?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->build->desc;?></legend>
<div class='content'><?php echo $build->desc;?></div>
<div class='article-content'><?php echo $build->desc;?></div>
</fieldset>
<?php echo $this->fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?>
<?php include '../../common/view/action.html.php';?>
<div class='a-center f-16px strong mb-10px'>
<div class='actions'>
<?php
$browseLink = $this->session->buildList ? $this->session->buildList : $this->createLink('project', 'build', "projectID=$build->project");
if(!$build->deleted)
@@ -32,64 +40,96 @@
echo common::printRPN($browseLink);
?>
</div>
<table class='table-1 fixed'>
<caption class='caption-t1'><?php echo $lang->build->stories;?></caption>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
<th class='w-hour'><?php echo $lang->statusAB;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
</tr>
<?php foreach($stories as $storyID => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
<tr class='text-center'>
<td><?php echo sprintf('%03d', $story->id);?></td>
<td><span class='<?php echo 'pri' . $lang->story->priList[$story->pri]?>'><?php echo $lang->story->priList[$story->pri];?></span></td>
<td class='text-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
<td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
<tr><td colspan=7 class='a-left strong'><?php echo sprintf($lang->build->finishStories, count($stories));?></td></tr>
</table>
<table class='table-1 fixed'>
<caption class='caption-t1'><?php echo $lang->build->bugs;?></caption>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='w-100px'><?php echo $lang->bug->status;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-date'><?php echo $lang->bug->openedDateAB;?></th>
<th class='w-user'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='w-date'><?php echo $lang->bug->resolvedDateAB;?></th>
</tr>
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td><?php echo sprintf('%03d', $bug->id);?></td>
<td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td><?php echo $lang->bug->statusList[$bug->status];?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
</tr>
<?php endforeach;?>
<tr><td colspan=7 class='a-left strong'><?php echo sprintf($lang->build->resolvedBugs, count($bugs));?></td></tr>
</table>
</td>
<td class="divider"></td>
<td class="side">
<div class='tabs'>
<?php $countStories = count($stories); $countBugs = count($bugs); ?>
<ul class='nav nav-tabs'>
<li class='active'><a href='#stories' data-toggle='tab'><?php echo html::icon($lang->icons['story']) . ' ' . $lang->build->stories; if($countStories > 0) echo "<span class='label label-danger label-badge label-circle'>" . $countStories . "</span>";?></a></li>
<li><a href='#bugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug']) . ' ' . $lang->build->bugs; if($countBugs > 0) echo "<span class='label label-danger label-badge label-circle'>" . $countBugs . "</span>";?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='stories'>
<table class='table table-hover table-condensed table-borderless'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
<th class='w-hour'><?php echo $lang->statusAB;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
</tr>
</thead>
<?php foreach($stories as $storyID => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
<tr class='text-center'>
<td><?php echo sprintf('%03d', $story->id);?></td>
<td><span class='story-<?php echo 'pri' . $lang->story->priList[$story->pri]?>'><?php echo $lang->story->priList[$story->pri];?></span></td>
<td class='text-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
<td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
<tfoot>
<tr>
<td colspan='7'>
<div class='table-actions clearfix'>
<div class='text'><?php echo sprintf($lang->build->finishStories, $countStories);?></div>
</div>
</td>
</tr>
</tfoot>
</table>
</div>
<div class='tab-pane' id='bugs'>
<table class='table table-hover table-condensed table-borderless'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='w-100px'><?php echo $lang->bug->status;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-date'><?php echo $lang->bug->openedDateAB;?></th>
<th class='w-user'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='w-100px'><?php echo $lang->bug->resolvedDateAB;?></th>
</tr>
</thead>
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td><?php echo sprintf('%03d', $bug->id);?></td>
<td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td><?php echo $lang->bug->statusList[$bug->status];?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
</tr>
<?php endforeach;?>
<tfoot>
<tr>
<td colspan='7'>
<div class='table-actions clearfix'>
<div class='text'><?php echo sprintf($lang->build->resolvedBugs, $countBugs);?></div>
</div>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
</div>
</div>
<div class='col-md-4'>
<div class='main-side main'>
<fieldset>
<legend><?php echo $lang->build->basicInfo?></legend>
<table class='table-1 a-left fixed'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th width='25%' class='text-right'><?php echo $lang->build->product;?></th>
<th class='w-80px'><?php echo $lang->build->product;?></th>
<td><?php echo $build->productName;?></td>
</tr>
<tr>
@@ -114,7 +154,7 @@
</tr>
</table>
</fieldset>
</td>
</tr>
</table>
</div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/common/lang/zh-cn.php
+2 -2
View File
@@ -258,8 +258,8 @@ $lang->company->menu->dept = array('link' => '部门|dept|browse', 'subM
$lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group');
$lang->company->menu->view = array('link' => '公司|company|view', 'alias' => 'edit');
$lang->company->menu->dynamic = '动态|company|dynamic|';
$lang->company->menu->addGroup = array('link' => '<i class="icon-plus"></i>&nbsp;添加分组|group|create', 'float' => 'right');
$lang->company->menu->batchAddUser = array('link' => '<i class="icon-green-user-batchCreate"></i>&nbsp;批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->addGroup = array('link' => '<i class="icon-group"></i>&nbsp;添加分组|group|create', 'float' => 'right');
$lang->company->menu->batchAddUser = array('link' => '<i class="icon-plus-sign"></i>&nbsp;批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<i class="icon-plus"></i>&nbsp;添加用户|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->dept = new stdclass();
module/common/view/mail.html.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<?php if(isset($users[$action->actor])) $action->actor = $users[$action->actor];?>
<?php if(isset($users[$action->extra])) $action->extra = $users[$action->extra];?>
<span><?php $this->action->printAction($action);?>
<span><?php $this->action->printAction($action);?></span>
<?php if(!empty($action->comment) or !empty($action->history)):?>
<div class='history'>
<div><?php echo $this->action->printChanges($action->objectType, $action->history);?></div>
module/extension/view/activate.html.php
+21 -18
View File
@@ -11,23 +11,26 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td valign='middle'>
<?php
if(isset($error) and $error)
{
echo $error;
}
else
{
echo "<h3 class='a-center success'>{$title}</h3>";
echo "<p class='text-center'>" . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"') . '</p>';
}
?>
</td>
</tr>
</table>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $title;?></strong>
<small class='text-success'><?php echo $lang->extension->activate;?> <?php echo html::icon($lang->icons['activate']);?></small>
</div>
</div>
<?php if(isset($error) and $error):?>
<div class='alert alert-danger'>
<i class='icon-info-sign'></i>
<div class='content'><?php $error;?></div>
</div>
<?php else:?>
<div class='alert alert-success'>
<i class='icon-ok-sign'></i>
<div class='content'>
<h3><?php echo $title;?></h3>
<p class='text-center'><?php echo html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"');?></p>
</div>
</div>
<?php endif;?>
</body>
</html>
module/extension/view/checkscore.html.php
+17 -13
View File
@@ -11,18 +11,22 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td valign='middle'>
<?php if($error):?>
<?php
echo "<h3 class='error'>{$lang->extension->needSorce}</h3>";
echo "<p>$error</p>";
?>
<?php endif;?>
</td>
</tr>
</table>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $title;?></strong>
</div>
</div>
<?php if(isset($error) and $error):?>
<div class='alert alert-success'>
<i class='icon-ok-sign'></i>
<div class='content'>
<h3><?php echo $lang->extension->needSorce;?></h3>
<p><?php echo $error;?></p>
</div>
</div>
<?php endif;?>
</body>
</html>
</body>
</html>
module/extension/view/deactivate.html.php
+18 -16
View File
@@ -11,21 +11,23 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td valign='middle'>
<?php
echo "<h3 class='a-center success'>{$title}</h3>";
if($removeCommands)
{
echo "<p class='strong'>{$lang->extension->unremovedFiles}</p>";
echo join($removeCommands, '<br />');
}
echo "<p class='text-center'>" . html::commonButton($lang->extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"') . '</p>';
?>
</td>
</tr>
</table>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $title;?></strong>
<small class='text-danger'><?php echo $lang->extension->deactivate;?> <?php echo html::icon($lang->icons['activate']);?></small>
</div>
</div>
<div class='alert alert-success'>
<i class='icon-ok-sign'></i>
<div class='content'>
<h3><?php echo $title;?></h3>
<?php if($removeCommands):?>
<p><strong><?php echo $lang->extension->unremovedFiles;?></strong></p>
<p><?php echo join($removeCommands, '<br />');?></p>
<?php endif;?>
<p class='text-center'><?php echo html::commonButton($lang->extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"');?></p>
</div>
</div>
</body>
</html>
module/extension/view/erase.html.php
+18 -16
View File
@@ -11,21 +11,23 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td valign='middle'>
<?php
echo "<h3 class='a-center success'>{$title}</h3>";
if($removeCommands)
{
echo "<p class='strong'>{$lang->extension->unremovedFiles}</p>";
echo join($removeCommands, '<br />');
}
echo "<p class='text-center'>" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . '</p>';
?>
</td>
</tr>
</table>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $title;?></strong>
<small class='text-danger'><?php echo $lang->extension->erase;?> <?php echo html::icon('trash');?></small>
</div>
</div>
<div class='alert alert-success'>
<i class='icon-ok-sign'></i>
<div class='content'>
<h3><?php echo $title;?></h3>
<?php if($removeCommands):?>
<p><strong><?php echo $lang->extension->unremovedFiles;?></strong></p>
<p><?php echo join($removeCommands, '<br />');?></p>
<?php endif;?>
<p class='text-center'><?php echo html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"');?></p>
</div>
</div>
</body>
</html>
module/extension/view/structure.html.php
+13 -12
View File
@@ -11,16 +11,17 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $extension->name . '[' . $extension->code . '] ' .$lang->extension->structure . ':';?></cation>
<tr>
<td>
<?php
$appRoot = $this->app->getAppRoot();
$files = json_decode($extension->files);
foreach($files as $file => $md5) echo $appRoot . $file . "<br />";
?>
</td>
</tr>
</table>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $extension->name . '[' . $extension->code . '] ' .$lang->extension->structure . ':';?></strong>
</div>
</div>
<div class='main'>
<?php
$appRoot = $this->app->getAppRoot();
$files = json_decode($extension->files);
foreach($files as $file => $md5) echo $appRoot . $file . "<br />";
?>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/extension/view/uninstall.html.php
+31 -16
View File
@@ -11,25 +11,41 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td valign='middle'>
<?php if(isset($confirm) and $confirm == 'no'):?>
<?php
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $title;?></strong>
<small class='text-danger'><?php echo html::icon('cog');?> <?php echo $lang->extension->uninstall;?></small>
</div>
</div>
<?php if(isset($confirm) and $confirm == 'no'):?>
<div class='alert alert-warning'>
<i class='icon-info-sign'></i>
<div class='content'>
<?php
echo "<p class='waring'>{$lang->extension->confirmUninstall}";
echo html::a(inlink('uninstall', "extension=$code&confirm=yes"), $lang->extension->uninstall, '', "class='btn'");
echo "</p>";
echo "<p>{$lang->extension->noticeBackupDB}</p>"
?>
<?php elseif(!empty($error)):?>
<?php
?>
</div>
</div>
<?php elseif(!empty($error)):?>
<div class='alert alert-danger'>
<i class='icon-info-sign'></i>
<div class='content'>
<?php
echo "<h3 class='error'>" . $lang->extension->uninstallFailed . "</h3>";
echo "<p>$error</p>";
?>
<?php else:?>
?>
</div>
</div>
<?php else:?>
<div class='alert alert-success'>
<i class='icon-ok-sign'></i>
<div class='content'>
<?php
echo "<h3 class='a-center success'>{$title}</h3>";
echo "<h3>{$title}</h3>";
if(!empty($backupFile)) echo '<p>' . sprintf($lang->extension->backDBFile, $backupFile) . '</p>';
if($removeCommands)
{
@@ -38,9 +54,8 @@
}
echo "<p class='text-center'>" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . '</p>';
?>
<?php endif;?>
</td>
</tr>
</table>
</div>
</div>
<?php endif;?>
</body>
</html>
module/extension/view/upload.html.php
+5 -3
View File
@@ -11,10 +11,12 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div id='featurebar'>
<div class='heading'><?php echo html::icon('upload') . ' ' . $lang->extension->upload;?></div>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon('upload');?></span>
<strong><?php echo $lang->extension->upload;?></strong>
</div>
</div>
<form method='post' enctype='multipart/form-data' style='padding: 5% 20%'>
<div class='input-group'>
<input type='file' name='file' class='form-control' />
module/extension/view/waring.htm.php
+16 -14
View File
@@ -11,19 +11,21 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td valign='middle'>
<?php if($error):?>
<?php
echo "<h3 class='error'>{$lang->extension->waringInstall}</h3>";
echo "<p>$error</p>";
echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href');
?>
<?php endif;?>
</td>
</tr>
</table>
<div id='titlebar'>
<div class='heading'>
<span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
<strong><?php echo $title;?></strong>
</div>
</div>
<?php if($error):?>
<div class='alert alert-danger'>
<i class='icon-info-sign'></i>
<div class='content'>
<h3><?php echo $lang->extension->waringInstall;?></h3>
<p><?php echo $error;?></p>
<p class='text-center'><?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href');?></p>
</div>
</div>
<?php endif;?>
</body>
</html>
module/file/view/edit.html.php
+14 -6
View File
@@ -28,15 +28,23 @@ function closeWindow()
clearInterval(time);
}
</script>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['edit']);?></span>
<strong><?php echo $lang->file->inputFileName;?></strong>
</div>
</div>
<form method='post' target='hiddenwin' onsubmit='setFileName();'>
<table class='table-1'>
<caption><?php echo $lang->file->inputFileName;?></caption>
<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setFileName();' style='padding: 30px 5%'>
<table class='w-p100'>
<tr>
<td class='text-center' style='padding-top:30px;'>
<?php echo html::input('fileName', $file->title) . "<strong>.{$file->extension}</strong>";?>
<?php echo html::submitButton();?>
<td>
<div class='input-group'>
<?php echo html::input('fileName', $file->title, "class='form-control'");?>
<strong class='input-group-addon'>.<?php echo $file->extension;?></strong>
</div>
</td>
<td><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/file/view/export.html.php
+1 -3
View File
@@ -54,9 +54,7 @@ function switchEncode(fileType)
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->setFileName;?></span>
<?php
echo html::input('fileName', '', 'class=form-control');
?>
<?php echo html::input('fileName', '', 'class=form-control');?>
</div>
</td>
<td class='w-60px'>
module/file/view/printfiles.html.php
+8 -7
View File
@@ -2,7 +2,7 @@
$sessionString = $config->requestType == 'PATH_INFO' ? '?' : '&';
$sessionString .= session_name() . '=' . session_id();
?>
<style>.button-c {padding:1px}</style>
<style> .files-list {margin: 0; max-width: 300px;} .files-list > .list-group-item {padding-right: 5px;} .files-list > .list-group-item a {color: #666} .files-list > .list-group-item:hover a {color: #333} .files-list > .list-group-item > .pull-right {opacity: 0.2; transition: all 0.3s;} .files-list > .list-group-item:hover > .pull-right {opacity: 1}</style>
<script language='Javascript'>
$(function(){
$(".edit").modalTrigger({width:350, type:'iframe'});
@@ -28,17 +28,18 @@ function downloadFile(fileID)
<fieldset>
<legend><?php echo $lang->file->common;?></legend>
<?php endif;?>
<div>
<div class='list-group files-list'>
<?php
foreach($files as $file)
{
if(common::hasPriv('file', 'download'))
{
echo '<div>';
echo html::a($this->createLink('file', 'download', "fileID=$file->id") . $sessionString, $file->title .'.' . $file->extension, '_blank', "onclick='return downloadFile($file->id)'");
common::printLink('file', 'edit', "fileID=$file->id", "<i class='icon-pencil'></i>", '', "class='edit link-icon' title='{$lang->file->edit}'");
if(common::hasPriv('file', 'delete')) echo html::a('###', "<i class='icon-remove'></i>", '', "class='link-icon' onclick='deleteFile($file->id)' title='$lang->delete'");
echo '</div>';
echo "<li class='list-group-item'><i class='icon-file-text text-muted icon'></i> &nbsp;";
echo '<strong>' . html::a($this->createLink('file', 'download', "fileID=$file->id") . $sessionString, $file->title .'.' . $file->extension, '_blank', "onclick='return downloadFile($file->id)'") . '</strong>';
echo "<span class='pull-right'>";
common::printLink('file', 'edit', "fileID=$file->id", "<i class='icon-pencil'></i>", '', "class='edit btn-icon' title='{$lang->file->edit}'");
if(common::hasPriv('file', 'delete')) echo html::a('###', "<i class='icon-remove'></i>", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");
echo '</span></li>';
}
}
?>
module/release/css/common.css
+2 -3
View File
@@ -1,3 +1,2 @@
.mainTable { width:100%; border:none}
.headTable { width:100%; height:30px; margin:0px;}
.contentDiv { height:195px; overflow-y:auto}
.contentDiv { height:190px; overflow-y:auto; margin-bottom: 10px!important}
.contentDiv .panel-heading {line-height: 14px;}
module/release/view/ajaxgetstoriesandbugs.html.php
+48 -73
View File
@@ -1,78 +1,53 @@
<th><?php echo $lang->release->linkStoriesAndBugs;?></th>
<td>
<div class="w-p90">
<div class='half-left'>
<table class='mainTable'>
<tr style='border-bottom:none'>
<td style='border-bottom:none; padding:0px'>
<table class='headTable'>
<caption><?php echo $lang->release->linkStories;?></caption>
<tr>
<th class='w-id a-left'><?php echo html::selectAll('story', 'checkbox') . $lang->idAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-hour'><?php echo $lang->statusAB;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
</tr>
</table>
</td>
</tr>
<tr style='border-bottom:none'>
<td style='border-bottom:none; padding:0px'>
<div class='contentDiv'>
<table class='f-left table-1 fixed'>
<?php foreach($stories as $storyID => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$storyID", '', true);?>
<tr class='text-center'>
<td id='story' class='w-id a-left'>
<input type='checkbox' name='stories[]' value="<?php echo $storyID;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
</td>
<td id='preview<?php echo $story->id;?>' class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
<td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
<td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</td>
</tr>
</table>
<td colspan='2'>
<div class='row pd-0' style='margin: 0 0 0 -15px'>
<div class='col-md-6'>
<div class='panel panel-sm contentDiv'>
<div class='panel-heading'><?php echo html::icon($lang->icons['story']) . ' ' . $lang->release->linkStories;?></div>
<table class='table table table-borderless table-condensed table-hover'>
<thead>
<th class='w-id text-left'><?php echo html::selectAll('story', 'checkbox') . $lang->idAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-hour'><?php echo $lang->statusAB;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
</thead>
<?php foreach($stories as $storyID => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$storyID", '', true);?>
<tr class='text-center'>
<td id='story' class='w-id text-left'>
<input type='checkbox' name='stories[]' value="<?php echo $storyID;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
</td>
<td id='preview<?php echo $story->id;?>' class='text-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
<td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
<td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</div>
<div class='half-right'>
<table class='mainTable'>
<tr style='border-bottom:none'>
<td style='border-bottom:none; padding:0px'>
<table class='headTable'>
<caption><?php echo $lang->release->linkBugs;?></caption>
<tr>
<th class='w-id a-left'><?php echo html::selectAll('bug', 'checkbox') . $lang->idAB;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='w-100px'><?php echo $lang->bug->status;?></th>
</tr>
</table>
</td>
</tr>
<tr style='border-bottom:none'>
<td style='border-bottom:none; padding:0px'>
<div class='contentDiv'>
<table class='f-left table-1 fixed'>
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td class='w-id a-left' id='bug'>
<input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'closed' or $bug->status == 'resolved') echo "checked"; ?>> <?php echo sprintf('%03d', $bug->id);?>
</td>
<td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</td>
</tr>
</table>
<div class='col-md-6'>
<div class='panel panel-sm contentDiv'>
<div class='panel-heading'><?php echo html::icon($lang->icons['bug']) . ' ' . $lang->release->linkBugs;?></div>
<table class='table table table-borderless table-condensed table-hover'>
<thead>
<tr>
<th class='w-id text-left'><?php echo html::selectAll('bug', 'checkbox') . $lang->idAB;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='w-100px'><?php echo $lang->bug->status;?></th>
</tr>
</thead>
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td class='w-id text-left' id='bug'>
<input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'closed' or $bug->status == 'resolved') echo "checked"; ?>> <?php echo sprintf('%03d', $bug->id);?>
</td>
<td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</div>
</div>
</td>
module/release/view/create.html.php
+2 -2
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div class='container mw-900px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['release']);?></span>
@@ -23,7 +23,7 @@
<form class='form-condensed' method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->release->name;?></th>
<th class='w-110px'><?php echo $lang->release->name;?></th>
<td class='w-p45'>
<div class='input-group'>
<?php echo html::input('name', '', "class='form-control'");?>
module/release/view/export.html.php
+15 -8
View File
@@ -32,16 +32,23 @@ function closeWindow()
i ++;
}
</script>
<br /><br />
<form method='post' target='hiddenwin' onsubmit='setDownloading();'>
<table class='table-1'>
<caption><?php echo $lang->export;?></caption>
<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%'>
<table class='w-p100'>
<tr>
<td class='text-center'>
<?php echo $lang->setFileName;?>
<?php echo html::input('fileName', '', 'size=15') . ".html";?>
<?php echo html::submitButton();?>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->setFileName;?></span>
<?php echo html::input('fileName', '', 'class=form-control');?>
<span class='input-group-addon'>.html</span>
</div>
</td>
<td><?php echo html::submitButton($lang->export);?></td>
</tr>
</table>
</form>
module/release/view/view.html.php
+1 -5
View File
@@ -123,10 +123,6 @@
</div>
<div class='tab-pane' id='bugs'>
<table class='table table-hover table-condensed table-borderless'>
<caption class='caption-t1'>
<?php echo $lang->release->bugs;?>
<div class='text-right'></div>
</caption>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -170,7 +166,7 @@
<div class='main-side main'>
<fieldset>
<legend><?php echo $lang->release->basicInfo?></legend>
<table class='table-data'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th class='w-80px'><?php echo $lang->release->product;?></th>
<td><?php echo $release->productName;?></td>
module/user/view/batchedit.html.php
+23 -15
View File
@@ -13,31 +13,39 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/chosen.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['user']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchEdit']);?></small> <?php echo $lang->user->batchEdit;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table-1 fixed'>
<caption><?php echo $lang->user->batchEdit;?></caption>
<tr>
<th class='w-20px'><?php echo $lang->idAB;?></th>
<th class='w-150px'><?php echo $lang->user->dept;?></th>
<th class='w-120px'><?php echo $lang->user->account;?></th>
<th class='w-120px'><?php echo $lang->user->realname;?></th>
<th class='w-100px'><?php echo $lang->user->role;?></th>
<th><?php echo $lang->user->commiter;?></th>
<th><?php echo $lang->user->email;?></th>
<th class='w-120px'><?php echo $lang->user->join;?></th>
</tr>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='w-150px'><?php echo $lang->user->dept;?></th>
<th class='w-120px'><?php echo $lang->user->account;?></th>
<th class='w-120px'><?php echo $lang->user->realname;?></th>
<th class='w-100px'><?php echo $lang->user->role;?></th>
<th><?php echo $lang->user->commiter;?></th>
<th><?php echo $lang->user->email;?></th>
<th class='w-120px'><?php echo $lang->user->join;?></th>
</tr>
</thead>
<?php $depts = $depts + array('ditto' => $lang->user->ditto)?>
<?php $lang->user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?>
<?php foreach($users as $user):?>
<tr class='text-center'>
<td><?php echo $user->id;?></td>
<td><?php echo html::select("dept[$user->id]", $depts, empty($user->dept) ? 'ditto' : $user->dept, "class='form-control'");?>
<td><?php echo html::select("dept[$user->id]", $depts, empty($user->dept) ? 'ditto' : $user->dept, "class='form-control'");?></td>
<td><?php echo html::input("account[$user->id]", $user->account, "class='form-control' autocomplete='off'");?></td>
<td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
<td><?php echo html::select("role[$user->id]", $lang->user->roleList, empty($user->role) ? 'ditto' : $user->role, "class='form-control'");?>
<td><?php echo html::select("role[$user->id]", $lang->user->roleList, empty($user->role) ? 'ditto' : $user->role, "class='form-control'");?></td>
<td><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control'");?></td>
<td><?php echo html::input("email[$user->id]", $user->email, "class='form-control'");?></td>
<td><?php echo html::input("join[$user->id]", $user->join, "class='w-p70 date'");?></td>
<td><?php echo html::input("join[$user->id]", $user->join, "class='form-control form-date'");?></td>
</tr>
<?php endforeach;?>
<tr><td colspan='7' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
module/webapp/view/install.html.php
-2
View File
@@ -17,8 +17,6 @@
<strong><small class='text-muted'> <i class='icon-cog'></i></small> <?php echo $lang->webapp->install;?></strong>
</div>
</div>
<div class='main'>
</div>
<form class='form-condensed' method='post' target='hiddenwin' style='padding: 40px 5%'>
<table class='table table-form'>
<tr>
www/js/my.full.js
+4 -4
View File
@@ -229,7 +229,7 @@ function setHelpLink()
$(this).after(' <a class="helplink ' + className + '" href=' + helpLink + ' target="_blank">?</a> ');
});
if($('a.helplink').size()) $("a.helplink").colorbox({width:600, height:240, iframe:true, transition:'none', scrolling:false});
$("a.helplink").modalTrigger({width:600, type:'iframe'});
}
/**
@@ -493,13 +493,13 @@ function setImageSize(image, maxWidth)
*/
function setRepoLink()
{
if($('.repolink').size()) $('.repolink').colorbox({width:960, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
$('.repolink').modalTrigger({width:960, type:'iframe'});
}
/* Set the colorbox of export. */
/* Set the modal dialog of export. */
function setExport()
{
// if($('.export').size()) $(".export").colorbox({width:650, height:240, iframe:true, transition:'none', scrolling:true});
$(".export").modalTrigger({width:650, type:'iframe'});
}
/**
www/theme/default/style.css
+2 -2
View File
@@ -14,7 +14,7 @@
.w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%}
.w-auto {width: auto} .w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-300px {width:300px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px}
.mw-200px {max-width:200px} .mw-400px {max-width:400px} .mw-500px {max-width:500px} .mw-600px {max-width:600px} .mw-700px {max-width:700px} .mw-800px {max-width:800px} .mw-900px {max-width:900px}
.mw-200px {max-width:200px} .mw-300px {max-width:300px} .mw-400px {max-width:400px} .mw-500px {max-width:500px} .mw-600px {max-width:600px} .mw-700px {max-width:700px} .mw-800px {max-width:800px} .mw-900px {max-width:900px}
.w-id {width:60px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:65px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
@@ -430,7 +430,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
.outer .main .table-form td > .tabs {margin-bottom: 0;}
.outer .main .nav-tabs > li > a {padding: 5px 10px; color: #333}
.outer .main .nav-tabs > li {margin-bottom: -2px;}
.outer .main .nav-tabs > li.active > a, .outer .main .nav-tabs > li.active > a:hover, .outer .main .nav-tabs > li.active > a:focus {color: #333; font-weight: bold;}
.outer .main .nav-tabs > li.active > a, .outer .main .nav-tabs > li.active > a:hover, .outer .main .nav-tabs > li.active > a:focus {color: #333; font-weight: bold; line-height: 20px}
.outer .main .tab-content {border: 1px solid #ddd; border-top: 0; padding: 10px 15px}
/* Table data in outer */