smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add in locale icon in header

Browse Source
This commit is contained in:
Brian Read 2024-07-27 20:03:14 +01:00
parent fb5b0942d6
commit 77a7849898
5 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clog
View File

@ -1,2 +0,0 @@
* Fri Jul 26 2024 Brian Read <brianr@koozali.org> 11.0.0-10.sme
- fix navigation2.conf to more correctly translate menus [SME: 12714]

8
root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body
View File

@ -230,6 +230,14 @@ hr.sme-copyrightbar {
font-size: 10px; font-size: 10px;
} }
#flag-icon {
font-size: 20px;
float: right;
margin-top: 0.67em;
margin-right: 1%;
}
/*These style definitions were found int he old css file (manager.css) /*These style definitions were found int he old css file (manager.css)
but don't seem to ever be referenced in the code. They're here but don't seem to ever be referenced in the code. They're here
for reference. for reference.

2
root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
View File

@ -31,7 +31,9 @@
%= javascript '/js/vfs_fonts.js' %= javascript '/js/vfs_fonts.js'
%= javascript '/js/buttons.html5.min.js' %= javascript '/js/buttons.html5.min.js'
%= javascript '/js/buttons.print.min.js' %= javascript '/js/buttons.print.min.js'
%= javascript '/js/flag-by-locale.js'
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.5.0/css/flag-icon.min.css">
%= stylesheet '/css/sme-jquery-overrides.css' %= stylesheet '/css/sme-jquery-overrides.css'
</head> </head>

45
root/usr/share/smanager/themes/default/templates/partials/_header.html.ep
View File

@ -1,27 +1,30 @@
<div id="header2" class="hd2"> <div id="header2" class="hd2">
<div id="h2l1"> <div id="h2l1">
<div id="h2e11"> <div id="h2e11">
<a target='_blank' href="http://www.koozali.org"><img src="images/smeserver_logo.jpg" height="40" alt="SME Server"></a> <a target='_blank' href="http://www.koozali.org"><img src="images/smeserver_logo.jpg" height="40" alt="SME Server"></a>
</div> </div>
<!-- <div id="h2e12"><h5><a href="initial">Server Manager</a> <div id="h2e12" style="float:right;">
<a href="/server-manager" target='_blank'>&nbsp &nbsp (Prev SM)</a></h5> --> <br><a href="/server-manager" target='_blank'><button style="background-color:#98d36e;font-weight:bold;color:#063;">Legacy SM</button></a>
<div id="h2e12" style="float:right;"><br><a href="/server-manager" target='_blank'><button style="background-color:#98d36e;font-weight:bold;color:#063;">Legacy SM</button></a></div> </div>
<div id="flag-container">
<!-- The flag icon will be inserted here -->
</div>
</div> </div>
<div id="h2l2" class="infobar"> <div id="h2l2" class="infobar">
<div id="h2e21"> <div id="h2e21">
<b> <b>
<%= session 'SystemName' %>@<%= session 'DomainName' %></b> <%= session 'SystemName' %>@<%= session 'DomainName' %></b>
</div>
<div id="h2e22">
<a target="_parent" href="manual">&nbsp;&nbsp;<b> ? </b>&nbsp;&nbsp;</a>&nbsp;
</div>
<div id="h2e23">
% if ( not defined $c->session->{username} ) {
<a target="_parent" href="login"><b>Login</b></a>&nbsp;
% } else {
<a target="_parent" href="logout"><b><%= $c->session->{username} %> Logout</b></a>&nbsp;
% }
</div>
</div>
</div> </div>
<div id="h2e22">
<a target="_parent" href="manual">&nbsp;&nbsp;<b> ? </b>&nbsp;&nbsp;</a>&nbsp;
</div>
<div id="h2e23">
% if ( not defined $c->session->{username} ) {
<a target="_parent" href="login"><b>Login</b></a>&nbsp;
% } else {
<a target="_parent" href="logout"><b><%= $c->session->{username} %> Logout</b></a>&nbsp;
% }
</div>
</div>
</div> </div>

5
smeserver-manager.spec
View File

@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager %define name smeserver-manager
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 10 %define release 11
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -108,6 +108,9 @@ true
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Sat Jul 27 2024 Brian Read <brianr@koozali.org> 11.0.0-11.sme
- Add in flag icon indication of locale [SME: 12706]
* Fri Jul 26 2024 Brian Read <brianr@koozali.org> 11.0.0-10.sme * Fri Jul 26 2024 Brian Read <brianr@koozali.org> 11.0.0-10.sme
- fix navigation2.conf to more correctly translate menus [SME: 12714] - fix navigation2.conf to more correctly translate menus [SME: 12714]