1 |
brianr |
1.1 |
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 |
2 |
|
|
--- smeserver-manager-AdminLTE-0.1.3.old/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep 2021-04-28 07:07:00.000000000 +0100 |
3 |
|
|
+++ smeserver-manager-AdminLTE-0.1.3/root/usr/share/smanager/themes/AdminLTE/templates/layouts/default.html.ep 2021-06-06 20:38:21.860584277 +0100 |
4 |
|
|
@@ -29,7 +29,8 @@ |
5 |
|
|
<!-- Theme style --> |
6 |
|
|
%= stylesheet "/dist/css/adminlte.css" |
7 |
|
|
%= stylesheet "/css/server-manager2.css" |
8 |
|
|
- |
9 |
|
|
+ %= content_for 'head_contrib' |
10 |
|
|
+ %= content_for 'refresh' |
11 |
|
|
|
12 |
|
|
</head> |
13 |
|
|
<body class="hold-transition sidebar-mini layout-boxed"> |
14 |
|
|
@@ -124,14 +125,15 @@ |
15 |
|
|
|
16 |
|
|
<div class="container-fluid"> |
17 |
|
|
<div class="row mb-2"> |
18 |
|
|
+<!-- |
19 |
|
|
<div class="col-sm-3"> |
20 |
|
|
%# Extract the initial h1 to 3 heading from content and use that as header |
21 |
|
|
% my $content = content('module'); |
22 |
|
|
- % my $heading; |
23 |
|
|
- % if ($content =~ /<h(1|2|3)>[\n]*[\s]*(.*)[\s]*[\n]*<\/h(1|2|3)>/i) { |
24 |
|
|
- % $heading = $2; |
25 |
|
|
- % } else { $heading = "unknown";} |
26 |
|
|
- %= "$heading"; |
27 |
|
|
+ %# my $heading; |
28 |
|
|
+ %# if ($content =~ /<h(1|2|3)>[\n]*[\s]*(.*)[\s]*[\n]*<\/h(1|2|3)>/i) { |
29 |
|
|
+ %# $heading = $2; |
30 |
|
|
+ %# } else { $heading = "unknown";} |
31 |
|
|
+ %#= "$heading"; |
32 |
|
|
%#and take out heading that we have used already - this does not work - left for later... |
33 |
|
|
%# my $startofheading = index(lc($content),"<h$3>"); |
34 |
|
|
%# my $endofheading = index(lc($content),"<\/h$3>"); |
35 |
|
|
@@ -140,12 +142,13 @@ |
36 |
|
|
%# my $content =~ s/<p>//gim; |
37 |
|
|
%# my $content =~ s/<\/p>//gim; |
38 |
|
|
</div> |
39 |
|
|
+--> |
40 |
|
|
|
41 |
|
|
- <div class="col-sm-4"> |
42 |
|
|
+ <div class="col-sm-5"> |
43 |
|
|
<b><%= session 'SystemName' %>@<%= session 'DomainName' %></b> |
44 |
|
|
</div> |
45 |
|
|
|
46 |
|
|
- <div id="h2e23" class="col-sm-2"> |
47 |
|
|
+ <div id="h2e23" class="col-sm-3"> |
48 |
|
|
% if ( not defined $c->session->{username} ) { |
49 |
|
|
<a class="button" target="_parent" href="login"><b>Login</b></a> |
50 |
|
|
% } else { |
51 |
|
|
@@ -154,7 +157,7 @@ |
52 |
|
|
</div> |
53 |
|
|
|
54 |
|
|
|
55 |
|
|
- <div class="col-sm-2"> |
56 |
|
|
+ <div class="col-sm-4"> |
57 |
|
|
<ol class="breadcrumb float-sm-right"> |
58 |
|
|
|
59 |
|
|
<li class="breadcrumb-item active"><a href="#">Home</a></li> |