From 3ca0442d851f724901074ba60bf24d329763f4f2 Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Fri, 4 May 2012 12:25:57 +0200
Subject: [PATCH] SONAR-1927 Global Dashboard and widgets. Part I

---
 .../app/controllers/dashboard_controller.rb   |  46 ++---
 .../app/controllers/detached_controller.rb    | 175 ------------------
 .../WEB-INF/app/helpers/dashboard_helper.rb   |   6 +-
 .../WEB-INF/app/helpers/detached_helper.rb    |  22 ---
 .../views/detached/_configure_widget.html.erb |  53 ------
 .../app/views/detached/_header.html.erb       |  38 ----
 .../app/views/detached/_widget.html.erb       |  31 ----
 .../detached/_widget_definition.html.erb      |  12 --
 .../detached/_widget_definitions.html.erb     |  24 ---
 .../detached/_widget_properties.html.erb      |  30 ---
 .../app/views/detached/configure.html.erb     |  67 -------
 .../app/views/detached/edit_layout.html.erb   |  20 --
 .../WEB-INF/app/views/detached/index.html.erb |  28 ---
 .../app/views/detached/no_dashboard.html.erb  |  27 ---
 .../app/views/layouts/_layout.html.erb        |  13 +-
 15 files changed, 35 insertions(+), 557 deletions(-)
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/controllers/detached_controller.rb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/helpers/detached_helper.rb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/_configure_widget.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/_header.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definition.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definitions.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_properties.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/configure.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/edit_layout.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/index.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/detached/no_dashboard.html.erb

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
index ff0c91466e9..b9014a082d0 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
@@ -27,21 +27,20 @@ class DashboardController < ApplicationController
   def index
     # TODO display error page if no dashboard or no resource
     load_resource()
-    if @resource.display_dashboard?
+
+    if !@resource || @resource.display_dashboard?
       load_dashboard()
       load_authorized_widget_definitions()
       unless @dashboard
         redirect_to home_path
       end
-    else
+    elsif @snapshot
       # display the layout of the parent, usually the directory, but display the file viewers
-      if @snapshot
-        @file = @resource
-        @project = @snapshot.parent.project
-        render :action => 'no_dashboard'
-      else
-        redirect_to home_path
-      end
+      @file = @resource
+      @project = @snapshot.parent.project
+      render :action => 'no_dashboard'
+    else
+      redirect_to home_path
     end
   end
 
@@ -50,7 +49,7 @@ class DashboardController < ApplicationController
     load_resource()
     load_dashboard()
     @category=params[:category]
-    load_widget_definitions(@category)
+    load_widget_definitions(@dashboard, @category)
     unless @dashboard
       redirect_to home_path
     end
@@ -119,11 +118,11 @@ class DashboardController < ApplicationController
         end
       end
     end
-    redirect_to :action => :configure, :did => dashboard.id, :id => params[:id], :highlight => widget_id, :category => params[:category]
+    redirect_to :action => 'configure', :did => dashboard.id, :id => params[:id], :highlight => widget_id, :category => params[:category]
   end
 
   def save_widget
-    widget=Widget.find(params[:wid].to_i)
+    widget=Widget.find(params[:wid])
     #TODO check owner of dashboard
     Widget.transaction do
       widget.properties.clear
@@ -137,7 +136,7 @@ class DashboardController < ApplicationController
       widget.configured=true
       widget.save!
       render :update do |page|
-        page.redirect_to(url_for(:action => :configure, :did => widget.dashboard_id, :id => params[:id]))
+        page.redirect_to(url_for(:action => configure, :did => widget.dashboard_id, :id => params[:id]))
       end
     end
   end
@@ -146,14 +145,15 @@ class DashboardController < ApplicationController
     @category=params[:category]
     load_resource()
     load_dashboard()
-    load_widget_definitions(@category)
-    render :partial => 'widget_definitions', :locals => {:dashboard => @dashboard, :resource => @resource, :category => @category}
+    load_widget_definitions(@dashboard, @category)
+    render :partial => 'widget_definitions', :locals => {:category => @category}
   end
 
   private
 
   def load_dashboard
     @active=nil
+
     if logged_in?
       if params[:did]
         @active=ActiveDashboard.find(:first, :include => 'dashboard', :conditions => ['active_dashboards.dashboard_id=? AND active_dashboards.user_id=?', params[:did].to_i, current_user.id])
