X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.Image.js;h=50a667bffbc4cd05c5d0f65b4eb082c389042d9b;hp=93c452def196cf7197cb38b877492ba3c7941c38;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=17d3680ebee1ef2ab1c45c8bd4c490aa5c81b569 diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js index 93c452de..50a667bf 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -16,6 +16,15 @@ Pman.Dialog.Image = { '91412465ea9169dfd901dd5e7c96dd99' :"Upload", 'ea72bacd2fdfa818907bb9559e6905a1' :"Upload Image or File" }, + _named_strings : { + 'imgtype_name_fieldLabel' : '8e16a71b3d8217eb80b39b7d8dec4296' /* Image Type */ , + 'imgtype_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ , + 'imgtype_name_emptyText' : 'dff0c70e4c11953e4e3ee1cf268fb96d' /* Select image type */ , + 'upload_max_filesize_value' : 'eb5d45750c7ab13aa8e6bacc80315a30' /* 32M */ , + 'imgtype_name_qtip' : 'dff0c70e4c11953e4e3ee1cf268fb96d' /* Select image type */ , + 'post_max_size_value' : 'eb5d45750c7ab13aa8e6bacc80315a30' /* 32M */ , + 'imageUpload_fieldLabel' : 'ea72bacd2fdfa818907bb9559e6905a1' /* Upload Image or File */ + }, dialog : false, callback: false, @@ -174,7 +183,7 @@ Pman.Dialog.Image = { _this.form.doAction('submit', { params: { ts : Math.random() - } + } }); _this.dialog.haveProgress = 0; // set to show.. _this.dialog.uploadProgress.defer(1000, _this.dialog); @@ -188,6 +197,7 @@ Pman.Dialog.Image = { items : [ { xtype : 'ContentPanel', + fitContainer : true, fitToFrame : true, region : 'center', xns : Roo, @@ -213,8 +223,11 @@ Pman.Dialog.Image = { _this.form.findField('imgtype').hide(); + _this.dialog.resizeTo(500, 140); + if(_this.data._show_image_type){ _this.form.findField('imgtype').show(); + _this.dialog.resizeTo(500, 170); } this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php'; @@ -315,6 +328,7 @@ Pman.Dialog.Image = { }, { xtype : 'ComboBox', + actionMode : 'fieldEl', allowBlank : true, alwaysQuery : true, displayField : 'display_name', @@ -333,7 +347,7 @@ Pman.Dialog.Image = { tpl : '
{display_name} {name}
', triggerAction : 'all', typeAhead : true, - valueField : 'id', + valueField : 'name', width : 250, xns : Roo.form, '|xns' : 'Roo.form', @@ -345,10 +359,9 @@ Pman.Dialog.Image = { beforeload : function (_self, o){ o.params = o.params || {}; - o.params['etype'] = _this.data.etype; + o.params.etype = 'ImageType'; - o.params['!id'] = _this.form.findField('id').getValue(); - // set more here + o.params.active = 1; } }, xns : Roo.data,