/[smecontribs]/rpms/smeserver-manager-AdminLTE/contribs10/smeserver-manager-AdminLTE-0.1.3-Position-and-space-headings-add-dev-conf-refactor-css-file.patch
ViewVC logotype

Annotation of /rpms/smeserver-manager-AdminLTE/contribs10/smeserver-manager-AdminLTE-0.1.3-Position-and-space-headings-add-dev-conf-refactor-css-file.patch

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


Revision 1.1 - (hide annotations) (download)
Mon Dec 20 15:29:14 2021 UTC (2 years, 10 months ago) by brianr
Branch: MAIN
CVS Tags: smeserver-manager-AdminLTE-0_1_3-19_el7_sme, smeserver-manager-AdminLTE-0_1_3-13_el7_sme, smeserver-manager-AdminLTE-0_1_3-18_el7_sme, smeserver-manager-AdminLTE-0_1_3-12_el7_sme, smeserver-manager-AdminLTE-0_1_4-1_el7_sme, smeserver-manager-AdminLTE-0_1_3-11_el7_sme, smeserver-manager-AdminLTE-0_1_3-16_el7_sme, smeserver-manager-AdminLTE-0_1_3-10_el7_sme, smeserver-manager-AdminLTE-0_1_3-20_el7_sme, smeserver-manager-AdminLTE-0_1_3-21_el7_sme, smeserver-manager-AdminLTE-0_1_3-15_el7_sme, HEAD
* Mon Dec 20 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.3-10.sme
- Position-and-space-headings [SME:11785]
- Add in development to smanager conf (will need to be removed at some point)
- Refactor smanager2.css into 3 files for menu, header and footer and content
- Widen footer panel to 100% width
- Sort out format for datetime panel

