extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-10 16:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change diff dialog to use auto sizing, hopefully avoid some scrollbars in FF

Browse Source
This commit is contained in:
Nathan Gray 2012-06-05 17:11:42 +00:00
parent 09937c410d
commit 30b3213b90
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -275,8 +275,7 @@ class etemplate_widget_menupopup extends etemplate_widget
$no_lang = True;
break;
case 'select-cat': // !$type == globals cats too, $type3: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
error_log("---CATS: $type, 2: $type2, 3: $type3, 4: $type4, 5: $type5, 6: $type6");
case 'select-cat': // !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
if ((!$type3 || $type3 === $GLOBALS['egw']->categories->app_name) &&
(!$type5 || $type5 == $GLOBALS['egw']->categories->account_id))
{
@ -286,7 +285,6 @@ error_log("---CATS: $type, 2: $type2, 3: $type3, 4: $type4, 5: $type5, 6: $type6
{
$categories = new categories($type5,$type3);
}
error_log("--- CAT APPNAME: {$categories->app_name}");
// Allow text for global
$type = ($type && strlen($type) > 1 ? $type : !$type);
// we cast $type4 (parent) to int, to get default of 0 if omitted

4
etemplate/js/et2_widget_diff.js
View File

@ -71,8 +71,8 @@ var et2_diff = et2_valueWidget.extend([et2_IDetachedDOM], {
.append(diff);
dialog_div.dialog({
title: self.options.label,
width: 400,
height: 300,
width: 'auto',
autoResize: true,
modal: true,
buttons: [{text: self.egw().lang('ok'), click: function() {jQuery(this).dialog("close");}}],
close: function(event, ui) {