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

* ajusted ui of module 'my'.

Browse Source
This commit is contained in:
Catouse
2014-03-18 09:19:57 +08:00
parent 4a99133745
commit 1b8230f645
15 changed files with 290 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/front/front.class.php
+9 -5
View File
@@ -411,14 +411,14 @@ EOT;
* @access public
* @return string the submit button tag.
*/
public static function submitButton($label = '', $misc = '')
public static function submitButton($label = '', $misc = '', $class = '')
{
if(empty($label))
{
global $lang;
$label = $lang->save;
}
return " <input type='submit' id='submit' value='$label' $misc class='btn btn-submit btn-primary' /> ";
return " <button type='submit' id='submit' $misc class='btn btn-submit $class'>$label</button>";
}
/**
@@ -428,10 +428,14 @@ EOT;
* @access public
* @return string the reset button tag.
*/
public static function resetButton()
public static function resetButton($label = '', $misc = '', $class = '')
{
global $lang;
return " <input type='reset' id='reset' value='{$lang->reset}' class='btn btn-reset' /> ";
if(empty($label))
{
global $lang;
$label = $lang->reset;
}
return " <button type='reset' id='reset' class='btn btn-reset $class'>$label</button>";
}
/**
module/common/control.php
+1 -1
View File
@@ -334,7 +334,7 @@ class common extends control
{
if($type == 'list')
{
echo "<button class='disabled btn-icon'><i class='$class' title='$title'></i></button>";
echo "<button class='disabled btn-icon $extraClass'><i class='$class' title='$title'></i></button>";
}
}
}
module/my/js/common.js
-1
View File
@@ -1,4 +1,3 @@
$(function()
{
if(typeof(listName) != 'undefined') setModal4List('iframe', listName, function(){$(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});});
});
module/my/view/bug.html.php
+20 -20
View File
@@ -11,22 +11,22 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<div id='featurebar'>
<div class='f-left'>
<div class='heading'><i class='icon-bug'></i> <?php echo $lang->my->bug;?></div>
<nav class='nav'>
<?php
echo "<span id='assignedToTab'>" . html::a(inlink('bug', "type=assignedTo"), $lang->bug->assignToMe) . "</span>";
echo "<span id='openedByTab'>" . html::a(inlink('bug', "type=openedBy"), $lang->bug->openedByMe) . "</span>";
echo "<span id='resolvedByTab'>" . html::a(inlink('bug', "type=resolvedBy"), $lang->bug->resolvedByMe) . "</span>";
echo "<span id='closedByTab'>" . html::a(inlink('bug', "type=closedBy"), $lang->bug->closedByMe) . "</span>";
echo "<li id='assignedToTab'>" . html::a(inlink('bug', "type=assignedTo"), $lang->bug->assignToMe) . "</li>";
echo "<li id='openedByTab'>" . html::a(inlink('bug', "type=openedBy"), $lang->bug->openedByMe) . "</li>";
echo "<li id='resolvedByTab'>" . html::a(inlink('bug', "type=resolvedBy"), $lang->bug->resolvedByMe) . "</li>";
echo "<li id='closedByTab'>" . html::a(inlink('bug', "type=closedBy"), $lang->bug->closedByMe) . "</li>";
?>
</div>
</nav>
</div>
<form method='post' action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
<table class='table-1 fixed tablesorter colored' id='bugList'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter' id='bugList'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='colhead'>
<tr class='text-center'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-severity'> <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
@@ -41,26 +41,26 @@
<tbody>
<?php $canBatchEdit = common::hasPriv('bug', 'batchEdit');?>
<?php foreach($bugs as $bug):?>
<tr class='a-center'>
<td class='a-left'>
<tr class='text-center'>
<td class='text-left'>
<?php if($canBatchEdit):?><input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>' /><?php endif;?>
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
</td>
<td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo isset($lang->bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?></span></td>
<td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo isset($lang->bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?></span></td>
<td><?php echo $lang->bug->typeList[$bug->type]?></td>
<td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
<td class='a-right'>
<td class='text-right'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'edit', $params, '', 'list');
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, '', 'list', 'hand-right', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'ok-sign', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', 'off', '', 'iframe text-danger', true);
common::printIcon('bug', 'edit', $params, '', 'list', 'pencil');
?>
</td>
</tr>
@@ -69,8 +69,8 @@
<tfoot>
<tr><td colspan='9'>
<?php if($bugs and $canBatchEdit):?>
<div class='f-left'>
<?php echo html::selectAll() . html::selectReverse() . html::submitButton($lang->edit);?>
<div class='table-actions clearfix'>
<?php echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>' . html::submitButton("<i class='icon-edit'></i> " . $lang->edit);?>
</div>
<?php endif;?>
<?php $pager->show();?>
module/my/view/changepassword.html.php
+26 -20
View File
@@ -11,24 +11,30 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<form method='post' target='hiddenwin'>
<table align='center' class='table-4 a-left'>
<caption><?php echo $lang->my->changePassword;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account . html::hidden('account',$user->account);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password1');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2');?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
</form>
<div class='container w-500px'>
<div id='featurebar'>
<div class='heading'><i class='icon-key'></i> <?php echo $lang->my->changePassword;?></div>
</div>
<form method='post' target='hiddenwin'>
<table align='center' class='table table-form w-400px'>
<tr>
<th class='rowhead w-100px'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account . html::hidden('account',$user->account);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password1', '', "class='form-control'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='form-control'");?></td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton('', '', 'btn-primary') . html::backButton();?></td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
module/my/view/dynamic.html.php
+16 -14
View File
@@ -11,21 +11,23 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<div id='featurebar'>
<?php
echo '<span id="today">' . html::a(inlink('dynamic', "type=today"), $lang->action->dynamic->today) . '</span>';
echo '<span id="yesterday">' . html::a(inlink('dynamic', "type=yesterday"), $lang->action->dynamic->yesterday) . '</span>';
echo '<span id="twodaysago">' . html::a(inlink('dynamic', "type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . '</span>';
echo '<span id="thisweek">' . html::a(inlink('dynamic', "type=thisweek"), $lang->action->dynamic->thisWeek) . '</span>';
echo '<span id="lastweek">' . html::a(inlink('dynamic', "type=lastweek"), $lang->action->dynamic->lastWeek) . '</span>';
echo '<span id="thismonth">' . html::a(inlink('dynamic', "type=thismonth"), $lang->action->dynamic->thisMonth) . '</span>';
echo '<span id="lastmonth">' . html::a(inlink('dynamic', "type=lastmonth"), $lang->action->dynamic->lastMonth) . '</span>';
echo '<span id="all">' . html::a(inlink('dynamic', "type=all"), $lang->action->dynamic->all) . '</span>';
?>
<div class='heading'><i class='icon-volume-up'></i> <?php echo $lang->my->dynamic;?></div>
<nav class='nav'>
<?php
echo '<li id="today">' . html::a(inlink('dynamic', "type=today"), $lang->action->dynamic->today) . '</li>';
echo '<li id="yesterday">' . html::a(inlink('dynamic', "type=yesterday"), $lang->action->dynamic->yesterday) . '</li>';
echo '<li id="twodaysago">' . html::a(inlink('dynamic', "type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . '</li>';
echo '<li id="thisweek">' . html::a(inlink('dynamic', "type=thisweek"), $lang->action->dynamic->thisWeek) . '</li>';
echo '<li id="lastweek">' . html::a(inlink('dynamic', "type=lastweek"), $lang->action->dynamic->lastWeek) . '</li>';
echo '<li id="thismonth">' . html::a(inlink('dynamic', "type=thismonth"), $lang->action->dynamic->thisMonth) . '</li>';
echo '<li id="lastmonth">' . html::a(inlink('dynamic', "type=lastmonth"), $lang->action->dynamic->lastMonth) . '</li>';
echo '<li id="all">' . html::a(inlink('dynamic', "type=all"), $lang->action->dynamic->all) . '</li>';
?>
</nav>
</div>
<table class='table-1 colored tablesorter fixed'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='colhead'>
@@ -40,13 +42,13 @@
<tbody>
<?php foreach($actions as $action):?>
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo $action->date;?></td>
<td><?php echo $app->user->realname;?></td>
<td><?php echo $action->actionLabel;?></td>
<td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
<td><?php echo $action->objectID;?></td>
<td class='a-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
<td class='text-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
</tr>
<?php endforeach;?>
</tbody>
module/my/view/profile.html.php
+105 -109
View File
@@ -11,113 +11,109 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<table align='center' class='table-4'>
<caption>
<div class='f-left'> <?php echo $lang->my->profile;?></div>
<div class='f-right'><?php echo html::a($this->createLink('my', 'editprofile'), $lang->user->editProfile);?></div>
</caption>
<tr>
<th class='rowhead'><?php echo $lang->user->dept;?></th>
<td>
<?php
if(empty($deptPath))
{
echo "/";
}
else
{
foreach($deptPath as $key => $dept)
{
if($dept->name) echo $dept->name;
if(isset($deptPath[$key + 1])) echo $lang->arrow;
}
}
?>
</td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo $user->realname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->role;?></th>
<td><?php echo $lang->user->roleList[$user->role];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->group->priv;?></th>
<td><?php foreach($groups as $group) echo $group->name . ' '; ?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo $user->commiter;?></td>
</tr>
<!--
<tr>
<?php //echo $lang->user->nickname;?>
<?php //echo $user->nickname;?>
</tr>
-->
<tr>
<th class='rowhead'><?php echo $lang->user->email;?></th>
<td><?php echo $user->email;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->join;?></th>
<td><?php echo $user->join;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->visits;?></th>
<td><?php echo $user->visits;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->ip;?></th>
<td><?php echo $user->ip;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->last;?></th>
<td><?php echo $user->last;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->skype;?></th>
<td><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->qq;?></th>
<td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->yahoo;?></th>
<td><?php echo $user->yahoo;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->gtalk;?></th>
<td><?php echo $user->gtalk;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->wangwang;?></th>
<td><?php echo $user->wangwang;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->mobile;?></th>
<td><?php echo $user->mobile;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->phone;?></th>
<td><?php echo $user->phone;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->address;?></th>
<td><?php echo $user->address;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->zipcode;?></th>
<td><?php echo $user->zipcode;?></td>
</tr>
</table>
<div class='container w-600px'>
<div id='featurebar'>
<div class='heading'><i class='icon-user'></i> <?php echo $lang->my->profile;?></div>
<div class='btn-group pull-right'>
<?php echo html::a($this->createLink('my', 'editprofile'), "<i class='icon-pencil'></i> " . $lang->user->editProfile, '', "class='btn btn-primary'");?>
</div>
</div>
<table class='table table-borderless table-condensed table-data'>
<tr>
<th class='rowhead w-100px'><?php echo $lang->user->dept;?></th>
<td>
<?php
if(empty($deptPath))
{
echo "/";
}
else
{
foreach($deptPath as $key => $dept)
{
if($dept->name) echo $dept->name;
if(isset($deptPath[$key + 1])) echo $lang->arrow;
}
}
?>
</td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo $user->realname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->role;?></th>
<td><?php echo $lang->user->roleList[$user->role];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->group->priv;?></th>
<td><?php foreach($groups as $group) echo $group->name . ' '; ?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo $user->commiter;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->email;?></th>
<td><?php echo $user->email;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->join;?></th>
<td><?php echo $user->join;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->visits;?></th>
<td><?php echo $user->visits;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->ip;?></th>
<td><?php echo $user->ip;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->last;?></th>
<td><?php echo $user->last;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->skype;?></th>
<td><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->qq;?></th>
<td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->yahoo;?></th>
<td><?php echo $user->yahoo;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->gtalk;?></th>
<td><?php echo $user->gtalk;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->wangwang;?></th>
<td><?php echo $user->wangwang;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->mobile;?></th>
<td><?php echo $user->mobile;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->phone;?></th>
<td><?php echo $user->phone;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->address;?></th>
<td><?php echo $user->address;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->zipcode;?></th>
<td><?php echo $user->zipcode;?></td>
</tr>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>
module/my/view/project.html.php
+1 -3
View File
@@ -13,9 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div id='featurebar'>
<div class='heading'>
<i class='icon-folder-open-alt'></i> <strong><?php echo $lang->my->myProject;?></strong>
</div>
<div class='heading'><i class='icon-folder-open-alt'></i> <?php echo $lang->my->myProject;?></div>
<div class='btn-group pull-right'>
<?php echo html::a(helper::createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProject, '', "class='btn'") ?>
</div>
module/my/view/story.html.php
+22 -22
View File
@@ -11,22 +11,22 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<div id='featurebar'>
<div class='f-left'>
<div class='heading'><i class='icon-file-text'></i> <?php echo $lang->my->story;?></div>
<nav class='nav'>
<?php
echo "<span id='assignedToTab'>" . html::a(inlink('story', "type=assignedTo"), $lang->my->storyMenu->assignedToMe) . "</span>";
echo "<span id='openedByTab'>" . html::a(inlink('story', "type=openedBy"), $lang->my->storyMenu->openedByMe) . "</span>";
echo "<span id='reviewedByTab'>" . html::a(inlink('story', "type=reviewedBy"), $lang->my->storyMenu->reviewedByMe) . "</span>";
echo "<span id='closedByTab'>" . html::a(inlink('story', "type=closedBy"), $lang->my->storyMenu->closedByMe) . "</span>";
echo "<li id='assignedToTab'>" . html::a(inlink('story', "type=assignedTo"), $lang->my->storyMenu->assignedToMe) . "</li>";
echo "<li id='openedByTab'>" . html::a(inlink('story', "type=openedBy"), $lang->my->storyMenu->openedByMe) . "</li>";
echo "<li id='reviewedByTab'>" . html::a(inlink('story', "type=reviewedBy"), $lang->my->storyMenu->reviewedByMe) . "</li>";
echo "<li id='closedByTab'>" . html::a(inlink('story', "type=closedBy"), $lang->my->storyMenu->closedByMe) . "</li>";
?>
</div>
</nav>
</div>
<form method='post' id='myStoryForm'>
<table class='table-1 tablesorter fixed colored'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='colhead'>
<tr class='text-center'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-200px'> <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
@@ -46,7 +46,7 @@
?>
<?php foreach($stories as $key => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<?php if($canBatchEdit or $canBatchClose):?>
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
@@ -55,19 +55,19 @@
</td>
<td><span class='<?php echo 'pri' . $story->pri;?>'><?php echo $story->pri?></span></td>
<td><?php echo $story->productTitle;?></td>
<td class='a-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<td><?php echo $story->planTitle;?></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>
<td class='a-right'>
<td class='text-right'>
<?php
common::printIcon('story', 'change', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'review', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'close', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", '', 'list', 'createCase');
common::printIcon('story', 'change', "storyID=$story->id", $story, 'list', 'random');
common::printIcon('story', 'review', "storyID=$story->id", $story, 'list', 'search');
common::printIcon('story', 'close', "storyID=$story->id", $story, 'list', 'off', 'text-danger');
common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list', 'pencil');
common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", '', 'list', 'usecase');
?>
</td>
</tr>
@@ -75,22 +75,22 @@
</tbody>
<tfoot>
<tr>
<td colspan='10' class='a-right'>
<div class='f-left'>
<td colspan='10'>
<div class='table-actions clearfix'>
<?php
if(count($stories))
{
if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
if($canBatchEdit or $canBatchRun) echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';
if($canBatchEdit)
{
$actionLink = $this->createLink('story', 'batchEdit');
echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton("<i class='icon-edit'></i> " . $lang->edit, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchClose)
{
$actionLink = $this->createLink('story', 'batchClose');
echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton("<i class='icon-off'></i> " . $lang->close, "onclick=\"setFormAction('$actionLink')\"");
}
}
?>
module/my/view/task.html.php
+25 -25
View File
@@ -11,24 +11,24 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<script language="Javascript">var type='<?php echo $type;?>';</script>
<div id='featurebar'>
<div class='f-left'>
<div class='heading'><i class='icon-tasks'></i> <?php echo $lang->my->task;?></div>
<ul class='nav'>
<?php
echo "<span id='assignedToTab'>" . html::a(inlink('task', "type=assignedTo"), $lang->my->taskMenu->assignedToMe) . "</span>";
echo "<span id='openedByTab'>" . html::a(inlink('task', "type=openedBy"), $lang->my->taskMenu->openedByMe) . "</span>";
echo "<span id='finishedByTab'>" . html::a(inlink('task', "type=finishedBy"), $lang->my->taskMenu->finishedByMe) . "</span>";
echo "<span id='closedByTab'>" . html::a(inlink('task', "type=closedBy"), $lang->my->taskMenu->closedByMe) . "</span>";
echo "<span id='canceledByTab'>" . html::a(inlink('task', "type=canceledBy"), $lang->my->taskMenu->canceledByMe) . "</span>";
echo "<li id='assignedToTab'>" . html::a(inlink('task', "type=assignedTo"), $lang->my->taskMenu->assignedToMe) . "</li>";
echo "<li id='openedByTab'>" . html::a(inlink('task', "type=openedBy"), $lang->my->taskMenu->openedByMe) . "</li>";
echo "<li id='finishedByTab'>" . html::a(inlink('task', "type=finishedBy"), $lang->my->taskMenu->finishedByMe) . "</li>";
echo "<li id='closedByTab'>" . html::a(inlink('task', "type=closedBy"), $lang->my->taskMenu->closedByMe) . "</li>";
echo "<li id='canceledByTab'>" . html::a(inlink('task', "type=canceledBy"), $lang->my->taskMenu->canceledByMe) . "</li>";
?>
</div>
</ul>
</div>
<form method='post' id='myTaskForm'>
<table class='table-1 tablesorter fixed colored' id='tasktable'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter' id='tasktable'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='colhead'>
<tr class='text-center'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-150px'> <?php common::printOrderLink('project', $orderBy, $vars, $lang->task->project);?></th>
@@ -46,28 +46,28 @@
<?php $canBatchEdit = common::hasPriv('task', 'batchEdit');?>
<?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
<?php foreach($tasks as $task):?>
<tr class='a-center'>
<td class='a-left'>
<tr class='text-center'>
<td class='text-left'>
<?php if($canBatchEdit or $canBatchClose):?><input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>' /><?php endif;?>
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
</td>
<td><span class='<?php echo 'pri' . $lang->task->priList[$task->pri];?>'><?php echo isset($lang->task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?></span></td>
<td class='nobr a-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
<td class='a-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='nobr text-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
<td><?php echo $task->estimate;?></td>
<td><?php echo $task->consumed;?></td>
<td><?php echo $task->left;?></td>
<td class='<?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
<td><?php echo $users[$task->openedBy];?></td>
<td class='a-right'>
<td class='text-right'>
<?php
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'edit', "taskID=$task->id", '', 'list');
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', 'hand-right', '', 'iframe', true);
common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', 'play', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'off', '', 'iframe text-danger', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', 'ok-sign', '', 'iframe', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', 'remove', '', 'iframe', true);
common::printIcon('task', 'edit', "taskID=$task->id", '', 'list', 'pencil');
?>
</td>
</tr>
@@ -77,18 +77,18 @@
<tr>
<td colspan='11'>
<?php if(count($tasks)):?>
<div class='f-left'>
<div class='table-actions clearfix'>
<?php
if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
if($canBatchEdit or $canBatchClose) echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';
if($canBatchEdit)
{
$actionLink = $this->createLink('task', 'batchEdit', "projectID=0&orderBy=$orderBy");
echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton("<i class='icon-edit'></i> " . $lang->edit, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchClose)
{
$actionLink = $this->createLink('task', 'batchClose');
echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
echo html::commonButton("<i class='icon-remove'></i> " . $lang->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
}
?>
</div>
module/my/view/testcase.html.php
+20 -21
View File
@@ -14,24 +14,23 @@
<?php include '../../common/view/colorize.html.php';?>
<?php js::set('confirmDelete', $lang->testcase->confirmDelete)?>
<div id='featurebar'>
<div class='f-left'>
<div class='heading'><i class='icon-list-alt'></i> <?php echo $lang->my->testCase;?></div>
<nav class='nav'>
<?php
echo "<span id='testtask'>" . html::a($this->createLink('my', 'testtask'), $lang->my->testTask) . "</span>";
echo "<span id='assigntomeTab'>" . html::a($this->createLink('my', 'testcase', "type=assigntome"), $lang->testcase->assignToMe) . "</span>";
//echo "<span id='donebymeTab'>" . html::a($this->createLink('my', 'testcase', "type=donebyme"), $lang->testcase->doneByMe) . "</span>";
echo "<span id='openedbymeTab'>" . html::a($this->createLink('my', 'testcase', "type=openedbyme"), $lang->testcase->openedByMe) . "</span>";
echo "<li id='testtask'>" . html::a($this->createLink('my', 'testtask'), $lang->my->testTask) . "</li>";
echo "<li id='assigntomeTab'>" . html::a($this->createLink('my', 'testcase', "type=assigntome"), $lang->testcase->assignToMe) . "</li>";
echo "<li id='openedbymeTab'>" . html::a($this->createLink('my', 'testcase', "type=openedbyme"), $lang->testcase->openedByMe) . "</li>";
?>
</div>
</nav>
</div>
<form method='post' id='myCaseForm'>
<table class='table-1 fixed tablesorter colored' id='caseList'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter' id='caseList'>
<?php
$vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
$this->app->loadLang('testtask');
?>
<thead>
<tr class='colhead'>
<tr class='text-center'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
@@ -50,33 +49,33 @@
$canBatchRun = common::hasPriv('testtask', 'batchRun');
?>
<?php foreach($cases as $case):?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<?php if($canBatchEdit or $canBatchRun):?><input type='checkbox' name='caseIDList[]' value='<?php echo $case->id;?>'/><?php endif;?>
<?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
</td>
<td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span</td>
<td class='a-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo $users[$case->lastRunner];?></td>
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
<td>
<td class='text-right'>
<?php
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'iframe');
common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe');
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', 'play', '', 'iframe');
common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'flag-checkered', '', 'iframe');
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list', 'pencil');
common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
if(common::hasPriv('testcase', 'delete'))
{
$deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->testcase->delete}'");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='btn-icon' title='{$lang->testcase->delete}'");
}
common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug');
?>
</td>
</tr>
@@ -86,18 +85,18 @@
<tr>
<td colspan='10'>
<?php if($cases):?>
<div class='f-left'>
<div class='table-actions clearfix'>
<?php
if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse();
if($canBatchEdit or $canBatchRun) echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';
if($canBatchEdit)
{
$actionLink = $this->createLink('testcase', 'batchEdit');
echo html::submitButton($lang->edit, "onclick=setFormAction('$actionLink')");
echo html::submitButton("<i class='icon-edit'></i> " . $lang->edit, "onclick=setFormAction('$actionLink')");
}
if($canBatchRun)
{
$actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase");
echo html::submitButton($lang->testtask->runCase, "onclick=setFormAction('$actionLink')");
echo html::submitButton("<i class='icon-play'></i> " . $lang->testtask->runCase, "onclick=setFormAction('$actionLink')");
}
?>
</div>
module/my/view/testtask.html.php
+12 -13
View File
@@ -11,22 +11,21 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
<div id='featurebar'>
<div class='f-left'>
<div class='heading'><i class='icon-list-alt'></i> <?php echo $lang->my->testTask;?></div>
<nav class='nav'>
<?php
echo "<span id='testtaskTab'>" . html::a($this->createLink('my', 'testtask'), $lang->my->testTask) . "</span>";
echo "<span id='assigntomeTab'>" . html::a($this->createLink('my', 'testcase', "type=assigntome"), $lang->testcase->assignToMe) . "</span>";
//echo "<span id='donebymeTab'>" . html::a($this->createLink('my', 'testcase', "type=donebyme"), $lang->testcase->doneByMe) . "</span>";
echo "<span id='closedbymeTab'>" . html::a($this->createLink('my', 'testcase', "type=openedbyme"), $lang->testcase->openedByMe) . "</span>";
echo "<li id='testtaskTab'>" . html::a($this->createLink('my', 'testtask'), $lang->my->testTask) . "</li>";
echo "<li id='assigntomeTab'>" . html::a($this->createLink('my', 'testcase', "type=assigntome"), $lang->testcase->assignToMe) . "</li>";
echo "<li id='closedbymeTab'>" . html::a($this->createLink('my', 'testcase', "type=openedbyme"), $lang->testcase->openedByMe) . "</li>";
?>
</div>
</nav>
</div>
<table class='table-1 tablesorter fixed colored' id='taskList'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter' id='taskList'>
<?php $vars = "orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='colhead'>
<tr class='text-center'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
@@ -39,17 +38,17 @@
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
<td class='a-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='nobr'><?php echo $task->projectName?></td>
<td class='nobr'><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='a-right'>
<td class='text-right'>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list');
common::printIcon('testtask', 'cases', "taskID=$task->id", 'play', 'list');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list');
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list');
module/my/view/todo.html.php
+7 -6
View File
@@ -15,11 +15,7 @@
<?php js::set('confirmDelete', $lang->todo->confirmDelete)?>
<form method='post' id='todoform'>
<div id='featurebar'>
<div class='btn-group pull-right'>
<?php echo html::a(helper::createLink('todo', 'export', "account=$account&orderBy=id_desc"), "<i class='icon-download-alt'></i> " . $lang->todo->export, '', "class='btn'") ?>
<?php echo html::a(helper::createLink('todo', 'batchCreate'), "<i class='icon-plus-sign'></i> " . $lang->todo->batchCreate, '', "class='btn'") ?>
<?php echo html::a(helper::createLink('todo', 'create', "date=" . str_replace('-', '', $date)), "<i class='icon-plus'></i> " . $lang->todo->create, '', "class='btn'") ?>
</div>
<div class='heading'><i class='icon-folder-open-alt'></i> <?php echo $lang->my->todo;?> </div>
<ul class='nav'>
<?php
foreach($lang->todo->periods as $period => $label)
@@ -43,7 +39,12 @@
}
?>
<script>$('#<?php echo $type;?>').addClass('active')</script>
</ul>
</ul>
<div class='btn-group pull-right'>
<?php echo html::a(helper::createLink('todo', 'export', "account=$account&orderBy=id_desc"), "<i class='icon-download-alt'></i> " . $lang->todo->export, '', "class='btn'") ?>
<?php echo html::a(helper::createLink('todo', 'batchCreate'), "<i class='icon-plus-sign'></i> " . $lang->todo->batchCreate, '', "class='btn'") ?>
<?php echo html::a(helper::createLink('todo', 'create', "date=" . str_replace('-', '', $date)), "<i class='icon-plus'></i> " . $lang->todo->create, '', "class='btn'") ?>
</div>
</div>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter' id='todoList'>
<?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
www/js/my.full.js
+1 -50
View File
@@ -759,55 +759,6 @@ function selectItem(SelectID)
}
}
/**
* Set modal for list page.
*
* Open operation pages in modal for list pages, after the modal window close, reload the list content and repace the replaceID.
*
* @param string colorboxClass the class for colorbox binding.
* @param string replaceID the html object to be replaced.
* @access public
* @return void
*/
function setModal4List(colorboxClass, replaceID, callback, width, height)
{
if(typeof(width) == 'undefined') width = 900
if(typeof(height) == 'undefined') height = 500
$('.' + colorboxClass).colorbox(
{
width: width,
height: height,
iframe: true,
transition: 'none',
onCleanup:function()
{
var selfClose = $.cookie('selfClose');
if(selfClose != 1) return;
saveWindowSize();
var link = self.location.href;
$('#' + replaceID).wrap("<div id='tmpDiv'></div>");
$('#tmpDiv').load(link + ' #' + replaceID, function()
{
$('#tmpDiv').replaceWith($('#tmpDiv').html());
setModal4List(colorboxClass, replaceID, callback, width, height);
try{$('.colored').colorize();}catch(err){}
$('tfoot td').css('background', 'white').unbind('click').unbind('hover');
try
{
$(".date").datePicker({createButton:true, startDate:startDate})
.dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_RIGHT)
}
catch(err){}
if(typeof(callback) == 'function') callback();
$.cookie('selfClose', 0);
});
}
});
}
/**
* Delete item use ajax.
*
@@ -900,7 +851,7 @@ function setModal()
try
{
var $frame = $(window.frames[options.name].document);
modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').height()}, 200);
modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').height()}, 100);
}
catch(e){}
}, 100);
www/theme/default/style.css
+25 -8
View File
@@ -12,9 +12,9 @@
/* Width definitions */
.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-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-200px {width:200px}
.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-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px}
.w-id {width:55px;} .w-pri {width:30px;} .w-severity {width:40px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:60px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
.w-id {width:60px;} .w-pri {width:30px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:60px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
/* Height definitions */
.h-5px {height:5px} .h-10px {height:10px} .h-20px {height:20px} .h-30px {height:30px} .h-35px {height:35px} .h-40px {height:40px} .h-45px {height:45px} .h-50px {height:50px} .h-60px {height:60px} .h-70px {height:70px} .h-80px {height:80px} .h-100px {height:100px} .h-120px {height:120px} .h-130px {height:130px} .h-140px {height:140px} .h-150px {height:150px} .h-200px {height:200px}
@@ -25,6 +25,7 @@
.text-middle,.text-middle td {vertical-align: middle !important;}
tr.text-center > td, tr.text-center > th {text-align: center;}
tr.text-center > td.text-left, tr.text-center > th.text-left {text-align: left;}
tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: right;}
/* === Components === */
/* Table */
@@ -166,9 +167,11 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.icon-green-task-create:before {content: "\e601";}
/* Button icon */
.btn-icon {border-radius: 4px; display: inline-block; width: 20px; height: 20px; line-height: 20px; font-size: 14px; border: none; background: none; padding: 0}
.btn-icon {border-radius: 2px; display: inline-block; width: 20px; height: 20px; line-height: 20px; font-size: 14px; border: none; background: none; padding: 0; color: #498CD0; text-align: center;}
.btn-icon:hover {text-decoration: none; background: #145CCD; color: #fff;}
.btn-icon.disabled:hover {background: none; color: #ccc; cursor: default}
.btn-icon.disabled:hover, .btn-icon.disabled:hover > i {background: none!important; color: #ccc!important; cursor: default}
.btn-icon.text-danger {color: #D2322D}
.btn-icon.text-danger:hover {background: #D2322D; color: #fff}
/* === Views === */
/* Table form */
@@ -183,6 +186,11 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.table-form td > .row {margin-right: 0;}
.table-form td > .row > [class*="col-"] {padding-right: 0;line-height: 34px}
.table-form td .checkbox {margin: 0}
.table-form td .btn + .btn {margin-left: 8px;}
/* Table data */
.table-data th, .table-data td {padding: 5px;}
.table-data th {text-align: right;}
/* Panel */
.panel > .table > thead > tr > th,.panel > form > .table > thead > tr > th {background-color: transparent;}
@@ -234,6 +242,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#topnav > a, #topnav > .dropdown > a, #companyname a {color:#d1e4f2;text-decoration:none;}
#topnav > a:hover, #topnav > .dropdown > a:hover, #companyname a:hover {color: #fff;}
#companyname {color:#ffcc00; font-weight: normal; margin: 0}
#companyname a {display: inline-block; margin-left: 4px;}
#mainmenu {margin-top: 12px; width: 100%; position: relative;}
#mainmenu li {float: left;}
@@ -294,9 +303,10 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
/* Feature bar. */
#featurebar {padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px;}
#featurebar .heading {float: left; padding: 0 6px}
#featurebar .heading > i {color: #666}
#featurebar .heading + .nav, #featurebar .heading + .btn-group + .nav {border-left: 1px solid #ddd; padding-left: 5px;}
#featurebar .heading {float: left; padding: 0 5px; color: #666}
#featurebar .heading:after {content: "\e6e1"; font-family: ZenIcon; font-size: 14px; color: #999; display: inline-block; margin-left: 5px;}
#featurebar .heading > i {color: #808080}
#featurebar .nav {height: 30px; float: left;}
#featurebar .nav > li {float: left; margin-right: 2px;}
#featurebar .nav > li > .form-control {margin-left: 6px; padding: 1px 8px; height: 30px}
@@ -306,9 +316,12 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900}
#featurebar .btn-group {margin-right: 5px;}
#featurebar .btn {padding: 4px 12px}
#featurebar .btn > i {display: inline-block; margin-right: 2px; color: #666}
#featurebar .btn > i {display: inline-block; margin-right: 2px; opacity: 0.8}
/* table in outer */
.outer .table .btn-icon {margin-left: -2px}
.outer .table thead tr th {text-align: center;}
.outer .table tbody td {vertical-align: middle;}
.outer .table th {vertical-align: middle;}
.outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 15px}
.outer .table tr > th:last-child, .outer .table tr > td:last-child {padding-right: 15px}
@@ -319,8 +332,12 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
.outer .table tfoot .datepicker-wrapper:before {top: 5px}
.outer .table tfoot .form-control.form-date {width: 110px}
.outer .table tfoot .input-wrapper {display: inline-block;}
.table-actions {float: left;}
.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group {float: left; margin-right: 10px}
.outer .table tfoot .pager {margin: 0;}
.outer .container {padding: 20px;}
.outer .container .table-form, .outer .container .table-data {margin-top: 10px;}
/* Pager. */
.pager {margin-bottom:0;line-height: 30px; color: #999}