@@ -179,21 +179,23 @@ class DashboardController < ApplicationController
   end
 
   def load_resource
-    init_resource_for_user_role
+    init_resource_for_user_role unless !params[:id]
     @project=@resource # for backward compatibility with old widgets
   end
 
   def load_authorized_widget_definitions
-    if @resource
-      @authorized_widget_definitions=java_facade.getWidgets().select do |widget|
-        roles = widget.getUserRoles()
-        roles.empty? || roles.any? { |role| (role=='user') || (role=='viewer') || has_role?(role, @resource) }
-      end
+    @authorized_widget_definitions=java_facade.getWidgets().select do |widget|
+      roles = widget.getUserRoles()
+      roles.empty? || roles.any? { |role| (role=='user') || (role=='viewer') || has_role?(role, @resource) }
     end
   end
 
-  def load_widget_definitions(filter_on_category=nil)
+  def load_widget_definitions(dashboard, filter_on_category=nil)
     @widget_definitions=java_facade.getWidgets()
+    if dashboard.detached
+      @widget_definitions=@widget_definitions.select(&:isDetached)
+    end
+
     @widget_categories=@widget_definitions.map(&:getWidgetCategories).flatten.uniq.sort
     unless filter_on_category.blank?
       @widget_definitions=@widget_definitions.select { |definition| definition.getWidgetCategories().to_a.include?(filter_on_category) }
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/detached_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/detached_controller.rb
deleted file mode 100644
index 1074a6674c0..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/detached_controller.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-# Sonar, entreprise quality control tool.
-# Copyright (C) 2008-2012 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# Sonar is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# Sonar is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with Sonar; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
-#
-class DetachedController < ApplicationController
-
-  SECTION=Navigation::SECTION_HOME
-
-  verify :method => :post, :only => [:set_layout, :add_widget, :set_dashboard, :save_widget], :redirect_to => {:action => :index}
-  before_filter :login_required, :except => [:index]
-
-  def index
-    # TODO display error page if no dashboard or no resource
-    load_resource()
-    load_dashboard()
-    load_authorized_widget_definitions()
-    unless @dashboard
-      redirect_to home_path
-    end
-  end
-
-  def configure
-    # TODO display error page if no dashboard or no resource
-    load_resource()
-    load_dashboard()
-    @category=params[:category]
-    load_widget_definitions(@category)
-    unless @dashboard
-      redirect_to home_path
-    end
-  end
-
-  def edit_layout
-    load_resource()
-    load_dashboard()
-  end
-
-  def set_layout
-    dashboard=Dashboard.find(params[:id])
-    if dashboard.editable_by?(current_user)
-      dashboard.column_layout=params[:layout]
-      dashboard.save!
-      columns=dashboard.column_layout.split('-')
-      dashboard.widgets.find(:all, :conditions => ["column_index > ?", columns.size()]).each do |widget|
-        widget.column_index=columns.size()
-        widget.save
-      end
-    end
-    redirect_to :action => 'index', :did => dashboard.id, :id => params[:id]
-  end
-
-  def set_dashboard
-    load_dashboard()
-
-    dashboardstate=params[:dashboardstate]
-
-    columns=dashboardstate.split(";")
-    all_ids=[]
-    columns.each_with_index do |col, index|
-      ids=col.split(",")
-      ids.each_with_index do |id, order|
-        widget=@dashboard.widgets.to_a.find { |i| i.id==id.to_i() }
-        if widget
-          widget.column_index=index+1
-          widget.row_index=order+1
-          widget.save!
-          all_ids<<widget.id
-        end
-      end
-    end
-    @dashboard.widgets.reject { |w| all_ids.include?(w.id) }.each do |w|
-      w.destroy
-    end
-    render :json => {:status => 'ok'}
-  end
-
-  def add_widget
-    dashboard=Dashboard.find(params[:id])
-    widget_id=nil
-    if dashboard.editable_by?(current_user)
-      definition=java_facade.getWidget(params[:widget])
-      if definition
-        first_column_widgets=dashboard.widgets.select { |w| w.column_index==1 }.sort_by { |w| w.row_index }
-        new_widget=dashboard.widgets.create(:widget_key => definition.getId(),
-                                            :name => definition.getTitle(),
-                                            :column_index => 1,
-                                            :row_index => 1,
-                                            :configured => !definition.hasRequiredProperties())
-        widget_id=new_widget.id
-        first_column_widgets.each_with_index do |w, index|
-          w.row_index=index+2
-          w.save
-        end
-      end
-    end
-    redirect_to :action => :configure, :id => params[:id], :highlight => widget_id, :category => params[:category]
-  end
-
-  def save_widget
-    widget=Widget.find(params[:wid].to_i)
-    #TODO check owner of dashboard
-    Widget.transaction do
-      widget.properties.clear
-      widget.java_definition.getWidgetProperties().each do |java_property|
-        value=params[java_property.key()] || java_property.defaultValue()
-        if value && !value.empty?
-          prop = widget.properties.build(:kee => java_property.key, :text_value => value)
-          prop.save!
-        end
-      end
-      widget.configured=true
-      widget.save!
-      render :update do |page|
-        page.redirect_to(url_for(:action => :configure, :id => widget.dashboard_id))
-      end
-    end
-  end
-
-  def widget_definitions
-    @category=params[:category]
-    load_resource()
-    load_dashboard()
-    load_widget_definitions(@category)
-    render :partial => 'widget_definitions', :locals => {:dashboard => @dashboard, :category => @category}
-  end
-
-  private
-
-  def load_dashboard
-    @active=nil
-    if logged_in?
-      @active=ActiveDashboard.find(:first, :include => 'dashboard', :conditions => ['active_dashboards.dashboard_id=? AND active_dashboards.user_id=?', params[:id].to_i, current_user.id])
-    end
-
-    if @active.nil?
-      # anonymous or not found in user dashboards
-      @active=ActiveDashboard.find(:first, :include => 'dashboard', :conditions => ['active_dashboards.dashboard_id=? AND active_dashboards.user_id IS NULL', params[:id].to_i])
-    end
-    @dashboard=(@active ? @active.dashboard : nil)
-    @dashboard_configuration=Api::DashboardConfiguration.new(@dashboard, :period_index => params[:period], :snapshot => @snapshot) if @dashboard && @snapshot
-  end
-
-  def load_resource
-  end
-
-  def load_authorized_widget_definitions
-    @authorized_widget_definitions=java_facade.getWidgets().select do |widget|
-      roles = widget.getUserRoles()
-      roles.empty? || roles.any? { |role| (role=='user') || (role=='viewer') }
-    end
-  end
-
-  def load_widget_definitions(filter_on_category=nil)
-    @widget_definitions=java_facade.getWidgets().select(&:isDetached)
-    @widget_categories=@widget_definitions.map(&:getWidgetCategories).flatten.uniq.sort
-    unless filter_on_category.blank?
-      @widget_definitions=@widget_definitions.select { |definition| definition.getWidgetCategories().to_a.include?(filter_on_category) }
-    end
-  end
-end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
index eb099e4a27c..f19c150e62e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
@@ -22,10 +22,10 @@ module DashboardHelper
   include MetricsHelper
 
   def dashboard_action(action_name, opts={})
