From 30b3213b9039d824e188fb630c6cb9595a70af9e Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 5 Jun 2012 17:11:42 +0000 Subject: [PATCH] Change diff dialog to use auto sizing, hopefully avoid some scrollbars in FF --- etemplate/inc/class.etemplate_widget_menupopup.inc.php | 4 +--- etemplate/js/et2_widget_diff.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php index 2aad9988c4..702f053121 100644 --- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php +++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php @@ -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 diff --git a/etemplate/js/et2_widget_diff.js b/etemplate/js/et2_widget_diff.js index bd7cd62092..a32a06a9b2 100644 --- a/etemplate/js/et2_widget_diff.js +++ b/etemplate/js/et2_widget_diff.js @@ -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) {