Commit 4afb2db0 authored by Fernando Verdugo's avatar Fernando Verdugo Committed by Francesc Guasch
Browse files

927 fix html (#945)

* fix(frontend): missing html tags

Issue [#927]

* fix(frontend): fix html

Issue [#927]

* fix(frontend): repeated form

Issue #927
parent 8ac1bb70
...@@ -34,11 +34,11 @@ navbar-inverse navbar-fixed-top" role="navigation"> ...@@ -34,11 +34,11 @@ navbar-inverse navbar-fixed-top" role="navigation">
</li> </li>
% } % }
<li><a href="/admin/messages"> <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> </li>
% if ($monitoring) { % if ($monitoring) {
<li><a href="/admin/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> </li>
% } % }
</ul> </ul>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </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" > <%=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 'en' ? "selected" : "" %> value="en" ><%=l 'English' %></option>
<option <%= $c->param("tongue") eq 'ca' ? "selected" : "" %> value="ca" ><%=l 'Catalan' %></option> <option <%= $c->param("tongue") eq 'ca' ? "selected" : "" %> value="ca" ><%=l 'Catalan' %></option>
...@@ -42,14 +42,13 @@ ...@@ -42,14 +42,13 @@
<font color="green"> <%=l 'Your language has been changed successfully' %></font> <font color="green"> <%=l 'Your language has been changed successfully' %></font>
% } % }
</form> </form>
</p>
% if (!$_user->is_external) { % if (!$_user->is_external) {
<hr> <hr>
<form method='post' enctype="multipart/form-data"> <form method='post' enctype="multipart/form-data">
<p><%=l 'New Password:' %><input type= 'password' name= 'password' id='password'></p> <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 '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><%=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) { % if ($changed_pass) {
<font color="green"> <%=l 'Your password has been changed successfully' %></font> <font color="green"> <%=l 'Your password has been changed successfully' %></font>
% } % }
......
...@@ -73,12 +73,12 @@ ...@@ -73,12 +73,12 @@
<a type="button" class="label label-default" <a type="button" class="label label-default"
ng-click="host_action=0" ng-click="host_action=0"
><span class="glyphicon glyphicon-arrow-left"></a> ><span class="glyphicon glyphicon-arrow-left"></span></a>
</span> </span>
% if ($user % if ($user
% && ( $user->can_change_settings || $user->can_change_settings_all)){ % && ( $user->can_change_settings || $user->can_change_settings_all)){
<a ng-show="machine.id_clone && (host_action != machine.id && host_restore != machine.id_clone)" <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> </div>
......
<div class="panel panel-primary" ng-show="requests.length > 0"> <div class="panel panel-primary" ng-show="requests.length > 0">
<div class="panel-heading"> <div class="panel-heading">
<span ng-show="pending_requests"><%=l 'Waiting for requests to complete' %> ... <span ng-show="pending_requests"><%=l 'Waiting for requests to complete' %> ...</span>
<span ng-show="pending_requests<1"><%=l 'Recent requests' %> ... <span ng-show="pending_requests<1"><%=l 'Recent requests' %> ...</span>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div ng-repeat="request in requests"> <div ng-repeat="request in requests">
...@@ -13,4 +13,3 @@ ...@@ -13,4 +13,3 @@
</div> </div>
</div> </div>
</div> </div>
...@@ -55,8 +55,6 @@ ...@@ -55,8 +55,6 @@
<a type="button" class="btn btn-danger" <a type="button" class="btn btn-danger"
ng-click="domain_remove_clones=0" ng-click="domain_remove_clones=0"
><%=l 'No' %></a> ><%=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='/'" <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> ><%=l 'Yes, remove all the clones' %></a>
</div><!-- del domain remove clones--> </div><!-- del domain remove clones-->
......
<div class="tab-pane fade" id="frommachine" > <div class="tab-pane fade" id="frommachine" >
<form method="post" action="/machine/copy">
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<form class="form-inline" method="post" action="/machine/copy"> <form class="form-inline" method="post" action="/machine/copy">
...@@ -58,5 +57,4 @@ ...@@ -58,5 +57,4 @@
<!-- Description --> <!-- Description -->
</div> </div>
</div> </div>
</form>
</div> </div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment