summaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-02-26 09:17:03 +0100
committerStas Vilchik <vilchiks@gmail.com>2014-02-26 09:18:44 +0100
commite4433857b778b308219e867dcd3389df65129bee (patch)
tree35e5345da87fab4a6b5ef5a544790af6de013f40 /sonar-server
parentaa816115e31105b9623196c078afcd189c7a7207 (diff)
downloadsonarqube-e4433857b778b308219e867dcd3389df65129bee.tar.gz
sonarqube-e4433857b778b308219e867dcd3389df65129bee.zip
Small visual adjustments on the issues page
(cherry picked from commit 2623672)
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb4
-rw-r--r--sonar-server/src/main/webapp/javascripts/issues-extra.js2
-rw-r--r--sonar-server/src/main/webapp/stylesheets/style.css3
6 files changed, 10 insertions, 9 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb
index c1c12f57770..e80b3a69106 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb
@@ -15,9 +15,9 @@
-%>
<input type="button" value="<%= message('issue.assign.submit') -%>" onclick="submitIssueForm(this)">
&nbsp;
- <%= link_to_function message('cancel'), 'closeIssueForm(this)' -%>&nbsp;
+ <%= link_to_function message('cancel'), 'closeIssueForm(this)', :class => 'action' -%>&nbsp;
<span class="loading hidden"></span>
</td>
</tr>
</table>
-</form> \ No newline at end of file
+</form>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb
index 73ce039b4cf..802fcf522e1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb
@@ -28,8 +28,8 @@
<%= dropdown_tag('plan', plan_options, {:show_search_box => false}, {:id => plans_select_box_id}) -%>
- <input type="button" value="<%= message('issue.plan.submit') -%>" onclick="submitIssueForm(this)">
- <%= link_to_function message('cancel'), 'closeIssueForm(this)' -%>
+ <input type="button" value="<%= message('issue.plan.submit') -%>" onclick="submitIssueForm(this)">&nbsp;
+ <%= link_to_function message('cancel'), 'closeIssueForm(this)', :class => 'action' -%>
<span class="loading hidden"></span>
</form>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb
index 24378e8cd25..e7c78994625 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb
@@ -3,7 +3,7 @@
<tr>
<td>
<input type="text" id="issue-assignee-select">
- <input id="issue-assign-submit" type="submit" value="<%= message('issue.assign.submit') -%>">
+ <input id="issue-assign-submit" type="submit" value="<%= message('issue.assign.submit') -%>">&nbsp;
<a id="issue-assign-cancel" class="action"><%= message('cancel') -%></a>
</td>
</tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb
index ad9a299449f..33e24157cbe 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb
@@ -10,7 +10,7 @@
{{/notEq}}
{{/each}}
</select>
- <input id="issue-plan-submit" type="submit" value="<%= message('issue.plan.submit') -%>">
+ <input id="issue-plan-submit" type="submit" value="<%= message('issue.plan.submit') -%>">&nbsp;
{{else}}
<% if is_admin? %>
<span class="error"><%= message('issue.plan.error.plan_must_be_created_first_for_admin') -%></span>
@@ -18,5 +18,5 @@
<span class="error"><%= message('issue.plan.error.plan_must_be_created_first_for_other') -%></span>
<% end %>
{{/if}}
- <a id="issue-plan-cancel" class="action"><%= message('cancel') -%></a>
+ <a id="issue-plan-cancel" class="action"><%= message('cancel') -%></a>
</script>
diff --git a/sonar-server/src/main/webapp/javascripts/issues-extra.js b/sonar-server/src/main/webapp/javascripts/issues-extra.js
index be28761c6b7..82e5ac5139a 100644
--- a/sonar-server/src/main/webapp/javascripts/issues-extra.js
+++ b/sonar-server/src/main/webapp/javascripts/issues-extra.js
@@ -586,7 +586,7 @@ define(
onRender: function () {
var format = function(state) {
if (!state.id) return state.text; // optgroup
- return '<i class="icon-severity-' + state.id.toLowerCase() + '"></i>' + state.text;
+ return '<i class="icon-severity-' + state.id.toLowerCase() + '"></i> ' + state.text;
}
this.ui.select.select2({
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 0ee49feb93e..fa1203973c2 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -869,7 +869,8 @@ th.operations, td.operations {
.code-issue-form input[type=submit],
.code-issue-form input[type=button],
-.code-issue-form button {
+.code-issue-form button,
+.code-issue-form .action {
vertical-align: middle;
}