X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.Image.js;h=50a667bffbc4cd05c5d0f65b4eb082c389042d9b;hp=8f1ebacd876891b5e4165c797d3be6ff3f9ff0a0;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=896602f38d4cdb1ffff457cb2bb30d9ef410b886 diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js index 8f1ebacd..50a667bf 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -9,10 +9,22 @@ Pman.Dialog.Image = { _strings : { 'eb5d45750c7ab13aa8e6bacc80315a30' :"32M", '2859a4ae58ae4e25abdfc530f814e42f' :"Upload an Image or File", + '1243daf593fa297e07ab03bf06d925af' :"Searching...", 'ea4788705e6873b424c65e91c2846b19' :"Cancel", + '8e16a71b3d8217eb80b39b7d8dec4296' :"Image Type", + 'dff0c70e4c11953e4e3ee1cf268fb96d' :"Select image type", '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, @@ -171,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); @@ -185,6 +197,7 @@ Pman.Dialog.Image = { items : [ { xtype : 'ContentPanel', + fitContainer : true, fitToFrame : true, region : 'center', xns : Roo, @@ -207,6 +220,16 @@ Pman.Dialog.Image = { //_this.dialog.el.unmask(); if (act.type == 'setdata') { + + _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'; this.el.dom.action = this.url; if (typeof(_this.data.timeout) != 'undefined') { @@ -304,26 +327,78 @@ Pman.Dialog.Image = { '|xns' : 'Roo.form' }, { - xtype : 'Hidden', - name : 'ontable', + xtype : 'ComboBox', + actionMode : 'fieldEl', + allowBlank : true, + alwaysQuery : true, + displayField : 'display_name', + emptyText : _this._strings['dff0c70e4c11953e4e3ee1cf268fb96d'] /* Select image type */, + fieldLabel : _this._strings['8e16a71b3d8217eb80b39b7d8dec4296'] /* Image Type */, + forceSelection : true, + hiddenName : 'imgtype', + listWidth : 400, + loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */, + minChars : 2, + name : 'imgtype_name', + pageSize : 20, + qtip : _this._strings['dff0c70e4c11953e4e3ee1cf268fb96d'] /* Select image type */, + queryParam : 'query[search]', + selectOnFocus : true, + tpl : '
{display_name} {name}
', + triggerAction : 'all', + typeAhead : true, + valueField : 'name', + width : 250, xns : Roo.form, - '|xns' : 'Roo.form' + '|xns' : 'Roo.form', + store : { + xtype : 'Store', + remoteSort : true, + sortInfo : { direction : 'ASC', field: 'name' }, + listeners : { + beforeload : function (_self, o){ + o.params = o.params || {}; + + o.params.etype = 'ImageType'; + + o.params.active = 1; + } + }, + xns : Roo.data, + '|xns' : 'Roo.data', + proxy : { + xtype : 'HttpProxy', + method : 'GET', + url : baseURL + '/Roo/Core_enum', + xns : Roo.data, + '|xns' : 'Roo.data' + }, + reader : { + xtype : 'JsonReader', + fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}], + id : 'id', + root : 'data', + totalProperty : 'total', + xns : Roo.data, + '|xns' : 'Roo.data' + } + } }, { xtype : 'Hidden', - name : 'onid', + name : 'ontable', xns : Roo.form, '|xns' : 'Roo.form' }, { xtype : 'Hidden', - name : 'id', + name : 'onid', xns : Roo.form, '|xns' : 'Roo.form' }, { xtype : 'Hidden', - name : 'imgtype', + name : 'id', xns : Roo.form, '|xns' : 'Roo.form' }