From 3d3efbbce15f5ff1dfee98f639cd72a0a5d02596 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 17 Sep 2012 18:58:12 +0200 Subject: [PATCH] SONAR-3802 new breadcrumb --- .../app/views/layouts/_breadcrumb.html.erb | 100 ++++++++++-------- .../app/views/layouts/_layout.html.erb | 2 +- .../src/main/webapp/images/bc-blue-gray.png | Bin 0 -> 188 bytes .../src/main/webapp/images/bc-gray-blue.png | Bin 0 -> 185 bytes .../src/main/webapp/images/bc-gray.png | Bin 0 -> 940 bytes .../src/main/webapp/stylesheets/layout.css | 62 ++++++++++- .../src/main/webapp/stylesheets/style.css | 3 +- 7 files changed, 116 insertions(+), 51 deletions(-) create mode 100644 sonar-server/src/main/webapp/images/bc-blue-gray.png create mode 100644 sonar-server/src/main/webapp/images/bc-gray-blue.png create mode 100644 sonar-server/src/main/webapp/images/bc-gray.png diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb index 526601cef6d..d59487b635d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb @@ -1,48 +1,60 @@ -<% -resource_link = {} -only_resource = true -if @review - resource_link = {:controller => 'dashboard', :action => 'index'} - only_resource = false -end +<% if @resource || @project %> +
+ +
+<% end %> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index 122c37c4cdc..87c876f3c4d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -22,7 +22,6 @@ <%= h main_global_dashboard.dashboard.name(true) -%> <% end %> - <%= render :partial => 'layouts/breadcrumb' -%>
@@ -46,6 +45,7 @@
+<%= render 'layouts/breadcrumb' -%>
diff --git a/sonar-server/src/main/webapp/images/bc-blue-gray.png b/sonar-server/src/main/webapp/images/bc-blue-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..c3df1379ad48d85cf1b8fe220913d02908cd3629 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp@KrF_=1|+3_iKzgoW=|K#5R2ZaS2hYZDDbpCOm|zb zX;X?sd7%`0ftIwFwszQsbIu+olw)`N-u1`lb)ntu8pUHB0!%Xm8E(91)l_{lr_zLL zX-tI1S7v7EBMzdK7hG&_xQdlbWYY|BmYV9k_>-Mxi2RoBElj&kcpY=udo1LM>rI7a mkK~g!|G#j;UU4x4L)?dNaX;4iGxh_W!{F)a=d#Wzp$PyEXhehn literal 0 HcmV?d00001 diff --git a/sonar-server/src/main/webapp/images/bc-gray-blue.png b/sonar-server/src/main/webapp/images/bc-gray-blue.png new file mode 100644 index 0000000000000000000000000000000000000000..e9af6985877e79be428b0aea60e69de6321c2684 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^+(0bG!3H9qq$LBX22U5q5RHkwXEq8pDDXI3%y(O` zX;F&x@q;_n8QPyfy^ zWr|0AI2?81=;DNq>VrYqwp$q%OmXt^+<)hs$o=r|Z%Y5Py?QFfSIA%Xk>lS6Hv0-T g`J6_Eq*f3TZ*ffeyQ-G+DbOtpp00i_>zopr08!CLO#lD@ literal 0 HcmV?d00001 diff --git a/sonar-server/src/main/webapp/images/bc-gray.png b/sonar-server/src/main/webapp/images/bc-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bee91c518298f5a6c24ddda898ac63d969e605 GIT binary patch literal 940 zcmV;d15^BoP)4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{ zle4qa%26U(f|ru*d1uDm5$(qdGxK?$AK&MB z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b zI_lE4ng@jaKh%lTb}(f=ak3uu6-!kMZ8FSKs7BM z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2 z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$wwEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5 zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3 zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ z4m|-D&ZtGJ}8;WLk96sqPn3I;4%{fxLET5GkbR{t#`+_*~}`j zbQ|o^>3*apuD zke=qk(ONs*9Wz5!sYFy2GsE49h#CUeg>nx&P@YQ_%KK1(A5?)ul)))l!6ll(qxXJh z5FjGBKPPP(rG%a>s+yxWNSj7riDqDmR$z!S@Ie*uhpOO*b^w6v0)Pwbwt{I0#;yhc O0000 ul > li { + float: left; + margin: 0; + background: #EFEFEF url("../images/bc-gray.png") no-repeat left; + border-bottom: 1px solid #CCC; + padding: 0 10px 0 20px; +} + +#bc > ul > li.first { + background: #EFEFEF; + border-left: 2px solid #CCC; + padding: 0 10px 0 5px; +} + +#bc > ul > li.first-selected { + background: #4B9FD5; + border-left: 2px solid #4B9FD5; + border-bottom: 1px solid #4B9FD5; + padding: 0 10px 0 5px; +} + +#bc > ul > li.selected { + background: #4B9FD5 url("../images/bc-gray-blue.png") no-repeat left; +} + +#bc > ul > li.last { + background: #EFEFEF url("../images/bc-blue-gray.png") no-repeat left; + border-bottom: #CCC; +} + +#bc > ul > li img { + vertical-align: text-bottom; + margin-right: -5px; +} + +#bc > ul > li.selected a, #bc > ul > li.first-selected a { + color: #FFF; +} +#bc > ul > li a { + text-decoration: none; +} +#bc > ul > li a:hover, #bc > ul > li a:focus { + text-decoration: underline; +} + #nonav { text-align: left; margin: 50px 180px 0; @@ -135,7 +190,7 @@ body, a { text-align: left; line-height: 1.1em; border: 2px solid #4b9fd5; - border-top: 0; + border-top-width: 1px; padding: 10px 0; } @@ -166,7 +221,6 @@ body, a { } #sidebar .selected a, #sidebar .selected a:hover, #sidebar.selected a:visited { - font-weight: bold; color: #FEFEFE; } @@ -186,7 +240,7 @@ body, a { #sidebarconf { background-color: #EFEFEF; - border: 2px solid #DDD; + border: 2px solid #CCC; color: #666; line-height: 1.1em; margin-top: 10px; diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index c10072a4b1c..74584a1093b 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -1651,8 +1651,7 @@ ul.bullet li { .tabs li a.selected:link, .tabs li a.selected:visited { text-decoration: none; background-color: #4B9FD5; - color: #efefef; - font-weight: bold; + color: #FFF; border: 1px solid #CAE3F2; margin: 0 1px 0 0; } -- 2.39.5