SONAR-2700 Add the server startup date/time to the System Info page

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
index b56d0afe72e92934f4f2411fd8d6ecc624bcb2a7..bea432fd4bf2ea441f388204b6432bd2e13fc8c2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
@@ -61,6 +61,7 @@ class Server
     sonar_info=[]
     add_property(sonar_info, 'Server Key') {org.sonar.server.platform.Platform.getServer().getKey()}
     add_property(sonar_info, 'Version') {org.sonar.server.platform.Platform.getServer().getVersion()}
+    add_property(sonar_info, 'Started at') {org.sonar.server.platform.Platform.getServer().getStartedAt()}
     add_property(sonar_info, 'Database') {"#{jdbc_metadata. getDatabaseProductName()} #{jdbc_metadata. getDatabaseProductVersion()}"}
     add_property(sonar_info, 'Database URL') {sonar_property('sonar.jdbc.url')}
     add_property(sonar_info, 'Database Login') {sonar_property('sonar.jdbc.username')}

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
index 8d99bb71e5540c6c304a1d79badc5a4772c3b0d6..f946a8d84a625243c49f5752b4eaba2f36959c65 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
@@ -4,73 +4,74 @@
   </li>
 </ul>
 
-<table class="data width100" id="system_info">
+<table class="data width100" id="sonar">
 <thead>
   <tr>
-    <th colspan="2"><h2>System Info</h2></th>
+    <th colspan="2"><h2>Sonar Info</h2></th>
   </tr>
 </thead>
 <tbody>
-  <% @server.system_info.each do |data| %>
-    <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'system' } %>
+  <% @server.sonar_info.each do |data| %>
+    <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'sonar' } %>
   <% end %>
 <tbody>
 </table>
 
 <br/>
 
-<table class="data width100" id="sonar">
+<table class="data width100" id="plugins">
 <thead>
   <tr>
-    <th colspan="2"><h2>Sonar Info</h2></th>
+    <th colspan="2"><h2>Sonar Plugins</h2></th>
   </tr>
 </thead>
 <tbody>
-  <% @server.sonar_info.each do |data| %>
-    <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'sonar' } %>
-  <% end %>
+  <%
+     user_plugins=@server.sonar_plugins
+     if user_plugins.empty?
+  %>
+    <tr><td colspan="2" class="even">None</td></tr>
+  <% else %>
+    <% user_plugins.each do |data| %>
+      <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'plugins' } %>
+    <% end %>
+  <% end  %>
 <tbody>
 </table>
 
 <br/>
 
-<table class="data width100" id="memory">
+<table class="data width100" id="system_info">
 <thead>
   <tr>
-    <th colspan="2"><h2>Java VM Statistics</h2></th>
+    <th colspan="2"><h2>System Info</h2></th>
   </tr>
 </thead>
 <tbody>
-  <% @server.system_statistics.each do |data| %>
-    <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'memory' } %>
+  <% @server.system_info.each do |data| %>
+    <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'system' } %>
   <% end %>
 <tbody>
 </table>
 
 <br/>
 
-<table class="data width100" id="plugins">
+<table class="data width100" id="memory">
 <thead>
   <tr>
-    <th colspan="2"><h2>Sonar Plugins</h2></th>
+    <th colspan="2"><h2>Java VM Statistics</h2></th>
   </tr>
 </thead>
 <tbody>
-  <%
-     user_plugins=@server.sonar_plugins
-     if user_plugins.empty?
-  %>
-    <tr><td colspan="2" class="even">None</td></tr>
-  <% else %>
-    <% user_plugins.each do |data| %>
-      <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'plugins' } %>
-    <% end %>
-  <% end  %>
+  <% @server.system_statistics.each do |data| %>
+    <%= render :partial => 'row', :locals => {:title => data[0], :value => data[1], :name => 'memory' } %>
+  <% end %>
 <tbody>
 </table>
 
 <br/>
 
+
 <table class="data width100" id="system_properties">
 <thead>
   <tr>