Add some HTML ids used by integration tests

3 files changed, 26 insertions, 27 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create.html.erb
index f5aef418880..1b9833d93ac 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create.html.erb
@@ -1,32 +1,31 @@
-
 <table class="admintable" width="100%">
   <form action="<%= url_for :action => 'create', :resource => params[:resource] -%>" id="create-dashboard-form" method="POST">
     <tbody>
-      <tr>
-        <td colspan="2"><h1><%= message('dashboard.create_dashboard') -%></h1></td>
-      </tr>
-      <tr>
-        <td class="left" valign="top">
-        <%= message('name') -%>:<br/><input type="text" name="name" size="30" maxlength="256"></input>
-        </td>
-      </tr>
-      <tr>
-        <td class="left" valign="top">
-        <%= message('description') -%>:<br/><input type="text" name="description" size="30" maxlength="1000"></input>
-        </td>
-      </tr>
-      <% if is_admin? %>
-      <tr>
-        <td class="left" valign="top">
-        <%= message('shared') -%>:<br/><input type="checkbox" name="shared" value="true"></input>
-        </td>
-      </tr>
-      <% end %>
+    <tr>
+      <td colspan="2"><h1><%= message('dashboard.create_dashboard') -%></h1></td>
+    </tr>
+    <tr>
+      <td class="left" valign="top">
+        <%= message('name') -%>:<br/><input type="text" name="name" size="30" maxlength="256">
+      </td>
+    </tr>
+    <tr>
+      <td class="left" valign="top">
+        <%= message('description') -%>:<br/><input type="text" name="description" size="30" maxlength="1000">
+      </td>
+    </tr>
+    <% if is_admin? %>
       <tr>
         <td class="left" valign="top">
-        <input type="submit" value="<%= message('dashboard.create_dashboard') -%>"/>
+          <%= message('shared') -%>:<br/><input type="checkbox" name="shared" value="true">
         </td>
       </tr>
+    <% end %>
+    <tr>
+      <td class="left" valign="top">
+        <input type="submit" value="<%= message('dashboard.create_dashboard') -%>" id="submit-create-dashboard"/>
+      </td>
+    </tr>
     </tbody>
   </form>
 </table>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit.html.erb
index 400a4df767c..38a5c31c732 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit.html.erb
@@ -6,24 +6,24 @@
       </tr>
       <tr>
         <td class="left" valign="top">
-        <%= message('name') -%>:<br/><input type="text" name="name" size="30" maxlength="256" value="<%= @dashboard.name -%>"></input>
+        <%= message('name') -%>:<br/><input type="text" name="name" size="30" maxlength="256" value="<%= @dashboard.name -%>">
         </td>
       </tr>
       <tr>
         <td class="left" valign="top">
-        <%= message('description') -%>:<br/><input type="text" name="description" size="30" maxlength="1000" value="<%= @dashboard.description -%>"></input>
+        <%= message('description') -%>:<br/><input type="text" name="description" size="30" maxlength="1000" value="<%= @dashboard.description -%>">
         </td>
       </tr>
       <% if is_admin? %>
       <tr>
         <td class="left" valign="top">
-        <%= message('shared') -%>:<br/><input type="checkbox" name="shared" value="true" <%= 'checked' if @dashboard.shared -%>></input>
+        <%= message('shared') -%>:<br/><input type="checkbox" name="shared" value="true" <%= 'checked' if @dashboard.shared -%>>
         </td>
       </tr>
       <% end %>
       <tr>
         <td class="left" valign="top">
-        <input type="submit" value="<%= message('dashboard.update_dashboard') -%>"/>
+        <input type="submit" value="<%= message('dashboard.update_dashboard') -%>" id="submit-update-dashboard"/>
         <a href="<%= url_for :action => 'index', :resource => params[:resource] -%>"><%= message('cancel') -%></a>
         </td>
       </tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb
index f8ddb83cb47..e3d5898e5d5 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb
@@ -49,7 +49,7 @@
                 <% if active.owner?(current_user) %>
                   <%= link_to message('dashboard.configure_widgets'), {:controller => :dashboard, :action => 'configure', :did => active.dashboard_id, :id => params[:resource]}, :id => "configure-#{u active.name}" %>
                   |
-                  <%= link_to_remote message('edit'), :update => "admin_form", :url => {:action => "edit", :id => active.dashboard_id, :resource => params[:resource]}, :id => "edit-#{u active.name}", :method => :get %>
+                  <%= link_to_remote message('edit'), {:update => "admin_form", :url => {:action => "edit", :id => active.dashboard_id, :resource => params[:resource]}}, {:id => "edit-#{u active.name}", :method => :get} %>
                   |
                   <%= link_to message('delete'), {:action => 'delete', :id => active.dashboard_id, :resource => params[:resource]}, :method => :post, :confirm => message('dashboard.do_you_want_to_delete_dashboard'), :id => "delete-#{u active.name}" %>
                 <% else %>