Changeset 10372

Timestamp:

07/21/08 03:23:39 (4 months ago)

Author:

Leon.van.der.Ree

Message:

Added Managed IFrame (requirement for TinyMCE)
updated tinyMCE to latest version 0.6
changed time-format for for json-data

Files:

• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/editAjaxSuccess.php (modified) (1 diff)
• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/listAjaxSuccess.php (modified) (1 diff)
• plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php (modified) (1 diff)
• plugins/sfExtjsThemePlugin/web/css/symfony-extjs.css (modified) (1 diff)
• plugins/sfExtjsThemePlugin/web/js/ext.ux.managediframe (added)
• plugins/sfExtjsThemePlugin/web/js/ext.ux.managediframe/miframe-min.js (added)
• plugins/sfExtjsThemePlugin/web/js/ext.ux.managediframe/miframe.js (added)
• plugins/sfExtjsThemePlugin/web/js/ext.ux.tinymce/Ext.ux.TinyMCE.js (modified) (7 diffs)
• plugins/sfExtjsThemePlugin/web/js/ext.ux.tinymce/Ext.ux.TinyMCE.min.js (modified) (1 diff)

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/editAjaxSuccess.php

@@ -27 +27 @@
-   $js[] = '/sfExtjsThemePlugin/js/tiny_mce/tiny_mce';
-   $js[] = '/sfExtjsThemePlugin/js/ext.ux.tinymce/Ext.ux.TinyMCE.min.js';
+   $js[] = '/sfExtjsThemePlugin/js/ext.ux.managediframe/miframe-min.js';
-<?php endif ?>
-

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/listAjaxSuccess.php

@@ -28 +28 @@
-   $js[] = '/sfExtjsThemePlugin/js/tiny_mce/tiny_mce';
-   $js[] = '/sfExtjsThemePlugin/js/ext.ux.tinymce/Ext.ux.TinyMCE.min.js';
+   $js[] = '/sfExtjsThemePlugin/js/ext.ux.managediframe/miframe-min.js';
-<?php endif ?>
-

plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php

@@ -1040 +1040 @@
-    else if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP)
-    {
-f
+U
-      return "($columnGetter !== null && $columnGetter !== '') ?  format_date($columnGetter, \"$format\") : ''";
-    }

plugins/sfExtjsThemePlugin/web/css/symfony-extjs.css

