From 8c3f19851eabb00b2626ce1b2eb22763404c5d49 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 17 Feb 2012 19:36:52 +0100 Subject: [PATCH] Improve display of drilldowns * SONAR-3273 Remove useless horizontal scrollbars on IE7 * SONAR-3242 The review buttons should not hide the violation title --- .../app/views/drilldown/_footer.html.erb | 11 +++ .../app/views/drilldown/measures.html.erb | 2 +- .../app/views/drilldown/violations.html.erb | 6 +- .../app/views/resource/_violation.html.erb | 64 ++++++++---------- .../WEB-INF/app/views/rules/show.html.erb | 7 +- .../src/main/webapp/images/actions.png | Bin 657 -> 671 bytes .../src/main/webapp/javascripts/resource.js | 8 ++- .../src/main/webapp/stylesheets/style.css | 52 ++++++++------ 8 files changed, 83 insertions(+), 67 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb index a2e095d5078..4c62051b374 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb @@ -9,3 +9,14 @@ <% end %> <% end %> + + diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb index 04a895828f1..e6d9c4650e6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb @@ -73,7 +73,7 @@ <%= link_to(resource.name, {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}) -%> <% end %> - + <%= format_measure(measure, :skip_span_id => true, :period => @period) -%> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb index 3cab320c054..8d300485af4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb @@ -122,7 +122,7 @@ @drilldown.columns.each_with_index do |column, index| %> <% if first_column %> - +
<% end %> - @@ -179,7 +179,5 @@ <% if @drilldown.highlighted_resource %> d(<%= @drilldown.highlighted_resource.id -%>); <% end %> - - <%= render :partial => 'footer' -%> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb index a45f05d58f2..53fe40a4d2a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb @@ -7,14 +7,40 @@ <% end %> + <% if current_user %> + + +   + <% end %> + <% if violation.review && violation.review.manual_severity && violation.review.severity!=violation.severity %> <% else %> <% end %>   - <%= image_tag 'sep12.png' -%> -   <%= h(violation.rule.name) -%> @@ -55,40 +81,6 @@
- - <% if current_user %> - - -   - <%= image_tag 'sep12.png' -%> -   - <% end %> - <%= violation.html_message || ' ' -%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb index e79d247e569..2cd0c9b02cf 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb @@ -1,7 +1,6 @@

<%= @rule.name %>

-<%= message('plugin') -%>: <%= @rule.plugin_name -%>    -<%= message('key') -%>: <%= @rule.plugin_rule_key %> +<%= @rule.plugin_name -%> : <%= @rule.plugin_rule_key -%>
@@ -10,9 +9,9 @@ <% else %>

<%= @rule.description %>

<% end %> - + <% if @rule.note && !@rule.note.text.strip.blank? %>

<%= @rule.note.html_text -%>

<% end %> - +
diff --git a/sonar-server/src/main/webapp/images/actions.png b/sonar-server/src/main/webapp/images/actions.png index f0c364053bbf46067403c0e262905af596db09bd..92692173f2f90048e34c576185e563e8bae76cf8 100644 GIT binary patch delta 648 zcmV;30(bq91)l|wBYyw{XF*Lt006JZHwB960000PbVXQnQ*UN;cVTj606}DLVr3vn zZDD6+Qe|Oed2z{QJOBU!F-b&0RCwB?Q@M&FQ53!9)*>qI7`QZu3L-RuilCqkhUWf& zm>L?Y|6pR+p_zf9;0y|_C`e=Gnkb07k+@Hthsq2y9nFJVb${yKb6(wg=N4Be6zH3k zqgJc+>`HXGT<{R~dcCC6=}4(mGU8&fU>FM+8(OVal1L=v@p!1+ zZim??V1rmJ_J7{*_i4Z1lRzL~WV_u?VzHP7FmkAY11>bsiq7XVdy7J$p!s}GdcB@r zUS6otXi&XgXSGl$M1eqn4u=El23#y?1^gvjEEaD_q9_y!(H`PQI-TYaz{sKY*Z>-6 zu|XytkCV}8B(vE}B9Vx?-7ck4srQFfz{sHn4!F=jD}OqjPBfWJ{_ytE;=gj>!x03q zFc=JSgTWwz6Q53}WH1;=E|=5i=V!#>aC|^iE|;rrxBFEpm9p+|c(qy$bC6?akVquB z<#Ne{yWNi2<#M?ql}hD?07ecqaKMEI+NTRR9Fxh!9GJ~!%r;CL7TQHlCX=xZVB^CD zq2KSPW`DC;bvm7|7^cx^#K^r~kB-M9v-a!ji&==)`A?zkc1xvFDZ)?b$72$I@-{_) z$Kx@3yGo^^-)CgCS`mL%to=@>!!*xH42Q#6{+@&1Z*Om$#bSZ?>}Np$BZnF|;NCUF iC6mej`kj9XFaSwhX{AU2>Rtc<002ovPDHLkU;%=7i8jCh delta 633 zcmV-<0*3vc1(5}iBYy%|Nkl<%16GP)PqMg@P3qL80;`^?UDo?>!E_ zU;7D?XSwIz=bZCA_qi92h3_t;#C%m%-vPt6ZD&d; zPb3|mo0~fv*Mt$++1WWE=?6)VfDcM37u&WCZQD+jQr-uaCH=m;yZhDucCfv@{YG8a z`<-b4B5 z8QZ6T+rUHHFUA$?6^0L#nEDy1mr`~Y~BBSO-*A%rj2*47GiUwL(P z)iK61F>=P!F-BsH!x-aV9VW*3N4L6ZnoDildSo~;0<*KTgOt*#obwB|=X1^>=RBKp zw(Ubody .scrollable { - margin-right: 0; +.scroll-ie { + overflow-x: hidden; + padding-right: 17px; } .red { @@ -2472,3 +2468,17 @@ select.medium-width { max-width: 175px; width: 175px; } +.pipe-left { + background-image: url('../images/sep12.png'); + background-position: left center; + background-repeat: no-repeat; + padding-left: 8px; + margin-left: 8px; +} +.pipe-right { + background-image: url('../images/sep12.png'); + background-position: right center; + background-repeat: no-repeat; + margin-right: 8px; + padding-right: 8px; +} \ No newline at end of file -- 2.39.5
@@ -149,7 +149,7 @@ <%= link_to(h(resource.name), {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}) -%> <% end %> + <%= @period ? format_variation(measure, :period => @period, :style => 'light') : measure.formatted_value -%>