X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.Image.js;h=50a667bffbc4cd05c5d0f65b4eb082c389042d9b;hp=3b73be786c6876e7bdda1f490c3b5d84c2263367;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=8c83b51a4d770f81b451a07957247b1ee6e9b84a

diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index 3b73be78..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,
@@ -38,6 +50,7 @@ Pman.Dialog.Image = {
  {
    var _this = this;
    this.dialog = Roo.factory({
+    xtype : 'LayoutDialog',
     closable : false,
     collapsible : false,
     haveProgress : false,
@@ -105,9 +118,6 @@ Pman.Dialog.Image = {
         
     },
     width : 500,
-    xns : Roo,
-    '|xns' : 'Roo',
-    xtype : 'LayoutDialog',
     listeners : {
      show : function (_self)
       {
@@ -140,29 +150,29 @@ Pman.Dialog.Image = {
           
       }
     },
+    xns : Roo,
+    '|xns' : 'Roo',
     center : {
+     xtype : 'LayoutRegion',
      xns : Roo,
-     '|xns' : 'Roo',
-     xtype : 'LayoutRegion'
+     '|xns' : 'Roo'
     },
     buttons : [
      {
-      text : _this._strings['ea4788705e6873b424c65e91c2846b19'] /* Cancel */,
-      xns : Roo,
-      '|xns' : 'Roo',
       xtype : 'Button',
+      text : _this._strings['ea4788705e6873b424c65e91c2846b19'] /* Cancel */,
       listeners : {
        click : function (_self, e)
         {
             _this.dialog.hide();
         }
-      }
+      },
+      xns : Roo,
+      '|xns' : 'Roo'
      },
      {
-      text : _this._strings['91412465ea9169dfd901dd5e7c96dd99'] /* Upload */,
-      xns : Roo,
-      '|xns' : 'Roo',
       xtype : 'Button',
+      text : _this._strings['91412465ea9169dfd901dd5e7c96dd99'] /* Upload */,
       listeners : {
        click : function (_self, e)
         {
@@ -173,33 +183,34 @@ 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);
         
         }
-      }
+      },
+      xns : Roo,
+      '|xns' : 'Roo'
      }
     ],
     items  : [
      {
+      xtype : 'ContentPanel',
+      fitContainer : true,
       fitToFrame : true,
       region : 'center',
       xns : Roo,
       '|xns' : 'Roo',
-      xtype : 'ContentPanel',
       items  : [
        {
+        xtype : 'Form',
         fileUpload : true,
         labelWidth : 140,
         method : 'POST',
         style : 'margin:10px;',
         timeout : 300,
         url : baseURL + '/Roo/Images.php',
-        xns : Roo.form,
-        '|xns' : 'Roo.form',
-        xtype : 'Form',
         listeners : {
          actioncomplete : function(_self,act)
           {
@@ -209,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') {
@@ -240,7 +261,7 @@ Pman.Dialog.Image = {
                   }
                   return; 
               }
-              
+           
           
               
           },
@@ -273,59 +294,113 @@ Pman.Dialog.Image = {
               _this.form= form;
           }
         },
+        xns : Roo.form,
+        '|xns' : 'Roo.form',
         items  : [
          {
+          xtype : 'Hidden',
           name : 'UPLOAD_IDENTIFIER',
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          },
          {
+          xtype : 'Hidden',
           name : 'post_max_size',
           value : _this._strings['eb5d45750c7ab13aa8e6bacc80315a30'] /* 32M */,
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          },
          {
+          xtype : 'Hidden',
           name : 'upload_max_filesize',
           value : _this._strings['eb5d45750c7ab13aa8e6bacc80315a30'] /* 32M */,
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          },
          {
+          xtype : 'TextField',
           fieldLabel : _this._strings['ea72bacd2fdfa818907bb9559e6905a1'] /* Upload Image or File */,
           inputType : 'file',
           name : 'imageUpload',
           width : 200,
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'TextField'
+          '|xns' : 'Roo.form'
          },
          {
-          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 : '<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>',
+          triggerAction : 'all',
+          typeAhead : true,
+          valueField : 'name',
+          width : 250,
           xns : Roo.form,
           '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          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'
+           }
+          }
          },
          {
-          name : 'onid',
+          xtype : 'Hidden',
+          name : 'ontable',
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          },
          {
-          name : 'id',
+          xtype : 'Hidden',
+          name : 'onid',
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          },
          {
-          name : 'imgtype',
+          xtype : 'Hidden',
+          name : 'id',
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          }
         ]
        }