extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

setting a wider default and minimum sidebox width from calendar with German (minimum, 2-letter day-shortcut) and English (default, 3-letter)

Browse Source
This commit is contained in:
Ralf Becker 2014-10-14 07:56:11 +00:00
parent b6e381365a
commit cda94cb8ed
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdots/inc/class.jdots_framework.inc.php
View File

@ -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));

4
jdots/js/egw_fw.js
View File

@ -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')); });