smeserver-manager/sme10/smeserver-manager-0.1.0-start_service.patch

diff -urN smeserver-manager-0.1.0.old/createlinks smeserver-manager-0.1.0/createlinks
--- smeserver-manager-0.1.0.old/createlinks     2020-06-14 20:32:54.490778984 +0400
+++ smeserver-manager-0.1.0/createlinks 2020-06-14 20:22:02.000000000 +0400
@@ -7,8 +7,6 @@
 #--------------------------------------------------
 my $mngrdir = '/usr/share/smanager';
 
-# links to add
-
 # templates to expand
 for (  qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
 {
@@ -18,14 +16,19 @@
 }
 
 templates2events("$mngrdir/conf/srvmngr.conf", 
-       qw( smanager-modify bootstrap-console-save console-save));
+       qw( smanager-modify bootstrap-console-save console-save ));
 templates2events("/etc/systemd/system/smanager.service", 
-       qw( smanager-modify bootstrap-console-save console-save));
+       qw( smanager-modify bootstrap-console-save console-save ));
 
 # services to launch on event
+for my $event ( qw( smanager-modify smanager-refresh bootstrap-console-save console-save ) )
+{
+    safe_symlink("restart",
+        "root/etc/e-smith/events/$event/services2adjust/smanager");
+}
 
 # actions to perform
-for my $event (qw( yum-install yum-update yum-remove smanager-refresh bootstrap-console-save console-save))
+for my $event ( qw( yum-install yum-update yum-remove smanager-refresh bootstrap-console-save console-save ) )
 {
     event_link('navigation2-conf', "$event", '80');
     event_link('routes2-conf', "$event", '80');
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass
--- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass   2020-05-20 16:50:11.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass       2020-06-25 18:21:34.550012316 +0400
@@ -4,13 +4,11 @@
     $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
     $plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no';
     $plainPort = ${'httpd-e-smith'}{TCPPort} || '80';
-    $adminPort2 = ${'httpd-admin'}{TCPPort2} || '982';
+    $adminPort2 = ${'smanager'}{TCPPort} || '982';
     $sslPort = ${modSSL}{TCPPort} || '443';
 
     $OUT = '';
 
-    $OUT .= "# LogLevel alert rewrite:trace8 \n";
-
     foreach $place ('smanager')
     {
         if (($port eq $plainPort) && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes'))
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All
--- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All    2020-05-28 23:45:55.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All        2020-06-30 21:41:30.756998402 +0400
@@ -1,13 +1,11 @@
 [Unit]
 Description=Server Manager 2 Mojo
 Requires=network.target
-After=network.target
-#Requires=apache.target
-#After=ldap.target
+##Requires= httpd.target slapd.target
+##After=network.target slapd.target
 
 [Service]
 Type=simple
-# Type=forking
 SyslogIdentifier=smanager
 WorkingDirectory=/usr/share/smanager/script
 PIDFile=/var/run/smanager.pid
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad
--- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad     2020-06-06 13:51:10.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad 2020-06-25 18:05:01.529568344 +0400
@@ -1,6 +1,6 @@
     hypnotoad => \{
     ## adresses and ports listened
-        listen => ['http://127.0.0.1:{$smanager{'Port'} || 982 }'],
+        listen => ['http://127.0.0.1:{$smanager{'TCPPort'} || 982 }'],
         proxy  => 1,
         pid_file => '/var/run/smanager.pid',
 
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body
--- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body       2020-06-12 22:40:03.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body   2020-06-30 19:51:14.759304053 +0400
@@ -1,7 +1,7 @@
 {
     $OUT = <<'EOF';
 
-/*     smanager (smeserver_manager2)  */
+/*     smeserver_manager2  */
 
 /*----------------------------------------------------------------------
  * copyright (C) 1999-2003 Mitel Networks Corporation
@@ -147,24 +147,26 @@
     font-weight: bold;
 }
 
+.section {
+}
 .a, .item {
     line-height: 12px;
 }
 
 .section-title {
     display: inline-block;
-    line-height: 19px;
-    color: #888;
+    color: #6CA345;    /*#888;*/
     padding-left: 5px;
     padding-right: 5px;
+    line-height: 18px;
     font-weight: bold;
 }
 
-p.menu-title {
+.menu-title {
     display: inline-block;
-    color: #666;
-    padding-left: 0px;
-    padding-right: 0px;
+    color: #1A6D1A;    /*#666;*/
+    padding-left: 1px;
+    padding-right: 1px;
     font-weight: bold;
 }
 
@@ -209,7 +211,6 @@
     text-align: center;
 }
 
-
 /*end*/
 
 EOF
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm      2020-05-30 20:46:54.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm  2020-07-01 18:03:45.268785684 +0400
@@ -19,7 +19,7 @@
 use esmith::FormMagick;
 #use esmith::FormMagick::Panel::datetime;
 
-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
+our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
 
 sub main {
     my $c = shift;
@@ -30,12 +30,12 @@
     my $modul = $c->l('dat_INITIAL_DESC');
 
 # more complicated for ntpstatus
-    $dat_datas{'ntpstatus'} = ($db->get_prop('ntpd','status')) || '';
-    $dat_datas{'ntpserver'} = ($db->get_prop('ntpd','NTPServer')) || '';
+    $dat_datas{'ntpstatus'} = ($cdb->get_prop('ntpd','status')) || '';
+    $dat_datas{'ntpserver'} = ($cdb->get_prop('ntpd','NTPServer')) || '';
     $dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string();
 
     $c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
-    $c->render(template => 'datetime');
+    $c->render('datetime');
 };
 
 
@@ -45,22 +45,22 @@
 
     my %dat_datas = ();
     my $title = $c->l('dat_FORM_TITLE');
-    my $result = "";
+    my $result = '';
 
     my $old_ntpstatus = $c->param('old_ntpstatus');
-    $dat_datas{'ntpstatus'} = $c->param('ntpstatus');
-    if ($dat_datas{'ntpstatus'} ne $old_ntpstatus) {
-       my $modul = $c->l('dat_INITIAL_DESC');
-       $dat_datas{'ntpserver'} = ($db->get_prop('ntpd','NTPServer')) || '';
-       $dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string();
+    $dat_datas{ntpstatus} = $c->param('ntpstatus');
 
+    if ($dat_datas{ntpstatus} ne $old_ntpstatus) {
+       my $modul = $c->l('dat_INITIAL_DESC');
+       $dat_datas{ntpserver} = ($cdb->get_prop('ntpd','NTPServer')) || '';
+       $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
        $c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
-       $c->render(template => 'datetime');
+       return $c->render('datetime');
     }
 
-    if ($dat_datas{'ntpstatus'} eq 'enabled') {
-        $dat_datas{'ntpserver'} = $c->param('ntpserver');
-       $db->get('ntpd')->set_prop('NTPServer', $dat_datas{'ntpserver'});
+    if ($dat_datas{ntpstatus} eq 'enabled') {
+        $dat_datas{ntpserver} = $c->param('ntpserver');
+       $cdb->get('ntpd')->set_prop('NTPServer', $dat_datas{'ntpserver'});
     } else {
            #my $servername = ($c->param('ServerName') || 'WS');
     }
@@ -69,15 +69,23 @@
     #
     # Update the system
     #
-    system ("/sbin/e-smith/signal-event datetime-update") == 0
-       or $result = $c->l('ERROR_UPDATING');
+    system ("/sbin/e-smith/signal-event", "datetime-update") == 0
+       or $result = $c->l('ERROR_UPDATING_CONFIGURATION');
 
+    if ( $result ) {
+       $c->stash( error => $result );
+       $c->stash( title => $title, dat_datas => \%dat_datas );
+       return $c->render('datetime');
+       #$c->flash( error => $result . '- f l a s h' );
+       #$c->redirect_to('/datetime');
+    }
+    $result = $c->l('dat_SUCCESS');
 
-    if ( $result eq '' ) { $result = $c->l('dat_SUCCESS'); }
-
-    $c->stash( title => $title, modul => $result );
-    $c->render(template => 'module');
+    my $message = "'Datetime' update DONE";
+    $c->app->log->info($message);
+    $c->flash( success => $result );
 
+    $c->redirect_to('/datetime');
 };
 
 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm       2020-05-30 20:48:16.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm   2020-06-28 18:55:52.827074656 +0400
@@ -166,7 +166,7 @@
        }
        
        if ( ! $result ) {
-           $result = $c->l('dom_CREATE_SUCCEEDED') . " $domain"; 
+           $result = $c->l('dom_SUCCESSFULLY_CREATED') . " $domain"; 
        }
     }
 
@@ -189,7 +189,7 @@
        }
 
        if ( ! $result ) { 
-               $result = $c->l('dom_MODIFY_SUCCEEDED') . " $domain"; 
+               $result = $c->l('dom_SUCCESSFULLY_MODIFIED') . " $domain"; 
        }
     }
 
@@ -234,7 +234,7 @@
            $result .= $res unless $res eq 'OK';
        }
        if ( ! $result ) { 
-           $result = $c->l('dom_REMOVE_SUCCEEDED') . " $domain"; 
+           $result = $c->l('dom_SUCCESSFULLY_DELETED') . " $domain"; 
        }
     }
 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm        2020-05-30 20:47:26.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm    2020-06-30 23:01:13.000000000 +0400
