activeadmin-selleo-cms 0.0.47 → 0.0.48

data/app/assets/javascripts/ckeditor/config.js

@@ -3,12 +3,27 @@
  For licensing, see LICENSE.html or http://ckeditor.com/license
  */
 
+CKEDITOR.stylesSet.add( 'jips', [
+    // Block-level styles.
+    { name: 'Header 1', element: 'h1' },
+    { name: 'Header 2',  element: 'h2' },
+    { name: 'Header 3',  element: 'h3' },
+    { name: 'Header 4',  element: 'h4' },
+    { name: 'Paragraph',  element: 'p' },
+
+    // Inline styles.
+    { name: 'CSS Style', element: 'span', attributes: { 'class': 'my_style' } },
+    { name: 'Marker: Yellow', element: 'span', styles: { 'background-color': 'Yellow' } }
+]);
+
 CKEDITOR.editorConfig = function( config )
 {
     // Define changes to default configuration here. For example:
     // config.language = 'fr';
     // config.uiColor = '#AADC6E';
 
+    config.allowedContent = true;
+
     /* Filebrowser routes */
     // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
     config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
@@ -31,6 +46,8 @@ CKEDITOR.editorConfig = function( config )
     // The location of a script that handles file uploads.
     config.filebrowserUploadUrl = "/ckeditor/attachment_files";
 
+    config.extraPlugins = "inlinesave,formswidget";
+
     // Rails CSRF token
     config.filebrowserParams = function(){
         var csrf_token, csrf_param, meta,
@@ -72,75 +89,18 @@ CKEDITOR.editorConfig = function( config )
         return url + ( ( url.indexOf( "?" ) != -1 ) ? "&" : "?" ) + queryString.join( "&" );
     };
 
-    // Integrate Rails CSRF token into file upload dialogs (link, image, attachment and flash)
-    CKEDITOR.on( 'dialogDefinition', function( ev ){
-        // Take the dialog name and its definition from the event data.
-        var dialogName = ev.data.name;
-        var dialogDefinition = ev.data.definition;
-        var content, upload;
-
-        if (CKEDITOR.tools.indexOf(['link', 'image', 'attachment', 'flash'], dialogName) > -1) {
-            content = (dialogDefinition.getContents('Upload') || dialogDefinition.getContents('upload'));
-            upload = (content == null ? null : content.get('upload'));
-
-            if (upload && upload.filebrowser['params'] == null) {
-                upload.filebrowser['params'] = config.filebrowserParams();
-                upload.action = config.addQueryString(upload.action, upload.filebrowser['params']);
-            }
-        }
-
-        if (dialogName == 'link') {
-            var linkInfoTab = dialogDefinition.getContents('info');
-            var pageField = linkInfoTab.get('page');
-
-            if (!pageField) {
-                $.ajax({
-                    url: '/en.json',
-                    type: 'GET',
-                    async: false
-                }).success(function(resp){
-                        linkInfoTab.add( {
-                            type : 'select',
-                            label : 'Page',
-                            id : 'page',
-                            name : 'page',
-                            items: resp,
-                            onChange: function(ev){
-                                var diag = CKEDITOR.dialog.getCurrent();
-                                var url = diag.getContentElement('info','url');
-                                var locale = $('[id*="lang"]:visible').find('input[name*="locale"]:hidden').val();
-                                url.setValue(ev.data.value.replace(':locale', locale));
-                            }
-                        });
-                    });
-            }
-        }
-    });
-
-    config.height = '200px';
-    config.width = '800px';
-
-    config.toolbar = 'Lite';
-
-    config.forcePasteAsPlainText = true;
-    config.fontSize_sizes = '12/12px;14/14px;18/18px;24/24px;30/30px;';
-
-    /* Extra plugins */
-    // works only with en, ru, uk locales
-    config.extraPlugins = "embed,attachment";
-
-    /* Toolbars */
-    config.toolbar = 'Lite';
+    config.toolbar = 'Full';
 
     config.toolbar_Easy =
         [
-            ['Source','-','Preview'],
-            ['Cut','Copy','Paste','PasteText','PasteFromWord',],
+            ['Source','-','Preview', 'Save'],
+            ['Cut','Copy','Paste'],
             ['Undo','Redo','-','SelectAll','RemoveFormat'],
-            ['Styles','Format'], ['Subscript', 'Superscript', 'TextColor'], ['Maximize','-','About'], '/',
+            ['Font', 'Styles', 'FontSize'],
+            ['Subscript', 'Superscript', 'TextColor'], ['Maximize','-','About'], '/',
+            ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             ['Bold','Italic','Underline','Strike'], ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
-            ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-            ['Link','Unlink','Anchor'], ['Image', 'Attachment', 'Flash', 'Embed'],
+            ['Link','Unlink','Anchor'], ['Image', 'Attachment', 'Flash'],
             ['Table','HorizontalRule','Smiley','SpecialChar','PageBreak']
         ];
 
@@ -176,7 +136,33 @@ CKEDITOR.editorConfig = function( config )
 
     config.toolbar_Header =
         [
-            ['Bold'],
+            ['Bold']
         ];
 
-};
+    config.toolbar_Link =
+        [
+            ['Link', 'Unlink']
+        ];
+
+    config.stylesSet = 'jips';
+
+    // Integrate Rails CSRF token into file upload dialogs (link, image, attachment and flash)
+    CKEDITOR.on( 'dialogDefinition', function( ev ){
+        // Take the dialog name and its definition from the event data.
+        var dialogName = ev.data.name;
+        var dialogDefinition = ev.data.definition;
+        var content, upload;
+
+        if (CKEDITOR.tools.indexOf(['link', 'image', 'attachment', 'flash'], dialogName) > -1) {
+            content = (dialogDefinition.getContents('Upload') || dialogDefinition.getContents('upload'));
+            upload = (content == null ? null : content.get('upload'));
+
+            if (upload && upload.filebrowser && upload.filebrowser['params'] === undefined) {
+                upload.filebrowser['params'] = config.filebrowserParams();
+                upload.action = config.addQueryString(upload.action, upload.filebrowser['params']);
+            }
+        }
+    });
+};
+
+

data/app/assets/javascripts/ckeditor/plugins/formswidget/dialogs/formswidget.js

@@ -0,0 +1,49 @@
+CKEDITOR.dialog.add( 'formswidgetDialog', function ( editor ) {
+    var items = [];
+    $.ajax({
+        url: '/admin/forms.json',
+        type: 'GET',
+        async: false,
+        success: function(resp){
+            items = [$.map(resp, function(obj, idx) {
+                return [obj.title, obj.id]
+            })]
+        }
+    });
+
+    return {
+        title: 'Insert form',
+        minWidth: 400,
+        minHeight: 70,
+
+        contents: [
+            {
+                id: 'tab-select',
+                label: 'Select form',
+                elements: [
+                    {
+                        type: 'select',
+                        id: 'form_id',
+                        label: 'Select a form to insert',
+                        items: items
+                    }
+                ]
+            }
+        ],
+
+        onOk: function() {
+            var dialog = this;
+            var form = editor.document.createElement('form');
+
+            var select = dialog.getContentElement('tab-select', 'form_id');
+            var input = select.getInputElement().$;
+
+            form.setAttribute('data-form-id', dialog.getValueOf('tab-select', 'form_id'));
+            form.setAttribute('style', 'border: 1px dotted #990000');
+
+            form.appendText( 'FORM: ' + input.options[ input.selectedIndex ].text );
+
+            editor.insertElement(form);
+        }
+    };
+});

data/app/assets/javascripts/ckeditor/plugins/formswidget/plugin.js

@@ -0,0 +1,18 @@
+(function() {
+    var pluginName = 'formswidget';
+
+    CKEDITOR.plugins.add( pluginName, {
+        icons: 'form',
+        init: function( editor ) {
+            CKEDITOR.dialog.add( 'formswidgetDialog', this.path + 'dialogs/formswidget.js' );
+
+            editor.addCommand('formswidgetDialog', new CKEDITOR.dialogCommand('formswidgetDialog') );
+
+            editor.ui.addButton( 'form', {
+                label: 'Insert form',
+                command: 'formswidgetDialog',
+                toolbar: 'insert'
+            });
+        }
+    });
+})();

data/app/assets/javascripts/ckeditor/plugins/inlinesave/plugin.js

@@ -16,7 +16,8 @@
                   type: 'PUT',
                   data: {
                       'section': {
-                          'body': editor.getData()
+                          'body': editor.getData(),
+                          'locale': $('html').attr('lang')
                       }
                   }
               });
