aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-07-01 11:10:47 +0200
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-07-01 11:39:23 +0200
commit1a2aa3cb462b042ec956078471af61dbc6aa1e7a (patch)
tree86d5316befa391937cead4038dd93e0b6d4c6905
parent16e9a19771a8442c0628f7291bef15e1427d3226 (diff)
downloadsonarqube-1a2aa3cb462b042ec956078471af61dbc6aa1e7a.tar.gz
sonarqube-1a2aa3cb462b042ec956078471af61dbc6aa1e7a.zip
SONAR-5138 Revert to old layout, with Coding Rules first
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb7
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_coding_rules.html.erb17
2 files changed, 6 insertions, 18 deletions
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 8a1185ef7b2..f3ca4d13826 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
@@ -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
index 138852a8a0b..00000000000
--- 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>