SONAR-3972 Display star on the left and "Configuration" on the right

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 b80b9dfb1e65f29939e6364a8306fcd5e7742eab..bc3d59fb70459f71f875deea2737065b4b33189a 100644 (file)
--- 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
@@ -7,9 +7,6 @@
   <div id="crumbs">
     <ul id="crumbs-ops">
       <% if displayed_resource %>
-        <% if has_role?(:admin, displayed_resource) %>
-          <%= render 'layouts/menu_resource_settings' -%>
-        <% end %>
         <li>
           <%= link_to_favourite(displayed_resource) -%>
         </li>
@@ -19,6 +16,9 @@
           <a href="<%= @permalink -%>"><img src="<%= ApplicationController.root_context -%>/images/permalink.png" width="16" height="16" title="<%= message('permalink') -%>"/></a>
         </li>
       <% end %>
+      <% if displayed_resource && has_role?(:admin, displayed_resource) && !displayed_resource.entity? %>
+        <%= render 'layouts/menu_resource_settings' -%>
+      <% end %>
     </ul>
     <ul id="bc">
       <%
@@ -48,9 +48,6 @@
   <div id="crumbs">
     <ul id="crumbs-ops">
       <% if displayed_resource %>
-        <% if has_role?(:admin, displayed_resource) %>
-          <%= render 'layouts/menu_resource_settings' -%>
-        <% end %>
         <li>
           <%= link_to_favourite(displayed_resource) -%>
         </li>
@@ -60,6 +57,9 @@
           <a href="<%= url_for(:overwrite_params => {:id => displayed_resource.key}) -%>"><img src="<%= ApplicationController.root_context -%>/images/permalink.png" width="16" height="16" title="<%= message('permalink') -%>"/></a>
         </li>
       <% end %>
+      <% if displayed_resource && has_role?(:admin, displayed_resource) && !displayed_resource.entity? %>
+        <%= render 'layouts/menu_resource_settings' -%>
+      <% end %>
     </ul>
     <ul id="bc">
       <%

diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css
index 9b44d779b26fb961618f06ecd40100a075d7e79c..4cd1411b51f08ac1ab6f7ee80f7cd6f260eaeabc 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/layout.css
+++ b/sonar-server/src/main/webapp/stylesheets/layout.css
@@ -166,7 +166,7 @@ body, a {
 
 #project-settings-menu {
   float: right;
-  right: 70px;
+  right: 20px;
 }
 
 #user-panel {
@@ -193,6 +193,7 @@ body, a {
 
 #recent-history {
   border-bottom: 1px solid #ccc;
+  padding-bottom: 10px;
 }
 
 #nonav {

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index ad40264b3dc5e8c22b32676f563703dd8e26a08a..4c8a61c9b4bc9ec06b779024b588db3ab7ad7fd6 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2128,6 +2128,7 @@ table.nowrap td, td.nowrap, th.nowrap {
 .dropdown-menu h2 {
   padding: 0 8px;
   font-size: 100%;
+  font-weight: bold;
 }
 
 .dropdown-menu li {