Some feedback on the issues page

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 5c167cd23b248a3c39856bf6529d45af458bb735..73ce039b4cf41e81a015842f20bfdd4f61800406 100644 (file)
--- 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
@@ -29,8 +29,7 @@
     <%= 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)">
-    &nbsp;
-    <%= link_to_function message('cancel'), 'closeIssueForm(this)' -%>&nbsp;
+    <%= link_to_function message('cancel'), 'closeIssueForm(this)' -%>
     <span class="loading hidden"></span>
 
   </form>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
index c41b006953ff8c89503642c928b38bf18be88bc6..ec64d9d8e276a71dfbd546528d1647193ee1ff78 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
@@ -154,7 +154,7 @@
             {{#if updatable}}
               &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
               <a class="link-action issue-comment-edit"><%= message('edit') -%></a>
-              <a class="link-action spacer-right issue-comment-delete"
+              <a class="link-action link-red spacer-right issue-comment-delete"
                  data-confirm-msg="<%= h message('issue.comment.delete_confirm_message') -%>"><%= message('delete') -%></a>
             {{/if}}
           </h4>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
index 2d6a7a9031fd6c42e39b6c75f4d4200fbb1a083e..15df36366b25f166fadf5804138eff3f010d1d50 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
@@ -20,7 +20,7 @@
     <%= message('issues.found') -%>: <strong>{{paging.total}}</strong>
     {{#if appState.canBulkChange}}
       <a href="<%= url_for params.merge({:action => 'bulk_change_form'}) -%>?{{query}}"
-         class="navigator-actions-bulk open-modal"
+         class="navigator-actions-bulk"
          title="<%= message('bulk_change') -%>"><i class="icon-settings-multiple"></i></a>
     {{/if}}
   </div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
index 624ad76e79e887c3bf050ef3505722014022d92a..fbbdcbe3c3d65a230ef6f0992ed42de26ee4254b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
@@ -16,19 +16,20 @@
 
     <% if @lines && @lines.size>0 %>
       <% if has_role?('codeviewer', @resource) %>
-        <%= render :partial => "shared/source_display", :locals => { :display_manual_violation_form => @display_manual_violation_form,
-                                                                     :scm_available => @scm_available,
-                                                                     :display_coverage => @display_coverage,
-                                                                     :lines => @lines,
-                                                                     :expanded => @expanded,
-                                                                     :display_violations => @display_violations,
-                                                                     :display_issues => @display_issues,
-                                                                     :has_global_issues => @global_issues && @global_issues.size>0,
-                                                                     :resource => @resource,
-                                                                     :snapshot => @snapshot,
-                                                                     :review_screens_by_vid => @review_screens_by_vid,
-                                                                     :filtered => @filtered}%>
-
+        <div style="border-top:1px solid #DDD;">
+          <%= render :partial => "shared/source_display", :locals => { :display_manual_violation_form => @display_manual_violation_form,
+                                                                       :scm_available => @scm_available,
+                                                                       :display_coverage => @display_coverage,
+                                                                       :lines => @lines,
+                                                                       :expanded => @expanded,
+                                                                       :display_violations => @display_violations,
+                                                                       :display_issues => @display_issues,
+                                                                       :has_global_issues => @global_issues && @global_issues.size>0,
+                                                                       :resource => @resource,
+                                                                       :snapshot => @snapshot,
+                                                                       :review_screens_by_vid => @review_screens_by_vid,
+                                                                       :filtered => @filtered}%>
+        </div>
       <% else %>
         <div class="note" style="margin: 5px;"><%= message('code_viewer.no_source_code_displayed_due_to_security') -%></div>
       <% end %>

diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues.js b/sonar-server/src/main/webapp/javascripts/navigator/issues.js
index 7cc91ce5e04df61866f37b7b5c4c7a8647b19518..847269b67e38dffe1dc3225ab3baaf33a44be4b7 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/navigator/issues.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/issues.js
@@ -293,7 +293,8 @@ jQuery(function() {
 
     events: {
       'click .navigator-actions-order': 'toggleOrderChoices',
-      'click .navigator-actions-order-choices': 'sort'
+      'click .navigator-actions-order-choices': 'sort',
+      'click .navigator-actions-bulk': 'bulkChange'
     },
 
 
@@ -308,8 +309,6 @@ jQuery(function() {
         this.render();
         return;
       }
-
-      this.$('.open-modal').modal();
     },
 
 
@@ -344,6 +343,12 @@ jQuery(function() {
     },
 
 
+    bulkChange: function(e) {
+      e.preventDefault();
+      openModalWindow(jQuery(e.currentTarget).prop('href'), {});
+    },
+
+
     serializeData: function() {
       var data = Backbone.Marionette.ItemView.prototype.serializeData.apply(this, arguments);
       return _.extend(data || {}, {

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css
index 2847ce7adae5b4d1fa10aac4850008d2a40ca772..fc1be6a727dca1b98475884603a5adae192fd8ec 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator.css
@@ -276,6 +276,7 @@
 }
 .navigator-details .scm .author {
   display: inline-block;
+  vertical-align: middle;
   max-width: 100px;
   white-space: nowrap;
   overflow: hidden;
@@ -312,7 +313,7 @@
   background-color: #fff;
   border-bottom: 1px solid #e1e1e1;
   border-right: 1px solid #e1e1e1;
-  overflow: scroll;
+  overflow: hidden;
   display: none;
 }
 .navigator-actions-order-choices > li {

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.css b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
index c86ddfc501dee8a42f062812dcb8df38fbf270b2..0a122c1b0e9457a3733c699c69622a4e8827831d 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
@@ -276,6 +276,7 @@
 }
 .navigator-details .scm .author {
   display: inline-block;
+  vertical-align: middle;
   max-width: 100px;
   white-space: nowrap;
   overflow: hidden;
@@ -312,7 +313,7 @@
   background-color: #fff;
   border-bottom: 1px solid #e1e1e1;
   border-right: 1px solid #e1e1e1;
-  overflow: scroll;
+  overflow: hidden;
   display: none;
 }
 .navigator-actions-order-choices > li {

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.less b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
index 73623b8bdc995f7428eaa6d883a83bc98d1e3978..e0a33b005dfd4f55b73755bf50b2c687478b2216 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.less
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
@@ -330,6 +330,7 @@
 
   .scm .author {
     display: inline-block;
+    vertical-align: middle;
     max-width: 100px;
     white-space: nowrap;
     overflow: hidden;
@@ -371,7 +372,7 @@
   background-color: #fff;
   border-bottom: 1px solid @navigatorBorderLightColor;
   border-right: 1px solid @navigatorBorderLightColor;
-  overflow: scroll;
+  overflow: hidden;
   display: none;
 
   & > li {

diff --git a/sonar-server/src/main/webapp/stylesheets/select2-sonar.css b/sonar-server/src/main/webapp/stylesheets/select2-sonar.css
index 07019a04423ad7ea0df01914aa3deab1717910c6..4f60dea2a4d6d0f49113ecfa25070e55b1db4aad 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/select2-sonar.css
+++ b/sonar-server/src/main/webapp/stylesheets/select2-sonar.css
@@ -142,7 +142,7 @@
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
   background-image: url('../images/spinner.gif');
 }
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   .select2-search-choice-close,
   .select2-container .select2-choice abbr,
   .select2-container .select2-choice div b {

diff --git a/sonar-server/src/main/webapp/stylesheets/select2-sonar.less b/sonar-server/src/main/webapp/stylesheets/select2-sonar.less
index e37cd3f90143f5913211f771422b4d077792be0d..fed92898f3d9f3cb030af816d16f99f48d55e67a 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/select2-sonar.less
+++ b/sonar-server/src/main/webapp/stylesheets/select2-sonar.less
@@ -167,7 +167,7 @@
   background-image: url(@spinnerPath);
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi)  {
+@media @retina {
   .select2-search-choice-close,
   .select2-container .select2-choice abbr,
   .select2-container .select2-choice div b {

diff --git a/sonar-server/src/main/webapp/stylesheets/select2.css b/sonar-server/src/main/webapp/stylesheets/select2.css
index 6451016022e09cc31ea3834419afd91c3fdc345c..aae6c48ffea4ced3ebfb07431ea272c863a94839 100755 (executable)
--- a/sonar-server/src/main/webapp/stylesheets/select2.css
+++ b/sonar-server/src/main/webapp/stylesheets/select2.css
@@ -523,7 +523,7 @@ disabled look for already selected choices in the results dropdown
 
 /* Retina-ize icons */
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
     background-image: url(select2x2.png) !important;
     background-repeat: no-repeat !important;

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 31433be39180ac65d41903be5bd40f5f724141ee..0ee49feb93e71f93f3c78b86436fc4cf19c402c2 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -648,6 +648,10 @@ th.operations, td.operations {
   white-space: nowrap;
 }
 
+.sources2 tr:first-child td.revision {
+  border-top: none;
+}
+
 .sources2 tr.row td.plus {
   background-color: #EFEFEF;
   padding: 0;
@@ -666,7 +670,6 @@ th.operations, td.operations {
 }
 
 .sources2 td.gray {
-  border-left: 1px solid #DDD;
   background-color: #EFEFEF;
   padding: 2px 0.5em 0;
 }
@@ -864,7 +867,9 @@ th.operations, td.operations {
   padding: 5px 10px;
 }
 
-.code-issue-form input[type=submit] {
+.code-issue-form input[type=submit],
+.code-issue-form input[type=button],
+.code-issue-form button {
   vertical-align: middle;
 }