bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]?>
| bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> |
createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> |
-
openedBy];?> |
-
assignedTo];?> |
-
resolvedBy];?> |
+
openedBy, $bug->openedBy);?> |
+
assignedTo, $bug->assignedTo);?> |
+
resolvedBy, $bug->resolvedBy);?> |
bug->resolutionList[$bug->resolution];?> |
project->groups, isset($groupBy) ? $groupBy : '', "onchange='switchGroup($projectID, this.value)'");
echo "";
- if($this->methodName == 'task') echo " {$lang->project->byQuery} ";
+ if($this->methodName == 'task') echo " {$lang->project->byQuery} ";
?>
diff --git a/module/task/model.php b/module/task/model.php
index e64f6397db..9e79d6e857 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -257,6 +257,7 @@ class taskModel extends model
$task->closedDate = "";
$task->lastEditedBy = $this->app->user->account;
$task->lastEditedDate = $now;
+ $task->consumed = $oldTask->consumed;
$this->setStatus($task);
if(isset($this->post->assignedTos[$taskID]))
{
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index beaf4af3f5..74ea176c10 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -26,7 +26,7 @@
task->assignedTo;?> |
typeAB;?> |
task->status;?> |
- task->pri;?> |
+ task->pri;?> |
task->estimateAB;?> |
task->consumed;?> |
task->consumedThisTime?> |
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 1dbc027066..9fb8ce2574 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -245,6 +245,7 @@ class testcaseModel extends model
foreach($this->post->steps as $stepID => $stepDesc)
{
if(empty($stepDesc)) continue;
+ $step = new stdclass();
$step->case = $caseID;
$step->version = $version;
$step->desc = htmlspecialchars($stepDesc);
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index e23abae545..eb0c96b8d0 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -26,7 +26,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . "";
echo " " . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->testcase->needConfirm) . "";
- echo " {$lang->testcase->bySearch} ";
+ echo " {$lang->testcase->bySearch} ";
?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 3e41b0b1a7..81072c54bd 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -25,7 +25,7 @@ var moduleID = '';
echo " " . $lang->testtask->byModule . " ";
echo " " . html::a($this->inlink('cases', "taskID=$taskID&browseType=all¶m=0"), $lang->testtask->allCases) . "";
echo " " . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome¶m=0"), $lang->testtask->assignedToMe) . "";
- echo " {$lang->testcase->bySearch} ";
+ echo " {$lang->testcase->bySearch} ";
?>
diff --git a/module/tree/model.php b/module/tree/model.php
index ac02e4d447..b7a5330a71 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -814,12 +814,12 @@ class treeModel extends model
public function getStoryModule($moduleID)
{
$module = $this->dao->select('id,type,parent')->from(TABLE_MODULE)->where('id')->eq($moduleID)->fetch();
- while($module->id and $module->type != 'story')
+ if($module->id and $module->type != 'story')
{
$module = $this->dao->select('id,type,parent')->from(TABLE_MODULE)->where('id')->eq($module->parent)->fetch();
}
- return $module->id;
+ return empty($module) ? 0 : $module->id;
}
/**
@@ -973,6 +973,7 @@ class treeModel extends model
if(!isset($modules[$parentModuleID]) and $parentModuleID != 0) continue;
if($parentModuleID == 0)
{
+ $parentModule = new stdclass();
$parentModule->grade = 0;
$parentModule->path = ',';
}
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 075f4bbba5..8c1a59fead 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -9,7 +9,6 @@
* @version $Id: login.html.php 5084 2013-07-10 01:31:38Z wyd621@gmail.com $
*/
include '../../common/view/header.lite.html.php';
-// include '../../common/view/colorbox.html.php';
?>
@@ -44,11 +43,10 @@ include '../../common/view/header.lite.html.php';
|
- user->keepLogin, $keepLogin);?> |
+ user->keepLogin, $keepLogin);?> |
- |
-
+ |
login);
if($app->company->guest) echo html::linkButton($lang->user->asGuest, $this->createLink($config->default->module));
diff --git a/module/webapp/model.php b/module/webapp/model.php
index d6328e7c65..b162a21129 100644
--- a/module/webapp/model.php
+++ b/module/webapp/model.php
@@ -260,7 +260,7 @@ class webappModel extends model
if(isset($data->url))
{
$data->url = trim($data->url);
- if(strpos($data->url, 'http://') !== 0) $data->url = 'http://' . $data->url;
+ if(!preg_match('/^https?:\/\//', $data->url)) $data->url = 'http://' . $data->url;
}
if($data->size == 'custom') $data->size = (float)$this->post->customWidth . 'x' . (float)$this->post->customHeight;
@@ -301,7 +301,7 @@ class webappModel extends model
->remove('files,customWidth,customHeight')->get();
$data->url = trim($data->url);
- if(strpos($data->url, 'http://') !== 0) $data->url = 'http://' . $data->url;
+ if(!preg_match('/^https?:\/\//', $data->url)) $data->url = 'http://' . $data->url;
if($data->size == 'custom') $data->size = (float)$this->post->customWidth . 'x' . (float)$this->post->customHeight;
$this->dao->insert(TABLE_WEBAPP)->data($data)
diff --git a/www/index.php b/www/index.php
index e1d00a28e8..0b07e57f1c 100644
--- a/www/index.php
+++ b/www/index.php
@@ -35,7 +35,7 @@ if(!isset($config->installed) or !$config->installed) die(header('location: inst
/* Detect mobile. */
$mobile = $app->loadClass('mobile');
-if($mobile->isMobile() or $mobile->isTablet())
+if(!$mobile->isTablet())
{
$config->default->view = 'mhtml';
helper::setViewType();
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index f3333c22d5..ece6a5192c 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -22,9 +22,8 @@ a {text-decoration:none;}
/*-----------------------ICONS-----------------------------------*/
/* icons use fontawesome */
-.icon{filter: alpha(opacity=50);-moz-opacity:0.5;opacity: 0.5;}
-.link-icon{color: #036;display: inline-block;filter: alpha(opacity=85);-moz-opacity:0.85;opacity: 0.85;}
-.link-icon:hover{color:#000;text-shadow:1px 1px 3px rgba(0,0,0,0.25);filter: alpha(opacity=100);-moz-opacity:1;opacity: 1;}
+.link-icon{color: #036;display: inline-block;}
+.link-icon:hover{color:#000;text-shadow:1px 1px 3px rgba(0,0,0,0.25);}
i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[class*=" icon-"]{display: inline-block;min-width: 13px;min-height: 13px;}
.outer td i[class^="icon-"],.outer td i[class*=" icon-"]{font-size: 18px;margin-right: 4px;}
.outer td i[class^="icon-"].icon-sm,.outer td i[class*=" icon-"].icon-sm{font-size: 0.9em;}
@@ -282,9 +281,8 @@ caption {border:1px solid #e4e4e4; background:#edf3fe; margin:0; padding:6px 2p
.table-5 {width:600px;margin-bottom:10px}
.table-6 {width:800px;margin-bottom:10px}
-/*.table-1 tr, .table-2 tr, .table-3 tr, .table-4 tr, .table-5 tr {padding:4px 3px}*/
-.table-1 td, .table-2 td, .table-3 td, .table-4 td, .table-5 td {padding:8px}
-.table-1 th, .table-2 th, .table-3 th, .table-4 th, .table-5 th {padding:8px}
+.table-1 td, .table-2 td, .table-3 td, .table-4 td, .table-5 td {padding:8px 4px}
+.table-1 th, .table-2 th, .table-3 th, .table-4 th, .table-5 th {padding:8px 4px}
.side table td,.side table th{padding: 2px 4px;}
.colhead td {text-align:center; background-color:#efefef;}
@@ -510,9 +508,17 @@ table.data-table td:last-child{padding-right: 20px;}
#querybox{margin: -20px -20px 20px -20px;background-color: #ffc;}
#querybox table{border: none;border-bottom: 1px solid #e5e5e5;}
#querybox td{vertical-align: middle;}
-@media(max-width:1628px){#querybox input[type="text"],#querybox select{max-width: 115px;} #querybox .button-c,#querybox .button-s{width: auto;min-width: 80px;}}
-@media(max-width:1500px){#querybox input[type="text"],#querybox select{max-width: 85px;} #querybox .button-c,#querybox .button-s{width: auto;min-width: 65px;}}
-@media(max-width:1280px){#querybox input[type="text"],#querybox select{max-width: 70px;} #querybox .button-c,#querybox .button-s{width: auto;min-width: 50px;}}
+#querybox select,#querybox input[type="text"]{min-width: 95px;max-width: 140px;}
+@media(max-width:1610px){
+ #querybox input[type="text"],#querybox select[name='value3'],#querybox select[name='value5']{min-width: 80px;width: 80px;}
+ #querybox .button-c,#querybox .button-s{width: auto;min-width: 42px;}
+ #querybox select[name='operator6'],#querybox select[name='operator5'], #querybox select[name='operator4'],#querybox select[name='operator3'], #querybox select[name='operator2'],#querybox select[name='operator1'], #querybox select[name='groupAndOr'],#querybox select[name='andOr1'],#querybox select[name='andOr2'],#querybox select[name='andOr3'],#querybox select[name='andOr4']{width: 65px;min-width: 65px;}
+ #querybox select[name='queryID'], #querybox select[name='field4'],#querybox select[name='field3'],
+ #querybox select[name='field2'],#querybox select[name='field1']{width: 95px;}
+}
+@media(max-width:1220px){
+ #querybox input[type="text"],#querybox select[name='value3'],#querybox select[name='value5']{min-width: 70px;width: 70px;}
+}
/* Tree slider. */
.treeSlider{position:absolute;background-color: #bbb;background-repeat: repeat-x;border: 1px solid #bbb;border-left:none;cursor: pointer;width: 8px;height: 50px;left: 20px;border-radius:0px 10px 10px 0px}
| |