@@ -30,7 +31,7 @@
 
 	// Register a plugin named "save".
 	CKEDITOR.plugins.add( pluginName, {
-		icons: 'save', // %REMOVE_LINE_CORE%
+		icons: 'formswidget', // %REMOVE_LINE_CORE%
 		init: function( editor ) {
 
 			editor.addCommand( pluginName, saveCmd );

data/app/assets/javascripts/ckeditor/toolbars.js

@@ -0,0 +1,36 @@
+CKEDITOR.on( 'instanceCreated', function( event ) {
+    var editor = event.editor,
+        element = editor.element;
+
+    if ( element.getAttribute('data-toolbar') == 'Save' ) {
+        editor.on( 'configLoaded', function() {
+            editor.config.plugins = 'toolbar,floatingspace';
+            editor.config.extraPlugins = 'inlinesave';
+        });
+    } else if ( element.getAttribute('data-toolbar') == 'Header' ) {
+        editor.on( 'configLoaded', function() {
+            editor.config.plugins = 'toolbar,floatingspace,basicstyles';
+            editor.config.extraPlugins = 'inlinesave';
+        });
+    } else if ( element.getAttribute('data-toolbar') == 'Link' ) {
+        editor.on( 'configLoaded', function() {
+            editor.config.plugins = 'toolbar,floatingspace,basicstyles,link';
+            editor.config.extraPlugins = 'inlinesave';
+        });
+    } else if ( element.getAttribute('data-toolbar') == 'Lite' ) {
+        editor.on( 'configLoaded', function() {
+            editor.config.plugins = "toolbar,floatingspace,basicstyles,stylescombo";
+        });
+    } else {
+        editor.on( 'configLoaded', function() {
+            editor.config.plugins = "dialogui,dialog,about,a11yhelp,dialogadvtab,basicstyles,bidi,blockquote,clipboard,button,panelbutton,panel,floatpanel,colorbutton,colordialog,templates,menu,contextmenu,div,resize,toolbar,elementspath,list,indent,enterkey,entities,popup,filebrowser,find,fakeobjects,flash,floatingspace,listblock,richcombo,font,format,htmlwriter,horizontalrule,iframe,wysiwygarea,image,smiley,justify,link,liststyle,magicline,maximize,newpage,pagebreak,pastetext,pastefromword,preview,print,removeformat,save,selectall,showblocks,showborders,sourcearea,specialchar,menubutton,scayt,stylescombo,tab,table,tabletools,undo,wsc";
+        });
+    }
+
+//    editor.config.toolbarGroups = [
+//        { name: 'editing',		groups: [ 'document', 'basicstyles', 'stylescombo', 'link' ] }
+//    ];
+
+});
+
+// plugins "dialogui,dialog,about,a11yhelp,dialogadvtab,basicstyles,bidi,blockquote,clipboard,button,panelbutton,panel,floatpanel,colorbutton,colordialog,templates,menu,contextmenu,div,resize,toolbar,elementspath,list,indent,enterkey,entities,popup,filebrowser,find,fakeobjects,flash,floatingspace,listblock,richcombo,font,forms,format,htmlwriter,horizontalrule,iframe,wysiwygarea,image,smiley,justify,link,liststyle,magicline,maximize,newpage,pagebreak,pastetext,pastefromword,preview,print,removeformat,save,selectall,showblocks,showborders,sourcearea,specialchar,menubutton,scayt,stylescombo,tab,table,tabletools,undo,wsc"

data/app/models/activeadmin_selleo_cms/section.rb

@@ -77,7 +77,7 @@ module ActiveadminSelleoCms
       section_definition = sectionable.layout.find_section(name) if sectionable and sectionable.respond_to? :layout
       if section_definition
         if section_definition.text?
-          render_body
+          render
         elsif section_definition.image?
           image ? image.url : ""
         end

data/app/views/forms/_form.html.erb

@@ -34,9 +34,8 @@
   </ol>
 <% end %>
 
-<%= button_to_function "Print", "$('##{dom_id(form)}').printElement({printMode:'popup'});", class: 'print', title: 'Print' %>
+<%= button_to_function "Print", "print(#{form.id}, '#{dom_id(form)}')", class: 'print', title: 'Print' %>
 <%= button_to_function "Download PDF", "downloadPDF(#{form.id}, '#{dom_id(form)}')", class: 'save', title: 'Download PDF' %>
-<%= button_to_function "Download", "download(#{form.id}, '#{dom_id(form)}')", class: 'save', title: 'Download' %>
 <%= button_to_function "Send to JIPS", "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send' %>
 
 <script>
@@ -48,8 +47,8 @@
       window.location='/forms/'+form_id+'/download.pdf?form_uuid='+localStorage[form_dom_id];
   }
 
-  function download(form_id, form_dom_id){
-      window.location='/forms/'+form_id+'/download?form_uuid='+localStorage[form_dom_id];
+  function print(form_id, form_dom_id){
+      window.open('/forms/'+form_id+'/download?form_uuid='+localStorage[form_dom_id]);
   }
 
   function deliver(form_id, form_dom_id) {

data/app/views/forms/download.html.erb

@@ -1 +1,5 @@
-<%= render partial: 'download'%>
+<%= render partial: 'download'%>
+
+<script>
+    window.print();
+</script>

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.47"
+  VERSION = "0.0.48"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.48
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
@@ -428,8 +444,12 @@ files:
 - app/assets/images/activeadmin-selleo-cms/Jcrop.gif
 - app/assets/javascripts/active_admin.js
 - app/assets/javascripts/ckeditor/config.js
+- app/assets/javascripts/ckeditor/toolbars.js
 - app/assets/javascripts/ckeditor/plugins/inlinesave/icons/save.png
 - app/assets/javascripts/ckeditor/plugins/inlinesave/plugin.js
+- app/assets/javascripts/ckeditor/plugins/formswidget/dialogs/formswidget.js
+- app/assets/javascripts/ckeditor/plugins/formswidget/icons/formswidget.png
+- app/assets/javascripts/ckeditor/plugins/formswidget/plugin.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery.Jcrop.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery-ui-timepicker-addon.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery.printElement.js