From 53f72765ff3868ef94e5b6f319bdb4d7b009dfee Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 3 Jun 2013 11:04:08 +0200
Subject: [PATCH] SONAR-4303 improve popups

---
 .../WEB-INF/app/views/issue/_changelog.html.erb      |  4 ++--
 .../webapp/WEB-INF/app/views/issue/_issue.html.erb   |  5 +----
 .../webapp/WEB-INF/app/views/issue/_rule.html.erb    |  2 +-
 .../webapp/WEB-INF/app/views/issue/show.html.erb     |  4 +---
 sonar-server/src/main/webapp/javascripts/issue.js    |  7 +++++++
 sonar-server/src/main/webapp/stylesheets/style.css   | 12 +-----------
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb
index abf14866c45..6f96669525f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb
@@ -1,4 +1,4 @@
-<ul>
+<ul class="marginbottom10">
   <li>
     <%= format_datetime(@issue.creationDate()) -%>
     <% if @issue.reporter %>
@@ -15,5 +15,5 @@
 </ul>
 
 <div class="note">
-  <a href="#" onclick="return toggleIssueChangelog(this)">Hide</a><%= image_tag 'asc.png' -%>
+  <a href="#" onclick="return toggleIssueChangelog(this)"><%= message 'hide' -%></a><%= image_tag 'asc.png' -%>
 </div>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
index ec8d800150e..de7d6ba2812 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
@@ -1,10 +1,7 @@
 <div class="code-issue" data-issue-key="<%= issue.key -%>" data-issue-component="<%= issue.componentKey() -%>" data-issue-rule="<%= issue.ruleKey().toString() -%>">
   <div class="code-issue-name">
     <div style="float: right">
-      <a target="issue"
-         href="<%= url_for :controller => 'issue', :action => 'show', :id => issue.key -%>">
-        <img src="<%= ApplicationController.root_context -%>/images/new-window-16.gif">
-      </a>
+      <a href="#" onclick="return openIssuePopup(this)"><img src="<%= ApplicationController.root_context -%>/images/new-window-16.gif"></a>
     </div>
 
     <img src="<%= ApplicationController.root_context -%>/images/priority/<%= issue.severity -%>.png" title="<%= h message("severity.#{issue.severity}") -%>">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb
index 5085f7cdefb..e67b1a7d1e0 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb
@@ -13,7 +13,7 @@
 <% end %>
 
 <div class="note">
-  <a href="#" onclick="return toggleIssueRule(this)">Hide</a><%= image_tag 'asc.png' -%>
+  <a href="#" onclick="return toggleIssueRule(this)"><%= message 'hide' -%></a><%= image_tag 'asc.png' -%>
   &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
   <%= @rule.plugin_name -%>
   &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb
index bd91dd4939c..8161c09ad7d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb
@@ -1,3 +1 @@
-<div id="content">
-  <%= render :partial => 'issue/show' -%>
-</div>
+<%= render :partial => 'issue/show' -%>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/javascripts/issue.js b/sonar-server/src/main/webapp/javascripts/issue.js
index 7cfed4909c2..e034916d251 100644
--- a/sonar-server/src/main/webapp/javascripts/issue.js
+++ b/sonar-server/src/main/webapp/javascripts/issue.js
@@ -238,4 +238,11 @@ function openIssueRulePopup(elt) {
   var ruleKey = issueElt.attr('data-issue-rule');
   openPopup(baseUrl + "/rules/show/" + ruleKey + "?layout=false", 'rule');
   return false;
+}
+
+function openIssuePopup(elt) {
+  var issueElt = $j(elt).closest('[data-issue-key]');
+  var issueKey = issueElt.attr('data-issue-key');
+  openPopup(baseUrl + "/issue/show/" + issueKey + "?layout=false", 'issue');
+  return false;
 }
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 59224045f1b..cbf43afaf30 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -826,7 +826,7 @@ ul.operations li img {
 }
 
 .code-global-issues {
-  padding: 0 0 10px 0;
+  padding: 10px;
 }
 
 .code-issues {
@@ -882,16 +882,6 @@ ul.operations li img {
   font-size: 12px;
 }
 
-
-
-
-
-
-
-
-
-
-
 .tab_header {
   border-bottom: 1px solid #DDD;
   background-color: #EFEFEF;
-- 
2.39.5