-    if @dashboard.detached
-      { :action => action_name, :id => @dashboard.id }.merge!(opts)
-    else
+    if @resource
       { :action => action_name, :did => @dashboard.id, :id => @resource.id }.merge!(opts)
+    else
+      { :action => action_name, :did => @dashboard.id }.merge!(opts)
     end
   end
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/detached_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/detached_helper.rb
deleted file mode 100644
index b4858d7b40e..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/detached_helper.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Sonar, entreprise quality control tool.
-# Copyright (C) 2008-2012 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# Sonar is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# Sonar is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with Sonar; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
-#
-module DetachedHelper
-  include DashboardHelper
-end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_configure_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_configure_widget.html.erb
deleted file mode 100644
index 61d45160038..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_configure_widget.html.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<%
-   begin
-     widget_body=render :inline => widget.java_definition.getTarget().getTemplate(), :locals => {:widget_properties => widget.properties_as_hash, :widget => widget, :dashboard_configuration => @dashboard_configuration}
-   rescue => error
-     logger.error(message('dashboard.cannot_render_widget_x', :params => [widget.java_definition.getId(), error]))
-     logger.error(error.backtrace.join("\n"))
-     widget_body=""
-   end
-%>
-
-<div class="widget-header">
-  <div class="widget-actions">
-    <% if widget.java_definition.isEditable() %>
-      <a class="link-action" onclick="portal.editWidget(<%= widget.id -%>);return false;"><%= message('edit') -%></a>
-    <% end %>
-    <a class="link-action" onclick="portal.deleteWidget(this);return false;"><%= message('delete') -%></a>
-  </div>
-  <div class="widget-handle">
-    <%= h message('widget.' + widget.java_definition.getId() + '.name', :default => widget.java_definition.getTitle()) -%>
-  </div>
-</div>
-
-<div class="widget_props" id="widget_props_<%= widget.id -%>" style="<%= 'display:none' if widget.configured -%>">
-  <%= render :partial => 'widget_properties', :locals => {:widget => widget} -%>
-</div>
-
-<div id="widget_<%= widget.id -%>" class="configure_widget <%= h widget.java_definition.getId() -%>" style="height:100%;<%= 'display:none;' if !widget.configured -%>">
-  <!--[if lte IE 6]>
-  <style type="text/css">
-    #dashboard .block .content .transparent {
-      display: none;
-    }
-  </style>
-  <![endif]-->
-  <div class="transparent"></div>
-  <% if widget_body.include? '<' %>
-    <%
-       default_layout=(widget.layout=='DEFAULT')
-       if default_layout
-    %>
-      <div class="widget">
-    <% end %>
-    <%= widget_body -%>
-    <% if default_layout %>
-      <div class="clear"></div>
-      </div>
-    <% end %>
-  <% else %>
-    <div class="widget"><p><%= message('no_data') -%></p></div>
-  <% end %>
-  <div style="clear: both;"></div>
-</div>
-
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_header.html.erb
deleted file mode 100644
index 20963d490eb..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_header.html.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="line-block">
-  <% if logged_in? %>
-    <ul class="operations">
-      <% if back %>
-        <li class="last"><%= link_to message('dashboard.back_to_dashboard'), dashboard_action(:index) -%></li>
-      <% else %>
-        <% if @dashboard.editable_by?(current_user) %>
-          <li><%= link_to message('dashboard.configure_widgets'), dashboard_action(:configure) -%></li>
-          <li><%= link_to message('dashboard.edit_layout'), dashboard_action(:edit_layout) -%></li>
-        <% end %>
-        <% if @resource %>
-          <li class="last"><%= link_to message('dashboard.manage_dashboards'), {:controller => :dashboards, :action => :index, :resource => @resource.id} -%></li>
-        <% end %>
-      <% end %>
-    </ul>
-  <% end %>
-
-  <% if @snapshot %>
-    <div id="snapshot_title" class="page_title">
-      <h4>
-        <%= link_to_favourite(@project) -%> <%= "Version #{@snapshot.version} - " if @snapshot.version.present? -%><%= l @snapshot.created_at -%>
-        <% if @snapshot.project_snapshot.periods? %>
-          <form method="GET" action="<%= url_for :controller => :dashboard, :action => :index, :id => @resource.id -%>" style="display: inline" class="spacer-left">
-            <input type="hidden" name="did" value="<%= @dashboard.id -%>"/>
-            <select id="select-comparison" name="period" onchange="submit()" class="small">
-              <option value=""><%= message('time_changes') -%>...</option>
-              <%= period_select_options(@snapshot, 1) -%>
-              <%= period_select_options(@snapshot, 2) -%>
-              <%= period_select_options(@snapshot, 3) -%>
-              <%= period_select_options(@snapshot, 4) -%>
-              <%= period_select_options(@snapshot, 5) -%>
-            </select>
-          </form>
-        <% end %>
-      </h4>
-    </div>
-  <% end %>
-</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget.html.erb
deleted file mode 100644
index 035b4a87c94..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="<%= h widget.key -%>" style="height:100%;">
-  <% if widget.configured
-       begin
-         widget_body=render :inline => widget.java_definition.getTarget().getTemplate(), :locals => {:widget_properties => widget.properties_as_hash, :widget => widget, :dashboard_configuration => @dashboard_configuration}
-       rescue => error
-         logger.error(message('dashboard.cannot_render_widget_x', :params => [widget.key, error]))
-         logger.error(error.backtrace.join("\n"))
-         widget_body=""
-       end
-
-       if widget_body.include?('<')
-         default_layout=(widget.java_definition.getWidgetLayout().name()=='DEFAULT')
-         if default_layout
-      %>
-        <div class="widget">
-      <% end %>
-      <%= widget_body -%>
-      <% if default_layout %>
-        <div class="clear"></div>
-        </div>
-      <% end %>
-    <% end %>
-  <% else %>
-    <div class="widget">
-      <p>
-        <a href="<%= url_for(dashboard_action(:configure, :id => @dashboard.id)) -%>"><%= message('dashboard.please_configure_the_widget_x', :params => widget.java_definition.getTitle()) -%></a>
-      </p>
-    </div>
-  <% end %>
-  <div style="clear: both;"></div>
-</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definition.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definition.html.erb
deleted file mode 100644
index dd6b59963da..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definition.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<td>
-  <div class="widget_def" id="def_<%= definition.id.tr('_', '') -%>">
-    <p><b><%= h message("widget.#{definition.id}.name", :default => definition.title) -%></b></p>
-
-    <p><%= h message("widget.#{definition.id}.description", :default => definition.description) -%></p>
-
-    <% form_tag dashboard_action(:add_widget, :widget => definition.id) do -%>
-      <input type="hidden" name="category" value="<%= category -%>">
-      <input type="submit" value="<%= message('dashboard.add_widget') -%>" id="add-widget-<%= u(definition.id) -%>">
-    <% end -%>
-  </div>
-</td>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definitions.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definitions.html.erb
deleted file mode 100644
index 1cf2deba4f5..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definitions.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<p>
-<ul class="horizontal widget_categs" id="widget-filters">
-  <li><%= message('filter_verb') -%>:</li>
-  <li class="<%= 'selected' if category.blank? -%>">
-    <a href="#" onClick="return filterWidgets('')" id="widget-filter-none"><%= message('none') -%></a>
-  </li>
-  <% @widget_categories.each do |c| %>
-    <li class="<%= 'selected' if category==c -%>">
-      <a href="#" onClick="return filterWidgets('<%= escape_javascript(c) -%>')" id="widget-filter-<%= u(c) -%>"><%= h(c) -%></a>
-    </li>
-  <% end %>
-</ul>
-<%= image_tag 'loading.gif', :style => 'vertical-align: top;display: none', :id => 'filter-widgets-loading' -%>
-</p>
-
-<table width="100%">
-  <% @widget_definitions.each_slice(4) do |row_definitions| %>
-    <tr>
-      <% row_definitions.each do |definition| %>
-        <%= render :partial => 'widget_definition', :locals => {:definition => definition, :dashboard => @dashboard, :resource => @resource, :category => category} %>
-      <% end %>
-    </tr>
-  <% end %>
-</table>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_properties.html.erb
deleted file mode 100644
index 839de6ccad7..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_properties.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<% form_remote_tag :url => {:action => :save_widget, :wid => widget.id, :id => params[:id]},
-                   :method => :post,
-                   :update => {:failure => "error#{widget.id}"},
-                   :failure => "$('error#{widget.id}').show()" do -%>
-  <div id="error<%= widget.id -%>" class="error" style="display: none"></div>
-  <table class="table width100">
-    <tbody>
-    <% widget.java_definition.getWidgetProperties().sort { |w1, w2| natural_comparison(w1.key, w2.key) }.each do |property_def| %>
-      <tr>
-        <td class="form-key-cell"><%= property_def.key() -%><%= "*" unless property_def.optional()==true -%></td>
-        <td class="form-val-cell" id="row_<%= property_def.key() -%>">
-          <%= property_value_field(property_def, widget.property_text_value(property_def.key())) -%>
-          <div class="form-val-note">
-            <%= message("widget." + widget.key + ".param." + property_def.key(), :default => property_def.description()) -%>
-          </div>
-        </td>
-      </tr>
-    <% end %>
-    <tr>
-      <td colspan="2">
-        <%= submit_tag message('save') %>
-        <% if widget.configured %>
-          <a href="#" onClick="portal.cancelEditWidget(<%= widget.id -%>);return false;"><%= message('cancel') -%></a>
-        <% end %>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-  <%= hidden_field_tag "widgetid", "", :class => "widgetid" %>
-<% end -%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/configure.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/configure.html.erb
deleted file mode 100644
index 743b447d18f..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/configure.html.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-<script type="text/javascript">
-  <!--
-  var options = {
-    editorEnabled:true,
-    portal:'dashboard',
-    column:'dashboard-column',
-    columnhandle:'column-handle',
-    block:'block',
-    hoverclass:'block-hover',
-    handleClass:'widget-handle',
-    dashboardstate:'dashboardstate',
-    toggle:'block-toggle',
-    blocklist:'widget_defs',
-    highlight_duration:2,
-    highlight_startcolor:'#cae3f2',
-    highlight_endcolor:'#ffffff',
-    saveurl:'<%= url_for dashboard_action(:set_dashboard) -%>'
-  };
-  var portal;
-  function init_dashboard() {
-    portal = new Portal(options);
-  <% if params[:highlight] %>
-    portal.highlightWidget(<%= params[:highlight] -%>);
-  <% end %>
-  }
-  Event.observe(window, 'load', init_dashboard, false);
-
-  function filterWidgets(category) {
-    new Ajax.Updater(
-      'widget_defs',
-      '<%= add_category_to_url(url_for dashboard_action(:widget_definitions))  -%>' + encodeURIComponent(category),
-      {asynchronous:true, evalScripts:true});
-    $('filter-widgets-loading').show();
-    return false;
-  }
-  //-->
-</script>
-
-<div id="dashboard">
-  <%= render :partial => 'header', :locals => {:back => true} %>
-
-  <div id="widget_defs">
-    <%= render :partial => 'widget_definitions', :locals => {:category => @category} -%>
-  </div>
-
-  <%
-     columns=@dashboard.column_layout.split('-')
-     for index in 1..columns.size()
-  %>
-    <div class="dashboard-column-wrapper" style="width: <%= columns[index-1] -%>;margin: 0 -1px 0 0;">
-      <div class="dashboard-column" id="dashboard-column-<%= index -%>" style="margin: 0 <%= index<columns.size() ? "5px" : "0px" -%> 0 <%= index>1 ? "5px" : "0px" -%>;">
-        <div class="column-handle" style="display: none"></div>
-
-        <%
-           @dashboard.widgets.select { |widget| widget.column_index==index && widget.java_definition }.sort_by { |widget| widget.row_index }.each do |widget|
-        %>
-          <div class="block" id="block_<%= widget.id -%>">
-            <%= render :partial => 'configure_widget', :locals => {:widget => widget} %>
-          </div>
-        <%
-           end
-        %>
-      </div>
-    </div>
-  <% end %>
-  <div style="clear: both;"></div>
-</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/edit_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/edit_layout.html.erb
deleted file mode 100644
index cd3f8269ce5..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/edit_layout.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="dashboard">
-  <%= render :partial => 'header', :locals => {:back => true} %>
-
-  <div id="edit-layout" class="admin">
-    <p class="note"><%= message('dashboard.click_to_choose_layout') -%>: </p><br/>
-
-    <% {'100%', 'layout100.png',
-        '50%-50%', 'layout5050.png',
-        '30%-70%', 'layout3070.png',
-        '70%-30%', 'layout7030.png',
-        '33%-33%-33%', 'layout333333.png'
-       }.each_pair do |layout, picto| %>
-      <div class="select-layout <%= 'selected' if @dashboard.layout==layout -%>" style="text-align:center;width: 20%;">
-        <%= link_to image_tag(picto), dashboard_action(:set_layout, :layout => layout), :method => :post %>
-      </div>
-    <% end %>
-
-    <div style="clear:both;"></div>
-  </div>
-</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/index.html.erb
deleted file mode 100644
index 83b795b23ed..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/index.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<div id="dashboard">
-  <%= render :partial => 'header', :locals => {:back => false} %>
-  <div style="width: 100%;display: block; float: none">
-    <%
-       columns=@dashboard.column_layout.split('-')
-       for index in 1..columns.size()
-    %>
-      <!-- the right margin with 1px is a trick for IE. See SONAR-2637 -->
-      <div class="dashboard-column-wrapper" style="width: <%= columns[index-1] -%>;margin: 0 -1px 0 0;">
-        <div class="dashboard-column" id="dashboard-column-<%= index -%>" style="margin: 0 <%= index<columns.size() ? "5px" : "0px" -%> 0 <%= index>1 ? "5px" : "0px" -%>;">
-          <%
-             @dashboard.widgets.select { |widget| widget.column_index==index }.sort_by { |widget| widget.row_index }.each do |widget|
-               widget_definition=@authorized_widget_definitions.find { |wd| wd.getId()==widget.widget_key }
-               if widget_definition
-          %>
-              <div class="block" id="block_<%= widget.id -%>">
-                <%= render :partial => 'widget', :locals => {:widget => widget} %>
-              </div>
-            <%
-               end
-               end
-            %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-  <div style="clear: both;"></div>
-</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/no_dashboard.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/no_dashboard.html.erb
deleted file mode 100644
index be9f086e585..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/detached/no_dashboard.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<%= render :partial => 'gwt/base', :locals => {:resource => nil, :popup => false, :metric => nil} -%>
-<%= render :partial => 'gwt/resource_viewers' -%>
-
-<img id="page_loading" src="<%= ApplicationController.root_context -%>/images/loading.gif">
-<div id="resource_container"></div>
-
-<script type="text/javascript">
-  // see if an anchor has been passed
-  var anchor;
-  var stripped_url = document.location.toString().split("#");
-  if (stripped_url.length > 1) {
-    anchor = stripped_url[1];
-  }
-
-  // and call the resource page
-  new Ajax.Updater('resource_container', '<%= url_for params.merge({:controller => 'resource', :action => :index, :id => @file.id}) -%>',
-    {
-      asynchronous:true,
-      evalScripts:true,
-      onComplete:function (transport) {
-        $('page_loading').hide();
-        if (anchor != null) {
-          window.location.hash = anchor;
-        }
-      }
-    });
-</script>
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 9117a336cdc..aeb2e3fa7aa 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
@@ -1,5 +1,8 @@
 <%
    selected_section = controller.class::SECTION
