| 1 |
brianr |
1.1 |
diff -urN smeserver-manager-0.1.4.old/root/etc/e-smith/templates/etc/rsyslog.conf/32smanager smeserver-manager-0.1.4/root/etc/e-smith/templates/etc/rsyslog.conf/32smanager |
| 2 |
|
|
--- smeserver-manager-0.1.4.old/root/etc/e-smith/templates/etc/rsyslog.conf/32smanager 1970-01-01 01:00:00.000000000 +0100 |
| 3 |
|
|
+++ smeserver-manager-0.1.4/root/etc/e-smith/templates/etc/rsyslog.conf/32smanager 2024-05-01 06:15:24.800916581 +0100 |
| 4 |
|
|
@@ -0,0 +1,4 @@ |
| 5 |
|
|
+#smanager |
| 6 |
|
|
+:programname, isequal, "smanager" /var/log/smanager/smanager.log |
| 7 |
|
|
+& stop |
| 8 |
|
|
+ |
| 9 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/etc/logrotate.d/smanager smeserver-manager-0.1.4/root/etc/logrotate.d/smanager |
| 10 |
|
|
--- smeserver-manager-0.1.4.old/root/etc/logrotate.d/smanager 2020-11-19 07:53:26.000000000 +0000 |
| 11 |
|
|
+++ smeserver-manager-0.1.4/root/etc/logrotate.d/smanager 2024-05-01 06:15:24.800916581 +0100 |
| 12 |
|
|
@@ -1,4 +1,6 @@ |
| 13 |
|
|
-/usr/share/smanager/log/production.log { |
| 14 |
|
|
+/var/log/smanager/smanager.log { |
| 15 |
|
|
+ su root root |
| 16 |
|
|
+ create 600 root root |
| 17 |
|
|
weekly |
| 18 |
|
|
copytruncate |
| 19 |
|
|
rotate 12 |
| 20 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/lib/systemd/system/smanager.service smeserver-manager-0.1.4/root/usr/lib/systemd/system/smanager.service |
| 21 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/lib/systemd/system/smanager.service 2024-06-29 13:13:35.495126742 +0100 |
| 22 |
|
|
+++ smeserver-manager-0.1.4/root/usr/lib/systemd/system/smanager.service 2024-05-01 06:15:24.800916581 +0100 |
| 23 |
|
|
@@ -7,7 +7,7 @@ |
| 24 |
|
|
Type=simple |
| 25 |
|
|
SyslogIdentifier=smanager |
| 26 |
|
|
WorkingDirectory=/usr/share/smanager/script |
| 27 |
|
|
-PIDFile=/var/run/smanager.pid |
| 28 |
|
|
+PIDFile=/run/smanager.pid |
| 29 |
|
|
ExecStartPre=/sbin/e-smith/service-status smanager |
| 30 |
|
|
ExecStart=/usr/bin/hypnotoad srvmngr -f |
| 31 |
|
|
ExecStop=/usr/bin/hypnotoad -s srvmngr |
| 32 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm |
| 33 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-06-29 13:13:35.597129774 +0100 |
| 34 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-04-30 12:35:00.000000000 +0100 |
| 35 |
|
|
@@ -37,6 +37,8 @@ |
| 36 |
|
|
use esmith::util; |
| 37 |
|
|
use esmith::lockfile; |
| 38 |
|
|
|
| 39 |
|
|
+use esmith::BlockDevices; |
| 40 |
|
|
+ |
| 41 |
|
|
use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0; |
| 42 |
|
|
|
| 43 |
|
|
our $cdb = esmith::ConfigDB->open || die "Couldn't open config db"; |
| 44 |
|
|
@@ -1576,19 +1578,33 @@ |
| 45 |
|
|
my @usbdisks = (); |
| 46 |
|
|
|
| 47 |
|
|
if ( $VFSType eq 'usb' ) { |
| 48 |
|
|
- foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) { |
| 49 |
|
|
- $udi =~ m/^(\S+)/; |
| 50 |
|
|
- |
| 51 |
|
|
- my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted); |
| 52 |
|
|
+ my $devices = esmith::BlockDevices->new ('allowmount' => 'disabled'); |
| 53 |
|
|
+ my ($valid, $invalid) = $devices->checkBackupDrives(0); |
| 54 |
|
|
|
| 55 |
|
|
- if ($is_mounted eq "false\n") { |
| 56 |
|
|
- my $vollbl = qx(hal-get-property --udi $1 --key volume.label); |
| 57 |
|
|
- $vollbl =~ m/^(\S+)/; |
| 58 |
|
|
- if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';} |
| 59 |
|
|
- chomp $vollbl; |
| 60 |
|
|
- push @usbdisks, $vollbl; |
| 61 |
|
|
+ if ( ${$valid}[0] ) { |
| 62 |
|
|
+ foreach ( @{$valid} ) { |
| 63 |
|
|
+ push @usbdisks, $devices->label($_); |
| 64 |
|
|
} |
| 65 |
|
|
} |
| 66 |
|
|
+ |
| 67 |
|
|
+ if (!$usbdisks[0]){ |
| 68 |
|
|
+ push (@usbdisks,$c->l('bac_No suitable local devices found')); |
| 69 |
|
|
+ } |
| 70 |
|
|
+ $devices->destroy; |
| 71 |
|
|
+ |
| 72 |
|
|
+ #foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) { |
| 73 |
|
|
+ #$udi =~ m/^(\S+)/; |
| 74 |
|
|
+ |
| 75 |
|
|
+ #my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted); |
| 76 |
|
|
+ |
| 77 |
|
|
+ #if ($is_mounted eq "false\n") { |
| 78 |
|
|
+ #my $vollbl = qx(hal-get-property --udi $1 --key volume.label); |
| 79 |
|
|
+ #$vollbl =~ m/^(\S+)/; |
| 80 |
|
|
+ #if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';} |
| 81 |
|
|
+ #chomp $vollbl; |
| 82 |
|
|
+ #push @usbdisks, $vollbl; |
| 83 |
|
|
+ #} |
| 84 |
|
|
+ #} |
| 85 |
|
|
# return undef unless ($usbdisks[0]); |
| 86 |
|
|
} |
| 87 |
|
|
|
| 88 |
|
|
@@ -1985,31 +2001,50 @@ |
| 89 |
|
|
return ( qx(/bin/mount -t nfs -o nolock "$host:/$share" $mountdir 2>&1) ); |
| 90 |
|
|
} |
| 91 |
|
|
elsif ($VFSType eq 'usb') { |
| 92 |
|
|
- my $device = ""; |
| 93 |
|
|
- my $blkdev = ""; |
| 94 |
|
|
+ my $device = ""; |
| 95 |
|
|
my $vollbl = ""; |
| 96 |
|
|
- foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) { |
| 97 |
|
|
- $udi =~ m/^(\S+)/; |
| 98 |
|
|
- my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted); |
| 99 |
|
|
- |
| 100 |
|
|
- if ($is_mounted eq "false\n") { |
| 101 |
|
|
- $blkdev = qx(hal-get-property --udi $1 --key block.device); |
| 102 |
|
|
- if ($blkdev =~ m/^(\S+)/) {$blkdev = $1;} |
| 103 |
|
|
- } |
| 104 |
|
|
- if ($is_mounted eq "false\n") { |
| 105 |
|
|
- $vollbl = qx(hal-get-property --udi $1 --key volume.label); |
| 106 |
|
|
- $vollbl =~ m/^(\S+)/; |
| 107 |
|
|
- if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';} |
| 108 |
|
|
- } |
| 109 |
|
|
- |
| 110 |
|
|
- chomp $vollbl; |
| 111 |
|
|
- chomp $blkdev; |
| 112 |
|
|
- $vollbl = "media/$vollbl"; |
| 113 |
|
|
- if ($vollbl eq $share) { |
| 114 |
|
|
- $device = $blkdev; |
| 115 |
|
|
- } |
| 116 |
|
|
+ |
| 117 |
|
|
+ my $devices = esmith::BlockDevices->new ('allowmount' => 'disabled'); |
| 118 |
|
|
+ my ($valid, $invalid) = $devices->checkBackupDrives(0); |
| 119 |
|
|
+ |
| 120 |
|
|
+ if ( ${$valid}[0] ) { |
| 121 |
|
|
+ foreach ( @{$valid} ) { |
| 122 |
|
|
+ $vollbl = $devices->label($_); |
| 123 |
|
|
+ if ( $share eq "media/$vollbl" ) { |
| 124 |
|
|
+ $device = "/dev/$_"; |
| 125 |
|
|
+ } |
| 126 |
|
|
+ } |
| 127 |
|
|
} |
| 128 |
|
|
- return ( qx(/bin/mount $device "/$share" 2>&1) ); |
| 129 |
|
|
+ $devices->destroy; |
| 130 |
|
|
+ return ( qx (mount $device /$share 2>&1) ); |
| 131 |
|
|
+ |
| 132 |
|
|
+#------------------------------------------------------------------------------------------------------- |
| 133 |
|
|
+ #my $device = ""; |
| 134 |
|
|
+ #my $blkdev = ""; |
| 135 |
|
|
+ #my $vollbl = ""; |
| 136 |
|
|
+ #foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) { |
| 137 |
|
|
+ #$udi =~ m/^(\S+)/; |
| 138 |
|
|
+ #my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted); |
| 139 |
|
|
+ |
| 140 |
|
|
+ #if ($is_mounted eq "false\n") { |
| 141 |
|
|
+ #$blkdev = qx(hal-get-property --udi $1 --key block.device); |
| 142 |
|
|
+ #if ($blkdev =~ m/^(\S+)/) {$blkdev = $1;} |
| 143 |
|
|
+ #} |
| 144 |
|
|
+ #if ($is_mounted eq "false\n") { |
| 145 |
|
|
+ #$vollbl = qx(hal-get-property --udi $1 --key volume.label); |
| 146 |
|
|
+ #$vollbl =~ m/^(\S+)/; |
| 147 |
|
|
+ #if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';} |
| 148 |
|
|
+ #} |
| 149 |
|
|
+ |
| 150 |
|
|
+ #chomp $vollbl; |
| 151 |
|
|
+ #chomp $blkdev; |
| 152 |
|
|
+ #$vollbl = "media/$vollbl"; |
| 153 |
|
|
+ #if ($vollbl eq $share) { |
| 154 |
|
|
+ #$device = $blkdev; |
| 155 |
|
|
+ #} |
| 156 |
|
|
+ #} |
| 157 |
|
|
+ #return ( qx(/bin/mount $device "/$share" 2>&1) ); |
| 158 |
|
|
+#------------------------------------------------------------------------------------------------------- |
| 159 |
|
|
} else { |
| 160 |
|
|
return ("Error while mounting $host/$share : $VFSType not supported.\n"); |
| 161 |
|
|
} |
| 162 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm |
| 163 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm 2024-06-29 13:13:35.664131766 +0100 |
| 164 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm 2024-04-23 09:04:00.000000000 +0100 |
| 165 |
|
|
@@ -1,6 +1,11 @@ |
| 166 |
|
|
package SrvMngr::Controller::Legacypanel; |
| 167 |
|
|
|
| 168 |
|
|
#---------------------------------------------------------------------- |
| 169 |
|
|
+# heading : Legacy |
| 170 |
|
|
+# description : Legacy panel |
| 171 |
|
|
+# navigation : 99999 9999 |
| 172 |
|
|
+#---------------------------------------------------------------------- |
| 173 |
|
|
+#---------------------------------------------------------------------- |
| 174 |
|
|
# name : legacypanel, method : get, url : /legacypanel, ctlact : Legacypanel#main |
| 175 |
|
|
# |
| 176 |
|
|
# routes : end |
| 177 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_en.lex smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_en.lex |
| 178 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_en.lex 2021-06-21 10:25:10.000000000 +0100 |
| 179 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_en.lex 2024-04-30 12:41:00.000000000 +0100 |
| 180 |
|
|
@@ -1,3 +1,4 @@ |
| 181 |
|
|
+'bac_No suitable local devices found' => 'No suitable local devices found', |
| 182 |
|
|
'bac_BACKUP_TITLE' => 'Backup or restore server data', |
| 183 |
|
|
'bac_BACKUP_DESC' => '<P>The server provides two ways to back up and restore |
| 184 |
|
|
your server: using your local desktop or a tape drive.</P> |
| 185 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm |
| 186 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm 2024-06-29 13:13:35.665131795 +0100 |
| 187 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm 2024-05-09 10:04:17.227378431 +0100 |
| 188 |
|
|
@@ -535,7 +535,7 @@ |
| 189 |
|
|
# Determine the directory where the functions are kept |
| 190 |
|
|
#----------------------------------------------------- |
| 191 |
|
|
my $navigation_ctlr_ignore = |
| 192 |
|
|
- "(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm(-.*)?)"; |
| 193 |
|
|
+ "(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)"; |
| 194 |
|
|
# "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)"; |
| 195 |
|
|
my $navigation_cgi_ignore = |
| 196 |
|
|
"(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)"; |
| 197 |
|
|
@@ -624,7 +624,7 @@ |
| 198 |
|
|
{ |
| 199 |
|
|
$heading = $rec->prop('Heading'); |
| 200 |
|
|
$description = $rec->prop('Description'); |
| 201 |
|
|
- $headingWeight = $rec->prop('HeadingWeight'); |
| 202 |
|
|
+ $headingWeight = $rec->prop('HeadingWeight') || 99999; #Stop noise in logs if file in dir does not have nav header. |
| 203 |
|
|
$descriptionWeight = $rec->prop('DescriptionWeight'); |
| 204 |
|
|
$urlpath = $rec->prop('UrlPath') || ''; |
| 205 |
|
|
$menucat = $rec->prop('MenuCat') || 'A'; # admin menu (default) |
| 206 |
|
|
Binary files smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png and smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png differ |
| 207 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep |
| 208 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-06-29 13:13:35.673132033 +0100 |
| 209 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-04-29 08:56:00.000000000 +0100 |
| 210 |
|
|
@@ -19,16 +19,18 @@ |
| 211 |
|
|
%= content_for 'refresh' |
| 212 |
|
|
|
| 213 |
|
|
%= stylesheet '/js/datatables.min.css' |
| 214 |
|
|
+ |
| 215 |
|
|
%= javascript '/js/datatables.min.js' |
| 216 |
|
|
+ |
| 217 |
|
|
%= stylesheet '/js/jquery-ui.min.css' |
| 218 |
|
|
+ |
| 219 |
|
|
%= javascript '/js/jquery-ui.min.js' |
| 220 |
|
|
- |
| 221 |
|
|
- %= stylesheet '/js/dataTables.buttons.min.js' |
| 222 |
|
|
- %= stylesheet '/js/jszip.min.js' |
| 223 |
|
|
- %= stylesheet '/js/pdfmake.min.js' |
| 224 |
|
|
- %= stylesheet '/js/vfs_fonts.js' |
| 225 |
|
|
- %= stylesheet '/js/buttons.html5.min.js' |
| 226 |
|
|
- %= stylesheet '/js/buttons.print.min.js' |
| 227 |
|
|
+ %= javascript '/js/dataTables.buttons.min.js' |
| 228 |
|
|
+ %= javascript '/js/jszip.min.js' |
| 229 |
|
|
+ %= javascript '/js/pdfmake.min.js' |
| 230 |
|
|
+ %= javascript '/js/vfs_fonts.js' |
| 231 |
|
|
+ %= javascript '/js/buttons.html5.min.js' |
| 232 |
|
|
+ %= javascript '/js/buttons.print.min.js' |
| 233 |
|
|
|
| 234 |
|
|
%= stylesheet '/css/sme-jquery-overrides.css' |
| 235 |
|
|
|
| 236 |
|
|
@@ -90,47 +92,6 @@ |
| 237 |
|
|
% } |
| 238 |
|
|
|
| 239 |
|
|
%= javascript '/js/sme-dataTable-setup.js' |
| 240 |
|
|
- |
| 241 |
|
|
-%= javascript begin |
| 242 |
|
|
-//Set menu to initial condition based on localStorage |
| 243 |
|
|
-$(document).ready(function() { |
| 244 |
|
|
- let menunavflag = window.localStorage.getItem('menunav'); |
| 245 |
|
|
- if (menunavflag != "false"){ |
| 246 |
|
|
- $('#menunav').toggle(true); |
| 247 |
|
|
- } else { |
| 248 |
|
|
- $('#menunav').toggle(false); |
| 249 |
|
|
- } |
| 250 |
|
|
- |
| 251 |
|
|
- let menuadmflag = window.localStorage.getItem('menuadm'); |
| 252 |
|
|
- if (menuadmflag != "false"){ |
| 253 |
|
|
- $('#menuadm').toggle(true); |
| 254 |
|
|
- } else { |
| 255 |
|
|
- $('#menuadm').toggle(false); |
| 256 |
|
|
- } |
| 257 |
|
|
- |
| 258 |
|
|
- let menuuserflag = window.localStorage.getItem('menuuser'); |
| 259 |
|
|
- if (menuuserflag != "false"){ |
| 260 |
|
|
- $('#menuuser').toggle(true); |
| 261 |
|
|
- } else { |
| 262 |
|
|
- $('#menuuser').toggle(false); |
| 263 |
|
|
- } |
| 264 |
|
|
- |
| 265 |
|
|
- var sections = document.getElementsByClassName("section-title"); |
| 266 |
|
|
- for (var i = 0, len = sections.length; i < len; i++) { |
| 267 |
|
|
- var jqObj = $(sections[i]); |
| 268 |
|
|
- var $section = jqObj.parent().next('div'); |
| 269 |
|
|
- if(!$section.length){ |
| 270 |
|
|
- return false; |
| 271 |
|
|
- } |
| 272 |
|
|
- let localStorageTag = "admSection-"+sections[i].innerHTML; |
| 273 |
|
|
- if (window.localStorage.getItem(localStorageTag) != "false"){ |
| 274 |
|
|
- $section.toggle(true); |
| 275 |
|
|
- } else { |
| 276 |
|
|
- $section.toggle(false); |
| 277 |
|
|
- } |
| 278 |
|
|
- } |
| 279 |
|
|
-}) |
| 280 |
|
|
-%end |
| 281 |
|
|
|
| 282 |
|
|
</body> |
| 283 |
|
|
</html> |
| 284 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep |
| 285 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2024-06-29 13:13:35.646131231 +0100 |
| 286 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2024-05-09 11:55:00.000000000 +0100 |
| 287 |
|
|
@@ -1,5 +1,6 @@ |
| 288 |
|
|
-<div id="footer"> |
| 289 |
|
|
+<div id="footer" width=100%> |
| 290 |
|
|
<HR class="sme-copyrightbar"> |
| 291 |
|
|
+<a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a> |
| 292 |
|
|
<font class="sme-copyright"> |
| 293 |
|
|
% if ( $c->is_logged_in ) { |
| 294 |
|
|
SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %> |
| 295 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep |
| 296 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-06-29 13:13:35.569128941 +0100 |
| 297 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-04-28 10:11:00.000000000 +0100 |
| 298 |
|
|
@@ -9,6 +9,7 @@ |
| 299 |
|
|
<br> |
| 300 |
|
|
%= submit_button "$btn", class => 'action' |
| 301 |
|
|
</p> |
| 302 |
|
|
+ %= hidden_field 'trt' => 'ADD'; |
| 303 |
|
|
|
| 304 |
|
|
% end |
| 305 |
|
|
|
| 306 |
|
|
@@ -71,9 +72,7 @@ |
| 307 |
|
|
% } |
| 308 |
|
|
</tbody> |
| 309 |
|
|
</table> |
| 310 |
|
|
- |
| 311 |
|
|
<%} %> |
| 312 |
|
|
|
| 313 |
|
|
- %= hidden_field 'trt' => $iba_datas->{trt} |
| 314 |
|
|
|
| 315 |
|
|
</div> |
| 316 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep |
| 317 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep 2020-11-19 07:53:26.000000000 +0000 |
| 318 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep 2024-05-09 13:59:00.000000000 +0100 |
| 319 |
|
|
@@ -60,9 +60,10 @@ |
| 320 |
|
|
<span class=data> |
| 321 |
|
|
%=text_field 'networkRouter' |
| 322 |
|
|
</span><br><br> |
| 323 |
|
|
- <div class='center'> |
| 324 |
|
|
- %= submit_button "$btn", class => 'action' |
| 325 |
|
|
- </div> |
| 326 |
|
|
+ <p> |
| 327 |
|
|
+ <br> |
| 328 |
|
|
+ %= submit_button "$btn", class => 'action' |
| 329 |
|
|
+ </p> |
| 330 |
|
|
%end |
| 331 |
|
|
|
| 332 |
|
|
</div> |
| 333 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep |
| 334 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep 2020-11-19 07:53:26.000000000 +0000 |
| 335 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep 2024-05-09 13:58:00.000000000 +0100 |
| 336 |
|
|
@@ -49,9 +49,11 @@ |
| 337 |
|
|
</span><br><br> |
| 338 |
|
|
%} |
| 339 |
|
|
%= hidden_field localnetwork=>$localnetwork |
| 340 |
|
|
- <div class='center'> |
| 341 |
|
|
- %= submit_button "$btn", class => 'action' |
| 342 |
|
|
- </div> |
| 343 |
|
|
+ <p> |
| 344 |
|
|
+ <br> |
| 345 |
|
|
+ %= submit_button "$btn", class => 'action' |
| 346 |
|
|
+ </p> |
| 347 |
|
|
+ |
| 348 |
|
|
%end |
| 349 |
|
|
|
| 350 |
|
|
</div> |
| 351 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep |
| 352 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-06-29 13:13:35.570128971 +0100 |
| 353 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-05-09 13:51:00.000000000 +0100 |
| 354 |
|
|
@@ -37,10 +37,12 @@ |
| 355 |
|
|
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); |
| 356 |
|
|
</div> |
| 357 |
|
|
%} |
| 358 |
|
|
- <br><br> |
| 359 |
|
|
- <div class='center'> |
| 360 |
|
|
+ |
| 361 |
|
|
+ <p> |
| 362 |
|
|
+ <br> |
| 363 |
|
|
%= submit_button "$btn", class => 'action' |
| 364 |
|
|
- </div> |
| 365 |
|
|
+ </p> |
| 366 |
|
|
+ |
| 367 |
|
|
% end |
| 368 |
|
|
|
| 369 |
|
|
<br> |
| 370 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep |
| 371 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep 2020-11-19 07:53:26.000000000 +0000 |
| 372 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep 2024-05-09 14:05:00.000000000 +0100 |
| 373 |
|
|
@@ -77,9 +77,11 @@ |
| 374 |
|
|
<span class=data> |
| 375 |
|
|
%=text_field 'cmmnt' |
| 376 |
|
|
</span><br><br> |
| 377 |
|
|
- <div class='center'> |
| 378 |
|
|
- %= submit_button "$btn", class => 'action' |
| 379 |
|
|
- </div> |
| 380 |
|
|
+ <p> |
| 381 |
|
|
+ <br> |
| 382 |
|
|
+ %= submit_button "$btn", class => 'action' |
| 383 |
|
|
+ </p> |
| 384 |
|
|
+ |
| 385 |
|
|
%end |
| 386 |
|
|
|
| 387 |
|
|
</div> |
| 388 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep |
| 389 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep 2020-11-19 07:53:26.000000000 +0000 |
| 390 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep 2024-05-09 14:03:00.000000000 +0100 |
| 391 |
|
|
@@ -57,9 +57,10 @@ |
| 392 |
|
|
%#} |
| 393 |
|
|
%= hidden_field sport=>$sport |
| 394 |
|
|
%= hidden_field proto=>$proto |
| 395 |
|
|
- <div class='center'> |
| 396 |
|
|
- %= submit_button "$btn", class => 'action' |
| 397 |
|
|
- </div> |
| 398 |
|
|
+ <br> |
| 399 |
|
|
+ %= submit_button "$btn", class => 'action' |
| 400 |
|
|
+ </p> |
| 401 |
|
|
+ |
| 402 |
|
|
%end |
| 403 |
|
|
|
| 404 |
|
|
</div> |
| 405 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep |
| 406 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-06-29 13:13:35.570128971 +0100 |
| 407 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-05-09 14:07:00.000000000 +0100 |
| 408 |
|
|
@@ -18,8 +18,6 @@ |
| 409 |
|
|
% my $var5 = @vars[4]; |
| 410 |
|
|
% my $var6 = @vars[5]; |
| 411 |
|
|
|
| 412 |
|
|
- |
| 413 |
|
|
- |
| 414 |
|
|
%if ($ret{ret} eq "") { |
| 415 |
|
|
%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); |
| 416 |
|
|
%} elsif (index($ret{ret},"SUCCESS") != -1) { |
| 417 |
|
|
@@ -33,21 +31,22 @@ |
| 418 |
|
|
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); |
| 419 |
|
|
</div> |
| 420 |
|
|
%} |
| 421 |
|
|
- <br><br> |
| 422 |
|
|
- <div class='center'> |
| 423 |
|
|
+ |
| 424 |
|
|
+ <p> |
| 425 |
|
|
+ <br> |
| 426 |
|
|
%= submit_button "$btn", class => 'action' |
| 427 |
|
|
- </div> |
| 428 |
|
|
+ </p> |
| 429 |
|
|
+ |
| 430 |
|
|
+ |
| 431 |
|
|
% end |
| 432 |
|
|
|
| 433 |
|
|
- <br> |
| 434 |
|
|
- |
| 435 |
|
|
% if ($empty){ |
| 436 |
|
|
<br> |
| 437 |
|
|
%=l 'pf_NO_FORWARDS' |
| 438 |
|
|
% } else { |
| 439 |
|
|
<br> |
| 440 |
|
|
%=l 'pf_SHOW_FORWARDS' |
| 441 |
|
|
- <br> |
| 442 |
|
|
+ <br><br /> |
| 443 |
|
|
<table class="sme-border TableSort"><thead> |
| 444 |
|
|
<tr> |
| 445 |
|
|
<th class='sme-border'> |
| 446 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep |
| 447 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-06-29 13:13:35.538128021 +0100 |
| 448 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-05-09 13:48:00.000000000 +0100 |
| 449 |
|
|
@@ -213,10 +213,10 @@ |
| 450 |
|
|
</p> |
| 451 |
|
|
%} |
| 452 |
|
|
|
| 453 |
|
|
- |
| 454 |
|
|
- <div class='center'> |
| 455 |
|
|
+ <p> |
| 456 |
|
|
+ <br> |
| 457 |
|
|
%= submit_button "$btn", class => 'action' |
| 458 |
|
|
- </div> |
| 459 |
|
|
+ </p> |
| 460 |
|
|
|
| 461 |
|
|
% end |
| 462 |
|
|
|
| 463 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/userpassword.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/userpassword.html.ep |
| 464 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/userpassword.html.ep 2024-06-29 13:13:35.484126415 +0100 |
| 465 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/userpassword.html.ep 2024-05-09 13:54:00.000000000 +0100 |
| 466 |
|
|
@@ -66,9 +66,10 @@ |
| 467 |
|
|
</span> |
| 468 |
|
|
<br><br></p> |
| 469 |
|
|
|
| 470 |
|
|
- <div class='center'> |
| 471 |
|
|
- %= submit_button "$btn", class => 'action' |
| 472 |
|
|
- </div> |
| 473 |
|
|
+ <p> |
| 474 |
|
|
+ <br> |
| 475 |
|
|
+ %= submit_button "$btn", class => 'action' |
| 476 |
|
|
+ </p> |
| 477 |
|
|
|
| 478 |
|
|
% end |
| 479 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