@@ -279,8 +279,9 @@
 
     my ( $c, $group ) = @_;
 
+    my @members = ();
     my $rec = $adb->get($group);
-    my @members = split ( /,/, $rec->prop('Members') );
+    @members = split ( /,/, $rec->prop('Members') ) if ( $rec );
 
     my %names;
     foreach my $m (@members) {
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-06-04 21:12:20.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm     2020-06-30 22:04:23.000000000 +0400
@@ -32,7 +32,6 @@
 
     my %iba_datas = ();
     my $title = $c->l('iba_FORM_TITLE');
-    my $modul = '';
 
     $iba_datas{'trt'} = 'LIST';
 
@@ -42,7 +41,7 @@
         @ibays = $adb->ibays();
     }
 
-    $c->stash( title => $title, modul => $modul, iba_datas => \%iba_datas, ibays => \@ibays );
+    $c->stash( title => $title, iba_datas => \%iba_datas, ibays => \@ibays );
     $c->render(template => 'ibays');
 
 };
@@ -143,13 +142,14 @@
     $iba_datas{'trt'} = $trt;
 
     my $result = '';
+    my $res;
 
     if ( $trt eq 'ADD' ) {
 
        my $name = ($c->param('ibay') || '');
 
        # controls
-       my $res = validate_ibay( $c, $name );
+       $res = validate_ibay( $c, $name );
        $result .= $res unless $res eq 'OK';
 
        if ( ! $result ) {
@@ -167,7 +167,7 @@
        my $name = ($c->param('ibay') || '');
 
        # controls
-       my $res = '';
+       $res = '';
 
        if ( ! $result ) {
            $res = modify_ibay( $c, $name ); 
@@ -190,11 +190,11 @@
             $result .= $c->l('iba_IBAY_PASSWD_VERIFY_ERROR') . ' - ';
        }
 
-       my $res = check_password( $c, $pass1 );
+       $res = check_password( $c, $pass1 );
        $result .= $res unless $res eq 'OK';
        
        if ( ! $result ) {
-           my $res = reset_password( $c, $ibay, $pass1 );
+           $res = reset_password( $c, $ibay, $pass1 );
            $result .= $res unless $res eq 'OK';
            if ( ! $result ) { 
                $result = $c->l('iba_SUCCESSFULLY_RESET_PASSWORD') . ' ' . $ibay; 
@@ -214,7 +214,7 @@
        }
 
        if ( ! $result ) {
-           my $res = remove_ibay( $c, $ibay );
+           $res = remove_ibay( $c, $ibay );
            $result .= $res unless $res eq 'OK';
            if ( ! $result ) { 
                $result = $c->l('iba_SUCCESSFULLY_DELETED_IBAY') . ' ' . $ibay; 
@@ -223,9 +223,19 @@
        }
     }
 
-    $c->stash( title => $title, modul => $result, iba_datas => \%iba_datas );
-    $c->render(template => 'module');
+    # common parts
+
+    if ($res ne 'OK') {
+       $c->stash( error => $result );
+       $c->stash( title => $title, iba_datas => \%iba_datas );
+       return $c->render('ibays');
+    }
+
+    my $message = "'Ibays' updates ($trt) DONE";
+    $c->app->log->info($message);
+    $c->flash( success => $result );
 
+    $c->redirect_to('/ibays');
 };
 
 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2020-05-30 20:47:10.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm     2020-06-28 18:50:36.433935049 +0400
@@ -106,7 +106,7 @@
        $result .= $res unless $res eq 'OK';
 
        if ( ! $result ) {
-           $result = $c->l('quo_SUCCESSFULLY_MODIFY') . ' ' . $acct; 
+           $result = $c->l('quo_SUCCESSFULLY_MODIFIED') . ' ' . $acct; 
        }
     }
 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm        2020-05-30 20:47:43.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm    2020-07-01 00:51:07.000000000 +0400
@@ -74,9 +74,9 @@
 sub rebootFunction_list {
 
     my $c = shift;
-    return [[ $c->l('SHUTDOWN') => 'shutdown' ],
-           [ $c->l('rbo_REBOOT') => 'reboot' ],
-           [ $c->l('RECONFIGURE') => 'reconfigure' ]];
+    return [[ $c->l('rbo_REBOOT') => 'reboot' ],
+           [ $c->l('RECONFIGURE') => 'reconfigure' ],
+           [ $c->l('SHUTDOWN') => 'shutdown' ]];
 }
 
 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex   2020-04-18 15:59:25.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex       2020-07-01 12:01:35.020031190 +0400
@@ -1,4 +1,4 @@
-manual_FORM_TITLE => 'Documentation et manuel en ligne (séparé)',
+manual_FORM_TITLE => 'Documentation et manuel en ligne',
 manual_DESCRIPTION => '
 <ul> <li><a target="new" href="https://wiki.koozali.org/documentation/manual/">Manuel en ligne</a> 
 <li><a target="new" href="https://wiki.koozali.org/documentation/FAQ/">Questions fréquemment posées (FAQs)</a>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/script/srvmngr smeserver-manager-0.1.0/root/usr/share/smanager/script/srvmngr
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/script/srvmngr  2020-06-04 23:03:32.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/script/srvmngr      2020-06-22 01:03:32.724205365 +0400
@@ -11,7 +11,7 @@
     $0 =~ /^(.+)$/ms; $0 = $1; # Untaint script name
     $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
     $ENV{'SHELL'} = '/bin/bash';
-    $ENV{'HOME'} = '/opt/smanager';
+    $ENV{'HOME'} = '/usr/share/smanager';
     delete $ENV{'ENV'};
     esmith::util::setRealToEffective();
 } 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/datetime.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/datetime.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/datetime.html.ep       2020-04-26 12:59:58.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/datetime.html.ep   2020-07-01 00:47:43.000000000 +0400
