spud_core 0.9.3 → 0.9.4

data/app/assets/javascripts/spud/admin/application.js

@@ -24,10 +24,12 @@ $(document).ready(function() {
     };
   }
 
-    $('#user_table').dataTable({
-      "bJQueryUI": true,
-      "sPaginationType": "full_numbers"
-    });
+  spud.admin.editor.init();
+
+    // $('#user_table').dataTable({
+    //   "bJQueryUI": true,
+    //   "sPaginationType": "full_numbers"
+    // });
 
     $("#modal_window .modal-footer .form-submit").bind('click', function() {
       $("#modal_window .modal-body form").submit();
@@ -71,9 +73,7 @@ $(document).ready(function() {
 
     $('#multisite_switcher select').change(function() {
       $(this).parent().submit();
-      // alert('test');
     });
-    initFormTabs();
 
 } );
 
@@ -89,41 +89,18 @@ function add_fields(link, association, content) {
   $(link).parent().before(content.replace(regexp, new_id));
 }
 
-function initFormTabs(){
-   var tabNames = [];
-
-   $('.formtabs .formtab').each(function(tabind) {
-      if(tabind === 0) {
-        $(this).addClass('active');
-      }
-      this.id = 'tab-' + tabind;
-      tabNames.push($('.tab_name',this).first().val());
-   });
-   var tabButtons = $('.formtabs .formtab_buttons').first();
-   for(var x=0;x<tabNames.length;x++)
-   {
-      var tabButton = $('<li><a href="#tab-' + x + '" data-toggle="tab">' + tabNames[x] + '</a></li>');
-      if(x == 0) {
-        tabButton.addClass('active');
-      }
-       tabButtons.append(tabButton);
-   }
-
-   // $('.formtabs').tabs();
-}
+
 
 
 function initTinyMCE(selector) {
-  console.warn('Deprecation Notice: `initTinyMCE()` is depcreated, please use `spud.admin.editor.init()` instead.');
+  console.warn('Deprecation Notice: `initTinyMCE()` is deprecated, please use `spud.admin.editor.init()` instead.');
   spud.admin.editor.init();
 }
 
 function initDatePicker(selector){
-  selector = (typeof(selector) == 'undefined') ? '.spud_form_date_picker' : selector;
-  $(selector).datepicker({
-    'format': 'yyyy-mm-dd',
-    'autoclose': true
-  });
+  console.warn('Deprecation Notice: `initDatePicker()` is deprecated, please use `spud.admin.date_picker.init()` instead.');
+  spud.admin.date_picker.init();
+
 }
 
 function displayModalDialogWithOptions(options){

data/app/assets/javascripts/spud/admin/date_picker.js

@@ -0,0 +1,56 @@
+spud.admin.date_picker = {};
+
+(function() {
+  var picker = spud.admin.date_picker;
+
+  parsePickerDate = function(value) {
+    var date = new Date();
+
+    var currentDateTimeComponents = value.split(" ");
+    var dateComponents = currentDateTimeComponents[0].split("-");
+    if(dateComponents.length >= 3) {
+      date = new Date(parseInt(dateComponents[0],10),parseInt(dateComponents[1],10) - 1,parseInt(dateComponents[2],10));
+    }
+    return date;
+  }
+
+  picker.init = function(selector) {
+      selector = (typeof(selector) == 'undefined') ? '.spud_form_date_picker' : selector;
+      $(selector).each(function() {
+        var $this = $(this);
+        var baseName = $this.attr('name');
+        $this.attr('name',baseName.replace("[","_").replace("]",""));
+        $this.datepicker({
+          'format': 'yyyy-mm-dd',
+          'autoclose': true
+        });
+        $this.val($this.val().split(" ")[0]);
+        var date = parsePickerDate($this.val());
+
+        var yearField = $("<input type='hidden'/>");
+          yearField.attr('name',baseName.replace(']',"(1i)]"));
+          yearField.val(date.getFullYear());
+        var monthField = $("<input type='hidden'/>");
+          monthField.attr('name',baseName.replace(']',"(2i)]"));
+          monthField.val(date.getMonth() + 1);
+        var dayField = $("<input type='hidden'/>");
+          dayField.attr('name',baseName.replace(']',"(3i)]"));
+          dayField.val(date.getUTCDate());
+        yearField.insertAfter($this);
+        monthField.insertAfter($this);
+        dayField.insertAfter($this);
+
+
+        $this.bind('change', function(evt) {
+          var date = parsePickerDate($(this).val());
+          yearField.val(date.getFullYear());
+          monthField.val(date.getMonth() + 1);
+          dayField.val(date.getUTCDate());
+
+        });
+
+
+      });
+
+  };
+})();

data/app/assets/javascripts/spud/admin/editor.js

@@ -6,12 +6,12 @@ spud.admin.editor = {};
   var editor = spud.admin.editor;
 
   var registeredPlugins = [
-    'autolink','lists','layer','table','advhr','advimage','advlink','iespell','inlinepopups','media','paste'
+    'autolink','lists','layer','table','tableDropdown','advhr','advimage','advlink','iespell','inlinepopups','media','paste'
   ];
 
   var registeredButtons = [
-    ['bold','italic','underline','strikethrough','forecolor','backcolor','|','justifyleft','justifycenter','justifyright','justifyfull','|','formatselect','fontsizeselect','cut','copy','paste','pastetext','pasteword','|','bullist','numlist','outdent','indent'],
-    ['tablecontrols','|','link','unlink','anchor','image','code'],
+    ['bold','italic','underline','strikethrough','|','justifyleft','justifycenter','justifyright','justifyfull','|','formatselect','cut','copy','paste','pastetext','|','bullist','numlist','outdent','indent','|','tableDropdown','|','link','unlink','anchor','image','code'],
+    [],
     [],
     []
   ];
@@ -38,6 +38,9 @@ spud.admin.editor = {};
     "q[cite],samp,select[disabled|multiple|name|size],small," +
     "textarea[cols|rows|disabled|name|readonly],tt,var,big";
 
+  var validFormats = "p,h1,h2,h3,h4,h5,h6";
+
+  theme_advanced_blockformats :
   editor.init = function(){
     editor.initWithOptions({});
   };
@@ -46,8 +49,8 @@ spud.admin.editor = {};
     var selector = options.selector || 'textarea.tinymce';
     var theme = options.theme || 'advanced';
     var height = options.height || 400;
-    //var alignment:
-    $(selector).tinymce({
+    $(selector).each(function() {
+      $(this).tinymce({
       theme: theme,
       plugins: registeredPlugins.join(','),
       theme_advanced_toolbar_location: "top",
@@ -56,10 +59,20 @@ spud.admin.editor = {};
       theme_advanced_buttons3: registeredButtons[2].join(','),
       theme_advanced_buttons4: registeredButtons[3].join(','),
       theme_advanced_toolbar_align: 'left',
+      theme_advanced_blockformats: validFormats,
       convert_urls: false,
       valid_elements: validElements,
+      width: $(this).width(),
       height: height
+      });
     });
+
+  };
+
+  editor.unload = function(selectorOptional) {
+    var selector = selectorOptional || 'textarea.tinymce';
+    $(selector).each(function() {$(this).tinymce().execCommand('mceRemoveControl',false,this.id);});
+
   };
 
   editor.registerPlugin = function(pluginName){
@@ -80,7 +93,7 @@ spud.admin.editor = {};
   };
 
   editor.registerButton = function(buttonNameOrArray, rowNum){
-    rowNum = rowNum || 1;
+    rowNum = rowNum || 0;
     if(typeof(buttonNameOrArray) == 'object'){
       registeredButtons[rowNum].concat(buttonNameOrArray);
     }

data/app/assets/libs/tiny_mce/plugins/tableDropdown/editor_plugin.js

@@ -0,0 +1,140 @@
+/*
+ *
+ * Table Dropdown Plugin for TinyMCE
+ *
+ * Copyright 2011 Cory LaViska for A Beautiful Site, LLC. — www.abeautifulsite.net
+ *
+ * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+(function() {
+	
+	tinymce.create('tinymce.plugins.TableDropdown', {
+		
+	    createControl: function(n, cm) {
+	    	
+	        switch( n ) {
+				
+	            case 'tableDropdown':
+	            	
+	                var c = cm.createSplitButton('tableDropdown', {
+	                    title : 'table.desc',
+	                    'class': 'mce_table',
+	                    onclick: function() {
+	                        tinymce.activeEditor.execCommand('mceInsertTable');
+	                    }
+	                });
+					
+	                c.onRenderMenu.add(function(c, m) {
+	                    
+						m.add({
+							title: 'table.desc', 
+							icon: 'table',
+							cmd: 'mceInsertTable'
+						});
+						
+						m.add({
+							title: 'table.del',
+							icon: 'delete_table',
+							cmd: 'mceTableDelete'
+						});
+						
+						m.addSeparator();
+						
+						m.add({
+							title: 'table.row_desc', 
+							icon: 'row_props', 
+							cmd: 'mceTableRowProps'
+						});
+						
+						m.add({
+							title: 'table.cell_desc', 
+							icon: 'cell_props', 
+							cmd: 'mceTableCellProps'
+						});
+						
+						m.addSeparator();
+						
+						m.add({
+							title: 'table.row_before_desc', 
+							icon: 'row_before', 
+							cmd: 'mceTableInsertRowBefore'
+						});
+						
+						m.add({
+							title: 'table.row_after_desc', 
+							icon: 'row_after', 
+							cmd: 'mceTableInsertRowAfter'
+						});
+						
+						m.add({
+							title: 'table.delete_row_desc', 
+							icon: 'delete_row', 
+							cmd: 'mceTableDeleteRow'
+						});
+						
+						m.addSeparator();
+						
+						m.add({
+							title: 'table.col_before_desc', 
+							icon: 'col_before', 
+							cmd: 'mceTableInsertColBefore'
+						});
+						
+						m.add({
+							title: 'table.col_after_desc', 
+							icon: 'col_after', 
+							cmd: 'mceTableInsertColAfter'
+						});
+						
+						m.add({
+							title: 'table.delete_col_desc', 
+							icon: 'delete_col', 
+							cmd: 'mceTableDeleteCol'
+						});
+						
+						m.addSeparator();
+						
+						m.add({
+							title: 'table.merge_cells_desc', 
+							icon: 'merge_cells', 
+							cmd: 'mceTableMergeCells'
+						});
+						
+						m.add({
+							title: 'table.split_cells_desc', 
+							icon: 'split_cells', 
+							cmd: 'mceTableSplitCells'
+						});
+						
+						// Enable/disable menu items on node change
+						c.editor.onNodeChange.add( function(ed, cm, n, co) {
+							var items = items = ed.controlManager.controls[ed.id + '_tableDropdown'].menu.items,
+								p = ed.dom.getParent(ed.selection.getStart(), 'td,th,caption');
+							if( p && p.nodeName === 'CAPTION' ) p = 0;
+							tinymce.each(items, function(t) {
+								if( t.settings.icon === 'table' ) return;
+								t.setDisabled(!p);
+							});
+						});
+						
+						// This really needs to be done with a callback, but there 
+						// doesn't seem to be one that works in the wiki
+						setTimeout( function() {
+							c.editor.nodeChanged();
+						}, 50);
+						
+					});
+	                
+	                return c;
+	        }
+	
+	        return null;
+	        
+	    }
+	});
+	
+	// Register plugin
+	tinymce.PluginManager.add('tableDropdown', tinymce.plugins.TableDropdown);
+	
+})();

data/app/assets/stylesheets/spud/admin/application.css

@@ -401,6 +401,10 @@ form input.full-width {
     -moz-transform: rotate(-1deg);
 }
 
+.time_select select {
+	width:auto;
+}
+
 @-moz-keyframes jiggle {
     0% {
         -moz-transform: rotate(-1deg);

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.9.3"
+	  VERSION = "0.9.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_core
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -286,6 +286,7 @@ files:
 - app/assets/images/spud/admin/users_thumb.png
 - app/assets/javascripts/spud/admin/application.js
 - app/assets/javascripts/spud/admin/dashboard.js
+- app/assets/javascripts/spud/admin/date_picker.js
 - app/assets/javascripts/spud/admin/editor.js
 - app/assets/javascripts/spud/admin/jquery.dataTables.min.js
 - app/assets/javascripts/spud/admin/preinit.js
@@ -413,6 +414,7 @@ files:
 - app/assets/libs/tiny_mce/plugins/table/merge_cells.htm
 - app/assets/libs/tiny_mce/plugins/table/row.htm
 - app/assets/libs/tiny_mce/plugins/table/table.htm
+- app/assets/libs/tiny_mce/plugins/tableDropdown/editor_plugin.js
 - app/assets/libs/tiny_mce/themes/advanced/about.htm
 - app/assets/libs/tiny_mce/themes/advanced/anchor.htm
 - app/assets/libs/tiny_mce/themes/advanced/charmap.htm
@@ -606,7 +608,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4022793112075818376
+      hash: -1527295184139763898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -615,7 +617,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4022793112075818376
+      hash: -1527295184139763898
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24