diff --git a/clog b/clog deleted file mode 100644 index fb62aec..0000000 --- a/clog +++ /dev/null @@ -1,2 +0,0 @@ -* Fri Jul 26 2024 Brian Read 11.0.0-10.sme -- fix navigation2.conf to more correctly translate menus [SME: 12714] diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body index 9152533..827c2ec 100644 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body +++ b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body @@ -230,6 +230,14 @@ hr.sme-copyrightbar { 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) but don't seem to ever be referenced in the code. They're here for reference. diff --git a/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep b/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep index 290cb98..02f18a7 100644 --- a/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep +++ b/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep @@ -31,7 +31,9 @@ %= javascript '/js/vfs_fonts.js' %= javascript '/js/buttons.html5.min.js' %= javascript '/js/buttons.print.min.js' + %= javascript '/js/flag-by-locale.js' + %= stylesheet '/css/sme-jquery-overrides.css' diff --git a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep index 8dd92ec..a0216b7 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep @@ -1,27 +1,30 @@
-
- SME Server -
- - +
+ SME Server +
+
+
+
+
+ +
-
-
- - <%= session 'SystemName' %>@<%= session 'DomainName' %> +
+ + <%= session 'SystemName' %>@<%= session 'DomainName' %> +
+
+    ?     +
+
+ % if ( not defined $c->session->{username} ) { + Login  + % } else { + <%= $c->session->{username} %> Logout  + % } +
+
-
-    ?     -
-
-% if ( not defined $c->session->{username} ) { - Login  -% } else { - <%= $c->session->{username} %> Logout  -% } -
-
diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 8bba1ef..9cca084 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 10 +%define release 11 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -108,6 +108,9 @@ true %defattr(-,root,root) %changelog +* Sat Jul 27 2024 Brian Read 11.0.0-11.sme +- Add in flag icon indication of locale [SME: 12706] + * Fri Jul 26 2024 Brian Read 11.0.0-10.sme - fix navigation2.conf to more correctly translate menus [SME: 12714]