/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Update-format-for-datetime-and-reboot.patch
ViewVC logotype

Contents of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Update-format-for-datetime-and-reboot.patch

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

Revision 1.1 - (show annotations) (download)
Wed Jan 5 16:16:07 2022 UTC (2 years, 4 months ago) by brianr
Branch: MAIN
CVS Tags: smeserver-manager-0_1_4-31_el7_sme, smeserver-manager-0_1_4-27_el7_sme, smeserver-manager-0_1_4-24_el7_sme, smeserver-manager-0_1_4-29_el7_sme, smeserver-manager-0_1_4-23_el7_sme, smeserver-manager-0_1_4-33_el7_sme, smeserver-manager-0_1_4-25_el7_sme, smeserver-manager-0_1_4-17_el7_sme, smeserver-manager-0_1_4-13_el7_sme, smeserver-manager-0_1_4-19_el7_sme, smeserver-manager-0_1_4-18_el7_sme, smeserver-manager-0_1_4-26_el7_sme, smeserver-manager-0_1_4-28_el7_sme, smeserver-manager-0_1_4-21_el7_sme, smeserver-manager-0_1_4-16_el7_sme, smeserver-manager-0_1_4-15_el7_sme, smeserver-manager-0_1_4-32_el7_sme, smeserver-manager-0_1_4-20_el7_sme, smeserver-manager-0_1_4-14_el7_sme, smeserver-manager-0_1_4-22_el7_sme, HEAD 
* Wed Jan 05 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-13.sme
- Update-format-for-datetime-and-reboot [SME: 11830]
1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/datetime.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/datetime.html.ep
2 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/datetime.html.ep 2022-01-05 15:52:46.048500428 +0000
3 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/datetime.html.ep 2022-01-04 15:05:00.000000000 +0000
4 @@ -11,7 +11,7 @@
5 % }
6
7 % if ( stash 'error' ) {
8 - <br><div class=sme-error>
9 + <br><div class=sme-error>
10 %= $c->render_to_string(inline => stash 'error')
11 </div>
12 %}
13 @@ -31,81 +31,87 @@
14 </span>
15 <br>
16 % if ($dat_datas->{ntpstatus} eq 'disabled') {
17 -
18 - %=l 'dat_NTP_ENABLE_DESC'
19 - <br>
20 - </p>
21 + <div class='datetime-set-ntp'>
22 + %=l 'dat_NTP_ENABLE_DESC'
23 + <br>
24 + </div>
25 % } else {
26 - %=l 'dat_NTP_CONFIGURE_DESC'
27 - <br><br>
28 - %=l 'dat_CURRENT_SETTING'
29 - <span class=data>
30 - %= $dat_datas->{now_string}
31 - </span>
32 - <br>
33 - <span class=label>
34 - %=l 'dat_NTP_SERVER'
35 - </span><span class=data2>
36 - %= text_field 'Ntpserver' => $dat_datas->{ntpserver}, class => 'input'
37 - </span>
38 - </p>
39 - % }
40 - <p>
41 + <div class='datetime-set-ntp'>
42 + %=l 'dat_NTP_CONFIGURE_DESC'
43 + <br><br>
44 + <p>
45 + %=l 'dat_CURRENT_SETTING'
46 + <b>
47 + %= $dat_datas->{now_string}
48 + </b>
49 + </p>
50 + <br>
51 + <span class=label>
52 + %=l 'dat_NTP_SERVER'
53 + </span><span class=data2>
54 + %= text_field 'Ntpserver' => $dat_datas->{ntpserver}, class => 'input'
55 + </span>
56 + </p>
57 + </div>
58 + % }
59 %= radio_button Ntpstatus => 'disabled'
60 - <span class=label>
61 + <span class=label datetime-set-ntp>
62 %=l 'dat_NTP_DISABLE_TITLE'
63 </span>
64
65 % if ($dat_datas->{ntpstatus} eq 'enabled') {
66
67 <br><BR>
68 - %=l 'dat_NTP_DISABLE_DESC'
69 - </p>
70 - % } else {
71 - <br>
72 - </p>
73 - <p>
74 - %=l 'dat_CURRENT_SETTING'
75 - <span class=label>
76 - %= $dat_datas->{now_string}
77 - </span>
78 - <br>
79 - <span class=label>
80 - %=l 'dat_NEW_M/D/Y'
81 - </span><span class=data2>
82 - % param 'Month' => $dat_datas->{month} unless param 'Month';
83 - %= select_field 'Month' => $c->getMonth_list(), class => 'input'
84 - </span><span class=data2>
85 - % param 'Day' => $dat_datas->{day} unless param 'Day';
86 - %= text_field 'Day', size => '2', class => 'input'
87 - </span><span class=data2>
88 - % param 'Year' => $dat_datas->{year} unless param 'Year';
89 - %= text_field 'Year', size => '4', class => 'input'
90 - </span>
91 - <br>
92 - <span class=label>
93 - %=l 'dat_NEW_H/M/S'
94 - </span><span class=data2>
95 - % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
96 - %= text_field 'Hour', size => '2', class => 'input'
97 - </span><span class=data2>
98 - % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
99 - %= text_field 'Minute', size => '2', class => 'input'
100 - </span><span class=data2>
101 - % param 'Second' => $dat_datas->{second} unless param 'Second';
102 - %= text_field 'Second', size => '2', class => 'input'
103 - </span>
104 - <br>
105 - <span class=label>
106 - %=l 'dat_AM/PM_AND_TZ'
107 - </span><span class=data2>
108 - % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
109 - %= select_field 'Ampm' => ['AM', 'PM'], class => 'input'
110 - </span><span class=data2>
111 - % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
112 - %= select_field 'Timezone' => $c->getZone_list(), class => 'input'
113 - </span>
114 - </p>
115 + <div class='datetime-set-ntp'>
116 + %=l 'dat_NTP_DISABLE_DESC'
117 + </div>
118 + % } else {
119 + <div class='datetime-set-ntp'>
120 + <br>
121 + </p>
122 + <p>
123 + %=l 'dat_CURRENT_SETTING'
124 + <b>
125 + %= $dat_datas->{now_string}
126 + </b>
127 + <br>
128 + <span class=label>
129 + %=l 'dat_NEW_M/D/Y'
130 + </span><span class=data2>
131 + % param 'Month' => $dat_datas->{month} unless param 'Month';
132 + %= select_field 'Month' => $c->getMonth_list(), class => 'input'
133 + </span><span class=data2>
134 + % param 'Day' => $dat_datas->{day} unless param 'Day';
135 + %= text_field 'Day', size => '2', class => 'input'
136 + </span><span class=data2>
137 + % param 'Year' => $dat_datas->{year} unless param 'Year';
138 + %= text_field 'Year', size => '4', class => 'input'
139 + </span>
140 + <br>
141 + <span class=label>
142 + %=l 'dat_NEW_H/M/S'
143 + </span><span class=data2>
144 + % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
145 + %= text_field 'Hour', size => '2', class => 'input'
146 + </span><span class=data2>
147 + % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
148 + %= text_field 'Minute', size => '2', class => 'input'
149 + </span><span class=data2>
150 + % param 'Second' => $dat_datas->{second} unless param 'Second';
151 + %= text_field 'Second', size => '2', class => 'input'
152 + </span>
153 + <br>
154 + <span class=label>
155 + %=l 'dat_AM/PM_AND_TZ'
156 + </span><span class=data2>
157 + % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
158 + %= select_field 'Ampm' => ['AM', 'PM'], class => 'input'
159 + </span><span class=data2>
160 + % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
161 + %= select_field 'Timezone' => $c->getZone_list(), class => 'input'
162 + </span>
163 + </p>
164 + </div>
165 % }
166 <p>
167 <br>
168 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/reboot.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/reboot.html.ep
169 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/reboot.html.ep 2022-01-05 15:52:46.053500474 +0000
170 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/reboot.html.ep 2022-01-04 15:05:00.000000000 +0000
171 @@ -16,15 +16,17 @@
172 %= $modul
173
174 <% my $btn = l('PERFORM'); %>
175 + %= form_for 'reboot' => (method => 'POST') => begin
176
177 + <p>
178 %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
179 <br>
180
181 - %= form_for 'reboot' => (method => 'POST') => begin
182 - <p>
183 <span class=label>
184 %=l 'rbo_LABEL_REBOOT'
185 - </span><span class=data>
186 + </span>
187 +
188 + <span class=data>
189 %= select_field 'function' => $c->rebootFunction_list()
190 </span>
191 </p>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed