SONAR-1887: Display available plugin updates

2 files changed, 35 insertions, 16 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
index 3ce11dbb104..b5d8ffab38d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
@@ -14,9 +14,9 @@
 
 <%= render :partial => 'updatecenter/operations' -%>
 
-<h2>User-installed plugins</h2>
-<table class="data">
+<table class="data width100" id="user-plugins">
   <thead>
+    <tr><th colspan="3"><h2>User-installed plugins</h2></th></tr>
     <tr>
       <th>Plugin</th>
       <th>Version</th>
@@ -30,7 +30,7 @@
       @user_plugins.each do |plugin|
     %>
       <tr class="select <%= cycle('even', 'odd', :name => 'user') -%>" id="select_<%= plugin.plugin_key -%>">
-        <td><b><a href="#" onclick="showPlugin('<%= plugin.plugin_key -%>')"><%= h(plugin.name) -%></a></b></td>
+        <td><b><a href="#plugin" onclick="showPlugin('<%= plugin.plugin_key -%>')"><%= h(plugin.name) -%></a></b></td>
         <td><%= plugin.version || '-' -%></td>
         <td>
         <%= plugin.description -%>
@@ -58,12 +58,14 @@
 
 <div class="break30"> </div>
 
-<h2>System plugins</h2>
 <table class="data width100" id="core-plugins">
-  <thead><tr>
-    <th>Plugin</th>
-    <th>Description</th>
-  </tr></thead>
+  <thead>
+    <tr><th colspan="3"><h2>System plugins</h2></th></tr>
+    <tr>
+      <th>Plugin</th>
+      <th>Description</th>
+    </tr>
+  </thead>
   <tbody>
   <%
     @core_plugins.each do |plugin|
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
index 9cdc7ea0796..32deda6e50b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
@@ -17,19 +17,19 @@
   <table class="data width100" id="plugin-updates">
     <thead>
         <tr>
-          <th colspan="3"><h2>User-installed plugins</h2></th>
+          <th colspan="2"><h2>User-installed plugins</h2></th>
         </tr>
     </thead>
     <tbody>
     <% if @plugin_updates.empty? %>
       <tr class="even">
-        <td colspan="3">No updates</td>
+        <td colspan="2">No updates</td>
       </tr>
     <% end %>
     <% @plugin_updates.each do |update|
     %>
       <tr class="<%= cycle('even','odd', :name => 'user-plugins') -%>">
-        <td><b><%= h(update.getPlugin().getName()) -%></b></td>
+        <td><b><a href="#plugin" onclick="showPlugin('<%= update.getPlugin().getKey() + update.getRelease().getVersion().toString() -%>')"><%= h(update.getPlugin().getName()) -%></a></b></td>
         <td>
           <%= update.getRelease().getVersion() -%>
           <% if update.isIncompatible() %>
@@ -37,12 +37,24 @@
           <% elsif update.requiresSonarUpgrade %>
             not compatible, needs Sonar upgrade
           <% end %>
-        </td>
-        <td>
-          <div>
+          
+          <div id="detail-<%= update.getPlugin().getKey() + update.getRelease().getVersion().toString() -%>" style="display:none">
+          <p>
+          <%= update.getRelease().getDescription() -%><br/>
+          <% if update.getRelease().getDate() %>
+            Released <%= update.getRelease().getDate() -%><br/>
+          <% end %>
+
+          <% if update.getRelease().getChangelogUrl() %>
+            <%= link_to 'Changelog', update.getRelease().getChangelogUrl(), :class => 'external' -%><br/>
+          <% end %>
+          </p>
+          
+          <% if update.isCompatible() %>
             <form method="post" action="<%= ApplicationController.root_context -%>/updatecenter/install?from=updates&key=<%= update.getPlugin().getKey() -%>&version=<%= update.getRelease().getVersion() -%>" style="display: inline-block">
               <input type="submit" value="Update"></input>
             </form>
+          <% end %>
           </div>
         </td>
       </tr>
@@ -70,7 +82,12 @@
     %>
       <tr class="<%= cycle('even','odd', :name => 'system') -%>">
         <td><b>Sonar <%= sonar_release.getVersion() -%></b></td>
-        <td><%= sonar_release.getDescription() -%></td>
+        <td>
+          <%= sonar_release.getDescription() -%>
+          <% if update.getRelease().getDate() %>
+            Released <%= update.getRelease().getDate() -%><br/>
+          <% end %>
+        </td>
         <td>
           <%= link_to 'Release Notes', sonar_release.getChangelogUrl(), :class => 'external' if sonar_release.getChangelogUrl() %> &nbsp;
           <%= link_to 'Download', sonar_release.getDownloadUrl(), :class => 'external' if sonar_release.getDownloadUrl() %>
@@ -82,4 +99,4 @@
   <br/>
 <% end %>
 <%= render :partial => 'updatecenter/status', :locals => {:action => 'updates' } %>
-</div>
\ No newline at end of file
+</div>