browsercms 3.0.0 → 3.0.1

data/lib/cms/behaviors/rendering.rb

@@ -114,7 +114,7 @@ module Cms
         # Copy instance variables from this renderable object to it's view
         action_view.assigns = assigns_for_view
           
-        if respond_to?(:inline_options)
+        if respond_to?(:inline_options) && self.inline_options && self.inline_options.has_key?(:inline)
           options = {:locals => {}}.merge(self.inline_options)
           ActionView::InlineTemplate.new(options[:inline], options[:type]).render(action_view, options[:locals])
         else

data/lib/cms/behaviors/taggable.rb

@@ -36,10 +36,11 @@ module Cms
           @tag_list ||= tags.reload.map(&:name).join(self.class.tag_separator)
         end
         def tag_list=(tag_names)
+          changed_attributes["tag_list"] = tag_list unless @tag_list == tag_names
           @tag_list = tag_names
         end
         def save_tags
-          tag_list_tags = tag_list.to_s.split(self.class.tag_separator).map{|t| Tag.find_or_create_by_name(t) }
+          tag_list_tags = tag_list.to_s.split(self.class.tag_separator).map{|t| Tag.find_or_create_by_name(t.strip) }
           taggings.each do |tg|
             if tag_list_tags.include?(tg.tag)
               tag_list_tags.delete(tg.tag)

data/lib/cms/behaviors/versioning.rb

@@ -208,7 +208,7 @@ module Cms
           raise ActiveRecord::RecordNotFound.new("version #{version.inspect} does not exist for <#{self.class}:#{id}>") unless v
           obj = self.class.new
 
-          (self.class.versioned_columns + [:version, :updated_at]).each do |a|
+          (self.class.versioned_columns + [:version, :created_at, :created_by_id, :updated_at, :updated_by_id]).each do |a|
             obj.send("#{a}=", v.send(a))
           end
           obj.id = id

data/lib/cms/init.rb

@@ -12,7 +12,7 @@ module Cms
       @version = SPEC.version.version
     end
     
-    def build_number; 236 end
+    def build_number; 252 end
     
     def load_rake_tasks
       load "#{Cms.root}/lib/tasks/cms.rake"
@@ -56,7 +56,7 @@ module Cms
     def reserved_paths
       @reserved_paths ||= ["/cms", "/cache"]
     end
-
+    
     # This next 'hack' is to allow script/generate browser_cms to work on Windows machines. I'm not sure why this is necessary.
     #
     # This Generator is adding an absolute file path to the manifest, which is file (like a .js or migration) in
@@ -72,7 +72,7 @@ module Cms
     #   m.file "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", "testing/jquery-ui.js"
     #
     def scrub_path(path)
-      windows_drive_pattern =  /[A-Z\\A]:\//    # Works on drives labeled A-Z:
+      windows_drive_pattern =  /\b[A-Za-z]:\//    # Works on drives labeled A-Z:
       scrubbed_source_file_name = path.gsub(windows_drive_pattern, "/")
     end
   end
@@ -97,4 +97,4 @@ Cms.add_generator_paths(Cms.root,
   "public/site/**/*",   
   "public/stylesheets/cms/**/*",
   "public/images/cms/**/*",
-  "db/migrate/[0-9]*_*.rb")
+  "db/migrate/[0-9]*_*.rb")

data/lib/tasks/cms.rake

@@ -29,55 +29,29 @@ namespace :cms do
   
   desc "Generate guides for the CMS"
   task :guides do
-    require 'mizuho/generator'
+    require 'rubygems'
 
-    source = "doc/guides/source/"
-    html   = "doc/guides/html/"
-    FileUtils.rm_r(html) if File.directory?(html)
-    FileUtils.mkdir(html)
+    gem "actionpack", '>= 2.3'
+    require "action_controller"
+    require "action_view"
 
-    template = File.expand_path("doc/guides/source/templates/guides.html.erb")
+    gem 'RedCloth', '>= 4.1.1'
+    require 'redcloth'
 