+   if selected_section==Navigation::SECTION_RESOURCE && !@resource
+     selected_section = Navigation::SECTION_HOME
+   end
    @project=@resource unless @project || selected_section==Navigation::SECTION_HOME
    period_param = "period=#{params[:period]}" if params[:period]
 %>
@@ -40,9 +43,9 @@
               <a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('dependencies.page') -%></a></li>
 
             <% ActiveDashboard.user_dashboards(current_user).select { |active_dashboard| active_dashboard.dashboard.detached }.each do |active_dashboard| %>
-            <li class="<%= 'selected' if @dashboard && controller.controller_path=='detached' && active_dashboard.dashboard_id==@dashboard.id -%>">
-                <a href="<%= ApplicationController.root_context -%>/detached/index/<%= active_dashboard.dashboard_id -%>"><%= active_dashboard.dashboard.name(true) -%></a>
-            </li>
+              <li class="<%= 'selected' if @dashboard && controller.controller_path=='dashboard' && active_dashboard.dashboard_id==@dashboard.id -%>">
+                <a href="<%= ApplicationController.root_context -%>/dashboard/index/?did=<%= active_dashboard.dashboard_id -%>"><%= active_dashboard.dashboard.name(true) -%></a>
+              </li>
             <% end %>
 
             <% controller.java_facade.getPages(Navigation::SECTION_HOME, nil, nil, nil, nil).each do |page|
@@ -53,7 +56,7 @@
                 <a href="<%= ApplicationController.root_context -%><%= page_url -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) -%></a></li>
             <% end %>
 
-          <% elsif (selected_section==Navigation::SECTION_RESOURCE) %>
+          <% elsif selected_section==Navigation::SECTION_RESOURCE %>
             <% ActiveDashboard.user_dashboards(current_user).select { |active_dashboard| !active_dashboard.dashboard.detached }.each do |active_dashboard| %>
               <li class="<%= 'selected' if @dashboard && controller.controller_path=='dashboard' && active_dashboard.dashboard_id==@dashboard.id -%>">
                 <a href="<%= ApplicationController.root_context -%>/dashboard/index/<%= @project.id -%>?did=<%= active_dashboard.dashboard_id -%><%= "&"+period_param if period_param -%>"><%= active_dashboard.dashboard.name(true) -%></a>
@@ -98,7 +101,7 @@
               <% end %>
               <%
                  # NOTE: we keep "@project.view? || @project.subview?" in the test for backward compatibility with the Views plugin
-                 if (controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'modifiable_history') || @project.view? || @project.subview?) 
+                 if (controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'modifiable_history') || @project.view? || @project.subview?)
               %>
                 <li class="<%= 'selected' if request.request_uri.include?('/project/history') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/history/<%= @project.id -%>"><%= message('project_history.page') -%></a></li>
-- 
2.39.5