From cda94cb8ed002686a5b779ac1f1dab841dac1edc Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 14 Oct 2014 07:56:11 +0000 Subject: [PATCH] setting a wider default and minimum sidebox width from calendar with German (minimum, 2-letter day-shortcut) and English (default, 3-letter) --- jdots/inc/class.jdots_framework.inc.php | 16 +++++++++++++--- jdots/js/egw_fw.js | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jdots/inc/class.jdots_framework.inc.php b/jdots/inc/class.jdots_framework.inc.php index c94f257879..2d5ca798d9 100755 --- a/jdots/inc/class.jdots_framework.inc.php +++ b/jdots/inc/class.jdots_framework.inc.php @@ -25,8 +25,18 @@ class jdots_framework extends egw_framework */ const APP = 'jdots'; - const MIN_SIDEBAR_WIDTH = 185; - const DEFAULT_SIDEBAR_WIDTH = 225; + /** + * Minimum width of sidebar eg. from German 2-letter daynames in Calendar + * + * Need to be changed in js/egw_fw.js around line 1536 too! + */ + const MIN_SIDEBAR_WIDTH = 215; + /** + * Default width need to be tested with English 3-letter day-names and Pixelegg template in Calendar + * + * Need to be changed in js/egw_fw.js around line 1536 too! + */ + const DEFAULT_SIDEBAR_WIDTH = 255; /** * Whether javascript:egw_link_handler calls (including given app) should be returned by the "link" function * or just the link @@ -310,7 +320,7 @@ div .egw_fw_ui_sidemenu_entry_content > div { if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr'))) { if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']=''; - $extra['check-framework'] = true; + $extra['check-framework'] = $_GET['cd'] !== 'no'; } } $this->tpl->set_var($this->_get_header($extra)); diff --git a/jdots/js/egw_fw.js b/jdots/js/egw_fw.js index e3b3d03332..9935fed243 100644 --- a/jdots/js/egw_fw.js +++ b/jdots/js/egw_fw.js @@ -503,7 +503,7 @@ egw_fw.prototype.applicationTabNavigate = function(_app, _url, _hidden, _pos) { _url = _app.indexUrl; } - else if (_app.browser != null && + else if (_app.browser != null && // check if app has its own linkHandler !(this.applications[_app.appName].app_refresh) && _app.browser.iframe == null && _url == _app.browser.currentLocation) @@ -1533,7 +1533,7 @@ egw_LAB.wait(function() { $j(document).ready(function() { window.framework = new egw_fw("egw_fw_sidemenu", "egw_fw_tabs", "egw_fw_splitter", - window.egw_webserverUrl, egw_setSideboxSize, 225, 185); + window.egw_webserverUrl, egw_setSideboxSize, 255, 215); // should be identical to jdots_framework::(DEFAULT|MIN)_SIDEBAR_WIDTH window.callManual = window.framework.callManual; jQuery('#egw_fw_print').click(function(){window.framework.print()}); jQuery('#egw_fw_logout').click(function(){ window.framework.redirect(this.getAttribute('data-logout-url')); });