diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index cd462a7778..9be5e40bc3 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -6,7 +6,7 @@
{
$user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
- $class = $action->actor == $this->app->user->account ? "class='active'" : '';
+ $class = $action->major ? "class='active'" : '';
echo "
";
printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
echo "
";
diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php
index adb223f182..87d28208b8 100644
--- a/module/block/view/flowchart.html.php
+++ b/module/block/view/flowchart.html.php
@@ -11,7 +11,7 @@
.block-flowchart .table > thead > tr > th:first-child {width: auto;padding: 10px 10px 15px 10px;background: none;}
.block-flowchart .table > thead > tr > th:first-child + th > div {background: none;}
.block-flowchart .table > thead > tr > th,
-.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJPlIY5psn92jrSUGVrRFlfvHHh9JGS6aVQ2K2l+LYOO6KuCpby/No8DjvtgrfiD+gj5ozLpvMIfSanu2FyiKX1qqOsrsaNdbXCcfm8Ok1OBQA7') no-repeat;background-position: right -22px top 15px;}
+.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJEnH8imMvKopzKofrg3FRfb2Dc+FmNOYgkqZ4ZunZwm4KxHNH0nds1uuOFfDqf8NcDGoW7IuzYtAWZROmSF1U+oc+qsAAAOw==') no-repeat;background-position: right -22px top 15px;}
.block-flowchart .table > thead > tr > th > div {padding: 10px 10px 15px 10px;background-position: left -23px top 15px;}
.block-flowchart .table > thead > tr > th:last-child {background: none;}
.block-flowchart .table > tbody > tr > td {color: #3c4353;}
diff --git a/module/bug/css/batchcreate.css b/module/bug/css/batchcreate.css
index e69de29bb2..9a4637b9eb 100644
--- a/module/bug/css/batchcreate.css
+++ b/module/bug/css/batchcreate.css
@@ -0,0 +1 @@
+#batchCreateForm{overflow-x:auto;}
diff --git a/module/bug/css/batchedit.css b/module/bug/css/batchedit.css
index 24236cbe26..c293bdd635 100644
--- a/module/bug/css/batchedit.css
+++ b/module/bug/css/batchedit.css
@@ -1,3 +1,4 @@
.chosen-container[id^="plan"] .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
.duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px}
-.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
\ No newline at end of file
+.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
+#batchEditForm{overflow-x:auto;}
diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index 0bec2bd3c7..eb3c063969 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -2,6 +2,7 @@ $(function()
{
$(".chosenBox select").chosen(defaultChosenOptions);
removeDitto();//Remove 'ditto' in first row.
+ if($('#batchCreateForm table thead tr th.c-title').width() < 150) $('#batchCreateForm table thead tr th.c-title').width(150);
})
/**
@@ -159,4 +160,4 @@ $(document).keydown(function(event)
{
inputFocusJump('down');
}
-});
\ No newline at end of file
+});
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index ae0891a742..ef4c921464 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -6,15 +6,17 @@
*/
function loadAllUsers()
{
- link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val());
- $('#assignedToBox').load(link, function()
+ var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val());
+ $.get(link, function(data)
{
- moduleID = $('#module').val();
- productID = $('#product').val();
- setAssignedTo(moduleID, productID);
- $('#assignedTo').chosen(defaultChosenOptions);
+ if (data)
+ {
+ var moduleID = $('#module').val();
+ var productID = $('#product').val();
+ setAssignedTo(moduleID, productID);
+ $('#assignedTo').empty().append($(data).find('option')).trigger('chosen:updated').trigger('chosen:activate');
+ }
});
-
}
/**
@@ -26,7 +28,7 @@ function loadAllUsers()
*/
function loadProjectTeamMembers(productID)
{
- link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
+ var link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
$('#assignedToBox').load(link, function(){$('#assignedTo').chosen(defaultChosenOptions);});
}
@@ -38,8 +40,8 @@ function loadProjectTeamMembers(productID)
*/
function loadModuleRelated()
{
- moduleID = $('#module').val();
- productID = $('#product').val();
+ var moduleID = $('#module').val();
+ var productID = $('#product').val();
setAssignedTo(moduleID, productID);
setStories(moduleID, productID);
}
@@ -54,7 +56,7 @@ function setAssignedTo(moduleID, productID)
{
if(typeof(productID) == 'undefined') productID = $('#product').val();
if(typeof(moduleID) == 'undefined') moduleID = $('#module').val();
- link = createLink('bug', 'ajaxGetModuleOwner', 'moduleID=' + moduleID + '&productID=' + productID);
+ var link = createLink('bug', 'ajaxGetModuleOwner', 'moduleID=' + moduleID + '&productID=' + productID);
$.get(link, function(owner)
{
$('#assignedTo').val(owner);
@@ -67,7 +69,7 @@ function setTemplate(templateID)
{
$('#tplBox .list-group-item.active').removeClass('active');
$('#tplTitleBox' + templateID).closest('.list-group-item').addClass('active');
- steps = $('#template' + templateID).html();
+ var steps = $('#template' + templateID).html();
editor['#'].html(steps);
}
@@ -122,7 +124,7 @@ $(function()
var adjustBugTypeGroup = function()
{
var $group = $('#bugTypeInputGroup');
- var width = ($group.parent().width() - 10), addonWidth = 0;
+ var width = ($group.parent().width()), addonWidth = 0;
var $controls = $group.find('.chosen-single');
$group.children('.input-group-addon').each(function()
{
diff --git a/module/bug/js/view.js b/module/bug/js/view.js
index c86a31e59b..e69de29bb2 100644
--- a/module/bug/js/view.js
+++ b/module/bug/js/view.js
@@ -1,4 +0,0 @@
-function setModal4List(colorboxClass, replaceID)
-{
- if(config.onlybody != 'yes') $('.iframe').modalTrigger({width:900, type:'iframe', afterHide:function(){location.href=location.href;}})
-}
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 15d60a3739..e098bb35e5 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -139,7 +139,7 @@ $lang->bug->lblAssignedTo = 'Assignee';
$lang->bug->lblMailto = 'Mail To';
$lang->bug->lblLastEdited = 'Last Edited';
$lang->bug->lblResolved = 'Resolved By';
-$lang->bug->allUsers = 'All User';
+$lang->bug->allUsers = 'Load All User';
$lang->bug->allBuilds = 'All';
$lang->bug->createBuild = 'New';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 3a647035e7..a8cd3c51a4 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -139,7 +139,7 @@ $lang->bug->lblAssignedTo = '当前指派';
$lang->bug->lblMailto = '抄送给';
$lang->bug->lblLastEdited = '最后修改';
$lang->bug->lblResolved = '由谁解决';
-$lang->bug->allUsers = '所有用户';
+$lang->bug->allUsers = '加载所有用户';
$lang->bug->allBuilds = '所有';
$lang->bug->createBuild = '新建';
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 458c236ff7..a4262dc180 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -49,16 +49,16 @@
'> product->branch;?> |
bug->module;?> |
'>bug->project;?> |
-
bug->openedBuild;?> |
-
bug->title;?> |
-
'>bug->deadline;?> |
-
'>bug->steps;?> |
+
bug->openedBuild;?> |
+
bug->title;?> |
+
'>bug->deadline;?> |
+
'>bug->steps;?> |
'>typeAB;?> |
'>bug->pri;?> |
'>bug->severity;?> |
'>bug->os;?> |
'>bug->browser;?> |
-
'>bug->keywords;?> |
+
'>bug->keywords;?> |