SONAR-5138 Revert to old layout, with Coding Rules first

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 8a1185ef7b24b30c4f4e60491665041786a82b0e..f3ca4d13826731fc93a4f4ed492d06d90a60a72d 100644 (file)
--- 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
@@ -21,7 +21,12 @@
         <li>
           <a href="<%= ApplicationController.root_context -%>/issues/index" class="<%= 'selected' if selected_section==Navigation::SECTION_ISSUES -%>"><%= message('issues.page') -%></a>
         </li>
-        <%= render :partial => 'layouts/menu_coding_rules', :locals => { :selected_section => selected_section } -%>
+        <li>
+          <a href="<%= ApplicationController.root_context -%>/coding_rules" class="<%= 'selected' if selected_section==Navigation::SECTION_CODING_RULES -%>"><%= message('coding_rules.page') -%></a>
+        </li>
+        <li>
+          <a href="<%= ApplicationController.root_context -%>/profiles" class="<%= 'selected' if selected_section==Navigation::SECTION_QUALITY_PROFILES -%>"><%= message('quality_profiles.page') -%></a>
+        </li>
         <li>
           <a href="<%= ApplicationController.root_context -%>/quality_gates" class="<%= 'selected' if selected_section==Navigation::SECTION_QUALITY_GATES -%>"><%= message('quality_gates.page') -%></a>
         </li>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_coding_rules.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_coding_rules.html.erb
deleted file mode 100644 (file)
index 138852a..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_coding_rules.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<li>
-  <a href="#"
-    class="with-icon<%= ' selected' if [ Navigation::SECTION_CODING_RULES, Navigation::SECTION_QUALITY_PROFILES ].include? selected_section -%>"
-    onclick="showDropdownMenu('coding-rules-menu'); return false;">
-    <span><%= message('coding_rules.page') -%></span>
-    <i class="icon-dropdown"></i>
-  </a>
-
-  <div id="coding-rules-menu" class="dropdown-menu" style="max-width: none; display: none;">
-    <div>
-      <ul>
-        <li><a href="<%= ApplicationController.root_context -%>/coding_rules"><%= message('all_rules.page') -%></a></li>
-        <li><a href="<%= ApplicationController.root_context -%>/profiles"><%= message('quality_profiles.page') -%></a></li>
-      </ul>
-    </div>
-  </div>
-</li>