@@ -103 +103 @@
-
-
+.btn_mail .x-btn-text,
+.btn_mail .x-menu-item-icon {
+background-image: url('../images/silk_icons/icons/email.png');
+}
-
-.btn_refresh .x-btn-text {

plugins/sfExtjsThemePlugin/web/js/ext.ux.tinymce/Ext.ux.TinyMCE.js

@@ -1 +1 @@
-/** ************************************************************
-5
+6
-  ExtJS form field containing TinyMCE v3.
-  
@@ -92 +92 @@
-        this.ed = new tinymce.Editor( id, this.tinymceSettings );
-        
-PostRender
+BeforeRenderUI
-          // Replace control manager
-          ed.controlManager = new ControlManager( this, ed );
+        }.createDelegate( this ));
+
+        this.ed.onPostRender.add( function( ed, controlManager ){
-          // Change window manager
-          ed.windowManager = new WindowManager( this.ed );
@@ -112 +115 @@
-        
-        // Bind to editor focus
-
+//
-        
-        // Render the editor
@@ -312 +315 @@
-        s = s || {};
-        p = p || {};
+        
+        if ( !s.type )
+          this.bookmark = this.editor.selection.getBookmark( 'simple' );
-        
-        s.width = parseInt(s.width || 320);
@@ -379 +385 @@
-      },
-      
-
-
+
+
+
+
+
+
+
+
+
-        if( w ) w.setTitle( ti );
-      },
@@ -430 +443 @@
-          orig.call( this, x, y, px );
-          //var zi = self.control.getEl().getStyle( "z-index" );
-12000
+200001
-        }
-        
@@ -444 +457 @@
-        res.showMenu = function( x, y, px ) {
-          orig.call( this, x, y, px );
-12000
+200001
-        }
-        

plugins/sfExtjsThemePlugin/web/js/ext.ux.tinymce/Ext.ux.TinyMCE.min.js

@@ -1 @@
-PostRender.add(function(K,J){K.controlManager=new A(this,K);K.windowManager=new B(this.ed)}.createDelegate(this));this.ed.onInit.add(function(){var K=Ext.get(Ext.DomQuery.selectNode("#"+this.ed.id+"_tbl td.mceToolbar"));var J=K.select("> table.mceToolbar");Ext.DomHelper.append(K,{tag:"div",style:{overflow:"hidden"}},true).appendChild(J)}.createDelegate(this));this.ed.onActivate.add(this.focus.createDelegate(this,[false,false],false));this.ed.render();tinyMCE.add(this.ed);this.fireEvent("editorcreated")},getName:function(){return this.rendered&&this.textareaEl.dom.name?this.textareaEl.dom.name:(this.name||"")},initValue:function(){if(this.value!==undefined){this.setValue(this.value)}else{var D=this.getEl().child("textarea",true);if(D.value.length>0){this.setValue(D.value)}}},onDestroy:function(){if(this.ed){tinyMCE.remove(this.ed)}Ext.ux.TinyMCE.superclass.onDestroy.call(this)},getValue:function(){if(!this.rendered||!this.ed.initialized){return this.value}var D=this.ed.getContent();if(D===this.emptyText||D===undefined){D=""}return D},setValue:function(D){this.value=D;if(this.rendered){this.withEd(function(){this.ed.undoManager.clear();this.ed.setContent(D===null||D===undefined?"":D);this.ed.startContent=this.ed.getContent({format:"raw"});this.validate()})}},isDirty:function(){if(this.disabled||!this.rendered){return false}return this.ed.isDirty()},syncValue:function(){if(this.rendered&&this.ed.initialized){this.ed.save()}},getEd:function(){return this.ed},onResize:function(E,D){if(this.rendered){this.withEd(function(){if(Ext.type(E)!="number"){E=this.el.getWidth()}if(Ext.type(D)!="number"){D=this.el.getHeight()}this.ed.theme.resizeTo(E,D)})}},focus:function(E,D){Ext.ux.TinyMCE.superclass.focus.call(this,E,D)},onFocus:function(){if(!this.hasFocus){this.hasFocus=true;this.startValue=this.getValue();this.withEd(function(){this.ed.focus();this.fireEvent("focus",this)})}},withEd:function(D){if(!this.ed){this.on("editorcreated",function(){this.withEd(D)},this)}else{if(this.ed.initialized){D.call(this)}else{this.ed.onInit.add(function(){D.defer(10,this)}.createDelegate(this))}}}});Ext.apply(Ext.ux.TinyMCE,{tinymcePlugins:"safari,pagebreak,style,layer,table,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,noneditable,visualchars,nonbreaking,xhtmlxtras,template",initTinyMCE:function(E){if(!C){var D={mode:"none",plugins:Ext.ux.TinyMCE.tinymcePlugins,theme:"advanced"};Ext.apply(D,E);tinyMCE.init(D);C=true}}});Ext.ComponentMgr.registerType("tinymce",Ext.ux.TinyMCE);var B=Ext.extend(function(D){B.superclass.constructor.call(this,D)},tinymce.WindowManager,{alert:function(E,D,F){Ext.MessageBox.alert("",E,function(){D.call(this)},F)},confirm:function(E,D,F){Ext.MessageBox.confirm("",E,function(G){D.call(this,G=="yes")},F)},open:function(D,F){D=D||{};F=F||{};D.width=parseInt(D.width||320);D.height=parseInt(D.height||240)+(tinymce.isIE?8:0);D.min_width=parseInt(D.min_width||150);D.min_height=parseInt(D.min_height||100);D.max_width=parseInt(D.max_width||2000);D.max_height=parseInt(D.max_height||2000);D.movable=D.resizable=true;F.mce_width=D.width;F.mce_height=D.height;F.mce_inline=true;this.features=D;this.params=F;var E=new Ext.Window({title:D.name,width:D.width,height:D.height,minWidth:D.min_width,minHeight:D.min_height,resizable:true,maximizable:D.maximizable==true,minimizable:D.minimizable==true,modal:true,layout:"fit",items:[{xtype:"iframepanel",defaultSrc:D.url||D.file}]});F.mce_window_id=E.getId();E.show(null,function(){if(D.left&&D.top){E.setPagePosition(D.left,D.top)}var G=E.getPosition();D.left=G[0];D.top=G[1];this.onOpen.dispatch(this,D,F)},this);return E},close:function(E){if(!E.tinyMCEPopup||!E.tinyMCEPopup.id){B.superclass.close.call(this,E);return }var D=Ext.getCmp(E.tinyMCEPopup.id);if(D){this.onClose.dispatch(this);D.close()}},setTitle:function(E,F){var D=Ext.getCmp(F);if(D){D.setTitle(E)}},resizeBy:function(E,G,H){var D=Ext.getCmp(H);if(D){var F=D.getSize();D.setSize(F.width+E,F.height+G)}},focus:function(E){var D=Ext.getCmp(E);if(D){D.setActive(true)}}});var A=Ext.extend(function(F,D,E){this.control=F;A.superclass.constructor.call(this,D,E)},tinymce.ControlManager,{control:null,createDropMenu:function(G,E){var D=A.superclass.createDropMenu.call(this,G,E);var F=D.showMenu;D.showMenu=function(H,J,I){F.call(this,H,J,I);Ext.fly("menu_"+this.id).setStyle("z-index",12000)};return D},createColorSplitButton:function(G,E){var D=A.superclass.createColorSplitButton.call(this,G,E);var F=D.showMenu;D.showMenu=function(H,J,I){F.call(this,H,J,I);Ext.fly(this.id+"_menu").setStyle("z-index",12000
+BeforeRenderUI.add(function(K,J){K.controlManager=new A(this,K)}.createDelegate(this));this.ed.onPostRender.add(function(K,J){K.windowManager=new B(this.ed)}.createDelegate(this));this.ed.onInit.add(function(){var K=Ext.get(Ext.DomQuery.selectNode("#"+this.ed.id+"_tbl td.mceToolbar"));var J=K.select("> table.mceToolbar");Ext.DomHelper.append(K,{tag:"div",style:{overflow:"hidden"}},true).appendChild(J)}.createDelegate(this));this.ed.render();tinyMCE.add(this.ed);this.fireEvent("editorcreated")},getName:function(){return this.rendered&&this.textareaEl.dom.name?this.textareaEl.dom.name:(this.name||"")},initValue:function(){if(this.value!==undefined){this.setValue(this.value)}else{var D=this.getEl().child("textarea",true);if(D.value.length>0){this.setValue(D.value)}}},onDestroy:function(){if(this.ed){tinyMCE.remove(this.ed)}Ext.ux.TinyMCE.superclass.onDestroy.call(this)},getValue:function(){if(!this.rendered||!this.ed.initialized){return this.value}var D=this.ed.getContent();if(D===this.emptyText||D===undefined){D=""}return D},setValue:function(D){this.value=D;if(this.rendered){this.withEd(function(){this.ed.undoManager.clear();this.ed.setContent(D===null||D===undefined?"":D);this.ed.startContent=this.ed.getContent({format:"raw"});this.validate()})}},isDirty:function(){if(this.disabled||!this.rendered){return false}return this.ed.isDirty()},syncValue:function(){if(this.rendered&&this.ed.initialized){this.ed.save()}},getEd:function(){return this.ed},onResize:function(E,D){if(this.rendered){this.withEd(function(){if(Ext.type(E)!="number"){E=this.el.getWidth()}if(Ext.type(D)!="number"){D=this.el.getHeight()}this.ed.theme.resizeTo(E,D)})}},focus:function(E,D){Ext.ux.TinyMCE.superclass.focus.call(this,E,D)},onFocus:function(){if(!this.hasFocus){this.hasFocus=true;this.startValue=this.getValue();this.withEd(function(){this.ed.focus();this.fireEvent("focus",this)})}},withEd:function(D){if(!this.ed){this.on("editorcreated",function(){this.withEd(D)},this)}else{if(this.ed.initialized){D.call(this)}else{this.ed.onInit.add(function(){D.defer(10,this)}.createDelegate(this))}}}});Ext.apply(Ext.ux.TinyMCE,{tinymcePlugins:"safari,pagebreak,style,layer,table,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,noneditable,visualchars,nonbreaking,xhtmlxtras,template",initTinyMCE:function(E){if(!C){var D={mode:"none",plugins:Ext.ux.TinyMCE.tinymcePlugins,theme:"advanced"};Ext.apply(D,E);tinyMCE.init(D);C=true}}});Ext.ComponentMgr.registerType("tinymce",Ext.ux.TinyMCE);var B=Ext.extend(function(D){B.superclass.constructor.call(this,D)},tinymce.WindowManager,{alert:function(E,D,F){Ext.MessageBox.alert("",E,function(){D.call(this)},F)},confirm:function(E,D,F){Ext.MessageBox.confirm("",E,function(G){D.call(this,G=="yes")},F)},open:function(D,F){D=D||{};F=F||{};if(!D.type){this.bookmark=this.editor.selection.getBookmark("simple")}D.width=parseInt(D.width||320);D.height=parseInt(D.height||240)+(tinymce.isIE?8:0);D.min_width=parseInt(D.min_width||150);D.min_height=parseInt(D.min_height||100);D.max_width=parseInt(D.max_width||2000);D.max_height=parseInt(D.max_height||2000);D.movable=D.resizable=true;F.mce_width=D.width;F.mce_height=D.height;F.mce_inline=true;this.features=D;this.params=F;var E=new Ext.Window({title:D.name,width:D.width,height:D.height,minWidth:D.min_width,minHeight:D.min_height,resizable:true,maximizable:D.maximizable==true,minimizable:D.minimizable==true,modal:true,layout:"fit",items:[{xtype:"iframepanel",defaultSrc:D.url||D.file}]});F.mce_window_id=E.getId();E.show(null,function(){if(D.left&&D.top){E.setPagePosition(D.left,D.top)}var G=E.getPosition();D.left=G[0];D.top=G[1];this.onOpen.dispatch(this,D,F)},this);return E},close:function(E){if(!E.tinyMCEPopup||!E.tinyMCEPopup.id){B.superclass.close.call(this,E);return }var D=Ext.getCmp(E.tinyMCEPopup.id);if(D){this.onClose.dispatch(this);D.close()}},setTitle:function(F,E){if(!F.tinyMCEPopup||!F.tinyMCEPopup.id){B.superclass.setTitle.call(this,F,E);return }var D=Ext.getCmp(F.tinyMCEPopup.id);if(D){D.setTitle(E)}},resizeBy:function(E,G,H){var D=Ext.getCmp(H);if(D){var F=D.getSize();D.setSize(F.width+E,F.height+G)}},focus:function(E){var D=Ext.getCmp(E);if(D){D.setActive(true)}}});var A=Ext.extend(function(F,D,E){this.control=F;A.superclass.constructor.call(this,D,E)},tinymce.ControlManager,{control:null,createDropMenu:function(G,E){var D=A.superclass.createDropMenu.call(this,G,E);var F=D.showMenu;D.showMenu=function(H,J,I){F.call(this,H,J,I);Ext.fly("menu_"+this.id).setStyle("z-index",200001)};return D},createColorSplitButton:function(G,E){var D=A.superclass.createColorSplitButton.call(this,G,E);var F=D.showMenu;D.showMenu=function(H,J,I){F.call(this,H,J,I);Ext.fly(this.id+"_menu").setStyle("z-index",200001