public_html/skins

Thu Oct 23 10:13:00 CEST 2014

public_html/skins/default/templates/error.html  |    2 +-
 public_html/skins/default/templates/login.html  |    2 +-
 public_html/skins/default/templates/main.html   |    2 +-
 public_html/skins/default/templates/signup.html |    2 +-
 public_html/skins/default/ui.js                 |    5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 5eb1c85b8b731ede3b8210f8fa26db3b4be3115d
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Thu Oct 23 10:11:16 2014 +0200

    Change logo element from div to img and add js logic to set min-width
    of the page body to make sure the menu does not overlap the logo.
    This is for branding purposes (#3613)

diff --git a/public_html/skins/default/templates/error.html b/public_html/skins/default/templates/error.html
index 4238460..848a161 100644
--- a/public_html/skins/default/templates/error.html
+++ b/public_html/skins/default/templates/error.html
@@ -7,12 +7,12 @@
     <link rel="shortcut icon" type="image/png" href="{$skin_path}images/favicon.png" />
 </head>
 <body>
+    <img id="logo" src="{$skin_path}images/logo.png" alt="logo" />
     <div id="message" class="error" style="display: block">
         <div>
             <span><b>{$engine->translate('error')} {$error_code}:</b><br />{$error_message}</span>
         </div>
     </div>
-    <div id="logo"></div>
     <div id="topmenu"></div>
     <div id="navigation"></div>
     <div id="task_navigation"></div>
diff --git a/public_html/skins/default/templates/login.html b/public_html/skins/default/templates/login.html
index ba672af..24c4730 100644
--- a/public_html/skins/default/templates/login.html
+++ b/public_html/skins/default/templates/login.html
@@ -9,7 +9,7 @@
     <script src="js/kolab_admin.js"></script>
 </head>
 <body>
-    <div id="logo"></div>
+    <img id="logo" src="{$skin_path}images/logo.png" alt="logo" />
     <div id="topmenu"></div>
     <div id="navigation"></div>
     <div id="task_navigation"></div>
diff --git a/public_html/skins/default/templates/main.html b/public_html/skins/default/templates/main.html
index 108845c..3237252 100644
--- a/public_html/skins/default/templates/main.html
+++ b/public_html/skins/default/templates/main.html
@@ -12,7 +12,7 @@
     <script src="{$skin_path}ui.js"></script>
 </head>
 <body>
-    <div id="logo" onclick="document.location='.'"></div>
+    <img id="logo" src="{$skin_path}images/logo.png" alt="logo" onclick="document.location='.'" />
     <div id="topmenu">
         <span class="login">{$user.fullname}</span>
         <span id="domain-selector" class="domain">
diff --git a/public_html/skins/default/templates/signup.html b/public_html/skins/default/templates/signup.html
index 66a649a..08475bb 100644
--- a/public_html/skins/default/templates/signup.html
+++ b/public_html/skins/default/templates/signup.html
@@ -14,7 +14,7 @@
 </head>
 <body>
     <div id="bodybox">
-        <div id="logo"></div>
+        <img id="logo" src="{$skin_path}images/logo.png" alt="logo" />
         <div id="content">
             <div id="task_content" class="signup">
                 <h1>{$engine->translate('signup.headline')}</h1>
diff --git a/public_html/skins/default/ui.js b/public_html/skins/default/ui.js
index c0ed08c..543b6b3 100644
--- a/public_html/skins/default/ui.js
+++ b/public_html/skins/default/ui.js
@@ -170,6 +170,11 @@ function ui_resize()
 function ui_load()
 {
   domain_selector();
+
+  // set minimum width of the page
+  var width = $('#logo').width() + 50;
+  $('#navigation li').each(function() { width += $(this).width(); });
+  $('body').css('min-width', width);
 };
 
 // API response handler


