Cleanup for AdminLTE

root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep

@@ -1,25 +1,25 @@
-<div id="">
+<div>
 
-    %	my $btn = l('REMOVE');
+    %   my $btn = l('REMOVE');
     %= form_for '/domains2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'dom_REMOVE_TITLE'
-	</h2>
-	</p>
+    <p>
+    <h2>
+    %=l 'dom_REMOVE_TITLE'
+    </h2>
+    </p>
 
-	<p>
-	%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
-	</p>
-	
-	<p><b>
-	%= l('dom_ABOUT_TO_REMOVE')
-	<b></p>
+    <p>
+    %= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
+    </p>
+    
+    <p><b>
+    %= l('dom_ABOUT_TO_REMOVE')
+    <b></p>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
         %= hidden_field 'trt' => $dom_datas->{trt}
         %= hidden_field 'Domain' => $dom_datas->{domain}

root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep

@@ -1,43 +1,45 @@
-<div id="">
+<div>
 
     % my $btn = l('dom_ADD_DOMAIN');
 
 
     %= form_for '/domains' => (method => 'POST') => begin
 
-		%= l('dom_FORM_DESCRIPTION');
-		
-		<p>
-		<br>
-		%= submit_button "$btn", class => ""
-		</p>
+        %= l('dom_FORM_DESCRIPTION');
+        
+        <p>
+        <br>
+        %= submit_button "$btn", class => ""
+        </p>
 
-		%= hidden_field 'trt' => 'ADD'
-	
+        %= hidden_field 'trt' => 'ADD'
+    
     % end
 
-	<h2>
-		%=l 'dom_CURRENT_DOMAINS'
-	</h2>
-	<table class=""><thead>
-	<tr>
-		<th class="">
-			%=l 'DOMAIN_NAME'
-		</th>
-		<th class="">
-			%=l 'DESCRIPTION_BRIEF'
-		</th>
-		<th class="">
-			%=l 'dom_CONTENT'
-		</th>
-		<th class="">
-			%=l 'dom_LABEL_NAMESERVERS'
-		</th>
-		<th class="">
-			%=l 'ACTION'
-		</th>
-	</tr>
-	</thead><tbody>
+    <h2>
+        %=l 'dom_CURRENT_DOMAINS'
+    </h2>
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+        <th class="">
+            %=l 'DOMAIN_NAME'
+        </th>
+        <th class="">
+            %=l 'DESCRIPTION_BRIEF'
+        </th>
+        <th class="">
+            %=l 'dom_CONTENT'
+        </th>
+        <th class="">
+            %=l 'dom_LABEL_NAMESERVERS'
+        </th>
+        <th class="">
+            %=l 'ACTION'
+        </th>
+    </tr>
+    </thead>
+    <tbody>
 
     % foreach my $domain ( @$domains ) {
         <tr>
@@ -46,76 +48,78 @@
             %= t td => (class => "") => $domain->{'Content'}
             %= t td => (class => "") => l('dom_' . $domain->{'Nameservers'})
 
-		%# 	my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>"; 
-			%my $modify_text = l('MODIFY');  # Localized text
-			%my $csrf_token = "TOKEN";  # CSRF token for security
-			%my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
-			%my $actionModify = qq{
+        %#  my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>"; 
+            %my $modify_text = l('MODIFY');  # Localized text
+            %my $csrf_token = "TOKEN";  # CSRF token for security
+            %my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+            %my $actionModify = qq{
                         %       <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
-			%	<button type='button' class="" title='$modify_text' >
-			%		$modify_text
-			%	</button>
+            %   <button type='button' class="" title='$modify_text' >
+            %       $modify_text
+            %   </button>
                         %       </a>
-			%};
-			%my $removable = ($domain->{Removable} || 'yes');
-			%my $actionRemove = '&nbsp;';
-			%if ($removable eq 'yes')  { 
-					%my $remove_text = l('REMOVE');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
-					%$actionRemove = qq{
+            %};
+            %my $removable = ($domain->{Removable} || 'yes');
+            %my $actionRemove = '&nbsp;';
+            %if ($removable eq 'yes')  { 
+                    %my $remove_text = l('REMOVE');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+                    %$actionRemove = qq{
                                                 %       <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
-						%	<button type='button' class="" title='$remove_text' >
-						%		$remove_text
-						%	</button>
+                        %   <button type='button' class="" title='$remove_text' >
+                        %       $remove_text
+                        %   </button>
                                                 %       </a>
-					%};
-				%#		$actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>"; 
-			%};
-			<td class="" style="min-width:15em">
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-			</td>
-		</tr>
-	%	}
+                    %};
+                %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>"; 
+            %};
+            <td class="" style="min-width:15em">
+                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+            </td>
+        </tr>
+    %   }
 
-	</tbody>
-   	</table>
+    </tbody>
+    </table>
 
     %= hidden_field 'trt' => 'ADD'
 
     %= form_for '/domains' => (method => 'POST') => begin
 
-		<!-- <HR class="">-->
-		<br>
+        <!-- <HR class="">-->
+        <br>
 
-		% my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
+        % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
 
-		<h3>
-			%= l 'dom_DESC_CORPORATE_DNS_CURRENT'
-			</h3>
+        <h3>
+            %= l 'dom_DESC_CORPORATE_DNS_CURRENT'
+            </h3>
 
-		<p>
-		<span class="">
-		%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
-		</span><span class="">
-		%= $dom_datas->{forwarder}
-		</span>
-		</p>
+        <p>
+        <span class="">
+        %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
+        </span>
+        <span class="">
+        %= $dom_datas->{forwarder}
+        </span>
+        </p>
 
-		% if ($dom_datas->{forwarder2}) {
-		<p>
-		<span class="">
-		%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
-		</span><span class="">
-		%= $dom_datas->{forwarder2}
-		</span>
-		</p>
-		% }
+        % if ($dom_datas->{forwarder2}) {
+        <p>
+        <span class="">
+        %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
+        </span>
+        <span class="">
+        %= $dom_datas->{forwarder2}
+        </span>
+        </p>
+        % }
 
-		<p>
-		%= submit_button "$btn2", class => ""
-		</p>
-		%= hidden_field 'trt' => 'UP2'
+        <p>
+        %= submit_button "$btn2", class => ""
+        </p>
+        %= hidden_field 'trt' => 'UP2'
     % end
 
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep

@@ -1,37 +1,39 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('SAVE');
+    %   my $btn = l('SAVE');
 
     %= form_for '/domains2' => (method => 'POST') => begin
 
-	<p><br>
-	%=l 'dom_DESC_CORPORATE_DNS'
-	</p>
+    <p><br>
+    %=l 'dom_DESC_CORPORATE_DNS'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
-	</span><span class="">
-	% param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
-	%= text_field 'Forwarder', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
+    </span>
+    <span class="">
+    % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
+    %= text_field 'Forwarder', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => ""
-	</span><span class="">
-	% param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
-	%= text_field 'Forwarder2',  class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => ""
+    </span>
+    <span class="">
+    % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
+    %= text_field 'Forwarder2',  class => ""
+    </span>
+    </p>
 
-	<p>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $dom_datas->{trt}
-	
+    %= hidden_field 'trt' => $dom_datas->{trt}
+    
     %end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep

@@ -1,70 +1,74 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('ADD');
+    %   my $btn = l('ADD');
 
     %= form_for '/domains2' => (method => 'POST') => begin
-	<p>
-	<h2>
+    <p>
+    <h2>
     % if ( $dom_datas->{trt} eq "ADD" ) {
-	%=l 'dom_CREATE_TITLE'
+    %=l 'dom_CREATE_TITLE'
     % } else {
-	%=l 'dom_MODIFY_TITLE'
-    % 	$btn = l('MODIFY');
+    %=l 'dom_MODIFY_TITLE'
+    %   $btn = l('MODIFY');
     % }
-	</h2>
-	</p>
+    </h2>
+    </p>
 
-	<p><br>
-	<span class="">
-	%=l 'DOMAIN_NAME', class => ""
-	</span><span class="">
+    <p><br>
+    <span class="">
+    %=l 'DOMAIN_NAME', class => ""
+    </span>
+    <span class="">
     % if ( $dom_datas->{trt} eq "ADD" ) {
-	% param 'Domain' => $dom_datas->{domain} unless param 'Domain';
-	%= text_field 'Domain', class => ""
+    % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
+    %= text_field 'Domain', class => ""
     % } else {
         %= hidden_field 'Domain' => $dom_datas->{domain}
-	%= $dom_datas->{domain}, class => ""
+    %= $dom_datas->{domain}, class => ""
     % }
-	</span>
-	</p>
+    </span>
+    </p>
 
-	<p><br>
-	<span class="">
-	%=l 'DESCRIPTION_BRIEF', class => ""
-	</span><span class="">
-	% param 'Description' => $dom_datas->{description} unless param 'Description';
-	%= text_field 'Description', class => ""
-	</span>
-	</p>
+    <p><br>
+    <span class="">
+    %=l 'DESCRIPTION_BRIEF', class => ""
+    </span>
+    <span class="">
+    % param 'Description' => $dom_datas->{description} unless param 'Description';
+    %= text_field 'Description', class => ""
+    </span>
+    </p>
 
-	<p><br>
-	%=l 'dom_CONTENT_FIELD_DESCRIPTION'
-	<br>
-	<span class="">
-	%= $c->l('dom_CONTENT', '');
-	</span><span class="">
-	% param 'Content' => $dom_datas->{content} unless param 'Content';
-	%= select_field 'Content', $c->content_options_list(), class => ""
-	</span>
-	</p>
+    <p><br>
+    %=l 'dom_CONTENT_FIELD_DESCRIPTION'
+    <br>
+    <span class="">
+    %= $c->l('dom_CONTENT', '');
+    </span>
+    <span class="">
+    % param 'Content' => $dom_datas->{content} unless param 'Content';
+    %= select_field 'Content', $c->content_options_list(), class => ""
+    </span>
+    </p>
 
-	<p><br>
-	%=l 'dom_DESC_NAMESERVERS'
-	<br>
-	<span class="">
-	%=l 'dom_LABEL_NAMESERVERS', class => ""
-	</span><span class="">
-	% param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
-	%= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
-	</span>
-	</p>
+    <p><br>
+    %=l 'dom_DESC_NAMESERVERS'
+    <br>
+    <span class="">
+    %=l 'dom_LABEL_NAMESERVERS', class => ""
+    </span>
+    <span class="">
+    % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
+    %= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
+    </span>
+    </p>
 
-	<p><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p><br>
+    %= submit_button "$btn", class => ""
+    </p>
+
+    %= hidden_field 'trt' => $dom_datas->{trt}
 
-	%= hidden_field 'trt' => $dom_datas->{trt}
-	
     %end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep

@@ -2,11 +2,11 @@
 <!--<HR class="">-->
 <a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
 <font class="">
-%	if ( $c->is_logged_in && $c->is_admin) {
-	SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
-	% my $mode;
-	% if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';}
-	(Mojo:<%= Mojolicious->VERSION %><%= $mode %>)
+%   if ( $c->is_logged_in && $c->is_admin) {
+    SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
+    % my $mode;
+    % if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';}
+    (Mojo:<%= Mojolicious->VERSION %><%= $mode %>)
 % }
 <br>Copyright 1999-2006 Mitel Corporation<br>
 %= session 'copyRight'

root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep

@@ -1,18 +1,20 @@
-<div id="">
+<div>
 
     % 	my $btn = l('ADD');
 
     %= form_for '/groups2' => (method => 'POST') => begin
 	<p><h2>
 	%=l 'CREATE_GROUP'
-	</h2><br><br>
+	</h2>
+	<br><br>
 	%=l 'grp_GROUP_NAMING'
 	</p>
 
 	<p>
 	<span class="">
 	%=l 'GROUP_NAME', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= text_field 'groupName', class => ""
 	</span>
 	</p>
@@ -22,7 +24,8 @@
 	<br><br>
 	<span class="">
 	%=l 'grp_GROUP_DESC', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= text_field 'groupDesc', class => ""
 	</span>
 	</p>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     %	my $btn = l('REMOVE');
     %= form_for '/groups2' => (method => 'POST') => begin

root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % my $btn = l('GROUP_ADD');
 
@@ -19,7 +19,8 @@
     %	if ($numGroups == 0){
         %=l 'ACCOUNT_GROUP_NONE'
     %	} else {
-	<table class=""><thead>
+	<table class="table table-bordered">
+	<thead>
 	<tr>
     	    <th class="">
     	    %=l 'GROUP'
@@ -28,10 +29,11 @@
     	    %=l 'DESCRIPTION'
     	    </th>
     	    <th class="">
-				%=l 'ACTION'
+	    %=l 'ACTION'
     	    </th>
     	</tr>
-    	</thead><tbody>
+    	</thead>
+    	<tbody>
 
     %    foreach my $group ( @$groups )
     %    {

root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % 	my $btn = l('SAVE');
 
@@ -11,7 +11,8 @@
 	<p>
 	<span class="">
 	%=l 'GROUP_NAME', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= $grp_datas->{group}, class => ""
 	</span>
 	</p>
@@ -21,7 +22,8 @@
 	<br><br>
 	<span class="">
 	%=l 'grp_GROUP_DESC', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
 	%= text_field 'groupDesc', class => ""
 	</span>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_header.html.ep

@@ -1,12 +1,23 @@
 
-<div id="" class="">
-	<img src="images/KoozaliServerManager.png" alt="Koozali Logo" class="" >
-	% if ( not defined $c->session->{username} ) {
-		<button type='button' class=""><a class = "no-visited-state" target="_parent" href="login">Login</a></button>
-	% } else {
-		<button type='button' class=""><a class = "no-visited-state" target="_parent" href="logout">Logout <%= $c->session->{username} %></a></button>
-	% }
-	<div id="" class = "flag-style">
-		<!--			 The flag icon will be inserted here -->
-	</div>
-</div>
+
+            <!--begin::App Content Header-->
+            <div class="app-content-header">
+                <!--begin::Container-->
+                <div class="container-fluid">
+                    <!--begin::Row-->
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <ol class="breadcrumb float-sm-start">
+                                <li class="breadcrumb-item"><a href="initial">Home</a></li>
+                                <li class="breadcrumb-item active" aria-current="page"><%= $c->current_route %></li>
+                            </ol>
+                        </div>
+                    </div>
+                    <!--end::Row-->
+
+                </div>
+                <!--end::Container-->
+            </div>
+            <!--end::App Content Header-->
+
+</div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep

@@ -1,25 +1,25 @@
-<div id="">
+<div>
 
-    %	my $btn = l('REMOVE');
+    %   my $btn = l('REMOVE');
     %= form_for '/hostentriesd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'hos_REMOVE_TITLE'
-	</h2>
-	</p>
+    <p>
+    <h2>
+    %=l 'hos_REMOVE_TITLE'
+    </h2>
+    </p>
 
-	<p>
-	%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname});
-	</p>
-	
-	<p><b>
-	%=l 'hos_ABOUT_TO_REMOVE'
-	</b></p>
+    <p>
+    %= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname});
+    </p>
+    
+    <p><b>
+    %=l 'hos_ABOUT_TO_REMOVE'
+    </b></p>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
         %= hidden_field 'trt' => $hos_datas->{trt}
         %= hidden_field 'Hostname' => $hos_datas->{hostname}

root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep

@@ -1,46 +1,48 @@
-<div id="">
+<div>
 
     % my $btn = l('hos_ADD_HOSTNAME');
 
     %= form_for '/hostentries' => (method => 'POST') => begin
 
-	<p>
-	%= submit_button "$btn", class => ""
-	<br></p>
+    <p>
+    %= submit_button "$btn", class => ""
+    <br></p>
 
         %= hidden_field 'trt' => $hos_datas->{trt}
 
     % end
 
-    %	my %dom_hos = %{$dom_hosts};
+    %   my %dom_hos = %{$dom_hosts};
     %  foreach my $domain ( sort ( keys %dom_hos ) ) {
 
-	<p><br><b>
-	%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
-	</b><br></p>
-	
-	<table class=""><thead>
-	<tr>
-    	    <th class="">
-    	    %=l 'hos_HOSTNAME'
-    	    </th>
-    	    <th class="">
-    	    %=l 'hos_HOSTTYPE'
-    	    </th>
-    	    <th class="">
-    	    %=l 'IP_ADDRESS_OR_FQDN'
-    	    </th>
-    	    <th class="">
-    	    %=l 'hos_ETHERNET_ADDRESS'
-    	    </th>
-    	    <th class="">
-    	    %=l 'COMMENT'
-    	    </th>
-    	    <th class="">
-    	    %=l 'ACTION'
-    	    </th>
-    	</tr>
-       </thead><tbody>
+    <p><br><b>
+    %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
+    </b><br></p>
+    
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+            <th class="">
+            %=l 'hos_HOSTNAME'
+            </th>
+            <th class="">
+            %=l 'hos_HOSTTYPE'
+            </th>
+            <th class="">
+            %=l 'IP_ADDRESS_OR_FQDN'
+            </th>
+            <th class="">
+            %=l 'hos_ETHERNET_ADDRESS'
+            </th>
+            <th class="">
+            %=l 'COMMENT'
+            </th>
+            <th class="">
+            %=l 'ACTION'
+            </th>
+        </tr>
+       </thead>
+       <tbody>
 
     %   foreach (@{$dom_hos{$domain}{'HOSTS'}}) {  
         <tr>
@@ -49,36 +51,36 @@
             %= t td => (class => "") => $_->{'IP'};
             %= t td => (class => "") => $_->{'MACAddress'};
             %= t td => (class => "") => $_->{'Comment'};
-			<td class="" style="min-width:15em">
-				%my ($actionModify, $actionRemove) = '&nbsp;';
-				%my $static = $_->{'static'} || "no";
-				%if ($static ne 'yes') {
-					%my $modify_text = l('MODIFY');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
-					%$actionModify = qq{
+            <td class="" style="min-width:15em">
+                %my ($actionModify, $actionRemove) = '&nbsp;';
+                %my $static = $_->{'static'} || "no";
+                %if ($static ne 'yes') {
+                    %my $modify_text = l('MODIFY');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
+                    %$actionModify = qq{
                                         %       <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
-					%	<button type='button' class="" title='$modify_text' > 
-					%		$modify_text
-					%	</button>
+                    %   <button type='button' class="" title='$modify_text' > 
+                    %       $modify_text
+                    %   </button>
                                         %       </a>
-					%};
-					%my $remove_text = l('REMOVE');  # Localized text
-					%$csrf_token = "TOKEN";  # CSRF token for security
-					%#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
-					%$actionRemove = qq{
+                    %};
+                    %my $remove_text = l('REMOVE');  # Localized text
+                    %$csrf_token = "TOKEN";  # CSRF token for security
+                    %#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
+                    %$actionRemove = qq{
                                         %       <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
-					%	<button type='button' class="" title='$remove_text' >
-					%		$remove_text
-					%	</button>
+                    %   <button type='button' class="" title='$remove_text' >
+                    %       $remove_text
+                    %   </button>
                                         %       </a>
-					%};
-				%}
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-    	    </td>
-    	</tr>
-    %	}
-   	</tbody>
-   	</table>
-     %	}
+                    %};
+                %}
+                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+            </td>
+        </tr>
+    %   }
+    </tbody>
+    </table>
+     %  }
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep

@@ -1,60 +1,62 @@
-<div id="">
-<!--	UPDATE HOST TYPE -->
+<div>
+<!--    UPDATE HOST TYPE -->
 
-    % 	my $btn = l('NEXT');
+    %   my $btn = l('NEXT');
 
     %= form_for '/hostentriesd' => (method => 'POST') => begin
-	<p><h2>
+    <p><h2>
     % if ( $hos_datas->{trt} eq "ALC" ) {
-	%=l 'hos_CREATE_TYPE'
+    %=l 'hos_CREATE_TYPE'
     % } else {
-	%=l 'hos_MODIFY_TYPE'
-    % 	$btn = l('MODIFY');
+    %=l 'hos_MODIFY_TYPE'
+    %   $btn = l('MODIFY');
     % }
-	</h2></p>
+    </h2></p>
 
-	<p>
-	%=l 'hos_LOCAL_PAGE_DESCRIPTION'
-	</p>
+    <p>
+    %=l 'hos_LOCAL_PAGE_DESCRIPTION'
+    </p>
 
-	<p>
-	%=l 'hos_LOCAL_IP_DESCRIPTION'
-	</p>
+    <p>
+    %=l 'hos_LOCAL_IP_DESCRIPTION'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'hos_LOCAL_IP', class => ""
-	</span><span class="">
-	% param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
-	%= text_field 'Internalip', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'hos_LOCAL_IP', class => ""
+    </span>
+    <span class="">
+    % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
+    %= text_field 'Internalip', class => ""
+    </span>
+    </p>
 
-	<p>
-	%=l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
-	</p>
+    <p>
+    %=l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'hos_ETHERNET_ADDRESS', class => ""
-	</span><span class="">
-	% param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
-	%= text_field 'Macaddress', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'hos_ETHERNET_ADDRESS', class => ""
+    </span>
+    <span class="">
+    % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
+    %= text_field 'Macaddress', class => ""
+    </span>
+    </p>
 
-	<p><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $hos_datas->{trt}
-	%= hidden_field 'Hostname' => $hos_datas->{hostname}
+    %= hidden_field 'trt' => $hos_datas->{trt}
+    %= hidden_field 'Hostname' => $hos_datas->{hostname}
         %= hidden_field 'Name' => $hos_datas->{name}
         %= hidden_field 'Domain' => $hos_datas->{domain}
-	%= hidden_field 'Comment'=> $hos_datas->{comment}
-	%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
-	%= hidden_field 'Externalip' => $hos_datas->{externalip}
-	
+    %= hidden_field 'Comment'=> $hos_datas->{comment}
+    %= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
+    %= hidden_field 'Externalip' => $hos_datas->{externalip}
+    
     %end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep

@@ -1,76 +1,80 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('NEXT');
+    %   my $btn = l('NEXT');
 
     %= form_for '/hostentriesd' => (method => 'POST') => begin
-	<p><h2>
+    <p><h2>
     % if ( $hos_datas->{trt} eq "ADD" ) {
-	%=l 'hos_CREATE_TITLE'
+    %=l 'hos_CREATE_TITLE'
     % } else {
-	%=l 'hos_MODIFY_TITLE'
-    % 	$btn = l('MODIFY');
+    %=l 'hos_MODIFY_TITLE'
+    %   $btn = l('MODIFY');
     % }
-	</h2></p>
+    </h2></p>
 
-	<p>
-	%=l 'hos_HOSTNAME_DESCRIPTION'
-	</p>
+    <p>
+    %=l 'hos_HOSTNAME_DESCRIPTION'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'hos_HOSTNAME', class => ""
-	</span><span class="">
+    <p>
+    <span class="">
+    %=l 'hos_HOSTNAME', class => ""
+    </span>
+    <span class="">
     % if ( $hos_datas->{trt} eq "ADD" ) {
-	% param 'Name' => $hos_datas->{name} unless param 'Name';
-	%= text_field 'Name', class => ""
+    % param 'Name' => $hos_datas->{name} unless param 'Name';
+    %= text_field 'Name', class => ""
     % } else {
         %= hidden_field 'Name' => $hos_datas->{name}
-	%= $hos_datas->{name}, class => ""
+    %= $hos_datas->{name}, class => ""
     % }
-	</span>
-	</p>
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'DOMAIN', class => ""
-	</span><span class="">
+    <p>
+    <span class="">
+    %=l 'DOMAIN', class => ""
+    </span>
+    <span class="">
     % if ( $hos_datas->{trt} eq "ADD" ) {
-	% param 'Domain' => $hos_datas->{domain} unless param 'Domain';
-	%= select_field 'Domain', $c->domains_list(), class => ""
+    % param 'Domain' => $hos_datas->{domain} unless param 'Domain';
+    %= select_field 'Domain', $c->domains_list(), class => ""
     % } else {
         %= hidden_field 'Domain' => $hos_datas->{domain}
-	%= $hos_datas->{domain}, class => ""
+    %= $hos_datas->{domain}, class => ""
     % }
-	</span>
-	</p>
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%= $c->l('COMMENT', '');
-	</span><span class="">
-	% param 'Comment' => $hos_datas->{comment} unless param 'Comment';
-	%= text_field 'Comment', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %= $c->l('COMMENT', '');
+    </span>
+    <span class="">
+    % param 'Comment' => $hos_datas->{comment} unless param 'Comment';
+    %= text_field 'Comment', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'LOCATION', class => ""
-	</span><span class="">
-	% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
-	%= select_field 'Hosttype', $c->hosttype_list(), class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'LOCATION', class => ""
+    </span>
+    <span class="">
+    % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
+    %= select_field 'Hosttype', $c->hosttype_list(), class => ""
+    </span>
+    </p>
 
-	<p><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $hos_datas->{trt}
-	%= hidden_field 'Hostname' => $hos_datas->{hostname}
-	%= hidden_field 'Internalip' => $hos_datas->{internalip}
-	%= hidden_field 'Externalip' => $hos_datas->{externalip}
-	%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
+    %= hidden_field 'trt' => $hos_datas->{trt}
+    %= hidden_field 'Hostname' => $hos_datas->{hostname}
+    %= hidden_field 'Internalip' => $hos_datas->{internalip}
+    %= hidden_field 'Externalip' => $hos_datas->{externalip}
+    %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
 
     %end
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep

@@ -1,37 +1,38 @@
-<div id="">
-<!--	UPDATE HOST TYPE -->
+<div>
+<!--    UPDATE HOST TYPE -->
 
-    % 	my $btn = l('MODIFY');
+    %   my $btn = l('MODIFY');
 
     %= form_for '/hostentriesd' => (method => 'POST') => begin
 
-	<p>
-	%=l 'hos_REMOTE_PAGE_DESCRIPTION'
-	</p>
+    <p>
+    %=l 'hos_REMOTE_PAGE_DESCRIPTION'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'IP_ADDRESS_OR_FQDN', class => ""
-	</span><span class="">
-	% param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
-	%= text_field 'Externalip', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'IP_ADDRESS_OR_FQDN', class => ""
+    </span>
+    <span class="">
+    % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
+    %= text_field 'Externalip', class => ""
+    </span>
+    </p>
 
 
-	<p><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $hos_datas->{trt}
-	%= hidden_field 'Hostname' => $hos_datas->{hostname}
+    %= hidden_field 'trt' => $hos_datas->{trt}
+    %= hidden_field 'Hostname' => $hos_datas->{hostname}
         %= hidden_field 'Name' => $hos_datas->{name}
         %= hidden_field 'Domain' => $hos_datas->{domain}
-	%= hidden_field 'Comment'=> $hos_datas->{comment}
-	%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
-	%= hidden_field 'Internalip' => $hos_datas->{internalip}
-	%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
-	
+    %= hidden_field 'Comment'=> $hos_datas->{comment}
+    %= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
+    %= hidden_field 'Internalip' => $hos_datas->{internalip}
+    %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
+    
     %end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep

@@ -1,22 +1,22 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('REMOVE');
+    %   my $btn = l('REMOVE');
     %= form_for '/ibaysd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'iba_REMOVE_TITLE'
-	</h2>
-	<br>
-	%= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description}));
-	<br>
-	</p>
-	<p>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <h2>
+    %=l 'iba_REMOVE_TITLE'
+    </h2>
+    <br>
+    %= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description}));
+    <br>
+    </p>
+    <p>
+    %= submit_button "$btn", class => ""
+    </p>
 
         %= hidden_field 'trt' => $iba_datas->{trt}
         %= hidden_field 'ibay' => $iba_datas->{ibay}
 
-    % end    
+    % end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep

@@ -1,111 +1,113 @@
-<div id="">
+<div>
 
 
     % my $btn = l('iba_ADD_IBAY');
 
     %= form_for '/ibays' => (method => 'POST') => begin
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
     %= hidden_field 'trt' => 'ADD';
 
     % end    
 
-	<p>
-	%=l 'iba_FIRSTPAGE_DESC'
-	<br><br>
-	</p>
-	
-    % 	my $numIbays = @$ibays;
-    %	if ($numIbays == 0){
+    <p>
+    %=l 'iba_FIRSTPAGE_DESC'
+    <br><br>
+    </p>
+    
+    %   my $numIbays = @$ibays;
+    %   if ($numIbays == 0){
         %=l 'iba_NO_IBAYS'
-    %	} else {
-	<table class=""><thead>
-	<tr>
-    	    <th class="">
-    	    %=l 'NAME'
-    	    </th>
-    	    <th class="">
-    	    %=l 'DESCRIPTION'
-    	    </th>
-    	    <th class="">
-				%=l 'ACTION'
-    	    </th>
-    	</tr>
-    	</thead><tbody>
+    %   } else {
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+            <th class="">
+            %=l 'NAME'
+            </th>
+            <th class="">
+            %=l 'DESCRIPTION'
+            </th>
+            <th class="">
+                %=l 'ACTION'
+            </th>
+        </tr>
+        </thead>
+        <tbody>
     %    foreach my $ibay (@$ibays)
     %    {
-    %	    my $modifiable = $ibay->prop('Modifiable') || 'yes';
-    %	    my $passwordable = $ibay->prop('Passwordable') || 'yes';
-    %	    my $removable = $ibay->prop('Removable') || 'yes';
-    %	    my $needPassword = grep { $_ eq $ibay->prop('PublicAccess') } 
+    %       my $modifiable = $ibay->prop('Modifiable') || 'yes';
+    %       my $passwordable = $ibay->prop('Passwordable') || 'yes';
+    %       my $removable = $ibay->prop('Removable') || 'yes';
+    %       my $needPassword = grep { $_ eq $ibay->prop('PublicAccess') } 
     %                            qw(local-pw global-pw global-pw-remote);
 
         <tr>
             %= t td => (class => "") => $ibay->key
             %= t td => (class => "") => $ibay->prop('Name')
-			<td class="" style="min-width:15em">
-				%my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
-				%if ($modifiable eq 'yes') { 
-					%my $modify_text = l('MODIFY');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
-					%$actionModify = qq{
+            <td class="" style="min-width:15em">
+                %my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
+                %if ($modifiable eq 'yes') { 
+                    %my $modify_text = l('MODIFY');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
+                    %$actionModify = qq{
                                         %       <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
-					%	<button type='button' class="" title='$modify_text' > 
-					%		$modify_text
-					%	</button>
+                    %   <button type='button' class="" title='$modify_text' > 
+                    %       $modify_text
+                    %   </button>
                                         %       </a>
-					%};
-				%}
-				
-				%if ($passwordable eq 'yes')  { 
-					%my $password_text = l('PASSWORD_RESET');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
-					%if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
-						%$actionResetPw = qq{
+                    %};
+                %}
+                
+                %if ($passwordable eq 'yes')  { 
+                    %my $password_text = l('PASSWORD_RESET');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
+                    %if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
+                        %$actionResetPw = qq{
                                                 %       <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-						%	<button type='button' class="" title="$password_text - currently unset" style = background:pink; >
-						%		$password_text
-						%	</button>
+                        %   <button type='button' class="" title="$password_text - currently unset" style = background:pink; >
+                        %       $password_text
+                        %   </button>
                                                 %       </a>
-						%};
-					%} else {
-						%$actionResetPw = qq{
+                        %};
+                    %} else {
+                        %$actionResetPw = qq{
                                                 %       <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-						%	<button type='button' class="" title='$password_text' > 
-						%		$password_text
-						%	</button>
+                        %   <button type='button' class="" title='$password_text' > 
+                        %       $password_text
+                        %   </button>
                                                 %       </a>
-						%};
-					%}
-					
-				%}
+                        %};
+                    %}
+                    
+                %}
 
-				%if ($removable eq 'yes')  { 
-					%my $remove_text = l('REMOVE');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
-					%$actionRemove = qq{
+                %if ($removable eq 'yes')  { 
+                    %my $remove_text = l('REMOVE');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
+                    %$actionRemove = qq{
                                         %       <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
-					%	<button type='button' class="" title='$remove_text' >
-					%		$remove_text
-					%	</button>
+                    %   <button type='button' class="" title='$remove_text' >
+                    %       $remove_text
+                    %   </button>
                                         %       </a>
-					%};
-				%}
-				<%= $c->render_to_string(inline => $actionModify) %>
-				<%= $c->render_to_string(inline => $actionResetPw)%>
-				<%= $c->render_to_string(inline => $actionRemove) %>
-    	    </td>
-   	</tr>
+                    %};
+                %}
+                <%= $c->render_to_string(inline => $actionModify) %>
+                <%= $c->render_to_string(inline => $actionResetPw)%>
+                <%= $c->render_to_string(inline => $actionRemove) %>
+            </td>
+    </tr>
     %    }
-    	</tbody>
-    	</table>
-	<%} %>
+        </tbody>
+        </table>
+    <%} %>
 
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep

@@ -1,42 +1,44 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('SAVE');
+    %   my $btn = l('SAVE');
 
     %= form_for '/ibaysd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'PASSWORD_RESET'
-	</h2>
-	
-	<br><br>
-	%=l 'iba_PASSWORD_DESC'
-	%= $iba_datas->{ibay}
-	</p>
-	
-	<p>
-	<span class="">
-	%=l 'PASSWORD_NEW', class => ""
-	</span><span class="">
-	%= password_field 'newPass', class => "" , class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <h2>
+    %=l 'PASSWORD_RESET'
+    </h2>
+    
+    <br><br>
+    %=l 'iba_PASSWORD_DESC'
+    %= $iba_datas->{ibay}
+    </p>
+    
+    <p>
+    <span class="">
+    %=l 'PASSWORD_NEW', class => ""
+    </span>
+    <span class="">
+    %= password_field 'newPass', class => "" , class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'PASSWORD_VERIFY_NEW', class => ""
-	</span><span class="">
-	%= password_field 'newPassVerify', class => "", class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'PASSWORD_VERIFY_NEW', class => ""
+    </span>
+    <span class="">
+    %= password_field 'newPassVerify', class => "", class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $iba_datas->{trt}
-	%= hidden_field 'ibay' => $iba_datas->{ibay}
-	
+    %= hidden_field 'trt' => $iba_datas->{trt}
+    %= hidden_field 'ibay' => $iba_datas->{ibay}
+    
     % end    
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_upd.html.ep

@@ -1,101 +1,108 @@
-<div id="">
+<div>
 
 
-	% my $btn = l('ADD');
+    % my $btn = l('ADD');
 
     %= form_for '/ibaysd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'iba_ADD_TITLE'
-	</h2>
-	<br>
-	%=l 'iba_NAME_FIELD_DESC'
-	</p>
+    <p>
+    <h2>
+    %=l 'iba_ADD_TITLE'
+    </h2>
+    <br>
+    %=l 'iba_NAME_FIELD_DESC'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'iba_NAME_LABEL', class => ""
-	</span><span class="">
-	% if ( $iba_datas->{trt} eq 'ADD' ) {
-	    % param 'ibay' => $iba_datas->{ibay} unless param 'ibay';
-	    %= text_field 'ibay', class => ""
-	% } else {
-	    % $btn = l('SAVE');
-	    %= $iba_datas->{ibay}, class => ""
-	% }
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'iba_NAME_LABEL', class => ""
+    </span>
+    <span class="">
+    % if ( $iba_datas->{trt} eq 'ADD' ) {
+        % param 'ibay' => $iba_datas->{ibay} unless param 'ibay';
+        %= text_field 'ibay', class => ""
+    % } else {
+        % $btn = l('SAVE');
+        %= $iba_datas->{ibay}, class => ""
+    % }
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'DESCRIPTION', class => ""
-	</span><span class="">
-	% param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc';
-	%= text_field 'ibayDesc', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'DESCRIPTION', class => ""
+    </span>
+    <span class="">
+    % param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc';
+    %= text_field 'ibayDesc', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'GROUP'
-	</span><span class="">
-	% param 'group' => $iba_datas->{group} unless param 'group';
-	%= select_field 'group' => $c->group_list_m(), class => ""
-	<br>
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'GROUP'
+    </span>
+    <span class="">
+    % param 'group' => $iba_datas->{group} unless param 'group';
+    %= select_field 'group' => $c->group_list_m(), class => ""
+    <br>
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'iba_USER_ACCESS'
-	</span><span class="">
-	% param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess';
-	%= select_field 'userAccess' => $c->userAccess_list_m(), class => ""
-	
-	<br>
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'iba_USER_ACCESS'
+    </span>
+    <span class="">
+    % param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess';
+    %= select_field 'userAccess' => $c->userAccess_list_m(), class => ""
+    
+    <br>
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'iba_PUBLIC_ACCESS'
-	</span><span class="">
-	% param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess';
-	%= select_field 'publicAccess' => $c->publicAccess_list_m(), class => ""
-	<br>
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'iba_PUBLIC_ACCESS'
+    </span>
+    <span class="">
+    % param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess';
+    %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => ""
+    <br>
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'iba_ALLOW_DYNAMIC_CONTENT'
-	</span><span class="">
-	% param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin';
-	%= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-	<br>
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'iba_ALLOW_DYNAMIC_CONTENT'
+    </span>
+    <span class="">
+    % param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin';
+    %= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
+    <br>
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'iba_HTTPS_Only'
-	</span><span class="">
-	% param 'SSL' => $iba_datas->{SSL} unless param 'SSL';
-	%= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-	<br>
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'iba_HTTPS_Only'
+    </span>
+    <span class="">
+    % param 'SSL' => $iba_datas->{SSL} unless param 'SSL';
+    %= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
+    <br>
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button $btn, class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button $btn, class => ""
+    </p>
 
-	%= hidden_field 'trt' => $iba_datas->{trt}
-	% if ( $iba_datas->{trt} eq 'UPD' ) {
-    	    %= hidden_field 'ibay' => $iba_datas->{ibay}
-	% }
-	
+    %= hidden_field 'trt' => $iba_datas->{trt}
+    % if ( $iba_datas->{trt} eq 'UPD' ) {
+            %= hidden_field 'ibay' => $iba_datas->{ibay}
+    % }
+    
     % end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_info.html.ep

@@ -1,25 +1,25 @@
 <%     use POSIX qw(strftime); %>
 <div id="">
     <% if (! $c->session->{PwdSet} ) { %>
-	<div class=""><h5>
+    <div class=""><h5>
         Warning: you have not yet changed the default system password.</h5></div>
     <% } %>
     <% if ( $c->is_unsafe ) { %>
-	<div class=""><h5>
+    <div class=""><h5>
         Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
         may leave your system in an unknown state!</h5></div>
     <% } %>
     <% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %>
-	<div class=""><h5>
+    <div class=""><h5>
         Warning: Development or debug mode enabled AND public access is offered !
         </h5></div>
     <% } %>
     <% my $curdate = strftime '%Y%m%d', localtime; %>
     <% if ( "$curdate"  >= "20290531" ) { %>
-	<div class=""><h5>
+    <div class=""><h5>
       URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE. NO support will be offered for any issue found with this installed version.
       Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version. Failure to upgrade may lead to the compromise of this server.
-      </br>Please, consult <a href="https://wiki.koozali.org/SME_Server:Download" target="_blank">https://wiki.koozali.org/SME_Server:Download</a> to get the latest version
+      <br>Please, consult <a href="https://wiki.koozali.org/SME_Server:Download" target="_blank">https://wiki.koozali.org/SME_Server:Download</a> to get the latest version
      </h5></div>
     <% } %>
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep

@@ -1,6 +1,11 @@
 
-<!--*** toggle hide/unhide password field in login panel ***
+<!-- _js_imports.html.ep -->
+<!-- required for adminlte? -->
+<!-- These are specials but currently not included or used-->
 
+<!--*** toggle hide/unhide password field in login panel *** -->
+
+<!-- Code commented out
 % content_for 'js_togglePassword' => begin
   %= javascript begin
 
@@ -27,6 +32,7 @@
 <!--*** toggle hide/unhide menu contents navigation menu ***-->
 
 % content_for 'js_toggleMenu' => begin
+
   %= javascript begin
 
     $(document).ready(function() {
@@ -98,4 +104,6 @@
 
 	});
   % end
-% end
+% end
+
+<!-- end _js_imports.html.ep -->

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep

@@ -1,17 +1,19 @@
 %#
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput();
 	};
 	</script>
+
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $lets_data
 		</pre>
 	% }
+
 	% my $btn = l('lets_APPLY');
 	%= form_for "letsencryptu" => (method => 'POST') => begin
 		% param 'trt' => $lets_data->{trt} unless param 'trt';
@@ -24,7 +26,8 @@
 	
 		<span class="">
 			%=l('lets_All_domains_check_result')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
 			%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
 		</span><br>
@@ -38,8 +41,7 @@
                         %};
                       <%= $c->render_to_string(inline => $actionBack) %>
 		</span>
-		
-	
+
 		%# Probably finally by a submit.
 	%end    
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep

@@ -1,17 +1,19 @@
 %#
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput();
 	};
 	</script>
+	
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $lets_data
 		</pre>
 	% }
+	
 	% my $btn = l('lets_APPLY');
 	%= form_for "letsencryptu" => (method => 'POST') => begin
 		% param 'trt' => $lets_data->{trt} unless param 'trt';
@@ -24,11 +26,13 @@
 	
 		<span class="">
 			%=l('lets_Enabled_domains_check_result')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
 			%= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span><br>
-	
+		</span>
+		<br>
+
 		<span class="">
                         %my $back_text = l('lets_Back');  # Localized text
                         %my $actionBack = qq{

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep

@@ -1,17 +1,19 @@
 %#
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput();
 	};
 	</script>
+	
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $lets_data
 		</pre>
 	% }
+	
 	% my $btn = l('lets_APPLY');
 	%= form_for "letsencryptu" => (method => 'POST') => begin
 		% param 'trt' => $lets_data->{trt} unless param 'trt';
@@ -24,17 +26,22 @@
 	
 		<p><span class="">
 			%=l('lets_Domains_name')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
 			%= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
 		<span class="">
 			%=l('lets_One_domain_check_result')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
 			%= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span><br>
+		</span>
+		<br>
 	
 		<span class="">
                         %my $back_text = l('lets_Back');  # Localized text

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep

@@ -1,26 +1,27 @@
 %#
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput();
 	};
 	</script>
+	
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $lets_data
 		</pre>
 	% }
+	
 	% my $btn = l('lets_APPLY');
 	%= form_for "letsencryptu" => (method => 'POST') => begin
 		% param 'trt' => $lets_data->{trt} unless param 'trt';
 		%= hidden_field 'trt' => $lets_data->{trt}
 		%# Inputs etc in here.
 
-		<div class="">
-		
-	
+		<div>
+
 		<a href='letsencryptd?trt=PARAMS' class="">
 			%= l('lets_CONFIG')
 		</a>
@@ -44,53 +45,77 @@
 	
 		<h2 class=""><%=l('lets_For_this_Server')%></h2>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_Internal_IP')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
 			%= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_External_Interface_IP')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
 			%= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_Internet_IP')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
 			%= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
 		<h2 class=""><%=l('lets_Current_certificate_details')%></h2>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_Issuer')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
 			%= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_Expiry')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
 			%= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_Not_Before')
 		</span><span class="">
 			% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
 			%= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
-		<br></span></p>
+		<br>
+		</span>
+		</p>
 	
 		<h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
 	
-		<br /><table class="">
+		<br />
+		<table class="table table-bordered">
 			<thead class="">
 				<tr table-head-row>
 					<th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep

@@ -1,17 +1,19 @@
 %#
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput();
 	};
 	</script>
+	
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $lets_data
 		</pre>
 	% }
+	
 	% my $btn = l('lets_APPLY');
 	%= form_for "letsencryptu" => (method => 'POST') => begin
 		% param 'trt' => $lets_data->{trt} unless param 'trt';
@@ -24,75 +26,103 @@
 			%=l('lets_CONFIG_LETSENCRYPT')
 		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_SERVICE_STATUS')
 		</span><span class="">
 			%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
 			% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
 			%# param 'status' => $lets_data->{status} unless param 'status';
 			%= select_field 'status' => @status_options, class => ""
-		<br></span>	</p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_HOOKSCRIPT_STATUS')
-		</span><span class="">
+		</span>
+		<span class="">
 			% my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
 			% param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
 			%= select_field 'hookScript' => @hookScript_options, class => ""
-		<br></span>	</p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_HOSTOVERRIDE_STATUS')
-		</span><span class="">
+		</span>
+		<span class="">
 			% my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
 			% param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
 			%= select_field 'hostOverride' => @hostOverride_options, class => ""
-		<br></span>	</p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('lets_ACCEPT_TERMS_STATUS')
-		</span><span class="">
+		</span>
+		<span class="">
 			% my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
 			% param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
 			%= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
-		<br></span>	</p>
-	
-		<p><span class="">
+		<br>
+		</span>
+		</p>
+
+		<p>
+		<span class="">
 			%=l('lets_API_STATUS')
 		</span><span class="">
 			% my @API_options = [['2' => '2']];
 			% param 'API' => $lets_data->{API} unless param 'API';
 			%= select_field 'API' => @API_options, class => ""
-		<br></span>	</p>
-	
-		<p><span class="">
+		<br>
+		</span>
+		</p>
+
+		<p>
+		<span class="">
 			%=l('lets_KEYSIZE_STATUS')
-		</span><span class="">
+		</span>
+		<span class="">
 			% my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
 			% param 'keysize' => $lets_data->{keysize} unless param 'keysize';
 			%= select_field 'keysize' => @keysize_options, class => ""
-		<br></span>	</p>
-	
-		<p><span class="">
+		<br>
+		</span>
+		</p>
+
+		<p>
+		<span class="">
 			%=l('lets_CONFIGUREMODE_STATUS')
-		</span><span class="">
+		</span>
+		<span class="">
 			% my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
 			% param 'configure' => $lets_data->{configure} unless param 'configure';
 			%= select_field 'configure' => @configure_options, class => ""
-		<br></span>	</p>
-	
-		<p><span class="">
+		<br>
+		</span>
+		</p>
+
+		<p>
+		<span class="">
 			%=l('lets_EMAIL')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'email' => $lets_data->{email} unless param 'email';
 			%=email_field 'email', class => ""
-		</span></p>
-		
-	
+		</span>
+		</p>
+
 		<span class="">
 			%= submit_button l('lets_Save'), class => ""
 		</span>
-	
+
 		%# Probably finally by a submit.
 	%end    
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
 	% my $retref= $c->stash("ret");
 	% my %ret;
@@ -43,23 +43,29 @@
 		</h2>
 			<p>
 			%= $c->render_to_string(inline => l('ln_ADD_DESC'));
-			</p><br>
+			</p>
+			<br>
 			<span class="">
 				%=l "NETWORK"
-			</span><span class="">
+			</span>
+			<span class="">
 				%=text_field  'networkAddress'
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "ln_SUBNET_MASK"
-			</span><span class="">
+			</span>
+			<span class="">
 				%=text_field 'networkMask'
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "ROUTER"
 			</span>
 			<span class="">
 				%=text_field 'networkRouter'
-			</span><br><br>
+			</span>
+			<br><br>
 			<p>
 			<br>
 			%= submit_button "$btn", class => ""

root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % my $btn = l('REMOVE');
     % my $deletehosts = $ln_datas->{deletehosts};
@@ -13,30 +13,36 @@
     %= dumper $deletehosts
 	</p>
     % }
-     
+
     %= form_for '/localnetworkse' => (method => 'POST') => begin
 		<h2>
 		%=l "ln_REMOVE_TITLE"
 		</h2>
 			<p>
-				%=l "ln_REMOVE_DESC"
-			</p><br>
+			%=l "ln_REMOVE_DESC"
+			</p>
+			<br>
 			<span class="">
 				%=l "NETWORK"
-			</span><span class="">
+			</span>
+			<span class="">
 				%=$localnetwork
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "ln_SUBNET_MASK"
-			</span><span class="">
+			</span>
+			<span class="">
 				%= $subnet
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "ROUTER"
 			</span>
 			<span class="">
 				%= $router
-			</span><br><br>
+			</span>
+			<br><br>
 			% if($deletehosts) {
 			<br>
 			%=$c->l("ln_REMOVE_HOSTS_DESC")
@@ -46,14 +52,14 @@
 			</span>
 			<span class="">
 				%=check_box deletehost=>1, checked=>1
-			</span><br><br>
+			</span>
+			<br><br>
 			%}
 			%= hidden_field localnetwork=>$localnetwork
 			<p>
 			<br>
 			%= submit_button "$btn", class => ""
 			</p>
-
 	%end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
     % my $btn = l('ln_LOCALNETWORK_ADD');
     %= form_for '/localnetworksa' => (method => 'POST') => begin
 
@@ -50,7 +50,8 @@
         %=l 'ln_LOCAL_NETWORK_NONE'
     %	} else {
         <br>
-		<table class=""><thead>
+		<table class="table table-bordered">
+		<thead>
 		<tr>
 			<th class="">
 				%=l 'NETWORK'
@@ -71,7 +72,8 @@
 				%=l 'ACTION'
 			</th>
 		</tr>
-			</thead><tbody>
+		</thead>
+		<tbody>
 		%    foreach my $localnetwork (@$localnetworks )
 		%    {
 		%     	my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
@@ -101,6 +103,6 @@
 		%  } 
 		</tbody>
 		</table>
-			%= hidden_field 'trt' => $ln_datas->{trt}
+		%= hidden_field 'trt' => $ln_datas->{trt}
 	%}
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_module.html.ep

@@ -1,4 +1,4 @@
-% layout 'default', title => 'Sme server 2 - Support';
+% layout 'AdminLTE', title => 'Sme server 2 - Support';
 
 % content_for 'head' => begin
     %= include 'partials/_head'
@@ -23,7 +23,7 @@
 
 % content_for 'end' => begin
     <div id="" class="">
-	content_end
+    content_end
     </div>
 % end
 
@@ -37,6 +37,6 @@ Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum qui
 Aliquam autem blandit decet in jus loquor quidne saluto te. Eu meus voco wisi. Abico defui euismod huic jumentum lobortis mos vulpes. Causa eros feugiat hendrerit illum luctus nimis quidem valetudo. Elit ex obruo tation usitas vero. Abigo dolus hendrerit huic iriure jumentum letalis lobortis melior nulla. Blandit causa immitto iriure metuo nutus pagus ut voco.
     <br>
     <p>
-    	%= link_to Welcome => '/'
+        %= link_to Welcome => '/'
     </p>
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_nav_menu.html.ep

@@ -1,35 +0,0 @@
-%	use SrvMngr qw( getNavigation );
-%	my %nav = %{SrvMngr->getNavigation( $c->languages(), 'N' )};
-
-	<div id="">
-	<!-- <a href='#' id="" class="">NAVIGATION</a> -->
-	<div id="">
-
-%    my $cc = 200;
-%    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
-%		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
-%
-	<!-- div class=""><%= $h %></div -->
-	<div><a href='#' class=""><%= $h %></a></div>
-	<div class="">
-%	my ($classNew, $target, $href) = '';
-%	foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
-
-%	    next if ($_->{'MENUCAT'} ne 'N' );	# menu Navigation 
-
-%	    if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%		$target = '_self';
-%	    	(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
-%	    	$href = '/smanager/' . $file2;
-%	    } else {
-%		$target = 'main';
-%	    	$href = '/server-manager' . $_->{'FILENAME'};
-%	    }
-	    <div class=""><a class="">' target='<%= $target %>' id="">' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
-%           $cc++;
-%	}
-	</div>
-
-%    }
-    </div>
-    </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_navig2.html.ep

@@ -1,37 +0,0 @@
-%	use SrvMngr qw( getNavigation );
-%	my %nav = %{SrvMngr->getNavigation( $c->languages(), 'A' )};
-
-	<div id="">
-	 <!-- ><div><a href='#' id="" class="">ADMINISTRATION</a></div> -->
-	<div id="">
-
-%    my $cc = 100;
-%    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
-%		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
-	<div><a href='#' class=""><%= $h %></a></div>
-	<div class="">
-%	my ($classNew, $target, $href) = '';
-%	foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
-
-%	    next if ($_->{'MENUCAT'} ne 'A' );	# menu Admin 
-
-%	    if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%		$target = '_self';
-%	    	(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
-%	    	$href = '/smanager/' . $file2;
-%	    } else {
-%		$target = 'main';
-%#	    	$href = '/server-manager' . $_->{'FILENAME'};
-%#	    	$href = $c->getlegacyurl($c,'/server-manager' . $_->{'FILENAME'});
-% 			my $host = $c->req->url->to_abs->host;
-%	    	$href = "/smanager/legacypanel?url=https://$host/server-manager" . $_->{'FILENAME'};
-% 
-%	    }
-	    <div class=""><a class="">' target='<%= $target %>' id="">' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
-%           $cc++;
-%	}
-	</div>
-%    }
-
-    </div>
-    </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep

@@ -1,17 +1,19 @@
 %#
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput(); 
 	};
+
 	</script>
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $nut_data
 		</pre>
 	% }
+
 	% my $btn = l('nut_APPLY');
 	%= form_for "nutupsu" => (method => 'POST') => begin
 		% param 'trt' => $nut_data->{trt} unless param 'trt';
@@ -20,49 +22,67 @@
 
 		<h2 class=""><%=l('nut_Manage_Nutups-config_settings:')%></h2>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('nut_Nut_status')
-		</span><span class="">
+		</span>
+		<span class="">
 			%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
 			%# param 'status' => $nut_data->{status} unless param 'status';
 
 			% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
 			%= select_field 'status' => @status_options, class => "", id => ""
-		<br></span>	</p>
+		<br>
+		</span>
+		</p>
 	
-		<p><span class="">
+		<p>
+		<span class="">
 			%=l('nut_Nut_mode')
-		</span><span class="">
+		</span>
+		<span class="">
 			% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
 			% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
 			%= select_field 'Nutmode' => @Nutmode_options, class => "", id => ""
-		<br></span>	</p>
+		<br>
+		</span>
+		</p>
 	
 		<div class="">
 			<h2 class=""><%=l('nut_if_Net_Server')%></h2>
 		