@@ -1,34 +1,30 @@
 % layout 'default', title => "Sme server 2 - datetime";
 
-% content_for 'end' => begin
-    <div id="end" class="sme-copyrightbar">
-       content_end
-    </div>
-% end
-
 % content_for 'module' => begin
 <div id="module">
 
-    %if ($config->{debug} == 1) {
+    % if ($config->{debug} == 1) {
        <p>
-       (DBG)route: <%= $c->current_route %><br>
-       (DBG)ntp: <%= $dat_datas->{ntpstatus}%><br>
-       (DBG)svr: <%= $dat_datas->{ntpserver}%><br>
+       %= dumper $c->current_route
+       %= dumper $dat_datas
        </p>
+    % }
+
+    % if ( stash 'error' ) {
+       <br><div class=sme-error>
+       %= $c->render_to_string(inline => stash 'error') 
+       </div>
     %}
 
-    <!--h1>< % =  l('dat_FORM_TITLE') % ></h1>
-    < %= l('dat_INITIAL_DESC') % -->
-    <h1><%= $title %></h1>
-    <br>
-    <%= $modul %>
+    <h1><%= $title %></h1><br>
+    %= $modul
     <% my $btn = l('SAVE'); %>
 
-    %= form_for 'datetime' => (method => 'POST') => begin
+    %= form_for '/datetime' => (method => 'POST') => begin
        <p>
+       %= hidden_field 'old_ntpstatus' => $dat_datas->{ntpstatus};
+
        % param 'ntpstatus' => $dat_datas->{ntpstatus} unless param 'ntpstatus';
-       % param 'old_ntpstatus' => $dat_datas->{ntpstatus} unless param 'ntpstatus';
-       %= hidden_field 'old_ntpstatus'
        %= radio_button ntpstatus => 'enabled'
        <span class=label>
        %=l 'dat_NTP_CONFIGURE_TITLE'
@@ -77,21 +73,21 @@
        <span class=label>
        %=l 'dat_NEW_M/D/Y'
        </span><span class=data2>
-       %= text_field 'month' =>  $dat_datas->{month}, class => 'input'
+       %= text_field 'month' =>  $dat_datas->{month}, size => '2', class => 'input'
        </span><span class=data2>
-       %= text_field 'day' =>  $dat_datas->{day}, class => 'input'
+       %= text_field 'day' =>  $dat_datas->{day}, size => '2', class => 'input'
        </span><span class=data2>
-       %= text_field 'year' =>  $dat_datas->{year}, class => 'input'
+       %= text_field 'year' =>  $dat_datas->{year}, size => '2', class => 'input'
        </span>
        <br>
        <span class=label>
        %=l 'dat_NEW_H/M/S'
        </span><span class=data2>
-       %= text_field 'hour' =>  $dat_datas->{hour}, class => 'input'
+       %= text_field 'hour' =>  $dat_datas->{hour}, size => '2', class => 'input'
        </span><span class=data2>
-       %= text_field 'minute' =>  $dat_datas->{minute}, class => 'input'
+       %= text_field 'minute' =>  $dat_datas->{minute}, size => '2', class => 'input'
        </span><span class=data2>
-       %= text_field 'second' =>  $dat_datas->{second}, class => 'input'
+       %= text_field 'second' =>  $dat_datas->{second}, size => '2', class => 'input'
        </span>
        <br>
        <span class=label>
@@ -107,6 +103,8 @@
        <br>
        %= submit_button "$btn", class => 'action'
        </p>
+
     % end    
+
 </div>
 %end
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/directory.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/directory.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/directory.html.ep      2020-04-26 12:59:18.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/directory.html.ep  2020-06-28 19:11:30.406526546 +0400
@@ -10,7 +10,7 @@
        </p>
     %}
     
-    <h3><%= $title %></h3>
+    <h1><%= $title %></h1>
     <br>
     <%= $modul %>
     <%         my $btn = l('SAVE');
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/ibays.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/ibays.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/ibays.html.ep  2020-04-26 21:26:44.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/ibays.html.ep      2020-06-30 22:13:01.000000000 +0400
@@ -9,10 +9,18 @@
        %= dumper $iba_datas
        </p>
     % }
-    
+
+    % if ( stash 'error' ) {
+       <br><div class=sme-error>
+       %= $c->render_to_string(inline => stash 'error') 
+       </div>
+    %}
+
     <h1><%= $title%></h1>
 
-    %= $c->render_to_string(inline => $modul );
+    % if ( stash 'modul' ) {
+       %= $c->render_to_string(inline => stash 'modul' );
+    % }
 
     % if ($iba_datas->{trt} eq 'ADD') {
        %= include 'partials/_iba_upd'
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep        2020-05-31 01:32:17.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep    2020-06-29 21:22:51.000000000 +0400
@@ -11,7 +11,8 @@
     %= stylesheet '/css/sme_main.css'
     %= stylesheet '/css/sme_menu.css'
     %= stylesheet '/css/styles.css'
-    %= include '/partials/_js_imports'
+    %= include 'partials/_js_imports'
+    %= include 'common_js'
 </head>
 
 <body>
@@ -28,6 +29,9 @@
     %= include 'partials/_info'
 
     <div id="container">
+
+       %= content 'js_toggleMenu'
+
        <div id="navigation" class="col-md-3">
            %= include 'partials/_nav_menu'
 %      if ( $c->is_logged_in ) {
@@ -55,7 +59,6 @@
        </div>
     </div>
 
-    %= include 'common_js'
     %= content 'js_swapClass'
 
 </body>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/manual.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/manual.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/manual.html.ep 2020-04-26 21:25:20.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/manual.html.ep     2020-06-28 18:37:57.612477533 +0400
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 <div id="central">
-    <p><h3> <%= $title %> </h3></p>
+    <p><h1> <%= $title %> </h1></p>
     <%= $modul %><br>
 </div>
 
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_grp_upd.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_grp_upd.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_grp_upd.html.ep      2020-04-26 21:20:38.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_grp_upd.html.ep  2020-06-30 21:45:02.547260949 +0400
@@ -5,7 +5,7 @@
     %= form_for '/groups2' => (method => 'POST') => begin
 
        <p><h2>
-       %=l 'MODIFY_GROUP'
+       %=l 'MODIFY_USER_GROUP'
        </h2><br></p>
 
        <p>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep      2020-04-15 21:43:35.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep  2020-06-30 21:42:47.205009045 +0400
@@ -71,7 +71,7 @@
        %=l 'iba_ALLOW_DYNAMIC_CONTENT'
        </span><span class=data>
        % param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin';
-       %= select_field 'CgiBin' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => 'input'
+       %= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
        <br>
        </span>
        </p>
@@ -81,7 +81,7 @@
        %=l 'iba_HTTPS_Only'
        </span><span class=data>
        % param 'SSL' => $iba_datas->{SSL} unless param 'SSL';
-       %= select_field 'SSL' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => 'input'
+       %= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
        <br>
        </span>
        </p>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep   2020-04-15 21:43:42.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep       2020-06-28 23:31:41.000000000 +0400
@@ -1,4 +1,22 @@
 
+% content_for 'js_toggleMenu' => begin
+  %= javascript begin
+
+    $(document).ready(function() {
+       $('#tognav').click(function() {
+           $('#menunav').toggle({ duration: 300 });
+       });
+       $('#toguser').click(function() {
+           $('#menuuser').toggle({ duration: 600 });
+       });
+       $('#togadm').click(function() {
+           $('#menuadm').toggle({ duration: 900 });
+       });
+    });
+
+  % end
+% end
+
 % content_for 'js_swapClass' => begin
   %= javascript begin
        (function($) {
@@ -29,6 +47,7 @@
        //      alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class'));
            }
        })
+
        });
   % end
 % end
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep       2020-06-06 19:17:01.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep   2020-06-28 23:05:33.000000000 +0400
@@ -2,7 +2,9 @@
 %      my %nav = %{SrvMngr->getNavigation( $c->languages(), 'A' )};
 
        <div id='navigat2'>
