/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.0-translation_themes.patch
ViewVC logotype

Contents of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.0-translation_themes.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Sat Nov 21 08:43:52 2020 UTC (3 years, 6 months ago) by michel
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
* Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
- Fix smanager-update event name
- Move smanager service to /usr/lib/systemd
- Fix Bugreport file download
- Fix translations missing in 'viewlogfiles'
- Remove Admin auth in httpd configuration
- Add an optional alias for admin sign in.
- Remove systemctl from .spec file
1 diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Swttheme.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Swttheme.pm
2 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Swttheme.pm 2020-04-14 16:50:36.000000000 +0400
3 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Swttheme.pm 2020-05-08 15:36:16.518000000 +0400
4 @@ -24,14 +24,6 @@
5 my $oldTheme = $c->session->{CurrentTheme};
6
7 if ( $theme ne $oldTheme ) {
8 -# $c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
9 -# $c->app->static->paths([$c->app->home->rel_file('themes/default/public')]);
10 -# if ( $theme ne 'default' ) {
11 -# # Put the new theme first
12 -# my $t_path = $c->app->home->rel_file('themes/'.$theme);
13 -# unshift @{$c->app->renderer->paths}, $t_path.'/templates' if -d $t_path.'/templates';
14 -# unshift @{$c->app->static->paths}, $t_path.'/public' if -d $t_path.'/public';
15 -# }
16 $c->session->{CurrentTheme} = $theme;
17
18 $db->get('manager2')->set_prop('Theme', $theme);
19 @@ -40,6 +32,8 @@
20 }
21
22 $from = '/initial' if $from eq '/';
23 + $from = '/' . $from if ( $from !~ m|^\/| );
24 +
25 $c->redirect_to( $from);
26
27 }
28 diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Useraccounts.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Useraccounts.pm
29 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Useraccounts.pm 2020-04-14 16:50:36.000000000 +0400
30 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Useraccounts.pm 2020-05-08 11:37:04.281000000 +0400
31 @@ -543,7 +543,7 @@
32 my ($c, $acctName) = @_;
33
34 unless ($adb->validate_account_name($acctName)) {
35 - return $c->l('usrACCT_NAME_HAS_INVALID_CHARS', $acctName);
36 + return $c->l('usr_ACCT_NAME_HAS_INVALID_CHARS', $acctName);
37 }
38 return "OK";
39 }
40 @@ -557,7 +557,7 @@
41 ? $cdb->get('maxAcctNameLength')->prop('type') : "") || 12;
42
43 if ( length $acctName > $maxAcctNameLength ) {
44 - return $c->l('usrACCOUNT_TOO_LONG', $maxAcctNameLength);
45 + return $c->l('usr_ACCOUNT_TOO_LONG', $maxAcctNameLength);
46 } else {
47 return ('OK');
48 }
49 @@ -578,7 +578,7 @@
50 } else {
51 return('OK');
52 }
53 - return $c->l('usrACCOUNT_CONFLICT', $acctName, $type);
54 + return $c->l('usr_ACCOUNT_CONFLICT', $acctName, $type);
55
56 }
57
58 diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm
59 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm 2020-04-25 13:19:29.000000000 +0400
60 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm 2020-05-08 11:29:29.737000000 +0400
61 @@ -280,39 +280,27 @@
62 my $c = shift;
63 my $lang = shift || '';
64
65 - #sub lg_sp {
66 - #app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir");
67 - #$c->languages( $lang ) if ( defined $lang );
68 - #$c->i18ns( $moduleLong );
69 - #return 0;
70 - #}
71 -
72 my $panel = $c->tx->req->url;
73 $panel = '/initial' if ($panel eq '');
74
75 - (my $module = $panel) =~ s|/||;
76 + (my $module = $panel) =~ s|\?.*$||;
77 $module = ucfirst($module);
78
79 my $moduleLong = "SrvMngr::I18N::Modules::$module";
80 (my $dir = $moduleLong) =~ s|::|/|g;
81 my $I18Ndir = app->home->rel_file('lib/') . '/' . $dir;
82
83 - app->log->info("$module $moduleLong $I18Ndir");
84 +# app->log->info("$panel $module $moduleLong $I18Ndir");
85 + if ( ! -d $I18Ndir ) {
86 + ( $moduleLong = $moduleLong) =~ s/.$//;
87 + ( $I18Ndir = $I18Ndir) =~ s/.$//;
88 + }
89 if ( -d $I18Ndir ) {
90 - app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir");
91 - $c->languages( $lang ) if ( defined $lang );
92 +# app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir");
93 + $c->languages( $lang ) if ( defined $lang );
94 $c->i18ns( $moduleLong );
95 - #lg_sp();
96 } else {
97 - ( $moduleLong = $moduleLong) =~ s/.$//;
98 - ( $I18Ndir = $I18Ndir) =~ s/.$//;
99 - if ( -d $I18Ndir ) {
100 - app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir");
101 - $c->languages( $lang ) if ( defined $lang );
102 - $c->i18ns( $moduleLong );
103 - } else {
104 - warn "Locale lexicon missing for $module \n";
105 - }
106 + warn "Locale lexicon missing for $module \n";
107 }
108 };
109
110 diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl
111 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-04-27 10:47:14.000000000 +0400
112 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-05-08 11:26:09.081000000 +0400
113 @@ -153,6 +153,8 @@
114
115 $r->get('/support')->to('support#main')->name('support');
116
117 +$r->post('/swttheme')->to('swttheme#main')->name('swtheme');
118 +
119 $r->get('/useraccounts')->to('useraccounts#main')->name('useraccounts');
120 $r->post('/useraccounts')->to('useraccounts#do_display')->name('useraccountadd');
121 $r->get('/useraccountd')->to('useraccounts#do_display')->name('useraccountdis');
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed