rich_cms 2.0.6 → 2.0.7

data/lib/assets/jzip/jquery/raccoon_tip.js

@@ -1,7 +1,7 @@
 if (typeof(RaccoonTip) == "undefined") {
 
 // *
-// * RaccoonTip 1.0.7 (Uncompressed)
+// * RaccoonTip 1.0.8 (Uncompressed)
 // * A lightweight jQuery based balloon tip library
 // *
 // * This library requires jQuery (http://jquery.com)
@@ -10,14 +10,14 @@ if (typeof(RaccoonTip) == "undefined") {
 // * Except otherwise noted, RaccoonTip is licensed under
 // * http://creativecommons.org/licenses/by-sa/3.0
 // *
-// * $Date: 2010-10-02 00:00:01 +0100 (Sat, 02 October 2010) $
+// * $Date: 2010-10-17 13:37:39 +0100 (Sun, 17 October 2010) $
 // *
 
 RaccoonTip = (function() {
   var html = '<div id="raccoon_tip" style="display: none"><div class="rt_tip"></div><div class="rt_content"></div></div>';
   var css  = '<style>#raccoon_tip{*padding:14px;position:absolute;z-index:9999}#raccoon_tip .rt_tip{width:0;font-size:0;line-height:0;position:absolute;filter:chroma(color=pink)}#raccoon_tip.rt_bottom_right{margin-left:-28px;padding-top:14px}#raccoon_tip.rt_bottom_right .rt_tip{top:0;left:14px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-right-width:14px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_bottom_middle{padding-top:14px}#raccoon_tip.rt_bottom_middle .rt_tip{top:0;left:50%;margin-left:-7px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-left-width:7px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink;border-right-width:7px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_bottom_left{margin-left:28px;padding-top:14px}#raccoon_tip.rt_bottom_left .rt_tip{top:0;right:14px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-left-width:14px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink}#raccoon_tip.rt_middle_left{margin-left:-7px;padding-right:14px}#raccoon_tip.rt_middle_left .rt_tip{top:50%;right:0;margin-top:-7px;border-left-width:14px;border-left-style:solid;border-left-color:#f9e98e;border-top-width:7px;border-top-style:solid;border-top-color:transparent;*border-top-color:pink;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:transparent;*border-bottom-color:pink}#raccoon_tip.rt_top_left{margin-left:28px;padding-bottom:14px}#raccoon_tip.rt_top_left .rt_tip{bottom:0;right:14px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-left-width:14px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink}#raccoon_tip.rt_top_middle{padding-bottom:14px}#raccoon_tip.rt_top_middle .rt_tip{bottom:0;left:50%;margin-left:-7px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-left-width:7px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink;border-right-width:7px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_top_right{margin-left:-28px;padding-bottom:14px}#raccoon_tip.rt_top_right .rt_tip{bottom:0;left:14px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-right-width:14px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_middle_right{margin-left:7px;padding-left:14px}#raccoon_tip.rt_middle_right .rt_tip{top:50%;left:0;margin-top:-7px;border-right-width:14px;border-right-style:solid;border-right-color:#f9e98e;border-top-width:7px;border-top-style:solid;border-top-color:transparent;*border-top-color:pink;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:transparent;*border-bottom-color:pink}#raccoon_tip .rt_content{padding:6px 12px 8px 12px;overflow:hidden;background:#fbf7aa;border-width:10px;border-style:solid;border-color:#f9e98e;*border-width:7px;border-radius:10px;-moz-border-radius:10px;-webkit-border-radius:10px;box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px;-moz-box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px;-webkit-box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px}#raccoon_tip .rt_content,#raccoon_tip .rt_content a{color:#a27d35;text-shadow:none}#raccoon_tip .rt_content a{outline:0}</style>';
   
-  var default_options = {event: "click", duration: "fast", position: "bottom_right", beforeShow: function() {}, afterHide: function() {}}, opts = null;
+  var default_options = {event: "click", duration: "fast", position: "bottom_right", beforeShow: function() {}, canHide: function() { return true; }, afterHide: function() {}}, opts = null;
   var displaying = false, mouseover = false;
   
   var register = function(target, content, options) {
@@ -43,7 +43,7 @@ RaccoonTip = (function() {
   var setup = function() {
     if (!$("#raccoon_tip").length) {
       $("body").mouseup(function(event) {
-        if (!displaying && !mouseover) {
+        if (!displaying && !mouseover && opts.canHide.apply()) {
           hide();
         }
       });
@@ -163,7 +163,7 @@ RaccoonTip = (function() {
   };
   
   return {
-    version: "1.0.7",
+    version: "1.0.8",
     init: function() {
       if (typeof(onRaccoonTipReady) == "function") {
         onRaccoonTipReady();

data/lib/assets/jzip/rich/cms/editor.js

@@ -1,7 +1,9 @@
 
 Rich.Cms.Editor = (function() {
-  var content_class = "rich_cms_content", mark_class = "marked", edit_panel = "#rich_cms_panel",
-      editable_content = {}, content_items = "";
+  var content_class        = "rich_cms_content", mark_class = "marked", edit_panel = "#rich_cms_panel",
+      editable_content     = {}, content_items = "",
+      cleditor_images_path = "/images/rich/cms/cleditor",
+      cleditor_css         = '<style>.cleditorMain {border:1px solid #999; padding:0 1px 1px; background-color:white} .cleditorMain iframe {border:none; margin:0; padding:0} .cleditorMain textarea {border:none; margin:0; padding:0; overflow-y:scroll; font:10pt Arial,Verdana; resize:none; outline:none /* webkit grip focus */} .cleditorToolbar {background: url("' + cleditor_images_path + '/toolbar.gif") repeat} .cleditorGroup {float:left; height:26px} .cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url("' + cleditor_images_path + '/buttons.gif")} .cleditorDisabled {opacity:0.3; filter:alpha(opacity=30)} .cleditorDivider {float:left; width:1px; height:23px; margin:1px 0 1px 0; background:#CCC} .cleditorPopup {border:solid 1px #999; background-color:white; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000} .cleditorList div {padding:2px 4px 2px 4px} .cleditorList p, .cleditorList h1, .cleditorList h2, .cleditorList h3, .cleditorList h4, .cleditorList h5, .cleditorList h6, .cleditorList font {padding:0; margin:0; background-color:Transparent} .cleditorColor {width:150px; padding:1px 0 0 1px} .cleditorColor div {float:left; width:14px; height:14px; margin:0 1px 1px 0} .cleditorPrompt {background-color:#F6F7F9; padding:4px; font-size:8.5pt} .cleditorPrompt input, .cleditorPrompt textarea {font:8.5pt Arial,Verdana;} .cleditorMsg {background-color:#FDFCEE; width:150px; padding:4px; font-size:8.5pt}</style>';
   
   var register = function(hash) {
     $.extend(editable_content, hash);
@@ -14,8 +16,14 @@ Rich.Cms.Editor = (function() {
       RaccoonTip.close();
     });
     
-    RaccoonTip.register("." + content_class + "." + mark_class, "#rich_cms_panel", {beforeShow: edit, afterHide : function(content) { content.hide(); }});
+    RaccoonTip.register("." + content_class + "." + mark_class, "#rich_cms_panel", {
+                          beforeShow: edit,
+                          canHide: function() { return !$("#cleditor_input").length },
+                          afterHide: function(content) { content.hide(); }
+                        });
+
     bindSeatHolders();
+    injectCleditorCss();
     
     $.registerAjaxFormHandler({
       "rich_cms_content": afterUpdate
@@ -26,6 +34,13 @@ Rich.Cms.Editor = (function() {
     RaccoonTip.register("." + content_class + "." + mark_class + ".sh_hint", "#rich_cms_panel", {event: "focus", beforeShow: edit, afterHide : function(content) { content.hide(); }});
   };
   
+  var injectCleditorCss = function() {
+    if (!$("head").length) {
+      $(document.body).before("<head></head>");
+    }
+    $(cleditor_css).prependTo("head");
+  };
+
   var mark = function(event) {
     event.preventDefault();
     
@@ -44,6 +59,10 @@ Rich.Cms.Editor = (function() {
       $(content_items + ".block").removeClass("block");
       $(edit_panel).hide();
     }
+
+    if (typeof(SeatHolder) != "undefined") {
+      SeatHolder.react(!markedContentItems.length);
+    }
   };
   
   var edit = function() {
@@ -51,17 +70,15 @@ Rich.Cms.Editor = (function() {
     var label        = $("#rich_cms_panel .edit form fieldset.inputs label");
     var inputs       = $("#rich_cms_panel .edit form fieldset.inputs");
                      
-    var text         = content_item.is("textarea") || content_item.hasClass("block");
     var attrs        = content_item.get(0).attributes;
-    
     var selector     = $.grep($.keys(editable_content), function(s) {
                          return content_item.is(s);
                        })[0];
     var specs        = editable_content[selector];
     
-    label.html($.map(specs.keys, function(key) { return content_item.attr(key); }).join(", "));
+    label.html("Editing:&nbsp; " + $.map(specs.keys, function(key) { return "<strong>" + content_item.attr(key) + "</strong>"; }).join(", "));
     
-    inputs.find(":input").remove();
+    inputs.find(":input,div.cleditorMain").remove();
     inputs.append("<input name='content_item[__selector__]' type='hidden' value='" + selector + "'/>");
     
     $.each(attrs, function(index, attribute) {
@@ -72,13 +89,18 @@ Rich.Cms.Editor = (function() {
         var value =  content_item.attr(attr);
         
         if (attr == specs.value) {
-          if (text) {
-            inputs.append("<textarea name='" + name + "'>" + value + "</textarea>");
-          } else {
-            inputs.append("<input    name='" + name + "' type='text'   value='" + value + "'/>");
+          var editable_input_type = content_item.attr("data-editable_input_type") || (content_item.is("textarea") || content_item.hasClass("block") ? "text" : "string");
+
+          switch (editable_input_type) {
+            case "string":
+              inputs.append("<input name='" + name + "' type='text' value='" + value + "'/>"); break;
+            case "text":
+              inputs.append("<textarea name='" + name + "'>" + value + "</textarea>"); break;
+            case "html":
+              inputs.append("<textarea id='cleditor_input' name='" + name + "' style='width: 500px; height: 300px'>" + value + "</textarea>"); break;
           }
         } else {
-            inputs.append("<input    name='" + name + "' type='hidden' value='" + value + "'/>");
+            inputs.append("<input name='" + name + "' type='hidden' value='" + value + "'/>");
         }
       }
     });
@@ -89,6 +111,15 @@ Rich.Cms.Editor = (function() {
     }
     
     $(edit_panel).show();
+
+    setTimeout(function() {
+      if ($("#cleditor_input").length) {
+        $("#cleditor_input").cleditor({
+          width : 500,
+          height: 300
+        })[0].focus();
+      }
+    }, 250);
   };
   
   var afterUpdate = function(form, response) {

data/lib/assets/jzip/rich_cms.jz

@@ -4,6 +4,7 @@ var onRaccoonTipReady = function() {
 //= require jquery/extensions/modules
 //= require jquery/extensions/object
 //= require jquery/extensions/browser_detect
+//= require jquery/cleditor
 
 //= require rich
 //= require rich/cms

data/lib/assets/sass/rich_cms/_panel.sass

@@ -3,6 +3,13 @@
   min-width: 200px
   padding-right: 5px
 
+  .edit
+    form
+      .inputs
+        label
+          padding-top: 2px
+          padding-bottom: 5px
+
   form
     fieldset, ol
       margin: 0

data/lib/rich/cms/content/item.rb

@@ -55,6 +55,8 @@ module Rich
             default = "< #{default} >"
             keys    = @group.keys << @group.value.to_s
             data    = @object.attributes.reject{|k, v| !keys.include?(k.to_s)}
+
+            data[:editable_input_type] = options[:as] if %w(string text html).include? options[:as].to_s.downcase
           
             if class_name = @group.selector.match(/^\.\w+$/)
               (options[:html] ||= {}).store :class, [class_name.to_s.gsub(/^\./, ""), options[:html].try(:fetch, :class, nil)].compact.join(" ")

data/lib/rich/cms/engine.rb

@@ -23,6 +23,19 @@ module Rich
         
         ::Jzip::Engine.add_template_location({File.join(File.dirname(__FILE__), "..", "..", "assets", "jzip") => File.join(RAILS_ROOT, "public", "javascripts")})
         ::Sass::Plugin.add_template_location( File.join(File.dirname(__FILE__), "..", "..", "assets", "sass"),   File.join(RAILS_ROOT, "public", "stylesheets") )
+        
+        copy_assets
+      end
+    
+      def copy_assets
+        return if RAILS_ENV == "test"
+        
+        source_dir = File.join File.dirname(__FILE__), "..", "..", "assets", "images", "."
+        target_dir = File.join RAILS_ROOT, "public", "images", "rich", "cms"
+        
+        FileUtils.rm_r    target_dir if File.exists? target_dir
+        FileUtils.mkdir_p target_dir
+        FileUtils.cp_r    source_dir, target_dir
       end
       
       def current_controller=(current_controller)

data/lib/rich_cms.rb

@@ -1,9 +1,12 @@
-
+require "authlogic"
 require "jzip"
 require "sass/plugin"
 
+require "formtastic"
+ActionView::Base.send :include, Formtastic::SemanticFormHelper
+
 require "config/routes"
 require "rich/cms/actionpack"
 require "rich/cms/engine"
 require "rich/cms/content/group"
-require "rich/cms/content/item"
+require "rich/cms/content/item"

data/rich_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "2.0.6"
+  s.version = "2.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-10-08}
+  s.date = %q{2010-10-20}
   s.description = %q{Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [
@@ -36,6 +36,9 @@ Gem::Specification.new do |s|
      "lib/app/views/rich/cms/dock/panel/_edit.html.erb",
      "lib/app/views/rich/cms/dock/panel/_login.html.erb",
      "lib/app/views/rich_cms.html.erb",
+     "lib/assets/images/cleditor/buttons.gif",
+     "lib/assets/images/cleditor/toolbar.gif",
+     "lib/assets/jzip/jquery/cleditor.js",
      "lib/assets/jzip/jquery/core.jz",
      "lib/assets/jzip/jquery/extensions/ajaxify.js",
      "lib/assets/jzip/jquery/extensions/browser_detect.js",
@@ -106,20 +109,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<authlogic>, [">= 0"])
-      s.add_runtime_dependency(%q<jzip>, [">= 1.0.10"])
+      s.add_runtime_dependency(%q<formtastic>, ["= 1.0.1"])
       s.add_runtime_dependency(%q<haml>, [">= 3"])
-      s.add_runtime_dependency(%q<formtastic>, ["= 0.9.7"])
+      s.add_runtime_dependency(%q<jzip>, [">= 1.0.10"])
     else
       s.add_dependency(%q<authlogic>, [">= 0"])
-      s.add_dependency(%q<jzip>, [">= 1.0.10"])
+      s.add_dependency(%q<formtastic>, ["= 1.0.1"])
       s.add_dependency(%q<haml>, [">= 3"])
-      s.add_dependency(%q<formtastic>, ["= 0.9.7"])
+      s.add_dependency(%q<jzip>, [">= 1.0.10"])
     end
   else
     s.add_dependency(%q<authlogic>, [">= 0"])
-    s.add_dependency(%q<jzip>, [">= 1.0.10"])
+    s.add_dependency(%q<formtastic>, ["= 1.0.1"])
     s.add_dependency(%q<haml>, [">= 3"])
-    s.add_dependency(%q<formtastic>, ["= 0.9.7"])
+    s.add_dependency(%q<jzip>, [">= 1.0.10"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_cms
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +02:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,19 +33,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jzip
+  name: formtastic
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
         - 1
         - 0
-        - 10
-        version: 1.0.10
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -63,19 +63,19 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  name: jzip
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 3
         segments: 
+        - 1
         - 0
-        - 9
-        - 7
-        version: 0.9.7
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id004
 description: Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.
@@ -107,6 +107,9 @@ files:
 - lib/app/views/rich/cms/dock/panel/_edit.html.erb
 - lib/app/views/rich/cms/dock/panel/_login.html.erb
 - lib/app/views/rich_cms.html.erb
+- lib/assets/images/cleditor/buttons.gif
+- lib/assets/images/cleditor/toolbar.gif
+- lib/assets/jzip/jquery/cleditor.js
 - lib/assets/jzip/jquery/core.jz
 - lib/assets/jzip/jquery/extensions/ajaxify.js
 - lib/assets/jzip/jquery/extensions/browser_detect.js