-			<p><span class="">
+			<p>
+			<span class="">
 				%=l('nut_MasterUPS_UPSNAME@IP')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
 				%= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
-			<br></span></p>
-		
-			<p><span class="">
+			<br>
+			</span>
+			</p>
+
+			<p>
+			<span class="">
 				%=l('nut_MasterUPS_Password')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
 				%=password_field 'MasterUPS_Password', class => ""
-			</span></p>
-			
-			<p><span class="">
+			</span>
+			</p>
+
+			<p>
+			<span class="">
 				%=l('nut_UPS_Model')
-			</span><span class="">
+			</span>
+			<span class="">
 				% my @UPS_Model_options = $c->get_model_options();
 				% param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
 				%= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => ""
-			<br></span>	</p>
-		
+			<br>
+			</span></p>
+
 			<p><span class="">
 				%=l('nut_UPS_Device')
 			</span><span class="">
@@ -73,43 +93,62 @@
 		
 		<div class="">
 			<h2 class=""><%=l('nut_if_Net_Client')%></h2>
-			<p><span class="">
+			<p>
+			<span class="">
 				%=l('nut_SlaveUPS_UPSNAME@IP')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
 				%= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP'
-			<br></span></p>
+			<br>
+			</span>
+			</p>
 		
-			<p><span class="">
+			<p>
+			<span class="">
 				%=l('nut_SlaveUPS_Password')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
 				%=password_field 'SlaveUPS_Password', class => ""
-			</span></p>
+			</span>
+			</p>
 		</div>
 	
 		<div class="">
 `			<h2 class=""><%=l('nut_if_genericups')%></h2>
-			<p><span class="">
+			<p>
+			<span class="">
 				%=l('nut_UPS_Generic_Type')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
 				%= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type'
-			<br></span></p>
+			<br>
+			</span>
+			</p>
 		
-			<p><span class="">
+			<p>
+			<span class="">
 				%=l('nut_UPS_Generic_Manufacturer')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
 				%= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
-			<br></span></p>
+			<br>
+			</span>
+			</p>
 		
-			<p><span class="">
+			<p>
+			<span class="">
 				%=l('nut_UPS_Generic_Model')
-			</span><span class="">
+			</span>
+			<span class="">
 				% param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
 				%= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model'
-			<br></span></p>
+			<br>
+			</span>
+			</p>
 `		</div>
 			
 		<span class="">

root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep

@@ -1,17 +1,19 @@
 %#
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
 %#
-<div id="" class="">
+<div>
 	<script>
 		window.onload = function() {
 		SelectInput(); 
 	};
+	
 	</script>
 	% if (config->{debug} == 1) {
 		<pre>
 			%= dumper $nut_data
 		</pre>
 	% }
+	
 	% my $btn = l('nut_APPLY');
 	%= form_for "nutupsu" => (method => 'POST') => begin
 		% param 'trt' => $nut_data->{trt} unless param 'trt';
@@ -39,10 +41,12 @@
 <!--
 		<span class="">
 			%=l('nut_Status_(from_upsc)')
-		</span><span class="">
+		</span>
+		<span class="">
 			% param 'UPSStatus' => $nut_data->{UPSStatus} unless param 'UPSStatus';
 			%= text_area 'UPSStatus', cols=>55, rows=>35, Readonly=>'true'
-		</span><br>
+		</span>
+		<br>
 -->
 		
 		%= include 'partials/_nut_UPS_STATUS'

root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep

@@ -1,10 +1,9 @@
 <h1>UPS Status</h1>
 %= stylesheet '/css/nut_ups-status-page.css'
-<div class="">
-	<div class="">
-		<div class="">
+<div class="container-md">
+		<div>
 			<h2>Device Information</h2>
-			<table>
+			<table class="table table-bordered">
 				<tr><td>Manufacturer:</td><td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td></tr>
 				<tr><td>Model:</td><td><%= $nut_data->{'ups_data'}->{'device.model'} %></td></tr>
 				<tr><td>Serial:</td><td><%= $nut_data->{'ups_data'}->{'device.serial'} %></td></tr>
@@ -12,9 +11,9 @@
 			</table>
 		</div>
 		
-		<div class="">
+		<div>
 			<h2>Battery Status</h2>
-			<table>
+			<table class="table table-bordered">
 				<tr><td>Charge:</td><td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td></tr>
 				<tr><td>Runtime:</td><td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td></tr>
 				<tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td></tr>
@@ -22,9 +21,9 @@
 			</table>
 		</div>
 		
-		<div class="">
+		<div>
 			<h2>Input Power</h2>
-			<table>
+			<table class="table table-bordered">
 				<tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td></tr>
 				<tr><td>Nominal Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V</td></tr>
 				<tr><td>Sensitivity:</td><td><%= $nut_data->{'ups_data'}->{'input.sensitivity'} %></td></tr>
@@ -33,9 +32,9 @@
 			</table>
 		</div>
 		
-		<div class="">
+		<div>
 			<h2>UPS Status</h2>
-			<table>
+			<table class="table table-bordered">
 				<tr><td>Status:</td><td><%= $nut_data->{'ups_data'}->{'ups.status'} %></td></tr>
 				<tr><td>Load:</td><td><%= $nut_data->{'ups_data'}->{'ups.load'} %>%</td></tr>
 				<tr><td>Beeper:</td><td><%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %></td></tr>
@@ -43,5 +42,4 @@
 				<tr><td>Test Result:</td><td><%= $nut_data->{'ups_data'}->{'ups.test.result'} %></td></tr>
 			</table>
 		</div>
-	</div>
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
 	% my $retref= $c->stash("ret");
 	% my %ret;
@@ -42,42 +42,49 @@
 		%=l "pf_CREATE_RULE"
 		</h2>
 			<p>
-				%=l "pf_SUMMARY_ADD_DESC"
+			    %=l "pf_SUMMARY_ADD_DESC"
 			</p><br>
 			<span class="">
-				%=l "pf_LABEL_PROTOCOL"
-			</span><span class="">
+			    %=l "pf_LABEL_PROTOCOL"
+			</span>
+			<span class="">
 				%=select_field  'proto'=>["TCP","UDP"]
 			</span><br><br>
 			<span class="">
 				%=l "pf_LABEL_SOURCE_PORT"
-			</span><span class="">
+			</span>
+			<span class="">
 				%=text_field 'sport'
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_LABEL_DESTINATION_PORT"
 			</span>
 			<span class="">
 				%=text_field 'dport'
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_LABEL_DESTINATION_HOST"
 			</span>
 			<span class="">
 				%=text_field 'dhost'
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_ALLOW_HOSTS"
 			</span>
 			<span class="">
 				%=text_field 'allow'
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_RULE_COMMENT"
 			</span>
 			<span class="">
 				%=text_field 'cmmnt'
-			</span><br><br>
+			</span>
+			<br><br>
 			<p>
 			<br>
 			%= submit_button "$btn", class => ""

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % my $btn = l('REMOVE');
     % my $proto = $pf_datas->{proto};
@@ -22,38 +22,45 @@
 			</p><br>
 			<span class="">
 				%=l "pf_LABEL_PROTOCOL"
-			</span><span class="">
+			</span>
+			<span class="">
 				%=$proto
 			</span><br><br>
 			<span class="">
 				%=l "pf_LABEL_SOURCE_PORT"
-			</span><span class="">
+			</span>
+			<span class="">
 				%=$sport
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_LABEL_DESTINATION_HOST"
 			</span>
 			<span class="">
 				%=$dport
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_LABEL_DESTINATION_PORT"
 			</span>
 			<span class="">
 				%=$dhost
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_RULE_COMMENT"
 			</span>
 			<span class="">
 				%=$cmmnt
-			</span><br><br>
+			</span>
+			<br><br>
 			<span class="">
 				%=l "pf_ALLOW_HOSTS"
 			</span>
 			<span class="">
 				%=$allow
-			</span><br><br>
+			</span>
+			<br><br>
 		%#}
 			%= hidden_field sport=>$sport
 			%= hidden_field proto=>$proto

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
     % my $btn = l('pf_CREATE_RULE');
     %= form_for '/portforwardinga' => (method => 'POST') => begin
 
@@ -49,7 +49,8 @@
         <br>
 		%=l 'pf_SHOW_FORWARDS'
 	<br><br />
-		<table class=""><thead>
+		<table class="table table-bordered">
+		<thead>
 		<tr>
 			<th class="">
 				%=l 'pf_LABEL_PROTOCOL'
@@ -73,7 +74,8 @@
 				%=l 'ACTION'
 			</th>
 		</tr>
-		</thead><tbody>
+		</thead>
+		<tbody>
 		% my %forwards = ();
 		% $forwards{TCP} = $tcpforwards;
 		% $forwards{UDP} = $udpforwards;
@@ -115,4 +117,4 @@
 	</table>
 	%= hidden_field 'trt' => $pf_datas->{trt}
  
-</div>
+</div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % 	my $btn = l('ADD');
 
@@ -6,14 +6,17 @@
 	<p>
 	<h2>
 	%=l 'prt_CREATE_NEW_PRINTER'
-	</h2><br>
+	</h2>
+	<br>
 	%=l 'prt_CREATE_NEW_DESC'
-	</p><br>
+	</p>
+	<br>
 
 	<p>
 	<span class="">
 	%=l 'prt_PRINTER_NAME', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= text_field 'Name', class => ""
 	</span>
 	</p>
@@ -21,7 +24,8 @@
 	<p>
 	<span class="">
 	%=l 'DESCRIPTION_BRIEF', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= text_field 'Description', class => ""
 	</span>
 	</p>
@@ -29,7 +33,8 @@
 	<p>
 	<span class="">
 	%=l 'LOCATION', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= select_field 'Location' => $c->printerLocation_list(), class => ""
 	</span>
 	</p>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep

@@ -1,6 +1,4 @@
-<div id="">
-
-
+<div>
     % 	my $btn = l('REMOVE');
     %= form_for '/printers2' => (method => 'POST') => begin
 	<p>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep

@@ -1,5 +1,4 @@
-<div id="">
-
+<div>
 
     % my $btn = l('prt_INITIAL_BTN');
 
@@ -11,7 +10,7 @@
 	<br>
 	%= submit_button "$btn", class => ""
 	</p>
-   % end    
+   % end
 
 	<p>
 	<h2>
@@ -22,7 +21,8 @@
     %	if ($numPrinters == 0){
         %=l 'prt_NO_PRINTERS'
     %	} else {
-	<table class=""><thead>
+	<table class="table table-bordered">
+	<thead>
 	<tr>
     	    <th class="">
     	    %=l 'NAME'
@@ -43,7 +43,8 @@
     	    %=l 'ACTION'
     	    </th>
     	</tr>
-    	</thead><tbody>
+    	</thead>
+    	<tbody>
     %    foreach my $printer (@$printerDrivers)
     %    {
     %        my $address = ($printer->prop('Location') eq 'remote')

root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_net.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % 	my $btn = l('ADD');
 
@@ -15,7 +15,8 @@
 	<p>
 	<span class="">
 	%=l 'prt_HOSTNAME_OR_IP', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= text_field 'Address', class => ""
 	</span>
 	</p>
@@ -23,7 +24,8 @@
 	<p>
 	<span class="">
 	%=l 'prt_REMOTE_NAME_DESC', class => ""
-	</span><span class="">
+	</span>
+	<span class="">
 	%= text_field 'RemoteName' => 'raw', class => ""
 	</span>
 	</p>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep

@@ -1,39 +1,41 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('ADD');
+    %   my $btn = l('ADD');
 
     %= form_for '/pseudonyms2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'pse_TITLE_CREATE'
-	</h2>
-	<br>
-	%= $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES'));
-	</p>
+    <p>
+    <h2>
+    %=l 'pse_TITLE_CREATE'
+    </h2>
+    <br>
+    %= $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES'));
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'pse_PSEUDONYM_NAME', class => ""
-	</span><span class="">
-	%= text_field 'Pseudonym', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'pse_PSEUDONYM_NAME', class => ""
+    </span>
+    <span class="">
+    %= text_field 'Pseudonym', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'pse_SELECT_ACCOUNT', class => ""
-	</span><span class="">
-	%= select_field 'Account' => $c->existing_accounts_list(), class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'pse_SELECT_ACCOUNT', class => ""
+    </span>
+    <span class="">
+    %= select_field 'Account' => $c->existing_accounts_list(), class => ""
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $pse_datas->{trt}
-	
+    %= hidden_field 'trt' => $pse_datas->{trt}
+    
     % end    
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep

@@ -1,21 +1,21 @@
-<div id="">
+<div>
 
-    %	my $btn = l('REMOVE');
+    %   my $btn = l('REMOVE');
     %= form_for '/pseudonyms2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'pse_REMOVE_PSEUDONYM'
-	</h2>
+    <p>
+    <h2>
+    %=l 'pse_REMOVE_PSEUDONYM'
+    </h2>
 
-	<p>
-	%= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym}));
+    <p>
+    %= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym}));
 
-	</p>
+    </p>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
         %= hidden_field 'trt' => $pse_datas->{trt}
         %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep

@@ -1,4 +1,4 @@
-<div id="">
+<div>
 
     % my $btn = l('pse_CLICK_TO_CREATE');
 
@@ -8,89 +8,91 @@
 
         %= hidden_field 'trt' => 'ADD'
 
-	<p><br>
-	%= submit_button "$btn", class => ""
-	</p>
-	
+    <p><br>
+    %= submit_button "$btn", class => ""
+    </p>
+    
     % end    
 
 