-       <p class='menu-title'>ADMINISTRATION</p>
+       <a href='#' id='togadm' class='menu-title'>ADMINISTRATION</a>
+       <div id='menuadm'>
+
 %    my $cc = 1;
 %    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
 %              <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
@@ -29,3 +31,4 @@
 %    }
 
     </div>
+    </div>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep     2020-06-06 19:17:52.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep 2020-06-28 22:55:15.000000000 +0400
@@ -2,7 +2,8 @@
 %      my %nav = %{SrvMngr->getNavigation( $c->languages(), 'N' )};
 
        <div id='navmenu'>
-       <p class='menu-title'>NAVIGATION</p>
+       <a href='#' id='tognav' class='menu-title'>NAVIGATION</a>
+       <div id='menunav'>
 %    my $cc = 1;
 %    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
 %              <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
@@ -28,3 +29,4 @@
 
 %    }
     </div>
+    </div>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep.svg smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep.svg
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep.svg  2020-04-18 15:58:09.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep.svg      1970-01-01 04:00:00.000000000 +0400
@@ -1,109 +0,0 @@
-<div id='pf_list'>
-    % my $btn = l('pf_CREATE_RULE');
-    %= form_for '/portforwardingadd' => (method => 'POST') => begin
-
-       % my $retref= $c->stash("ret");
-       % my %ret;
-       % unless (length($retref)) {%ret = (ret=>"");}
-       % else {%ret = %$retref;}
- 
-    % my $numtcpforwards = @$tcpforwards;
-       % my $numudpforwards = @$udpforwards;
-
-       % my @vars = split(",",$ret{vars});
-       % my $var1 = @vars[0];
-       % my $var2 = @vars[1];
-       % my $var3 = @vars[2];
-       % my $var4 = @vars[3];
-       % my $var5 = @vars[4];
-       % my $var6 = @vars[5];
-
-
-
-       %if ($ret{ret} eq "") {
-           %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
-       %} elsif (index($ret{ret},"SUCCESS") != -1) {
-          <div class='success'>
-              <h2> Operation Status Report</h2>
-                       %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-               </div>
-          %} else { 
-          <div class='sme-error'>
-              <h2> Operation Status Report - Error</h2>
-                       %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-       </div>
-       %}
-       <br><br>
-       %= submit_button "$btn", class => 'action2'
-       <br>
-
-    %  if ($empty){
-            <br>
-               %=l 'pf_NO_FORWARDS'
-    %  } else {
-        <br>
-               %=l 'pf_SHOW_FORWARDS'
-       <br>
-               <table class="sme-border"><tbody>
-               <tr>
-                               <th class='sme-border'>
-                               %=l 'pf_LABEL_PROTOCOL'
-                               </th>
-                               <th class='sme-border'>
-                               %=l 'pf_LABEL_SOURCE_PORT'
-                               </th>
-
-                               <th class='sme-border'>
-                               %=l 'pf_LABEL_DESTINATION_HOST'
-                               </th>
-
-                               <th class='sme-border'>
-                               %=l 'pf_LABEL_DESTINATION_PORT'
-                               </th>
-
-                               <th class='sme-border'>
-                               %=l 'pf_ALLOW_HOSTS'
-                               </th>
-
-
-                               <th class='sme-border'>
-                               %=l 'pf_RULE_COMMENT'
-                               </th>
-
-                               <th class='sme-border' '>
-                               %=l 'ACTION'
-                               </th>
-                       </tr>
-
-               % my %forwards = ();
-               % $forwards{TCP} = $tcpforwards;
-               % $forwards{UDP} = $udpforwards;
-
-        % foreach my $proto (sort keys %forwards) {
-
-        %    if (@{ $forwards{$proto} }) {
-        %        foreach my $entry (@{ $forwards{$proto} }) {
-                       <tr>
-        %           my $sport = $entry->key;
-        %           my $dhost = $entry->prop('DestHost');
-        %           my $dport = $entry->prop('DestPort') || '';
-        %           my $cmmnt  = $entry->prop('Comment') || '';
-        %           my $allow  = $entry->prop('AllowHosts') || '';
-               %=                      t td => (class => 'sme-border') => $proto
-               %=                      t td => (class => 'sme-border') => $sport
-               %=                      t td => (class => 'sme-border') => $dhost
-               %=                      t td => (class => 'sme-border') => $dport
-               %=                      t td => (class => 'sme-border') => $allow
-               %=                      t td => (class => 'sme-border') => $cmmnt
-                                               <td class='sme-border'>
-                                               <a href="/smanager/portforwardingdel?trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td>
-                       </tr>
-         %       }
-         %   }
-        %}
-               %= hidden_field 'trt' => $pf_datas->{trt}
-       %}
-       </tbody>
-       </table>
-    % end    
-</div>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep    2020-06-06 19:18:20.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep        2020-06-28 23:07:32.000000000 +0400
@@ -2,11 +2,13 @@
 %      my %nav = %{SrvMngr->getNavigation( $c->languages(), 'U' )};
 
        <div id='usermenu'>
