holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "drag-and-drop" and "IE dropdownmenu hack" from the common preferences

Browse Source
This commit is contained in:
Hadi Nategh 2013-12-19 10:19:14 +00:00
parent d3e89b1095
commit 1d14ecc80f
4 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -1393,17 +1393,15 @@ class calendar_uiviews extends calendar_ui
if ($this->use_time_grid) if ($this->use_time_grid)
{ {
// drag and drop: check if the current user has EDIT permissions on the grid // drag and drop: check if the current user has EDIT permissions on the grid
if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop']) if($owner)
{ {
if($owner) $dropPermission = $this->bo->check_perms(EGW_ACL_EDIT,0,$owner);
{
$dropPermission = $this->bo->check_perms(EGW_ACL_EDIT,0,$owner);
}
else
{
$dropPermission = true;
}
} }
else
{
$dropPermission = true;
}
// adding divs to click on for each row / time-span // adding divs to click on for each row / time-span
for($t = $this->scroll_to_wdstart ? 0 : $this->wd_start,$i = 1 + $this->extraRows; for($t = $this->scroll_to_wdstart ? 0 : $this->wd_start,$i = 1 + $this->extraRows;
$t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24*60; $t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24*60;
@ -1843,8 +1841,7 @@ class calendar_uiviews extends calendar_ui
// ATM we do not support whole day events or recurring events for dragdrop // ATM we do not support whole day events or recurring events for dragdrop
$dd_emulation = ""; $dd_emulation = "";
if ($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop'] && if ($this->use_time_grid &&
$this->use_time_grid &&
(int)$event['id'] && $this->bo->check_perms(EGW_ACL_EDIT,$event)) (int)$event['id'] && $this->bo->check_perms(EGW_ACL_EDIT,$event))
{ {
if (!$event['whole_day_on_top'] && if (!$event['whole_day_on_top'] &&

6
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -1111,12 +1111,6 @@ abstract class egw_framework
{ {
$java_script = ''; $java_script = '';
// GLOBAL var to tell egroupware wether or not to enable the IE selectBox resize hack
if($GLOBALS['egw_info']['user']['preferences']['common']['enable_ie_dropdownmenuhack'] && html::$user_agent == 'msie' && html::$ua_version < 9)
{
$java_script .= "<script type=\"text/javascript\">\nvar enable_ie_dropdownmenuhack=1;\n</script>\n";
}
/* this flag is for all javascript code that has to be put before other jscode. /* this flag is for all javascript code that has to be put before other jscode.
Think of conf vars etc... (pim@lingewoud.nl) */ Think of conf vars etc... (pim@lingewoud.nl) */
if (isset($GLOBALS['egw_info']['flags']['java_script_thirst'])) if (isset($GLOBALS['egw_info']['flags']['java_script_thirst']))

9
phpgwapi/js/jsapi/jsapi.js
View File

@ -570,8 +570,13 @@ function dropdown_menu_hack(el)
{ {
if(el.runtimeStyle) if(el.runtimeStyle)
{ {
if(typeof(enable_ie_dropdownmenuhack) !== 'undefined') { if(typeof(enable_ie_dropdownmenuhack) !== 'undefined')
if (enable_ie_dropdownmenuhack==1){} else return; {
if (enable_ie_dropdownmenuhack==1){
}
else
return;
} else { } else {
return; return;
} }

19
preferences/inc/class.preferences_hooks.inc.php
View File

@ -228,25 +228,6 @@ class preferences_hooks
'admin' => True, 'admin' => True,
'forced' => true, 'forced' => true,
), ),
'enable_dragdrop' => array(
'type' => 'check',
'label' => 'Enable drag and drop functionality (experimental)',
'name' => 'enable_dragdrop',
'help' => 'Enables or disables drag and drop functions in all applications. If the browser does not support '.
'drag and drop, it will be disabled automatically. This feature is experimental at the moment.',
'xmlrpc' => False,
'admin' => False,
'forced' => true,
),
'enable_ie_dropdownmenuhack' => array(
'type' => 'check',
'label' => 'Enable selectbox dropdown resizing for IE (experimental)',
'name' => 'enable_ie_dropdownmenuhack',
'help' => 'Enables or disables selectbox dropdown resizing for IE in all applications. If the browser is not an IE, the option will not apply. This feature is experimental at the moment.',
'xmlrpc' => False,
'admin' => False,
'forced' => false,
),
array( array(
'type' => 'section', 'type' => 'section',
'title' => 'Formatting & general settings' 'title' => 'Formatting & general settings'