1 brianr 1.1 diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/etc/e-smith/templates-custom/usr/share/smanager/conf/srvmngr.conf/30Other smeserver-manager-AdminLTE-0.1.3/root/etc/e-smith/templates-custom/usr/share/smanager/conf/srvmngr.conf/30Other
2     --- smeserver-manager-AdminLTE-0.1.3.old/root/etc/e-smith/templates-custom/usr/share/smanager/conf/srvmngr.conf/30Other 1970-01-01 01:00:00.000000000 +0100
3     +++ smeserver-manager-AdminLTE-0.1.3/root/etc/e-smith/templates-custom/usr/share/smanager/conf/srvmngr.conf/30Other 2021-12-20 09:54:00.000000000 +0000
4     @@ -0,0 +1,5 @@
5     + modules_dir => 'lib/SrvMngr/Controller',
6     + webapp => 'smanager',
7     + mode => 'development',
8     + debug => 0,
9     +\}
10     diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-content.css smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-content.css
11     --- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-content.css 1970-01-01 01:00:00.000000000 +0100
12     +++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-content.css 2021-12-20 14:33:00.000000000 +0000
13     @@ -0,0 +1,113 @@
14     + .sme-border {
15     + border:0.07em solid lightgrey;
16     + padding:5px;
17     +}
18     + table.sme-border {
19     + margin-top:1.5em;
20     +}
21     + .table-striped>tr:nth-child(odd){
22     + background-color:#c2e8a8;
23     +}
24     + .action {
25     + background-color:#bee6a2;
26     + border-width:1px;
27     + border-radius:11px;
28     + color:black;
29     +}
30     + .label {
31     + display:inline-block;
32     + width:50%;
33     + filter:opacity(70%);
34     + background-color:#bee6a2;
35     + margin-bottom:4px;
36     +}
37     + .data {
38     + display:inline-block;
39     + margin-left:2px;
40     + font-weight:normal!important;
41     + float: left;
42     + width: 49%;
43     + height:80%;
44     +}
45     + .input {
46     + width:auto;
47     + margin-bottom:5px;
48     +}
49     + .wrapper {
50     + background:#ecf0f5;
51     +}
52     + h1 {
53     + font-size:2.5em;
54     +}
55     + h2 {
56     + font-size:1.5em;
57     +}
58     + .card-subtitle {
59     + margin-top: 0.625rem;
60     + float:left;
61     + margin-bottom:0.625rem;
62     +}
63     + h3 {
64     + font-size:1em;
65     +}
66     + h4,h5 {
67     + font-size:1em;
68     + color:inherit;
69     +}
70     + .success {
71     + color:green;
72     +}
73     + .sme-warning {
74     + color:amber;
75     +}
76     + .sme-error {
77     + color:red;
78     +}
79     + .active {
80     + background-color:#c2e8a8;
81     + color:black;
82     +}
83     + .button {
84     + display: block;
85     + width: 115px;
86     + height: 25px;
87     + background: darkgreen;
88     + padding: 0.1rem;
89     + text-align: center;
90     + border-radius: 5px;
91     + color: white;
92     + font-weight: bold;
93     + line-height: auto;
94     +}
95     + a.button:hover {
96     + color:lightgrey;
97     +}
98     + form p {
99     + padding : 0;
100     + margin : 0;
101     +}
102     + .login-box {
103     + margin: 0 auto;
104     +}
105     + .review-panel td.label{
106     + width:100%;
107     +}
108     + .review-panel p{
109     + margin-bottom:0.3em;
110     +}
111     + .review-panel span.label {
112     + margin-right:1%;
113     + width:52%;
114     +}
115     + .card-header {
116     + margin-bottom:0.625rem;
117     +}
118     + .module span.label {
119     + margin-right:0.3em;
120     +}
121     + h2,h3,h4,h5 {
122     + margin-top:1.5em;
123     +}
124     + .datetime-panel span.label {
125     + float:none !important;
126     +}
127     diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-header-and-footer.css smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-header-and-footer.css
128     --- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-header-and-footer.css 1970-01-01 01:00:00.000000000 +0100
129     +++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-header-and-footer.css 2021-12-20 12:13:00.000000000 +0000
130     @@ -0,0 +1,35 @@
131     +div#swt_theme select {
132     + width: 55%;
133     +}
134     + .main-header {
135     + position: relative;
136     + padding-right: 7.5px;
137     + padding-left: 7.5px;
138     +}
139     + hr.sme-copyrightbar {
140     + display: none;
141     +}
142     + .layout-boxed {
143     + background: url("/smanager/dist/img/boxed-bg.jpg") repeat fixed;
144     +}
145     + #h2e11 img {
146     + width: 100%;
147     +}
148     + #h2l1, #h2l2 {
149     + margin-left: 2px;
150     +}
151     + #h2l2 {
152     + height: 4px;
153     +}
154     + #swttheme {
155     + padding-left: 0.5rem;
156     + padding-top: 0.3rem;
157     +}
158     + #swtsize {
159     + padding-left: 0.5rem;
160     + padding-top: 0.5rem;
161     +}
162     +
163     + .sm2-footer {
164     + width:100%;
165     +}
166     diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-menu.css smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-menu.css
167     --- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-menu.css 1970-01-01 01:00:00.000000000 +0100
168     +++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/adminlte-menu.css 2021-12-20 10:34:00.000000000 +0000
169     @@ -0,0 +1,63 @@
170     +.navbar-white {
171     + background-image: linear-gradient(to right, #edf9e5,#bee6a2);
172     +}
173     + div.section {
174     + color:blue;
175     +}
176     + div.mb-2 {
177     + background-color:#98d36e;
178     +}
179     + .sidebar a.accent {
180     + color: brown;
181     +}
182     + #h2e12 img {
183     + width:100%;
184     +}
185     + #h2e11 img {
186     + display:none;
187     +}
188     + #h2l2 {
189     + height:34px;
190     +}
191     + p.menu-title {
192     + margin-top:0;
193     + margin-bottom:0;
194     +}
195     + .menu-title {
196     + color:green!important;
197     + font-weight:bold;
198     +}
199     + .section-title {
200     + color:blue!important;
201     +}
202     + a#toguser.menu-title {
203     + color:blue!important;
204     + font-weight:normal;
205     +}
206     + .brand-image {
207     + margin-bottom:1.75rem!important;
208     +}
209     + div.menu-cell a {
210     + font-size:inherit!important;
211     + margin-top:0.1em!important;
212     + margin-bottom:0.1em!important;
213     + line-height:1em!important;
214     + padding-top:0.1rem;
215     + padding-bottom:0.1rem;
216     + margin-left:0.2rem;
217     + padding-right:0.05rem;
218     + width: calc(250px - 0.5rem * 3)!important;
219     +}
220     + .nav {
221     + margin-bottom:0.7rem;
222     +}
223     + .brand-link {
224     + margin-bottom:4rem;
225     +}
226     + td a:link, td a:visited {
227     + color:blue;
228     +}
229     + td a:hover {
230     + color:red;
231     +}
232     +
233     \ No newline at end of file
234     diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/server-manager2.css smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/server-manager2.css
235     --- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/public/css/server-manager2.css 2021-12-20 09:00:23.640532422 +0000
236     +++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/public/css/server-manager2.css 1970-01-01 01:00:00.000000000 +0100
237     @@ -1,240 +0,0 @@
238     -.navbar-white {
239     - background-image: linear-gradient(to right, #edf9e5,#bee6a2);
240     -}
241     -
242     -
243     -div.section {
244     - color:blue;
245     -}
246     -
247     -div.mb-2 {
248     - background-color:#98d36e;
249     -}
250     -
251     -.sme-border {
252     - border:0.07em solid lightgrey;
253     - padding:5px;
254     -}
255     -
256     -table.sme-border {
257     - margin-top:1.5em;
258     -}
259     -
260     -.action {
261     - background-color:#bee6a2;
262     - border-width:1px;
263     - border-radius:11px;
264     - color:black;
265     -}
266     -
267     -.label {
268     - display:inline-block;
269     - width:50%;
270     - filter:opacity(70%);
271     - background-color:#bee6a2;
272     - margin-bottom:4px;
273     -
274     -}
275     -
276     -.data {
277     - display:inline-block;
278     - margin-left:2px;
279     - font-weight:normal!important;
280     - float: left;
281     - width: 45%;
282     - height:80%;
283     -}
284     -
285     -.sidebar a.accent {
286     - color: brown;
287     -}
288     -
289     -#h2e12 img {
290     - width:100%;
291     -}
292     -
293     -#h2e11 img {
294     - display:none;
295     -}
296     -
297     -#h2l2 { height:34px;}
298     -
299     -.input {
300     - width:auto;
301     - margin-bottom:5px;
302     -}
303     -
304     -div#swt_theme select{
305     - width:55%;
306     -}
307     -
308     -
309     -p.menu-title {
310     - margin-top:0;
311     - margin-bottom:0;
312     -}
313     -
314     -.main-header {
315     - position: relative;
316     - padding-right: 7.5px;
317     - padding-left: 7.5px;
318     -}
319     -
320     -hr.sme-copyrightbar {
321     - display:none;
322     -}
323     -
324     -
325     -.layout-boxed {
326     - background: url('/smanager/dist/img/boxed-bg.jpg') repeat fixed;
327     -}
328     -
329     -.wrapper {
330     - background:#ecf0f5;
331     -}
332     -
333     -h1 {
334     - font-size:2.5em;
335     -}
336     -
337     -h2 {
338     - font-size:1.5em;
339     -}
340     -
341     -
342     -.card-subtitle {
343     - margin-top: 0.625rem;
344     - float:left;
345     - margin-bottom:0.625rem;
346     -}
347     -
348     -h3 {
349     - font-size:1em;
350     -}
351     -
352     -h4,h5 {
353     - font-size:1em;
354     - color:inherit;
355     -}
356     -
357     -
358     -td a:link, td a:visited {
359     - color:blue;
360     -}
361     -
362     -td a:hover {
363     - color:red;
364     -}
365     -
366     -
367     -
368     -#h2e11 img{
369     - width:100%;
370     -}
371     -
372     -#h2l1,#h2l2 {margin-left:2px;}
373     -#h2l2 {height:4px;}
374     -
375     -#swttheme {
376     - padding-left:0.5rem;
377     - padding-top:0.3rem;
378     -}
379     -
380     -#swtsize {
381     - padding-left:0.5rem;
382     - padding-top:0.5rem;
383     -}
384     -
385     -.menu-title {
386     - color:green!important;
387     - font-weight:bold;
388     -}
389     -
390     -.section-title {
391     - color:blue!important;
392     -}
393     -
394     -a#toguser.menu-title {
395     - color:blue!important;
396     - font-weight:normal;
397     -}
398     -
399     -.success {color:green;}
400     -.sme-warning {color:amber;}
401     -.sme-error {color:red;}
402     -
403     -.active {
404     - background-color:#c2e8a8;
405     - color:black;
406     -}
407     -
408     -.brand-image {margin-bottom:1.75rem!important;}
409     -
410     -div.menu-cell a {
411     - font-size:inherit!important;
412     - margin-top:0.1em!important;
413     - margin-bottom:0.1em!important;
414     - line-height:1em!important;
415     - padding-top:0.1rem;
416     - padding-bottom:0.1rem;
417     - margin-left:0.2rem;
418     - padding-right:0.05rem;
419     - width: calc(250px - 0.5rem * 3)!important;
420     -}
421     -
422     -.nav {margin-bottom:0.7rem;}
423     -
424     -.button {
425     - display: block;
426     - width: 115px;
427     - height: 25px;
428     - background: darkgreen;
429     - padding: 0.1rem;
430     - text-align: center;
431     - border-radius: 5px;
432     - color: white;
433     - font-weight: bold;
434     - line-height: auto;
435     -}
436     -
437     -a.button:hover {
438     - color:lightgrey;
439     -}
440     -
441     -.brand-link {margin-bottom:4rem;}
442     -
443     -form p {
444     - padding : 0;
445     - margin : 0;
446     -}
447     -
448     -.login-box {
449     - margin: 0 auto;
450     -}
451     -
452     -.table-striped>tr:nth-child(odd){
453     - background-color:#c2e8a8;
454     -}
455     -
456     -.review-panel td.label{
457     - width:100%;
458     -}
459     -
460     -.review-panel p{
461     - margin-bottom:0.3em;
462     -}
463     -
464     -.review-panel span.label {
465     - margin-right:1%;
466     - width:52%;
467     -}
468     -
469     -.card-header {
470     - margin-bottom:0.625rem;
471     -}
472     -
473     -.module span.label {
474     - margin-right:0.3em;
475     -}
476     -
477     -
478     diff -urN smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep
479     --- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep 2021-12-20 09:00:23.641532431 +0000
480     +++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep 2021-12-20 12:12:00.000000000 +0000
481     @@ -14,6 +14,7 @@
482     5. Icons/ Short form for menu items when left sidebar is "just" visible.
483     6. Add dark mode - STARTED - nneds a lot more work!
484     7. Enhance Login button - DONE
485     +8. Forgotten Password on login screen
486    
487     -->
488     <html lang="en">
489     @@ -28,7 +29,9 @@
490     %= stylesheet "/plugins/fontawesome-free/css/all.css"
491     <!-- Theme style -->
492     %= stylesheet "/dist/css/adminlte.css"
493     - %= stylesheet "/css/server-manager2.css"
494     + %= stylesheet "/css/adminlte-menu.css"
495     + %= stylesheet "/css/adminlte-header-and-footer.css"
496     + %= stylesheet "/css/adminlte-content.css"
497     %= content_for 'head_contrib'
498     %= content_for 'refresh'
499    
500     @@ -225,7 +228,7 @@
501     <!-- Main Footer -->
502     <footer class="main-footer">
503     <!-- To the right -->
504     - <div class="float-left d-none d-sm-inline">
505     + <div class="sm2-footer float-left d-none d-sm-inline">
506     %= include 'partials/_footer'
507     <span class="adminlte-version"></span>
508     %= `rpm -q smeserver-manager`;

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed