More review template fixes

root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep.orig

@@ -1,69 +0,0 @@
-% layout 'AdminLTE' , title => "Sme server 2 - login";
-
-% content_for 'module' => begin
-
-<div id="" class="">
-
-    %if ( config 'debug' ) {
-	<p>
-	%= dumper $c->current_route
-	%if ( stash 'trt' ) {
-	    %= dumper stash 'trt'
-	%}
-	</p>
-    %}
-
-% if ( stash 'error' ) {
-    	<br><div class="">
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-%}
-
-% my $btn = l('use_SIGNIN');
-% if ( $trt eq 'RESET' ) {
-    	<br><div class=""><h2>
-    	%= $c->render_to_string(inline => l 'use_DESC_RESET') 
-	</h2></div>
-	% $btn = l('use_RESET');
-%}
-
-    <h1>
-    %=l 'use_TITLE'
-    </h1>
-
-    %= form_for '/login' => (method => 'POST') => begin
-
-    <p><span class="">
-    %=l 'USER_NAME'
-    </span><span class="">
-    %= text_field 'Username'
-    </span></p>
-
-% if ( $trt ne 'RESET' ) {
-    <p><span class="">
-    %=l 'PASSWORD'
-    </span><span class="">
-    %= password_field 'Password', id => "", autocomplete => 'current-password', class=>""
-    % if (config 'hasJquery') {
-	%#<a href='#' id="" class=""> <img src="images/visible.png" height="16" alt="Visible"></a>
-    % }
-    </span></p>
-%}
-
-    %= hidden_field 'From' => $c->tx->req->url
-    %= hidden_field 'Trt' => $trt
-
-    <br>
-    <div class="">
-    %= submit_button "$btn", class => ""
-    </div>
-    %if ( config 'pwdreset' ) {
-	<div class=""><a href='login2'>
-        %=l 'use_FORGOT'
-        </a></div>
-    %}
-
-  % end
-
-</div>
-%end

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

@@ -8,7 +8,10 @@
                         <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>
+                                <li class="breadcrumb-item active" aria-current="page">
+                                <a href="<%= $c->stash('controller') %>"> <%= $c->stash('controller') %>
+                                </a>
+                                </li>
                             </ol>
                         </div>
                     </div>

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

@@ -1,14 +1,14 @@
-<div id="" class="">
+<div>
 <!--<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 %>)
-% }
-<br>Copyright 1999-2006 Mitel Corporation<br>
-%= session 'copyRight'
-<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
+<font>
+    %   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'
+    <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
 </font>

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

@@ -0,0 +1,121 @@
+<div>
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_NETWORKING_PARAMS' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_SERVER_MODE' %></td>
+            <td><%= $rvw_datas->{servermode} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %></td>
+            <td><%= $rvw_datas->{localip} %></td>
+            </tr>
+            
+            % if ( $rvw_datas->{publicip} ) {
+                <tr>
+                <td><%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %></td>
+                <td><%= $rvw_datas->{publicip} %></td>
+                </tr>        
+            % }
+            
+            <tr>
+            <td><%= l 'rvw_GATEWAY'%></td>
+            <td>
+            <%= $rvw_datas->{gateway} %>
+            <%= $rvw_datas->{serveronly} %>
+            </td>
+            </tr>
+            
+            <tr>
+            <td>Local Networks (not translated?)</td>
+            <td><%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%> </td>
+            <tr>
+            
+            <tr>
+            <td><%= l 'rvw_DHCP_SERVER' %></td>
+            <td><%= $rvw_datas->{dhcpserver} %></td>
+            </tr>
+        </tbody>
+    </table>
+            
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_SERVER_NAMES' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_DNS_SERVER' %></td>
+            <td><%= $rvw_datas->{dnsserver} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_WEB_SERVER' %></td>
+            <td><%= $rvw_datas->{webserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_PROXY_SERVER' %></td>
+            <td><%= $rvw_datas->{proxyserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_FTP_SERVER' %></td>
+            <td><%= $rvw_datas->{ftpserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %></td>
+            <td><%= $rvw_datas->{smtpserver} %></tr>
+            </tr>
+        </tbody>
+    </table>
+            
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_PRIMARY_DOMAIN' %></td>
+            <td><%= $rvw_datas->{domainname} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_VIRTUAL_DOMAINS' %></td>
+            <td><%= $rvw_datas->{virtualdomains} %></td>
+            </tr>
+            <tr>
+            <td><%= l 'rvw_PRIMARY_WEB_SITE' %></td>
+            <td><%= $rvw_datas->{primarywebsite} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_SERVER_MANAGER' %></td>
+            <td><%= $rvw_datas->{servermanager} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_USER_PASSWORD_PANEL' %></td>
+            <td><%= $rvw_datas->{usermanager} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_EMAIL_ADDRESSES' %></td>
+            <td><%= $rvw_datas->{emailaddresses} %></td>
+            </tr>
+      
+        </tbody>
+    </table>
+</div>

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

@@ -141,7 +141,7 @@
     %=l 'usr_GROUP_MEMBERSHIPS'
     </span>
     <span class="">
-    <table class="tabel table-bordered">
+    <table class="table table-bordered">
     <thead>
       <tr>
         <th class="">

root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep

@@ -91,7 +91,9 @@
             %= t td => (class => "") => $net
             %= t td => (class => "") => $mask
             %= t td => (class => "") => $numhosts
-            <td class=""><input type='checkbox' name='Remote_nets' value='<%= $net.'/'.$mask %>'> </td>
+            <td class="">
+            <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
+            </td>
         </tr>
     %    }
 
@@ -226,4 +228,4 @@
 
 </div>
 
-% end
+% end

root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep

@@ -1,182 +1,32 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Review';
 
 % content_for 'module' => begin
-<div id="" class="">
-    <h1> <%= $title %> </h1>
-    <%= $modul %><br><br>
 
-    %= form_for 'review' => begin
-    <b>
-    %=l 'rvw_NETWORKING_PARAMS'
-    </b><br>
 
+%#= include 'partials/_panel_card_top'
+%#= include 'partials/_panel_card_header'
+
+
+<div>
+
+    <h1> <%= $title %> </h1> 
+    <!-- Header text -->
+    %= $modul
+    
+    % if (config->{debug} == 1) {
     <p>
-    <span class="">
-    %=l 'rvw_SERVER_MODE'
-    </span>
-    %= $rvw_datas->{servermode}
+    %= dumper $c->current_route
+    %= dumper $rvw_datas
     </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
-    </span>
-    %= $rvw_datas->{localip}
-    </p>
-
-    % if ( $rvw_datas->{publicip} ) {
-        <p><span class="">
-        %=l 'rvw_INTERNET_VISIBLE_ADDRESS'
-        </span>
-        %= $rvw_datas->{publicip}
-        </p>
     % }
-
-    <p>
-    <span class="">
-    %=l 'rvw_GATEWAY'
-    </span>
-    %= $rvw_datas->{gateway}
-    %= $rvw_datas->{serveronly}
-    </p>
-
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    <!--span class="">
-    %=l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
-    <!--/span-->
-    </td>
-    <td>
-    %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );
-    </td>
-    </tr>
-    </table>
-    </p>
-
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    <!--<p><span class="">-->
-    %=l 'rvw_DHCP_SERVER'
-    <!--</span>-->
-    </td>
-    <td>
-    %= $rvw_datas->{dhcpserver}
-    <!--</p>-->
-    </td>
-    </tr>
-    </table>
-    </p>
-
+    
     <br><br>
-    <b>
-    %=l 'rvw_SERVER_NAMES'
-    </b>
-    <br>
 
-    <p>
-    <span class="">
-    %=l 'rvw_DNS_SERVER'
-    </span>
-    %= $rvw_datas->{dnsserver}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'rvw_WEB_SERVER'
-    </span>
-    %= $rvw_datas->{webserver}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'rvw_PROXY_SERVER'
-    </span>
-    %= $rvw_datas->{proxyserver}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_FTP_SERVER'
-    </span>
-    %= $rvw_datas->{ftpserver}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
-    </span>
-    %= $rvw_datas->{smtpserver}
-    </p>
-
-    <br><br>
-    <b>
-    %=l 'rvw_DOMAIN_INFORMATION'
-    </b>
-    <br>
-
-    <p>
-    <span class="">
-    %=l 'rvw_PRIMARY_DOMAIN'
-    </span>
-    %= $rvw_datas->{domainname}
-    </p>
-
-    <!---<p><span class="">-->
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    %=l 'rvw_VIRTUAL_DOMAINS'
-    </td>
-    <td>
-    <!--</span>-->
-    %= $rvw_datas->{virtualdomains}
-    </td>
-    </tr>
-    </table>
-    </p>
-    <!--</p>-->
-
-    <p>
-    <span class="">
-    %=l 'rvw_PRIMARY_WEB_SITE'
-    </span>
-    %= $rvw_datas->{primarywebsite}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'rvw_SERVER_MANAGER'
-    </span>
-    %= $rvw_datas->{servermanager}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_USER_PASSWORD_PANEL'
-    </span>
-    %= $rvw_datas->{usermanager}
-    </p>
-
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    %=l 'rvw_EMAIL_ADDRESSES'
-    </td>
-    <td>
-    %= $rvw_datas->{emailaddresses}
-    </td>
-    </tr>
-    </table>
-    </p>
-
-    % end
+    %= include 'partials/_rvw_content'
 
 </div>
 
+%#= include 'partials/_panel_card_footer'
+%#= include 'partials/_panel_card_bottom'
+
 % end

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 4
+%define release 7
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,8 +26,19 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Thu Apr 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-7.sme
+- Clean up review template (but footer in the wrong place)
+- Fix typo tabel
+
+* Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-6.sme
+- Remove old template
+- Update breadcrumbs
+
+* Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-5.sme
+- Fix Remote Access remove network
+
 * Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-4.sme
-- More template cleanign
+- More template cleaning
 - Fix Password syntax errors
 
 * Tue Apr 15 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-3.sme