927 fix html (UPC#945)

* fix(frontend): missing html tags Issue [UPC#927] * fix(frontend): fix html Issue [UPC#927] * fix(frontend): repeated form Issue UPC#927
Klius · Nov 21, 2018 · 4afb2db · 4afb2db
1 parent 8ac1bb7
commit 4afb2db
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/templates/bootstrap/navigation.html.ep b/templates/bootstrap/navigation.html.ep
@@ -34,11 +34,11 @@ navbar-inverse navbar-fixed-top" role="navigation">
                         </li>
 %                   }
                     <li><a href="/admin/messages">
-                    <i class="fa fa-envelope" aria-hidden="true"></i>&nbsp<%=l 'messages' %></a>
+                    <i class="fa fa-envelope" aria-hidden="true"></i>&nbsp;<%=l 'messages' %></a>
                     </li>
 % if ($monitoring) {
                     <li><a href="/admin/monitoring">
-                      <i class="fas fa-tachometer-alt" aria-hidden="true"></i>&nbsp<%=l 'monitoring' %></a>
+                      <i class="fas fa-tachometer-alt" aria-hidden="true"></i>&nbsp;<%=l 'monitoring' %></a>
                     </li>
 % }
                   </ul>

diff --git a/templates/bootstrap/user_settings.html.ep b/templates/bootstrap/user_settings.html.ep
@@ -24,7 +24,7 @@
                                 </div>
 %                         }
 
-                        <p><form method='post' enctype="multipart/form-data">
+                        <form method='post' enctype="multipart/form-data">
                             <%=l 'Language:' %> <select onchange="this.form.submit();" id="tongue" name="tongue" >
                                 <option <%= $c->param("tongue") eq 'en' ? "selected" : "" %> value="en" ><%=l 'English' %></option>
                                 <option <%= $c->param("tongue") eq 'ca' ? "selected" : "" %> value="ca" ><%=l 'Catalan' %></option>
@@ -42,14 +42,13 @@
                                  <font color="green">   <%=l 'Your language has been changed successfully' %></font> 
 %                            }     
                         </form>                
-                        </p>
 %   if (!$_user->is_external) {
                         <hr>
                         <form method='post' enctype="multipart/form-data">
                             <p><%=l 'New Password:' %><input type= 'password' name= 'password' id='password'></p>
                             <p><%=l 'Confirm Password:' %><input type='password' name='conf_password' id='conf_password'></p>
                             <p><%=l 'Current Password:' %><input type='password' name='current_password' id='current_password'></p>
-                            <p><input type='submit' onclick='this.form.submit();' id='button_click' name='button_click' value='<%=l 'Submit' %>'></input>
+                            <p><input type='submit' onclick='this.form.submit();' id='button_click' name='button_click' value='<%=l 'Submit' %>'>
 %                               if ($changed_pass) {
                                     <font color="green">   <%=l 'Your password has been changed successfully' %></font> 
 %                               }     

diff --git a/templates/main/list_bases_ng.html.ep b/templates/main/list_bases_ng.html.ep
@@ -73,12 +73,12 @@
 
                         <a type="button" class="label label-default"
                            ng-click="host_action=0"
-                           ><span class="glyphicon glyphicon-arrow-left"></a>
+                           ><span class="glyphicon glyphicon-arrow-left"></span></a>
                     </span>
 %			        if ($user
 %                       && ( $user->can_change_settings || $user->can_change_settings_all)){
                         <a ng-show="machine.id_clone && (host_action != machine.id && host_restore != machine.id_clone)"
-                            align="right" href="/machine/manage/{{machine.id_clone}}.html"><i class="fa fa-fw fa-cog" title="<%=l 'Settings' %>"></a></i>
+                            align="right" href="/machine/manage/{{machine.id_clone}}.html"><i class="fa fa-fw fa-cog" title="<%=l 'Settings' %>"></i></a>
 %                   }
 
             </div>

diff --git a/templates/main/show_requests.html.ep b/templates/main/show_requests.html.ep
@@ -1,7 +1,7 @@
 <div class="panel panel-primary" ng-show="requests.length > 0">
     <div class="panel-heading">
-        <span ng-show="pending_requests"><%=l 'Waiting for requests to complete' %> ... 
-        <span ng-show="pending_requests<1"><%=l 'Recent requests' %> ... 
+        <span ng-show="pending_requests"><%=l 'Waiting for requests to complete' %> ...</span>
+        <span ng-show="pending_requests<1"><%=l 'Recent requests' %> ...</span>
     </div>
     <div class="panel-body">
         <div ng-repeat="request in requests">
@@ -13,4 +13,3 @@
         </div>
     </div>
 </div>
-
diff --git a/templates/main/vm_remove.html.ep b/templates/main/vm_remove.html.ep
@@ -55,8 +55,6 @@
                         <a type="button" class="btn btn-danger"
                             ng-click="domain_remove_clones=0"
                         ><%=l 'No' %></a>
-                        <a type="button" class="btn btn-warning"
-                            ng-click="remove_clones(<%= $domain->id %>);domain_remove_clones=0;"
                         <a type="button" class="btn btn-warning" ng-click="remove_clones(<%= $domain->id %>);domain_remove_clones=0;" onclick = "location='/'"
                         ><%=l 'Yes, remove all the clones' %></a>
            </div><!-- del domain remove clones-->

diff --git a/templates/ng-templates/new_machine_other.html.ep b/templates/ng-templates/new_machine_other.html.ep
@@ -1,5 +1,4 @@
 <div class="tab-pane fade" id="frommachine" >
-    <form method="post" action="/machine/copy">
         <div class="panel-body">
             <div class="row">
                 <form class="form-inline" method="post" action="/machine/copy">
@@ -58,5 +57,4 @@
                 <!-- Description -->
             </div>
         </div>
-    </form>
 </div>