summaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-09-29 12:57:38 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-09-29 12:57:38 +0000
commit1b6da80e16dd0cb200588422dfc5a655cb3b94f0 (patch)
tree5a4bedc3760b89680f96e989fa606fcba92e6250 /public
parent69b8931e92e37feceb7353d5baa6be6a51492bf0 (diff)
downloadredmine-1b6da80e16dd0cb200588422dfc5a655cb3b94f0.tar.gz
redmine-1b6da80e16dd0cb200588422dfc5a655cb3b94f0.zip
Makes related issues available for display and filtering on the issue list (#3239, #3265).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10513 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public')
-rw-r--r--public/javascripts/application.js18
-rw-r--r--public/stylesheets/application.css13
2 files changed, 26 insertions, 5 deletions
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 5fa9366a7..3f2b2392c 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -178,6 +178,20 @@ function buildFilterRow(field, operator, values) {
);
$('#values_'+fieldId).val(values[0]);
break;
+ case "relation":
+ tr.find('td.values').append(
+ '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="6" class="value" /></span>' +
+ '<span style="display:none;"><select class="value" name="v['+field+'][]" id="values_'+fieldId+'_1"></select></span>'
+ );
+ $('#values_'+fieldId).val(values[0]);
+ select = tr.find('td.values select');
+ for (i=0;i<allProjects.length;i++){
+ var filterValue = allProjects[i];
+ var option = $('<option>');
+ option.val(filterValue[1]).text(filterValue[0]);
+ if (values[0] == filterValue[1]) {option.attr('selected', true)};
+ select.append(option);
+ }
case "integer":
case "float":
tr.find('td.values').append(
@@ -244,6 +258,10 @@ function toggleOperator(field) {
case "t-":
enableValues(field, [2]);
break;
+ case "=p":
+ case "=!p":
+ enableValues(field, [1]);
+ break;
default:
enableValues(field, [0]);
break;
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fe6d7b458..fff82cedf 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -120,7 +120,7 @@ a#toggle-completed-versions {color:#999;}
/***** Tables *****/
table.list { border: 1px solid #e4e4e4; border-collapse: collapse; width: 100%; margin-bottom: 4px; }
table.list th { background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
-table.list td { vertical-align: top; }
+table.list td { vertical-align: top; padding-right:10px; }
table.list td.id { width: 2%; text-align: center;}
table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
table.list td.checkbox input {padding:0px;}
@@ -144,9 +144,10 @@ tr.project.idnt-8 td.name {padding-left: 11em;}
tr.project.idnt-9 td.name {padding-left: 12.5em;}
tr.issue { text-align: center; white-space: nowrap; }
-tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text { white-space: normal; }
-tr.issue td.subject { text-align: left; }
+tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text, tr.issue td.relations { white-space: normal; }
+tr.issue td.subject, tr.issue td.relations { text-align: left; }
tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
+tr.issue td.relations span {white-space: nowrap;}
tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
@@ -340,12 +341,14 @@ fieldset#date-range p { margin: 2px 0 2px 0; }
fieldset#filters table { border-collapse: collapse; }
fieldset#filters table td { padding: 0; vertical-align: middle; }
fieldset#filters tr.filter { height: 2.1em; }
-fieldset#filters td.field { width:250px; }
-fieldset#filters td.operator { width:170px; }
+fieldset#filters td.field { width:230px; }
+fieldset#filters td.operator { width:180px; }
+fieldset#filters td.operator select {max-width:170px;}
fieldset#filters td.values { white-space:nowrap; }
fieldset#filters td.values select {min-width:130px;}
fieldset#filters td.values input {height:1em;}
fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
+
.toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
.buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }