SONAR-3104 Improve rendering

diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 4a1e940aca189bb58d0a7620b96d4704c5895787..e20cd46b7113e00602cab04c015638257e0b0bf3 100644 (file)
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -869,7 +869,7 @@ project_history.version_updated=Version was updated to "{0}" for current project
 project_history.version_created=Version "{0}" was created for current project and all its sub-projects.
 project_history.version_removed=Version "{0}" was removed from current project and all its sub-projects.
 project_history.version_already_exists=Version "{0}" already exists.
-project_history.edit_event=Edit
+project_history.rename_event=Rename
 project_history.create_event=Create
 project_history.remove_event=Remove
 project_history.event_updated=Event was successfully updated.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb
index 30a4093d66211baa3bb57c79ac206a443d011dfe..bf6862c9e8379ddfa12798086d4d549a04b663ff 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb
@@ -57,15 +57,21 @@
       <td class="thin nowrap" style="padding-left: 20px;">
           <table class="max-width">
             <tr id="version_<%= index -%>">
+              <% if version_event %>
               <td class="max-width"><%= version_event.name if version_event -%></td>
               <td class="small edit_actions" style="padding-left:20px">
-                <a id="version_<%= index -%>_change" href="#" onclick="$('version_<%= index -%>').hide();$('version_<%= index -%>_form').show();$('version_name_<%= index -%>').focus();return false;"><%= version_event ? message('project_history.rename_version') : message('project_history.create_version') -%></a>
+                <a id="version_<%= index -%>_change" href="#" onclick="$('version_<%= index -%>').hide();$('version_<%= index -%>_form').show();$('version_name_<%= index -%>').focus();return false;"><%= message('project_history.rename_version') -%></a>
                 <% if version_event && !snapshot.islast? %>
                   <%= link_to( message('project_history.remove_version'),  
                                        { :action => 'delete_version', :sid => snapshot.id},
                                        :confirm => message('project_history.do_you_want_to_remove_version', :params => version_event.name) ) -%>
                 <% end %>
               </td>
+              <% else %>
+              <td class="small edit_actions" colspan="2">
+                <a id="version_<%= index -%>_change" href="#" onclick="$('version_<%= index -%>').hide();$('version_<%= index -%>_form').show();$('version_name_<%= index -%>').focus();return false;"><%= message('project_history.create_version') -%></a>
+              </td>
+              <% end %>
             </tr>
             <tr id="version_<%= index -%>_form" style="display:none;">
               <td coslpan="2" class="admin">
@@ -89,7 +95,7 @@
                <tr id="event_<%= event_index -%>">
                  <td class="max-width"><%= event.name -%></td>
                  <td class="small edit_actions" style="padding-left:20px">
-                <a id="event_<%= event_index -%>_change" href="#" onclick="$('event_<%= event_index -%>').hide();$('event_<%= event_index -%>_form').show();$('event_name_<%= event_index -%>').focus();return false;"><%= message('project_history.edit_event') -%></a>
+                <a id="event_<%= event_index -%>_change" href="#" onclick="$('event_<%= event_index -%>').hide();$('event_<%= event_index -%>_form').show();$('event_name_<%= event_index -%>').focus();return false;"><%= message('project_history.rename_event') -%></a>
                 <%= link_to( message('project_history.remove_version'),  
                                          { :action => 'delete_event', :id => event.id},
                                      :confirm => message('project_history.do_you_want_to_remove_version', :params => event.name) ) -%>
@@ -107,8 +113,10 @@
                </tr>
              <% end %>
                <tr id="create_event_<%= index -%>">
-                 <td colspan="2" class="small right create_actions">
-                <a id="create_event_<%= index -%>" href="#" onclick="$('create_event_<%= index -%>').hide();$('create_event_<%= index -%>_form').show();$('create_event_name_<%= index -%>').focus();return false;"><%= message('project_history.create_event') -%></a>
+                 <td colspan="2" class="create_actions">
+                   <span class="small">
+                  <a id="create_event_<%= index -%>" href="#" onclick="$('create_event_<%= index -%>').hide();$('create_event_<%= index -%>_form').show();$('create_event_name_<%= index -%>').focus();return false;"><%= message('project_history.create_event') -%></a>
+                </span>
                  </td>
                </tr>
                <tr id="create_event_<%= index -%>_form" style="display:none;">