-       <p class='menu-title'>Hello <%= session 'username' %></p>
+       <a href='#' id='toguser' class='menu-title'>
+       Hello <%= session 'username' %></a>
+       <div id='menuuser'>
 %    my $cc = 1;
 %    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
 %              <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
-       <!-- div class='section section-title'><%= $h %></div -->
+       <!-- div class='section'><%= $h %></div -->
 %      my ($classNew, $target, $href) = '';
 %      foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
 
@@ -28,3 +30,4 @@
 %    }
 
     </div>
+    </div>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/proxy.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/proxy.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/proxy.html.ep  2020-04-26 12:59:28.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/proxy.html.ep      2020-06-28 19:11:49.035298384 +0400
@@ -8,7 +8,7 @@
        (DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>
        </p>
     %}
-    <h3><%= $title %></h3>
+    <h1><%= $title %></h1>
     <br>
     <%= $modul %>
     <%         my $btn = l('SAVE'); %>
diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/review.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/review.html.ep
--- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/review.html.ep 2020-04-26 12:59:10.000000000 +0400
+++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/review.html.ep     2020-06-28 19:54:17.417844436 +0400
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 <div id="central">
-    <p><h3> <%= $title %> </h3></p>
+    <h1> <%= $title %> </h1>
     <%= $modul %><br><br>
 
     %= form_for 'review' => begin