-    ignore = ['..', 'icons', 'images', 'templates', 'stylesheets', '.svn']
-    ignore << 'active_record_basics.txt'
+    $: << File.join(File.dirname(__FILE__), '../../doc/guides')
 
-    indexless = ['index.txt', 'authors.txt']
-
-    # Traverse all entries in doc/guides/source/
-    Dir.entries(source).each do |entry|
-      next if ignore.include?(entry)
+    module CmsGuides
+      autoload :Generator, "cms_guides/generator"
+      autoload :Indexer, "cms_guides/indexer"
+      autoload :Helpers, "cms_guides/helpers"
+      autoload :TextileExtensions, "cms_guides/textile_extensions"
+      autoload :Levenshtein, "cms_guides/levenshtein"
+    end
 
-      if File.directory?(File.join(source, entry))
-        # If the current entry is a directory, then we will want to compile
-        # the 'index.txt' file inside this directory.
-        if entry == '.'
-          input  = File.join(source, 'index.txt')
-          output = File.join(html, "index.html")
-        else
-          input  = File.join(source, entry, 'index.txt')
-          output = File.join(html, "#{entry}.html")
-        end
-      else
-        # If the current entry is a file, then we will want to compile this file.
-        input  = File.join(source, entry)
-        output = File.join(html, entry).sub(/\.txt$/, '.html')
-      end
+    RedCloth.send(:include, CmsGuides::TextileExtensions)
 
-      begin
-        puts "GENERATING => #{output}"
-        ENV['MANUALSONRAILS_TOC'] = 'no' if indexless.include?(entry)
-        Mizuho::Generator.new(input, :output => output, :template => template).start
-      rescue Mizuho::GenerationError
-        STDERR.puts "*** ERROR"
-        exit 2
-      ensure
-        ENV.delete('MANUALSONRAILS_TOC')
-      end
-    end
+    CmsGuides::Generator.new.generate
 
-    # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled.
-    FileUtils.cp_r File.join(source, 'images'), File.join(html, 'images')
-    FileUtils.cp_r File.join(source, 'stylesheets'), File.join(html, 'stylesheets')
   end    
     
 end

data/public/stylesheets/cms/administration.css

