X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.Dialog.Image.js;h=e6d58edb13cd64c58e7fd7914ee7a9fc5a5be449;hb=refs%2Fheads%2Fmaster;hp=dac932d56e720a5488944d768b6e088f4f94597d;hpb=59a319d9e26db8e69a14f6a0d7db0d18ce7c0f0a;p=Pman.Core diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js index dac932d5..e6d58edb 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, @@ -28,7 +37,7 @@ Pman.Dialog.Image = { this.callback = cb; this.data = data; - this.dialog.show(this.data._el); + this.dialog.show.apply(this.dialog, Array.prototype.slice.call(arguments).slice(2)); if (this.form) { this.form.reset(); this.form.setValues(data); @@ -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'; @@ -306,6 +319,7 @@ Pman.Dialog.Image = { }, { xtype : 'TextField', + allowBlank : false, fieldLabel : _this._strings['ea72bacd2fdfa818907bb9559e6905a1'] /* Upload Image or File */, inputType : 'file', name : 'imageUpload', @@ -331,7 +345,7 @@ Pman.Dialog.Image = { qtip : _this._strings['dff0c70e4c11953e4e3ee1cf268fb96d'] /* Select image type */, queryParam : 'query[search]', selectOnFocus : true, - tpl : '
{display_name}??? {name}
', + tpl : '
{display_name} {name}
', triggerAction : 'all', typeAhead : true, valueField : 'name',