SONAR-1927 And Now For Some More Duplication.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb
index 242508a802e4a1d7e3413d0a8ad66818adafa78d..6fd94a29e6fbaacb0a82c52257eefb09d9595936 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb
@@ -22,7 +22,7 @@
 
 
 <div class="widget_props" id="widget_props_<%= widget.id -%>" style="<%= 'display:none' if widget.configured -%>">
-  <%= render :partial => 'dashboard/widget_properties', :locals => {:widget => widget} -%>
+  <%= render :partial => 'widget_properties', :locals => {:widget => widget} -%>
 </div>
 
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
index dea93b5444a6a77895658ca23c73a34b0daede9a..2d45e7756bb61bf44694357201335d59002241c9 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
@@ -4,7 +4,7 @@
     <% if back %>
       <li class="last"><%= link_to message('dashboard.back_to_dashboard'), {:action => 'index', :did => @dashboard.id, :id => @resource.id } -%></li>
     <% else %>
-      <% if @dashboard.editable_by?(current_user) %>
+    <% if @dashboard.editable_by?(current_user) %>
       <li><%= link_to message('dashboard.configure_widgets'), {:action => 'configure', :did => @dashboard.id, :id => @resource.id } -%></li>
       <li><%= link_to message('dashboard.edit_layout'), {:action => 'edit_layout', :did => @dashboard.id, :id => @resource.id } -%></li>
       <% end %>
@@ -33,4 +33,4 @@
   </h4>
   </div>
   <% end %>
-</div>
\ No newline at end of file
+</div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb
index aaee68693d9e8fd02f701e88c3b8b122b9198438..16a56d900c89387fba5af86dbd35ea5cfb8c52b0 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb
@@ -11,7 +11,7 @@
 <table width="100%">
   <% @widget_definitions.each_with_index do |definition, index| %>
     <% if index%4==0 %><tr><% end %>
-    <%= render :partial => 'dashboard/widget_definition', :locals => {:definition => definition, :dashboard_id => dashboard_id, :resource_id => resource_id, :category => category} %>
+    <%= render :partial => 'widget_definition', :locals => {:definition => definition, :dashboard_id => dashboard_id, :resource_id => resource_id, :category => category} %>
     <% if index%4==3 %></tr><% end %>
   <% end %>
   <% for i in 0..(4-(@widget_definitions.size%4)) %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
index 8e38d90656f192ebe1469c672d70586b0237b34d..dd08b02822a01d7337fe446e5d42fe2244a57eba 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
@@ -38,10 +38,10 @@
 </script>
 
 <div id="dashboard">
-  <%= render :partial => 'dashboard/header', :locals => {:back => true} %>
+  <%= render :partial => 'header', :locals => {:back => true} %>
 
   <div id="widget_defs">
-    <%= render :partial => 'dashboard/widget_definitions', :locals => {:dashboard_id => @dashboard.id, :resource_id => @resource.id, :category => @category} -%>
+    <%= render :partial => 'widget_definitions', :locals => {:dashboard_id => @dashboard.id, :resource_id => @resource.id, :category => @category} -%>
   </div>
 
 
@@ -57,7 +57,7 @@
            @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 => 'dashboard/configure_widget', :locals => {:widget => widget} %>
+            <%= render :partial => 'configure_widget', :locals => {:widget => widget} %>
           </div>
         <%
            end
@@ -66,4 +66,4 @@
     </div>
   <% end %>
   <div style="clear: both;"></div>
-</div>
\ No newline at end of file
+</div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/edit_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/edit_layout.html.erb
index 30c241fe82c787c2d895688601fd1862f773c5d7..c1039f85f5b0c66d631112ef2732188deda70e40 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/edit_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/edit_layout.html.erb
@@ -1,9 +1,9 @@
 <div id="dashboard">
-  <%= render :partial => 'dashboard/header', :locals => {:back => true} %>
+  <%= render :partial => 'header', :locals => {:back => true} %>
 
   <div id="edit-layout" class="admin">
       <p class="note"><%= message('dashboard.click_to_choose_layout') -%>: </p><br/>
-      
+
       <div class="select-layout <%= 'selected' if @dashboard.layout=='100%' -%>" style="text-align:center;width: 20%;">
         <%= link_to image_tag('layout100.png'), {:action => 'set_layout', :did => @dashboard.id, :id => @resource.id, :layout => "100%"}, :method => :post %>
       </div>
@@ -25,4 +25,4 @@
       </div>
       <div style="clear:both;"></div>
   </div>
-</div>
\ No newline at end of file
+</div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
index b40d14c6f1dd57593b176216f999127e6018613c..3b7b7e21743314892e37e8e33eddaefe59e5f279 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
@@ -1,5 +1,5 @@
 <div id="dashboard">
-  <%= render :partial => 'dashboard/header', :locals => {:back => false} %>
+  <%= render :partial => 'header', :locals => {:back => false} %>
 <div style="width: 100%;display: block; float: none">
   <%
      columns=@dashboard.column_layout.split('-')
@@ -14,7 +14,7 @@
                if widget_definition
           %>
               <div class="block" id="block_<%= widget.id -%>">