@@ -1,91 +1,91 @@
-#functions .box {
-background: url(/images/cms/administration/user_browser_bg.gif) repeat-x 0 0;
-text-transform: capitalize;
-margin-top: -5px;
-border: 1px solid #4E5359;
- padding: 4px 0 7px 0;
- float: right;
- color: #FFF;
-height: 22px;
-}
-#functions {
-padding-bottom: 25px;
-}
-table.data td a {
-color: #36659D;
-font-weight: bold;
-text-decoration: none;
-}
-fieldset.form legend {
-font-weight: bold;
-font-size: large;
-padding: 40px 0 10px 20px;
-}
-.box input, .box select {
-margin: 0 5px;
-color: #717171;
-}
-.box div {
-float:left;
-}
-.box .cb input {
-display: block;
-float:left;
-margin-top: 4px;
-* margin-top: 1px;
-}
-
-.box .cb span {
-display: block;
-float:left;
-margin-top: 6px;
-* margin-top: 8px;
-font-size: 8pt;
-}
-.box .cb {
-margin-right: 8px;
-}
-
-#per_page_input, #group_id_input, #key_word {
-border: 1px solid #51585E;
-}
-#key_word {
-margin-left: 6px;
-padding: 4px 0 1px 3px;
-height: 18px;
-}
-#user_search_submit_container {
-margin-left: -11px;
-* margin-top: 1px;
-}
-.box div.selectbox-wrapper {
-  margin: -1px 0 0 5px;
-* margin:  25px 0px 0px -160px;
-  border: 1px solid #51585E;
-  border-top: 1px solid #C6C6C6;  
-  color: #717171;
-}
-
-.text_editor_fields #label_for_page_template_language {
-position: absolute; margin: 6px 0 0 310px;
-}
-.text_editor_fields #page_template_language_input {
-margin-left: 381px;
-}
-table.data td a.sm_button {
-	   margin-top: -12px;
-	   margin-left: 40px;
-	   position: absolute;
-	   height: 15px;
-	   width: 38px;
-	display: block;
-	background: url(/images/cms/buttons/sm_button_2.gif) no-repeat top right;
-	color: #FFFFFF;
-}
-table.data td a.sm_button span{
-	   padding: 2px 0 0 3px;
-	   display: block;
-}
-table.data td a.sm_button:hover {
-	background: url(/images/cms/buttons/sm_button_2_h.gif) no-repeat top right;
-}
+#functions .box {
+background: url(/images/cms/administration/user_browser_bg.gif) repeat-x 0 0;
+text-transform: capitalize;
+margin-top: -5px;
+border: 1px solid #4E5359;
+ padding: 4px 0 7px 0;
+ float: right;
+ color: #FFF;
+height: 22px;
+}
+#functions {
+padding-bottom: 25px;
+}
+table.data td a {
+color: #36659D;
+font-weight: bold;
+text-decoration: none;
+}
+fieldset.form legend {
+font-weight: bold;
+font-size: large;
+padding: 40px 0 10px 20px;
+}
+.box input, .box select {
+margin: 0 5px;
+color: #717171;
+}
+.box div {
+float:left;
+}
+.box .cb input {
+display: block;
+float:left;
+margin-top: 4px;
+* margin-top: 1px;
+}
+
+.box .cb span {
+display: block;
+float:left;
+margin-top: 6px;
+* margin-top: 8px;
+font-size: 8pt;
+}
+.box .cb {
+margin-right: 8px;
+}
+
+#per_page_input, #group_id_input, #key_word {
+border: 1px solid #51585E;
+}
+#key_word {
+margin-left: 6px;
+padding: 4px 0 1px 3px;
+height: 18px;
+}
+#user_search_submit_container {
+margin-left: -11px;
+* margin-top: 1px;
+}
+.box div.selectbox-wrapper {
+  margin: -1px 0 0 5px;
+* margin:  25px 0px 0px -160px;
+  border: 1px solid #51585E;
+  border-top: 1px solid #C6C6C6;  
+  color: #717171;
+}
+
+.text_editor_fields #label_for_page_template_language {
+position: absolute; margin: 6px 0 0 310px;
+}
+.text_editor_fields #page_template_language_input {
+margin-left: 381px;
+}
+table.data td a.sm_button {
+	   margin-top: -12px;
+	   margin-left: 40px;
+	   position: absolute;
+	   height: 15px;
+	   width: 38px;
+	display: block;
+	background: url(/images/cms/buttons/sm_button_2.gif) no-repeat top right;
+	color: #FFFFFF;
+}
+table.data td a.sm_button span{
+	   padding: 2px 0 0 3px;
+	   display: block;
+}
+table.data td a.sm_button:hover {
+	background: url(/images/cms/buttons/sm_button_2_h.gif) no-repeat top right;
+}

data/public/stylesheets/cms/block.css

