spud_core 0.9.7 → 0.9.8

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

@@ -1,3 +1,5 @@
+//= require codemirror
+//= require codemirror/modes/markdown
 
 spud.admin.editor = {};
 
@@ -40,41 +42,93 @@ spud.admin.editor = {};
 
   var validFormats = "p,h1,h2,h3,h4,h5,h6";
 
-  theme_advanced_blockformats :
-  editor.init = function(){
-    editor.initWithOptions({});
-  };
 
-  editor.initWithOptions = function(options){
+  editor.init = function(options) {
+    editor.monitorFormatters();
+    options = options || {};
     var selector = options.selector || 'textarea.tinymce';
+    $(selector).each(function() {
+      var $this = $(this);
+      var dataFormat = $this.attr('data-format');
+      switch(dataFormat) {
+        case 'Markdown':
+          editor.initCodeMirrorWithOptions(this,'markdown', options || {});
+          break;
+        case 'HTML':
+        default:
+          editor.initMCEWithOptions(this, options || {});
+      };
+
+
+    });
+
+  };
+
+  editor.monitorFormatters = function() {
+    $('select[data-formatter]').off('onchange');
+    $('select[data-formatter]').change(editor.formatterChanged);
+  };
+
+  editor.formatterChanged = function() {
+    var formatId = $(this).attr('data-formatter');
+    editor.unload('#' + formatId);
+    $('#' + formatId).attr('data-format',$(this).val());
+    editor.init({selector: '#' + formatId});
+  };
+
+  editor.initMCEWithOptions = function(element, options){
+
     var theme = options.theme || 'advanced';
     var height = options.height || 400;
-    $(selector).each(function() {
-      $(this).tinymce({
-      theme: theme,
-      plugins: registeredPlugins.join(','),
-      theme_advanced_toolbar_location: "top",
-      theme_advanced_buttons1: registeredButtons[0].join(','),
-      theme_advanced_buttons2: registeredButtons[1].join(','),
-      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
-      });
+
+    $(element).tinymce({
+    theme: theme,
+    plugins: registeredPlugins.join(','),
+    theme_advanced_toolbar_location: "top",
+    theme_advanced_buttons1: registeredButtons[0].join(','),
+    theme_advanced_buttons2: registeredButtons[1].join(','),
+    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: $(element).width(),
+    height: height
     });
 
+
+  };
+
+  var codeMirrors = [];
+  editor.initCodeMirrorWithOptions = function(element, format, options) {
+    var editor = CodeMirror.fromTextArea(element, {
+        mode: 'markdown',
+        lineNumbers: true,
+        theme: "default",
+        extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
+      });
+    codeMirrors.push(editor);
+
+    $(element).attr('code-mirror-id',codeMirrors.length-1);
   };
 
   editor.unload = function(selectorOptional) {
     var selector = selectorOptional || 'textarea.tinymce';
-    $(selector).each(function() {$(this).tinymce().execCommand('mceRemoveControl',false,this.id);});
+    $(selector).each(function() {
+      var $this = $(this);
+      if($this.attr('code-mirror-id')) {
+        codeMirrors[parseInt($this.attr('code-mirror-id'),10)].toTextArea();
+        codeMirrors[parseInt($this.attr('code-mirror-id'),10)] = null;
+        $this.removeAttr('code-mirror-id');
+      }
+        tinyMCE.execCommand('mceRemoveControl',false,this.id);
+    });
 
   };
 
+
+
   editor.registerPlugin = function(pluginName){
     if($.inArray(registeredPlugins, pluginName) < 0){
       registeredPlugins.push(pluginName);

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

@@ -2,6 +2,7 @@
 *= require bootstrap/css/bootstrap
 *= require datepicker/css/datepicker
 *= require jquery-ui/css/flick/jquery-ui-1.9.1.custom
+*= require codemirror/themes/night
 *= require_self
 */
 
@@ -471,3 +472,9 @@ form input.full-width {
 	height:10px;
 	bottom:10px;
 }
+
+/* Modal Dialogs
+---------------*/
+#modal_window .form-actions-no-modal{
+	display: none;
+}

data/app/views/spud/admin/users/_edit.html.erb

@@ -5,6 +5,10 @@
   <%=form_for @user,:url => spud_admin_user_path(:id => @user.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
 
+    <div class="form-actions form-actions-no-modal">
+      <%=f.submit "Save User", :class=>"btn btn-primary"%> or <%=link_to "cancel",request.referer,:class => "btn"%>
+    </div>
+
   <%end%>
 
 

data/app/views/spud/admin/users/_new.html.erb

@@ -5,6 +5,10 @@
   <%=form_for @user,:url => spud_admin_users_path(),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
 
+    <div class="form-actions form-actions-no-modal">
+      <%=f.submit "Save User", :class=>"btn btn-primary"%> or <%=link_to "cancel",request.referer,:class => "btn"%>
+    </div>
+
   <%end%>
 
 

data/lib/spud_core/engine.rb

@@ -31,6 +31,7 @@ module Spud
           "tiny_mce/themes/**/*",
           "tiny_mce/utils/*",
           "tiny_mce/langs/*",
+          'tiny_mce/tiny_mce_popup.js',
           "tiny_mce/*",
           "spud/admin*"
         ]

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.9.7"
+	  VERSION = "0.9.8"
 	end
 end

data/spec/dummy/log/development.log

@@ -1,39 +1,17 @@
 Connecting to database specified by database.yml
-   (65.4ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (144.1ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-Migrating to CreateSpudAdminPermissions (20111214161011)
-   (103.8ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161011')
-Migrating to CreateSpudUsers (20111214161146)
-   (113.1ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (117.7ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
-   (111.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
-   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161146')
-Migrating to AddTimeZoneToSpudUser (20120327124229)
-   (149.1ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120327124229')
-Migrating to AddScopeToSpudAdminPermissions (20120328235431)
-   (130.5ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120328235431')
-Migrating to CreateSpudUserSettings (20120329174000)
-   (105.9ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120329174000')
-   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-Connecting to database specified by database.yml
-   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (0.5ms)  DROP DATABASE IF EXISTS `spud_core_test`
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (22.6ms)  DROP DATABASE IF EXISTS `spud_core_test`
    (0.3ms)  CREATE DATABASE `spud_core_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
-   (54.2ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
-   (177.3ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (191.0ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
-   (105.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
-   (100.1ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
-   (115.5ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (127.3ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.3ms)  SELECT version FROM `schema_migrations`
-   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
-   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
-   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
-   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')
+   (23.9ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
+   (20.2ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (9.2ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
+   (13.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (11.9ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (10.6ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (15.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.1ms)  SELECT version FROM `schema_migrations`
+   (1.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
+   (0.7ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
+   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
+   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')