-                <%= render :partial => 'dashboard/widget', :locals => {:widget => widget} %>
+                <%= render :partial => 'widget', :locals => {:widget => widget} %>
               </div>
             <%
                end
@@ -25,4 +25,4 @@
   <% end %>
   </div>
   <div style="clear: both;"></div>
-</div>
\ No newline at end of file
+</div>

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
index b17fce165001cad4d6392d14ff91e538e93ba4f2..c32dd623af49f572e01dbc2897751e08eff30759 100644 (file)
--- 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
@@ -22,7 +22,7 @@
 
 
 <div class="widget_props" id="widget_props_<%= widget.id -%>" style="<%= 'display:none' if widget.configured -%>">
-  <%= render :partial => 'detached/widget_properties', :locals => {:widget => widget} -%>
+  <%= render :partial => 'widget_properties', :locals => {:widget => widget} -%>
 </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
index bfbec602f4b5482177244c2e09c41e788a06b454..86032adc5176c5316fb19d094bdde0450c06bcca 100644 (file)
--- 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
@@ -1,10 +1,35 @@
 <div class="line-block">
   <% if logged_in? %>
-      <ul class="operations">
-        <% if @dashboard.editable_by?(current_user) %>
-            <li><%= link_to message('dashboard.configure_widgets'), {:action => 'configure', :id => @dashboard.id} -%></li>
-            <li><%= link_to message('dashboard.edit_layout'), {:action => 'edit_layout', :id => @dashboard.id} -%></li>
-        <% end %>
-      </ul>
+         <ul class="operations">
+               <% if back %>
+                       <li class="last"><%= link_to message('dashboard.back_to_dashboard'), {:action => 'index', :id => @dashboard.id } -%></li>
+               <% else %>
+                       <% if @dashboard.editable_by?(current_user) %>
+                               <li><%= link_to message('dashboard.configure_widgets'), {:action => 'configure', :id => @dashboard.id } -%></li>
+                               <li><%= link_to message('dashboard.edit_layout'), {:action => 'edit_layout', :id => @dashboard.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_definitions.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/detached/_widget_definitions.html.erb
index e39ef6ef01f8a98cbe8ae3d7dab2463b0896f862..2b0d25506ac02bff6aa3b3bef810095e977ac232 100644 (file)
--- 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
@@ -11,7 +11,7 @@
 <table width="100%">
   <% @widget_definitions.each_with_index do |definition, index| %>
       <% if index%4==0 %><tr><% end %>
-         <%= render :partial => 'detached/widget_definition', :locals => {:definition => definition, :dashboard_id => dashboard_id, :category => category} %>
+         <%= render :partial => 'widget_definition', :locals => {:definition => definition, :dashboard_id => dashboard_id, :category => category} %>
          <% if index%4==3 %></tr><% end %>
   <% end %>
   <% for i in 0..(4-(@widget_definitions.size%4)) %>

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
index 03a94bd5d1b6bd45d9f72010a8bfbe8340402651..037c71d66b86a638a7c934524c48f4530d515d68 100644 (file)
--- 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
@@ -38,10 +38,10 @@
 </script>
 
 <div id="dashboard">
-  <%= render :partial => 'detached/header', :locals => {:back => true} %>
+  <%= render :partial => 'header', :locals => {:back => true} %>
 
   <div id="widget_defs">
-    <%= render :partial => 'detached/widget_definitions', :locals => {:dashboard_id => @dashboard.id, :category => @category} -%>
+    <%= render :partial => 'widget_definitions', :locals => {:dashboard_id => @dashboard.id, :category => @category} -%>
   </div>
 
 
@@ -57,7 +57,7 @@
            @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 => 'dashboard/configure_widget', :locals => {:widget => widget} %>
+            <%= render :partial => 'configure_widget', :locals => {:widget => widget} %>
           </div>
         <%
            end

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
index cdc1e30d38bc04712fed39b68e7c05d0c5a63a4b..3023388e47d760a34e059cbb30c7b26479d226f5 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 <div id="dashboard">
-  <%= render :partial => 'detached/header', :locals => {:back => true} %>
+  <%= render :partial => 'header', :locals => {:back => true} %>
 
   <div id="edit-layout" class="admin">
       <p class="note"><%= message('dashboard.click_to_choose_layout') -%>: </p><br/>

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
index eaa4317651437f6c19ea15dbbc3c7773d57167e4..63e04036a96ac1de12872fba040debad452809d5 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 <div id="dashboard">
-  <%= render :partial => 'detached/header', :locals => {:back => false} %>
+  <%= render :partial => 'header', :locals => {:back => false} %>
 <div style="width: 100%;display: block; float: none">
   <%
      columns=@dashboard.column_layout.split('-')
@@ -12,7 +12,7 @@
              @dashboard.widgets.select { |widget| widget.column_index==index }.sort_by { |widget| widget.row_index }.each do |widget|
           %>
               <div class="block" id="block_<%= widget.id -%>">
-                <%= render :partial => 'detached/widget', :locals => {:widget => widget} %>
+                <%= render :partial => 'widget', :locals => {:widget => widget} %>
               </div>
             <%
                end