-	<p><h2>
-	%=l 'pse_CURRENT_PSEUDONYMS'
-	</h2><br>
-    % 	my $numPseudonyms = @$pseudonyms;
-    %	if ($numPseudonyms == 0){
+    <p><h2>
+    %=l 'pse_CURRENT_PSEUDONYMS'
+    </h2><br>
+    %   my $numPseudonyms = @$pseudonyms;
+    %   if ($numPseudonyms == 0){
         %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
-    %	} else {
-	<table class=""><thead>
-	<tr>
-    	    <th class="">
-    	    %=l 'pse_PSEUDONYM'
-    	    </th>
-    	    <th class="">
-    	    %=l 'pse_USER_OR_GROUP'
-    	    </th>
-    	    <th class="">
-    	    %=l 'ACTION'
-    	    </th>
-			<!-- <th class="" style="display: normal;"></th> -->
-   	</tr></thead>
-   	<tbody>
+    %   } else {
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+            <th class="">
+            %=l 'pse_PSEUDONYM'
+            </th>
+            <th class="">
+            %=l 'pse_USER_OR_GROUP'
+            </th>
+            <th class="">
+            %=l 'ACTION'
+            </th>
+
+        <!-- <th class="" style="display: normal;"></th> -->
+    </tr>
+    </thead>
+    <tbody>
 
     %    foreach my $pseudonym ( @$pseudonyms )
     %    {
-    %	    my $modifiable = $pseudonym->prop('Changeable') || 'yes';
-    %	    my $removable = $pseudonym->prop('Removable') || 'yes';
+    %       my $modifiable = $pseudonym->prop('Changeable') || 'yes';
+    %       my $removable = $pseudonym->prop('Removable') || 'yes';
 
     %       my $account = $pseudonym->prop('Account');
     %       $account = "Administrator" if ($account eq "admin");
-    %	    $account = $c->l("pse_EVERYONE") if ($account eq "shared");
+    %       $account = $c->l("pse_EVERYONE") if ($account eq "shared");
 
-    %	    my $visible = $pseudonym->prop('Visible');
-    %	    $account .= $c->l("pse_LOCAL_ONLY")
-    %    	if (defined $visible && $visible eq "internal");
+    %       my $visible = $pseudonym->prop('Visible');
+    %       $account .= $c->l("pse_LOCAL_ONLY")
+    %       if (defined $visible && $visible eq "internal");
 
         <tr>
             %= t td => (class => "") => $pseudonym->key
             %= t td => (class => "") => $account
 
-			<td class="">
-				%my ($actionModify, $actionRemove) = '&nbsp;'; 
-				%if ($modifiable eq 'yes') { 
-					%my $modify_text = l('MODIFY');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
-					%$actionModify = qq{
+            <td class="">
+                %my ($actionModify, $actionRemove) = '&nbsp;'; 
+                %if ($modifiable eq 'yes') { 
+                    %my $modify_text = l('MODIFY');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+                    %$actionModify = qq{
                                         %       <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
-					%	<button type='button' class="" title='$modify_text' >
-					%		$modify_text
-					%	</button>
+                    %   <button type='button' class="" title='$modify_text' >
+                    %       $modify_text
+                    %   </button>
                                         %       </a>
-					%};
-				%}
+                    %};
+                %}
 
-				%if ($removable eq 'yes')  { 
-					%my $remove_text = l('REMOVE');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
-					%$actionRemove = qq{
+                %if ($removable eq 'yes')  { 
+                    %my $remove_text = l('REMOVE');  # Localized text
+                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                    %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+                    %$actionRemove = qq{
                                         %       <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
-					%	<button type='button' class="" title='$remove_text' >
-					%		$remove_text
-					%	</button>
+                    %   <button type='button' class="" title='$remove_text' >
+                    %       $remove_text
+                    %   </button>
                                         %       </a>
-					%};
-				%}
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+                    %};
+                %}
+                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
 
-			</td>
-		</tr>
+            </td>
+        </tr>
     %    }
-    	</tbody>
-    	</table>
-	<%} %>
-	</p>
-
+        </tbody>
+        </table>
+    <%} %>
+    </p>
 
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_upd.html.ep

@@ -1,53 +1,56 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('SAVE');
+    %   my $btn = l('SAVE');
 
     %= form_for '/pseudonyms2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'pse_MODIFY_PSEUDONYM'
-	</h2>
-	<br>
-	%=l 'pse_DESC_PSEUDONYM_NAME'
-	</p>
+    <p>
+    <h2>
+    %=l 'pse_MODIFY_PSEUDONYM'
+    </h2>
+    <br>
+    %=l 'pse_DESC_PSEUDONYM_NAME'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'pse_PSEUDONYM_NAME', class => ""
-	</span><span class="">
-	%= $pse_datas->{pseudonym}, class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'pse_PSEUDONYM_NAME', class => ""
+    </span>
+    <span class="">
+    %= $pse_datas->{pseudonym}, class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'pse_SELECT_ACCOUNT', class => ""
-	</span><span class="">
-	% param 'Account' => $pse_datas->{account} unless param 'Account';
-	%= select_field 'Account' => $c->existing_accounts_list(), class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'pse_SELECT_ACCOUNT', class => ""
+    </span>
+    <span class="">
+    % param 'Account' => $pse_datas->{account} unless param 'Account';
+    %= select_field 'Account' => $c->existing_accounts_list(), class => ""
+    </span>
+    </p>
 
     %if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) {
 
-	<p>
-	<span class="">
-	%=l 'pse_SELECT_INTERNAL', class => ""
-	</span><span class="">
-	% param 'Internal' => $pse_datas->{internal} unless param 'Internal';
-	%= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ], class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'pse_SELECT_INTERNAL', class => ""
+    </span>
+    <span class="">
+    % param 'Internal' => $pse_datas->{internal} unless param 'Internal';
+    %= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ], class => ""
+    </span>
+    </p>
 
     %}
     
-	<p>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $pse_datas->{trt}
+    %= hidden_field 'trt' => $pse_datas->{trt}
         %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
-	
+    
     %end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep

@@ -1,81 +1,83 @@
-<div id="">
+<div>
 
-	<p>
+    <p>
     %    my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC'));
-	%= $modul
-	
-	<h3>
-	%=l 'quo_CURRENT_USAGE_AND_SETTINGS'
-	</h3>
+    %= $modul
+    
+    <h3>
+    %=l 'quo_CURRENT_USAGE_AND_SETTINGS'
+    </h3>
 
-	<br>
-    % 	my $numUsers = @$userAccounts;
-    %	if ($numUsers == 0){
+    <br>
+    %   my $numUsers = @$userAccounts;
+    %   if ($numUsers == 0){
         %=l 'ACCOUNT_USER_NONE'
-    %	} else {
+    %   } else {
 
     %    my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
-    %	 my $absolute = l('quo_ABS_LIMIT_MB');     $absolute =~ s#(limitX)#<br>$1#;
+    %    my $absolute = l('quo_ABS_LIMIT_MB');     $absolute =~ s#(limitX)#<br>$1#;
     %    my $current = l('quo_CURRENT_USAGE');     $current =~ s#(usageX)#<br>$1#;
 
-	<table class=""><thead>
-	<tr>
-    	    <th class="">
-    	    %=l 'ACCOUNT'
-    	    </th>
-    	    <th class="">
-    	    %=l 'USER_NAME'
-    	    </th>
-    	    <th class="">
-    	    %= $limit
-    	    </th>
-    	    <th class="">
-    	    %= $absolute
-    	    </th>
-    	    <th class="">
-    	    %= $current
-    	    </th>
-    	    <th class="">
-    	    %=l 'ACTION'
-    	    </th>
-    	</tr>
-    	</thead><tbody>
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+            <th class="">
+            %=l 'ACCOUNT'
+            </th>
+            <th class="">
+            %=l 'USER_NAME'
+            </th>
+            <th class="">
+            %= $limit
+            </th>
+            <th class="">
+            %= $absolute
+            </th>
+            <th class="">
+            %= $current
+            </th>
+            <th class="">
+            %=l 'ACTION'
+            </th>
+        </tr>
+        </thead>
+        <tbody>
 
     %    foreach my $user (@$userAccounts)
     %    {
-    %	    my $uid = getpwnam($user->key);
+    %       my $uid = getpwnam($user->key);
     %       unless ($uid) {
-    %		warn($self->localise('COULD_NOT_GET_UID'),$user->key);
-    %		next;
-    %	    }
-    %	    my $name = $user->prop("FirstName")." ".$user->prop("LastName");
-    %	    my $dev = Quota::getqcarg('/home/e-smith/files');
-    %	    my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+    %       warn($self->localise('COULD_NOT_GET_UID'),$user->key);
+    %       next;
+    %       }
+    %       my $name = $user->prop("FirstName")." ".$user->prop("LastName");
+    %       my $dev = Quota::getqcarg('/home/e-smith/files');
+    %       my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
         <tr>
             %= t td => (class => "") => $user->key
             %= t td => (class => "") => $name
             %= t td => (class => "") => sprintf("%.2f", $bs / 1024 )
             %= t td => (class => "") => sprintf("%.2f", $bh / 1024 )
             %= t td => (class => "") => sprintf("%.2f", $bc / 1024 )
-			<td class="">
-				%my $modify_text = l('MODIFY');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
-				%my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
-				%my $actionModify = qq{
+            <td class="">
+                %my $modify_text = l('MODIFY');  # Localized text
+                %my $csrf_token = "TOKEN";  # CSRF token for security
+                %my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
+                %my $actionModify = qq{
                                 %       <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
-				%	<button type='button' class="" title='$modify_text' >
-				%		$modify_text
-				%	</button>
+                %   <button type='button' class="" title='$modify_text' >
+                %       $modify_text
+                %   </button>
                                 %       </a>
-				%};
-				<%= $c->render_to_string(inline => $actionModify) %>
-			</td>
-    	</tr>
+                %};
+                <%= $c->render_to_string(inline => $actionModify) %>
+            </td>
+        </tr>
     %    }
-    	</tbody>
-    	</table>
-	<%} %>
-	</p>
+        </tbody>
+        </table>
+    <%} %>
+    </p>
 
         %= hidden_field 'trt' => $quo_datas->{trt}
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_upd.html.ep

@@ -1,84 +1,87 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('SAVE');
+    %   my $btn = l('SAVE');
 
     %= form_for '/quota2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'quo_MODIFY_USER_TITLE'
-	</h2>
-	</p>
+    <p>
+    <h2>
+    %=l 'quo_MODIFY_USER_TITLE'
+    </h2>
+    </p>
 
     %    my $userid = $quo_datas->{user};
     %    my $user = $quo_datas->{userRec};
 <!--
-    	 for my $user @$userAccounts
+         for my $user @$userAccounts
         {
            unless ( $user->key eq $userid) {
-    		warn(l('USER_DIFFERENT'),$user->key);
-    		next;
-    	    }
-	}
+            warn(l('USER_DIFFERENT'),$user->key);
+            next;
+            }
+    }
 -->
-    %	my $uid = getpwnam($user->key);
+    %   my $uid = getpwnam($user->key);
     %    unless ($uid) {
-    %		warn(l('COULD_NOT_GET_UID'),$user->key);
-    %		next;
-    %	 }
+    %       warn(l('COULD_NOT_GET_UID'),$user->key);
+    %       next;
+    %    }
 
-    %	  my $name = $user->prop("FirstName") . " " . $user->prop("LastName");
-    %	  my $dev = Quota::getqcarg('/home/e-smith/files');
-    %	  my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+    %     my $name = $user->prop("FirstName") . " " . $user->prop("LastName");
+    %     my $dev = Quota::getqcarg('/home/e-smith/files');
+    %     my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
 
-	<p>
-	%=l 'quo_USER' 
-	%= "$name (\"$userid\")" 
-	%=l 'quo_CURRENTLY_HAS' 
-	%= $ic 
+    <p>
+    %=l 'quo_USER' 
+    %= "$name (\"$userid\")" 
+    %=l 'quo_CURRENTLY_HAS' 
+    %= $ic 
         %=l 'quo_FILES' 
-	%=l 'quo_OCCUPYING' 
-	%= $c->toMB($bc)
-	%=l 'quo_MEGABYTES'
-	</p>
-	
-	<p>
-	%=l 'quo_INSTRUCTIONS'
-	</p>
+    %=l 'quo_OCCUPYING' 
+    %= $c->toMB($bc)
+    %=l 'quo_MEGABYTES'
+    </p>
+    
+    <p>
+    %=l 'quo_INSTRUCTIONS'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'quo_USER', class => ""
-	</span><span class="">
-	%= $name, class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'quo_USER', class => ""
+    </span>
+    <span class="">
+    %= $name, class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'quo_LIMIT_WITH_GRACE', class => ""
-	</span><span class="">
-	% param 'Soft' => $quo_datas->{softlim} unless param 'Soft';
-	%= text_field 'Soft', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'quo_LIMIT_WITH_GRACE', class => ""
+    </span>
+    <span class="">
+    % param 'Soft' => $quo_datas->{softlim} unless param 'Soft';
+    %= text_field 'Soft', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'quo_ABS_LIMIT', class => ""
-	</span><span class="">
-	% param 'Hard' => $quo_datas->{hardlim} unless param 'Hard';
-	%= text_field 'Hard', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'quo_ABS_LIMIT', class => ""
+    </span>
+    <span class="">
+    % param 'Hard' => $quo_datas->{hardlim} unless param 'Hard';
+    %= text_field 'Hard', class => ""
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $quo_datas->{trt}
+    %= hidden_field 'trt' => $quo_datas->{trt}
         %= hidden_field 'user' => $quo_datas->{user}
-	
+    
     % end    
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_rma_pptp.html.ep

@@ -5,7 +5,8 @@
 	<br>
 	<span class="">
 	%=l 'rma_LABEL_PPTP'
-	</span><span class="">
+	</span>
+	<span class="">
 	% param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions';
 	%= text_field 'PptpSessions' =>  $c->get_pptp_sessions(), class => ""
 	</span>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_swt_theme.html.ep

@@ -1,14 +1,48 @@
+
+<!-- Both Theme drop downs but only the first works curently -->
+
 <div id="">
-    <font class="">
     % my $btn = l('swt_THEME');
     %= form_for $c->url_for('swttheme') => (method => 'POST') => begin
-	% my $value = $c->session->{'CurrentTheme'};
-	% $value = session 'CurrentTheme';
+    % my $value = $c->session->{'CurrentTheme'};
+    % $value = session 'CurrentTheme';
 
-	% param 'Theme' => $value unless param 'Theme';
-	%= select_field 'Theme' => $c->theme_list(), class => ""
-	%= hidden_field 'From' => $c->tx->req->url
-	%= submit_button "$btn"
-    % end    
-    </font>
+    % param 'Theme' => $value unless param 'Theme';
+    %= select_field 'Theme' => $c->theme_list(), class => ""
+    %= hidden_field 'From' => $c->tx->req->url
+    %= submit_button "$btn"
 </div>
+
+
+
+
+
+%# my $value = $c->session->{'CurrentTheme'};
+% $value = session 'CurrentTheme';
+% my $formUrl = $c->url_for('swttheme');
+% param 'Theme' => $value unless param 'Theme';
+% my @themes = $c->theme_list();
+
+
+
+<form action="<%= $formUrl %>" method="POST" >
+  <div class="row g-3 align-items-center">
+      <div class="col-auto">
+        <label class="visually-hidden" for="inlineFormSelectPref">Preference</label>
+        <select class="form-select" id="inlineFormSelectPref">
+          <option selected><%= $value %></option>
+          % foreach my $theme (@themes) {
+              <option value="<%= $theme %>"><%= $theme %></option>
+          % };
+        </select>
+        %= hidden_field 'From' => $c->tx->req->url
+      </div>
+    
+    <div class="col-auto">
+      <button type="submit" class="btn btn-primary">Theme</button>
+    </div>
+    </div>
+</form>
+
+
+% end

root/usr/share/smanager/themes/AdminLTE/templates/partials/_user_menu.html.ep

@@ -1,31 +0,0 @@
-%	use SrvMngr qw( getNavigation );
-%	my %nav = %{SrvMngr->getNavigation( $c->languages(), 'U' )};
-
-	<div id="">
-	<a href='#' id="" class="">Current User (<%= session 'username' %>)</a>
-	<div id="">
-%    my $cc = 300;
-%    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
-%		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
-	<!-- div class=""><%= $h %></div -->
-%	my ($classNew, $target, $href) = '';
-%	foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
-
-%	next if ($_->{'MENUCAT'} ne 'U' );	# menu User 
-
-%	    if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%		$target = '_self';
-%	    	(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
-%	    	$href = '/smanager/' . $file2;
-%	    } else {
-%		$target = 'main';
-%	    	$href = '/server-manager' . $_->{'FILENAME'};
-%	    }
-	    <div class=""><a class="">' target='<%= $target %>' id="">' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
-%           $cc++;
-%	}
-
-%    }
-
-    </div>
-    </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep

@@ -1,28 +1,28 @@
 <div id="">
 
-    % 	my $btn = l('REMOVE');
+    %   my $btn = l('REMOVE');
 
     %= form_for '/useraccountsd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'usr_REMOVE_ACCOUNT_TITLE'
-	</h2>
-	
-	<br>
-	%= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
-	<br>
-	%= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
-	</p>
+    <p>
+    <h2>
+    %=l 'usr_REMOVE_ACCOUNT_TITLE'
+    </h2>
+    
+    <br>
+    %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
+    <br>
+    %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
+    </p>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $usr_datas->{trt}
-	%= hidden_field 'user' => $usr_datas->{user}
-	%= hidden_field 'name' => $usr_datas->{name}
-	
+    %= hidden_field 'trt' => $usr_datas->{trt}
+    %= hidden_field 'user' => $usr_datas->{user}
+    %= hidden_field 'name' => $usr_datas->{name}
+    
     % end    
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep

@@ -1,46 +1,47 @@
-<div id="">
+<div>
 
 
     % my $btn = l('usr_ADD_USER');
 
     %= form_for '/useraccounts' => (method => 'POST') => begin
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
     % end    
 
-	<p>
-	%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
-	<br>
-	</p>
-	
-    % 	my $numUsers = @$users;
-    %	if ($numUsers == 0){
+    <p>
+    %= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
+    <br>
+    </p>
+    
+    %   my $numUsers = @$users;
+    %   if ($numUsers == 0){
         %=l 'usr_NO_USER_ACCOUNTS'
-    %	} else {
-	<table class=""><thead>
-	<tr>
-    	    <th class="">
-    	    %=l 'ACCOUNT'
-    	    </th>
-    	    <th class="">
-    	    %=l 'USER_NAME'
-    	    </th>
-    	    <th class="">
-    	    %=l 'usr_VPN_CLIENT_ACCESS'
-    	    </th>
-    	    <th class="">
-    	    %=l 'usr_FORWARDING_ADDRESS'
-    	    </th>
-    	    <th class="">
-    	    %=l 'ACTION'
-    	    </th>
-    	</tr>
+    %   } else {
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+            <th>
+            %=l 'ACCOUNT'
+            </th>
+            <th>
+            %=l 'USER_NAME'
+            </th>
+            <th>
+            %=l 'usr_VPN_CLIENT_ACCESS'
+            </th>
+            <th>
+            %=l 'usr_FORWARDING_ADDRESS'
+            </th>
+            <th>
+            %=l 'ACTION'
+            </th>
+        </tr>
         </thead><tbody>
-    	
+        
     %    foreach my $user (@$users) {
 
     %        my $username = $user->key();
@@ -59,99 +60,99 @@
             %= t td => (class => "") => "$first  $last"
             %= t td => (class => "") => $vpnaccess
             %= t td => (class => "") => $fwd
-			% my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
-			% my $modify_text = l('MODIFY');  # Localized text
-			% my $csrf_token = "TOKEN";  # CSRF token for security
-			% my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-			% my $password_text = l("PASSWORD_RESET");
-			%if ($useraccounts_user_name eq 'admin')  { 
-				%$actionModify = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
-					%	<button type='button' class="" title='$modify_text'>
-					%		$modify_text
-					%	</button>
-					%</a>
-				%};                             
-				%$actionResetPw = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
-					%	<button type='button' class="" title='$password_text' >
-					%		$password_text
-					%	</button>
-					%</a>
-				%};
-			%} else {
-				%$actionModify = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
-					%	<button type='button' class="" title='$modify_text' >
-					%		$modify_text
-					%	</button>
-					%</a>
-				%};
-			%}
-			%if ($password_set ne 'yes') {
-				%$actionLock = l('ACCOUNT_LOCKED');
-				%$actionResetPw = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-						%	<button type='button' class="" title="$password_text - currently unset" style = background:pink; >
-						%		$password_text
-						%	</button>
-					%</a>
-				%};
-			%} elsif ($useraccounts_user_name ne 'admin') {
-				% my $lock_text = l('ACCOUNT LOCKED');  # Localized text
-				% my $csrf_token = "TOKEN";  # CSRF token for security
-				% my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-				%$actionLock = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
-						%	<button type='button' class="" title='$lock_text' >
-						%		$lock_text
-						%	</button>
-					%</a>
-					%};
-				%$actionResetPw = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-					%	<button type='button' class="" title='$password_text' >
-					%		$password_text
-					%	</button>
-					%</a>
-					%};
-			%}
-			%if ( $removable eq 'yes' )  { 
-				% my $remove_text = l('REMOVE');  # Localized text
-				% my $csrf_token = "TOKEN";  # CSRF token for security
-				%$actionRemove = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
-					%	<button type='button' class="" title='$remove_text' >
-					%		$remove_text
-					%	</button>
-					%</a>
-				%};
-			%}
-			
-		    % my $thisdomain = $c->req->url->to_abs->host;
-			% my $roundcube_text = l('Webmail');  # Localized text
-			% $csrf_token = "TOKEN";  # CSRF token for security
-			% $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-			% $actionroundcube = qq{
-				%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
-				%	<button type='button' class="" title='$roundcube_text' >
-				%		$roundcube_text
-				%	</button>
-				%</a>
-			%};
-			<td class="" style="min-width:35em">
-					<%= $c->render_to_string(inline => $actionModify) %>
-					<%= $c->render_to_string(inline => $actionResetPw) %>
-					<%= $c->render_to_string(inline => $actionLock) %>
-					<%= $c->render_to_string(inline => $actionRemove) %>
-					<%= $c->render_to_string(inline => $actionroundcube) %>
-			</td>
-    	</tr>
+            % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
+            % my $modify_text = l('MODIFY');  # Localized text
+            % my $csrf_token = "TOKEN";  # CSRF token for security
+            % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+            % my $password_text = l("PASSWORD_RESET");
+            %if ($useraccounts_user_name eq 'admin')  { 
+                %$actionModify = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
+                    %   <button type='button' class="" title='$modify_text'>
+                    %       $modify_text
+                    %   </button>
+                    %</a>
+                %};                             
+                %$actionResetPw = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
+                    %   <button type='button' class="" title='$password_text' >
+                    %       $password_text
+                    %   </button>
+                    %</a>
+                %};
+            %} else {
+                %$actionModify = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
+                    %   <button type='button' class="" title='$modify_text' >
+                    %       $modify_text
+                    %   </button>
+                    %</a>
+                %};
+            %}
+            %if ($password_set ne 'yes') {
+                %$actionLock = l('ACCOUNT_LOCKED');
+                %$actionResetPw = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
+                        %   <button type='button' class="" title="$password_text - currently unset" style = background:pink; >
+                        %       $password_text
+                        %   </button>
+                    %</a>
+                %};
+            %} elsif ($useraccounts_user_name ne 'admin') {
+                % my $lock_text = l('ACCOUNT LOCKED');  # Localized text
+                % my $csrf_token = "TOKEN";  # CSRF token for security
+                % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+                %$actionLock = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
+                        %   <button type='button' class="" title='$lock_text' >
+                        %       $lock_text
+                        %   </button>
+                    %</a>
+                    %};
+                %$actionResetPw = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
+                    %   <button type='button' class="" title='$password_text' >
+                    %       $password_text
+                    %   </button>
+                    %</a>
+                    %};
+            %}
+            %if ( $removable eq 'yes' )  { 
+                % my $remove_text = l('REMOVE');  # Localized text
+                % my $csrf_token = "TOKEN";  # CSRF token for security
+                %$actionRemove = qq{
+                    %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
+                    %   <button type='button' class="" title='$remove_text' >
+                    %       $remove_text
+                    %   </button>
+                    %</a>
+                %};
+            %}
+            
+            % my $thisdomain = $c->req->url->to_abs->host;
+            % my $roundcube_text = l('Webmail');  # Localized text
+            % $csrf_token = "TOKEN";  # CSRF token for security
+            % $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+            % $actionroundcube = qq{
+                %<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
+                %   <button type='button' class="" title='$roundcube_text' >
+                %       $roundcube_text
+                %   </button>
+                %</a>
+            %};
+            <td class="">
+                    <%= $c->render_to_string(inline => $actionModify) %>
+                    <%= $c->render_to_string(inline => $actionResetPw) %>
+                    <%= $c->render_to_string(inline => $actionLock) %>
+                    <%= $c->render_to_string(inline => $actionRemove) %>
+                    <%= $c->render_to_string(inline => $actionroundcube) %>
+            </td>
+        </tr>
     %    }
-    	</tbody>
-    	</table>
+        </tbody>
+        </table>
 
-	<%} %>
+    <%} %>
 
         %= hidden_field 'trt' => $usr_datas->{trt}
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep

@@ -1,28 +1,28 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('usr_LOCK');
+    %   my $btn = l('usr_LOCK');
 
     %= form_for '/useraccountsd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'usr_LOCK_ACCOUNT_TITLE'
-	</h2>
-	
-	<br>
-	%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} );
-	<br>
-	%= $c->render_to_string(inline => $c->l('usr_LOCK_DESC2'))
-	</p>
+    <p>
+    <h2>
+    %=l 'usr_LOCK_ACCOUNT_TITLE'
+    </h2>
+    
+    <br>
+    %= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} );
+    <br>
+    %= $c->render_to_string(inline => $c->l('usr_LOCK_DESC2'))
+    </p>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $usr_datas->{trt}
-	%= hidden_field 'user' => $usr_datas->{user}
-	%= hidden_field 'name' => $usr_datas->{name}
-	
+    %= hidden_field 'trt' => $usr_datas->{trt}
+    %= hidden_field 'user' => $usr_datas->{user}
+    %= hidden_field 'name' => $usr_datas->{name}
+    
     % end    
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep

@@ -1,44 +1,45 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('SAVE');
+    %   my $btn = l('SAVE');
 
     %= form_for '/useraccountsd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'RESET_PASSWORD_TITLE'