@@ -1,26 +1,26 @@
-.toolbar {
-margin-bottom: 10px;
-}
-.header {
-clear: both;
-font-size: larger;
-margin: 10px 0;
-}
-
-.status div {
-float: left;
-margin: 10px 0;
-text-transform: capitalize;
-}
-.nv_pair div {
-float: left;
-margin: 10px 5px 20px 0;
-}
-.status img {
-float:left;
-margin: 8px 5px 0 5px;
-}
-
-.content {
-margin: 10px;
+.toolbar {
+margin-bottom: 10px;
+}
+.header {
+clear: both;
+font-size: larger;
+margin: 10px 0;
+}
+
+.status div {
+float: left;
+margin: 10px 0;
+text-transform: capitalize;
+}
+.nv_pair div {
+float: left;
+margin: 10px 5px 20px 0;
+}
+.status img {
+float:left;
+margin: 8px 5px 0 5px;
+}
+
+.content {
+margin: 10px;
 }

data/public/stylesheets/cms/buttons.css

@@ -1,111 +1,120 @@
-
-a.button { 
-	display: block;
-	line-height: 27px;
-	padding-right: 10px;
-	background: url(/images/cms/buttons/button_cap.png) no-repeat top right;
-	float: left;
-	color: #FFF;
-	text-decoration: none;
-	margin-right: 5px;
-}
-
-  a.button.middle, a.button.middle.disabled:hover {
-    background: url(/images/cms/buttons/button_bg.png) no-repeat 100% 0;
-    margin-right: 0;
-  }
-  
-    a.button.middle:hover {
-      background: url(/images/cms/buttons/button_bg.png) no-repeat 100% -27px;
-    }
-
-  a.button.left, a.button.left.disabled:hover {
-    background: url(/images/cms/buttons/button_bg.png) no-repeat 100% 0px;
-    margin-right: 0;
-  }
-  
-    a.button.left:hover {
-      background: url(/images/cms/buttons/button_bg.png) no-repeat 100% -27px;
-    }
-
-  a.button.right, a.button.right.disabled:hover {
-    background: url(/images/cms/buttons/button_cap.png) no-repeat top right;
-  }
-  
-    a.button.right:hover {
-      background: url(/images/cms/buttons/button_cap_h.png) no-repeat top right;
-    }
-
-a.button span {
-	display: block;
-	background: url(/images/cms/buttons/button.png) no-repeat 0 0;
-	padding: 0 0 0 10px;
-	font-weight: bold;
-	text-transform: uppercase
-}
-
-  a.button.left span, a.button.left.disabled:hover span {
-    background: url(/images/cms/buttons/button.png) no-repeat 0 0;
-  }
-  
-    a.button.left:hover span {
-      background: url(/images/cms/buttons/button_h.png) 0 0;
-    }
-  
-  a.button.middle span, a.button.middle.disabled:hover span {
-    background: url(/images/cms/buttons/button_bg.png) no-repeat 0 0;
-  }
-    
-    a.button.middle:hover span {
-      background: url(/images/cms/buttons/button_bg.png) no-repeat 0 -27px;
-    }
-  
-  a.button.right span, a.button.right.disabled:hover span {
-    background: url(/images/cms/buttons/button_bg.png) no-repeat 0 0;
-  }
-  
-    a.button.right:hover span {
-      background: url(/images/cms/buttons/button_bg.png) no-repeat 0 -27px;
-    }
-
-a.button.off, a.button.off:hover {
-  background: url(/images/cms/buttons/button_cap_off.gif) no-repeat top right;
-}
-
-a.button.off span, a.button.off:hover span {
-  background: url(/images/cms/buttons/button_off.png) no-repeat 0 0;
-}
-
-a.button:hover {
-	background: url(/images/cms/buttons/button_cap_h.png) no-repeat 100% 0;
-	text-decoration: none;
-}
-
-a.button:hover span {
-	background: url(/images/cms/buttons/button_h.png) no-repeat 0 0;
-}
-
-a.button.disabled {
-	color: #88A8D2;
-	cursor: default;
-}
-a.button span span.delete_img{
-		  float:left;
-		  padding: 0 0 0 14px;
-	background: url(/images/cms/buttons/delete_x.png) no-repeat 0 0;		  
-}
-a.button:hover span span.delete_img{
-	background: url(/images/cms/buttons/delete_x_h.png) no-repeat 0 0;
-}
-a.button.disabled span span.delete_img{
-	background: url(/images/cms/buttons/delete_x_disabled.png) no-repeat 0 0;
-}
-a.disabled:hover, a.disabled:hover {
-	background: url(/images/cms/buttons/button_cap.png) no-repeat top right;
-}
-a.disabled:hover span {
-	background: url(/images/cms/buttons/button.png) no-repeat 0 0;
-}
-a.disabled:hover span span.delete_img {
-	background: url(/images/cms/buttons/delete_x_disabled.png) no-repeat 0 0;
-}
+
+a.button { 
+	display: block;
+	line-height: 27px;
+	padding-right: 10px;
+	background: url(/images/cms/buttons/button_cap.png) no-repeat top right;
+	float: left;
+	color: #FFF;
+	text-decoration: none;
+	margin-right: 5px;
+}
+
+  a.button.middle, a.button.middle.disabled:hover {
+    background: url(/images/cms/buttons/button_bg.png) no-repeat 100% 0;
+    margin-right: 0;
+  }
+  a.button.middle.off, a.button.middle.off:hover {
+    background: url(/images/cms/buttons/button_cap_off_middle.gif) no-repeat 100% 0;
+  }
+  
+    a.button.middle:hover {
+      background: url(/images/cms/buttons/button_bg.png) no-repeat 100% -27px;
+    }
+
+  a.button.left, a.button.left.disabled:hover {
+    background: url(/images/cms/buttons/button_left_bg.png) no-repeat 100% 0px;
+    margin-right: 0;
+  }
+  
+    a.button.left:hover {
+      background: url(/images/cms/buttons/button_left_bg.png) no-repeat 100% -27px;
+    }
+
+  a.button.right, a.button.right.disabled:hover {
+    background: url(/images/cms/buttons/button_cap.png) no-repeat top right;
+  }
+  
+    a.button.right:hover {
+      background: url(/images/cms/buttons/button_cap_h.png) no-repeat top right;
+    }
+
+a.button span {
+	display: block;
+	background: url(/images/cms/buttons/button.png) no-repeat 0 0;
+	padding: 0 0 0 10px;
+	font-weight: bold;
+	text-transform: uppercase
+}
+
+  a.button.left span, a.button.left.disabled:hover span {
+    background: url(/images/cms/buttons/button.png) no-repeat 0 0;
+  }
+  
+    a.button.left:hover span {
+      background: url(/images/cms/buttons/button_h.png) 0 0;
+    }
+  
+  a.button.middle span, a.button.middle.disabled:hover span {
+    background: url(/images/cms/buttons/button_bg.png) no-repeat 0 0;
+  }
+  a.button.middle.off span, a.button.middle.off:hover span {
+    background: url(/images/cms/buttons/button_off_middle.png) no-repeat 0 0;
+  }
+    
+    a.button.middle:hover span {
+      background: url(/images/cms/buttons/button_bg.png) no-repeat 0 -27px;
+    }
+  
+  a.button.right span, a.button.right.disabled:hover span {
+    background: url(/images/cms/buttons/button_bg.png) no-repeat 0 0;
+  }
+  a.button.right.off span, a.button.right.off:hover span {
+    background: url(/images/cms/buttons/button_off_middle.png) no-repeat 0 0;
+  }
+  
+    a.button.right:hover span {
+      background: url(/images/cms/buttons/button_bg.png) no-repeat 0 -27px;
+    }
+
+a.button.off, a.button.off:hover {
+  background: url(/images/cms/buttons/button_cap_off.gif) no-repeat top right;
+}
+
+a.button.off span, a.button.off:hover span {
+  background: url(/images/cms/buttons/button_off.png) no-repeat 0 0;
+}
+
+a.button:hover {
+	background: url(/images/cms/buttons/button_cap_h.png) no-repeat 100% 0;
+	text-decoration: none;
+}
+
+a.button:hover span {
+	background: url(/images/cms/buttons/button_h.png) no-repeat 0 0;
+}
+
+a.button.disabled {
+	color: #88A8D2;
+	cursor: default;
+}
+a.button span span.delete_img{
+		  float:left;
+		  padding: 0 0 0 14px;
+	background: url(/images/cms/buttons/delete_x.png) no-repeat 0 0;		  
+}
+a.button:hover span span.delete_img{
+	background: url(/images/cms/buttons/delete_x_h.png) no-repeat 0 0;
+}
+a.button.disabled span span.delete_img{
+	background: url(/images/cms/buttons/delete_x_disabled.png) no-repeat 0 0;
+}
+a.disabled:hover, a.disabled:hover {
+	background: url(/images/cms/buttons/button_cap.png) no-repeat top right;
+}
+a.disabled:hover span {
+	background: url(/images/cms/buttons/button.png) no-repeat 0 0;
+}
+a.disabled:hover span span.delete_img {
+	background: url(/images/cms/buttons/delete_x_disabled.png) no-repeat 0 0;
+}