-	</h2>
-	
-	<br>
-	%= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} );
-	<br>
-	%= l 'usr_RESET_DESC2'
-	</p>
+    <p>
+    <h2>
+    %=l 'RESET_PASSWORD_TITLE'
+    </h2>
+    
+    <br>
+    %= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} );
+    <br>
+    %= l 'usr_RESET_DESC2'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'PASSWORD_NEW', class => ""
-	</span><span class="">
-	%= password_field 'newPass', class => "", class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'PASSWORD_NEW', class => ""
+    </span><span class="">
+    %= password_field 'newPass', class => "", class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'PASSWORD_VERIFY_NEW', class => ""
-	</span><span class="">
-	%= password_field 'newPassVerify', class => "", class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'PASSWORD_VERIFY_NEW', class => ""
+    </span>
+    <span class="">
+    %= password_field 'newPassVerify', class => "", class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $usr_datas->{trt}
-	%= hidden_field 'user' => $usr_datas->{user}
-	%= hidden_field 'name' => $usr_datas->{name}
-	
+    %= hidden_field 'trt' => $usr_datas->{trt}
+    %= hidden_field 'user' => $usr_datas->{user}
+    %= hidden_field 'name' => $usr_datas->{name}
+    
     % end    
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep

@@ -1,45 +1,48 @@
-<div id="">
+<div>
 
-    % 	my $btn = l('SAVE');
+    % my $btn = l('SAVE');
 
     %= form_for '/useraccountsd' => (method => 'POST') => begin
-	<p>
-	%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
-	</p>
+    <p>
+    %= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_CURRENT_SYSTEM_PASSWORD', class => ""
-	</span><span class="">
-	%= password_field 'CurPass', class => "", class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_CURRENT_SYSTEM_PASSWORD', class => ""
+    </span>
+    <span class="">
+    %= password_field 'CurPass', class => "", class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_NEW_SYSTEM_PASSWORD', class => ""
-	</span><span class="">
-	%= password_field 'Pass', class => "", class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_NEW_SYSTEM_PASSWORD', class => ""
+    </span>
+    <span class="">
+    %= password_field 'Pass', class => "", class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => ""
-	</span><span class="">
-	%= password_field 'PassVerify', class => "", class="">'sme-password'
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => ""
+    </span>
+    <span class="">
+    %= password_field 'PassVerify', class => "", class="">'sme-password'
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $usr_datas->{trt}
-	%= hidden_field 'user' => $usr_datas->{user}
-	%= hidden_field 'name' => $usr_datas->{name}
-	
+    %= hidden_field 'trt' => $usr_datas->{trt}
+    %= hidden_field 'user' => $usr_datas->{user}
+    %= hidden_field 'name' => $usr_datas->{name}
+    
     % end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep

@@ -1,185 +1,195 @@
-<div id="">
+<div>
 
-
-	% my $btn = l('ADD');
+    % my $btn = l('ADD');
 
     %= form_for '/useraccountsd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'usr_P2_TITLE'
-	</h2>
-	<br>
-	%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC'))
-	</p>
+    <p>
+    <h2>
+    %=l 'usr_P2_TITLE'
+    </h2>
+    <br>
+    %= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC'))
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_ACCOUNT_NAME'
-	</span><span class="">
-	% if ( $usr_datas->{trt} eq 'ADD' ) {
-	    % param 'user' => $usr_datas->{user} unless param 'user';
-	    %= text_field 'user', class => ""
-	% } else {
-	    % $btn = l('SAVE');
-	    %= $usr_datas->{user}, class => ""
-	% }
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_ACCOUNT_NAME'
+    </span>
+    <span class="">
+    % if ( $usr_datas->{trt} eq 'ADD' ) {
+        % param 'user' => $usr_datas->{user} unless param 'user';
+        %= text_field 'user', class => ""
+    % } else {
+        % $btn = l('SAVE');
+        %= $usr_datas->{user}, class => ""
+    % }
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_FIRSTNAME'
-	</span><span class="">
-	% param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-	%= text_field 'FirstName', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_LASTNAME'
-	</span><span class="">
-	% param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-	%= text_field 'LastName', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_FIRSTNAME'
+    </span><span class="">
+    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
+    %= text_field 'FirstName', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_LASTNAME'
+    </span>
+    <span class="">
+    % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
+    %= text_field 'LastName', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_DEPARTMENT'
-	</span><span class="">
-	% param 'Dept' => $usr_datas->{dept} unless param 'Dept';
-	%= text_field 'Dept', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_COMPANY'
-	</span><span class="">
-	% param 'Company' => $usr_datas->{company} unless param 'Company';
-	%= text_field 'Company', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_STREET_ADDRESS'
-	</span><span class="">
-	% param 'Street' => $usr_datas->{street} unless param 'Street';
-	%= text_field 'Street', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_CITY'
-	</span><span class="">
-	% param 'City' => $usr_datas->{city} unless param 'City';
-	%= text_field 'City', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_PHONE_NUMBER'
-	</span><span class="">
-	% param 'Phone' => $usr_datas->{phone} unless param 'Phone';
-	%= text_field 'Phone', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_EMAIL_DELIVERY'
-	</span><span class="">
-	% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-	%= select_field 'EmailForward' => $c->emailForward_list(), class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_FORWARDING_ADDRESS'
-	</span><span class="">
-	% param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-	%= text_field 'ForwardAddress', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_DEPARTMENT'
+    </span><span class="">
+    % param 'Dept' => $usr_datas->{dept} unless param 'Dept';
+    %= text_field 'Dept', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_COMPANY'
+    </span>
+    <span class="">
+    % param 'Company' => $usr_datas->{company} unless param 'Company';
+    %= text_field 'Company', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_STREET_ADDRESS'
+    </span><span class="">
+    % param 'Street' => $usr_datas->{street} unless param 'Street';
+    %= text_field 'Street', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_CITY'
+    </span>
+    <span class="">
+    % param 'City' => $usr_datas->{city} unless param 'City';
+    %= text_field 'City', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_PHONE_NUMBER'
+    </span>
+    <span class="">
+    % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
+    %= text_field 'Phone', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_EMAIL_DELIVERY'
+    </span>
+    <span class="">
+    % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
+    %= select_field 'EmailForward' => $c->emailForward_list(), class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_FORWARDING_ADDRESS'
+    </span>
+    <span class="">
+    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
+    %= text_field 'ForwardAddress', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_VPN_CLIENT_ACCESS'
-	</span><span class="">
-	% param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-	%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_VPN_CLIENT_ACCESS'
+    </span>
+    <span class="">
+    % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
+    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
+    </span>
+    </p>
 
-    %	if (  $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
-    %	my $btn2 = $c->l('DOWNLOAD');
-	%= form_for '/useraccountso' => (method => 'POST') => begin
-	<p>
-	<span class="">
-	%=l 'usr_LABEL_IPSECRW_DOWNLOAD'
-	</span><span class="">
-	%= submit_button $btn2, class => ""
-	</span>
-	</p>
-	%= hidden_field 'trt' => 'CRT'
+    %   if (  $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
+    %   my $btn2 = $c->l('DOWNLOAD');
+    %= form_for '/useraccountso' => (method => 'POST') => begin
+    <p>
+    <span class="">
+    %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
+    </span>
+    <span class="">
+    %= submit_button $btn2, class => ""
+    </span>
+    </p>
+    %= hidden_field 'trt' => 'CRT'
         %= hidden_field 'user' => $usr_datas->{user}
-	%end
-    %	}
+    %end
+    %   }
 
-    %	my @groups = @{$c->get_groups()};
-    %	if ( @groups ) {
-	<p>
-	<span class="">
-	%=l 'usr_GROUP_MEMBERSHIPS'
-	</span>
-	<span class="">
-	<table class=""><thead>
-	<tr><th class="">
-    	    %=l 'usr_MEMBER'
-    	    </th><th class="">
-    	    %=l 'GROUP'
-    	    </th><th class="">
-    	    %=l 'DESCRIPTION'
-    	</th></tr>
-    	</thead><tbody>
-    	
+    %   my @groups = @{$c->get_groups()};
+    %   if ( @groups ) {
+    <p>
+    <span class="">
+    %=l 'usr_GROUP_MEMBERSHIPS'
+    </span>
+    <span class="">
+    <table class="tabel table-bordered">
+    <thead>
+    <tr><th class="">
+            %=l 'usr_MEMBER'
+            </th><th class="">
+            %=l 'GROUP'
+            </th><th class="">
+            %=l 'DESCRIPTION'
+        </th>
+        </tr>
+        </thead><tbody>
+        
     %    foreach my $g ( @groups) {
-    %	     my $user = $usr_datas->{user};
-    %        my $groupname 	= $g->key();
-    %        my $description	= $g->prop('Description');
+    %        my $user = $usr_datas->{user};
+    %        my $groupname  = $g->key();
+    %        my $description    = $g->prop('Description');
     %        my $checked = '';
     %        if ( $user and $c->is_user_in_group($user, $groupname) ) {
     %            $checked = 'checked';
     %        }
         <tr>
 
-	    <td>
-	    % if ( $checked eq 'checked' ) {
-		<!-- % = check_box 'groupMemberships', value => $groupname, checked => $checked -->
-		<input type='checkbox' name='groupMemberships' checked value='<%= $groupname %>'>
-	    %} else {
-		%= check_box 'groupMemberships' => $groupname
-	    %}
-	    </td>
+        <td>
+        % if ( $checked eq 'checked' ) {
+        <!-- % = check_box 'groupMemberships', value => $groupname, checked => $checked -->
+        <input type='checkbox' name='groupMemberships' checked value='<%= $groupname %>'>
+        %} else {
+        %= check_box 'groupMemberships' => $groupname
+        %}
+        </td>
             <!-- t td => (class => "") => (check_box ' groupMemberships' => $groupname  $checked) -->
             %= t td => (class => "") => $groupname
             %= t td => (class => "") => "$description"
-    	</tr>
+        </tr>
     %    }
-    	</tbody>
-    	</table>
-    	</span>
-	</p>
-    %	}
+        </tbody>
+        </table>
+        </span>
+    </p>
+    %   }
 
-	<p>
-	<br><br>
-	%= submit_button $btn, class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button $btn, class => ""
+    </p>
 
-	%= hidden_field 'trt' => $usr_datas->{trt}
-	% if ( $usr_datas->{trt} eq 'UPD' ) {
-    	    %= hidden_field 'user' => $usr_datas->{user}
-	% }
-	
+    %= hidden_field 'trt' => $usr_datas->{trt}
+    % if ( $usr_datas->{trt} eq 'UPD' ) {
+            %= hidden_field 'user' => $usr_datas->{user}
+    % }
+    
     % end
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep

@@ -1,89 +1,96 @@
-<div id="">
+<div>
 
-	% my $btn = l('SAVE');
+    % my $btn = l('SAVE');
 
     %= form_for '/useraccountsd' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'usr_MODIFY_ADMIN_TITLE'
-	</h2><br>
-	</p>
+    <p>
+    <h2>
+    %=l 'usr_MODIFY_ADMIN_TITLE'
+    </h2><br>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_ACCOUNT_NAME'
-	</span><span class="">
-	% $btn = l('SAVE');
-	%= $usr_datas->{user}, class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_ACCOUNT_NAME'
+    </span>
+    <span class="">
+    % $btn = l('SAVE');
+    %= $usr_datas->{user}, class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_FIRSTNAME'
-	</span><span class="">
-	% param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-	%= text_field 'FirstName', class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_LASTNAME'
-	</span><span class="">
-	% param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-	%= text_field 'LastName', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_FIRSTNAME'
+    </span>
+    <span class="">
+    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
+    %= text_field 'FirstName', class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_LASTNAME'
+    </span>
+    <span class="">
+    % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
+    %= text_field 'LastName', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_EMAIL_DELIVERY'
-	</span><span class="">
-	% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-	%= select_field 'EmailForward' => $c->emailForward_list(), class => ""
-	</span>
-	</p>
-	<p>
-	<span class="">
-	%=l 'usr_FORWARDING_ADDRESS'
-	</span><span class="">
-	% param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-	%= text_field 'ForwardAddress', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_EMAIL_DELIVERY'
+    </span>
+    <span class="">
+    % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
+    %= select_field 'EmailForward' => $c->emailForward_list(), class => ""
+    </span>
+    </p>
+    <p>
+    <span class="">
+    %=l 'usr_FORWARDING_ADDRESS'
+    </span>
+    <span class="">
+    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
+    %= text_field 'ForwardAddress', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'usr_VPN_CLIENT_ACCESS'
-	</span><span class="">
-	% param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-	%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'usr_VPN_CLIENT_ACCESS'
+    </span>
+    <span class="">
+    % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
+    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
+    </span>
+    </p>
 
-    %	if ( $c->ipsec_for_acct eq 'OK' ) {
-    %	my $btn2 = $c->l('DOWNLOAD');
-	%= form_for '/useraccountso' => (method => 'POST') => begin
-	<p>
-	<span class="">
-	%=l 'usr_LABEL_IPSECRW_DOWNLOAD'
-	</span><span class="">
-	%= submit_button $btn2, class => ""
-	</span>
-	</p>
-	%= hidden_field 'trt' => 'CRT'
+    %   if ( $c->ipsec_for_acct eq 'OK' ) {
+    %   my $btn2 = $c->l('DOWNLOAD');
+    %= form_for '/useraccountso' => (method => 'POST') => begin
+    <p>
+    <span class="">
+    %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
+    </span>
+    <span class="">
+    %= submit_button $btn2, class => ""
+    </span>
+    </p>
+    %= hidden_field 'trt' => 'CRT'
         %= hidden_field 'user' => $usr_datas->{user}
-	%end
-    %	}
+    %end
+    %   }
 
-	<p>
-	<br>
-	%= submit_button $btn, class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button $btn, class => ""
+    </p>
 
-	%= hidden_field 'trt' => $usr_datas->{trt}
-    	%= hidden_field 'user' => $usr_datas->{user}
-	
+    %= hidden_field 'trt' => $usr_datas->{trt}
+        %= hidden_field 'user' => $usr_datas->{user}
+    
     % end
 
 </div>