kuztuscms 0.0.5 → 0.0.6

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.0.6
+
+* bug fix
+  * Lists were not set to current value when editing
+  * configure TinyMCE to not delete empty divs
+  * description fix
+
 == 0.0.5
 
 * enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuztuscms (0.0.4)
+    kuztuscms (0.0.6)
       actionmailer
       coffee-rails
       devise (>= 2.0.4)
@@ -11,12 +11,6 @@ PATH
       tzinfo
       uglifier
 
-PATH
-  remote: /Users/fragallia/Developing/gems/i18n-active_record
-  specs:
-    i18n-active_record (0.0.2)
-      i18n (>= 0.5.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -74,11 +68,11 @@ GEM
       railties (>= 3.2.0.beta, < 5.0)
       thor (~> 0.14)
     json (1.6.5)
-    mail (2.4.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.18)
     multi_json (1.1.0)
     omniauth (1.0.3)
       hashie (~> 1.2)
@@ -124,7 +118,7 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.8.0)
     sass (3.1.15)
-    sass-rails (3.2.4)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -149,7 +143,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  i18n-active_record!
   jquery-rails
   kuztuscms!
   rspec-rails

data/README.rdoc

@@ -41,7 +41,7 @@ add to your config/routes.rb
 
 if you want to show default page as root_url then add following line to config/routes.rb
 
-   root :to => 'kuztuscms/page#show'
+   root :to => 'kuztuscms/pages#show'
 
 run
 

data/app/views/kuztuscms/articles/_form.html.erb

@@ -12,7 +12,7 @@
   <% end %>
   <fieldset>
     <legend><%= controller.action_name.capitalize %> Article</legend>
-    
+
     <div class="control-group">
       <%= f.label :name, :class => 'control-label' %>
       <div class="controls">

data/app/views/kuztuscms/layouts/_form.html.erb

@@ -31,7 +31,7 @@
       <%= f.label :locale, :class => 'control-label' %>
       <div class="controls">
         <%= f.select :locale, 
-          options_for_select(@locales), :class => 'select' %>
+          options_for_select(@locales, @layout.locale), :class => 'select' %>
       </div>
     </div>
 
@@ -39,7 +39,7 @@
       <%= f.label :handler, :class => 'control-label' %>
       <div class="controls">
         <%= f.select :handler, 
-          options_for_select(@handlers), :class => 'select' %>
+          options_for_select(@handlers, @layout.handler), :class => 'select' %>
       </div>
     </div>
 

data/app/views/kuztuscms/pages/_form.html.erb

@@ -23,8 +23,8 @@
     <div class="control-group">
       <%= f.label :article_id, :class => 'control-label' %>
       <div class="controls">
-        <%= f.select :article_id, 
-          options_from_collection_for_select(@articles, :id, :name), :class => 'select' %>
+        <%= f.select :article_id,
+          options_from_collection_for_select(@articles, :id, :name, @page.article_id), :class => 'select' %>
       </div>
     </div>
 
@@ -32,7 +32,7 @@
       <%= f.label :layout_id, :class => 'control-label' %>
       <div class="controls">
         <%= f.select :layout_id, 
-          options_from_collection_for_select(@layouts, :id, :path), :class => 'select' %>
+          options_from_collection_for_select(@layouts, :id, :path, @page.layout_id), :class => 'select' %>
       </div>
     </div>
 

data/app/views/kuztuscms/shared/_tiny_mce.html.erb

@@ -6,6 +6,10 @@
     $('#<%= textarea_id %>').tinymce({
       // Location of TinyMCE script
       script_url : '/assets/kuztuscms/tiny_mce/tiny_mce.js',
+      verify_html : false,
+      apply_source_formatting : true,
+      valid_elements : "*[*]=*",
+      extended_valid_elements : "*[*]=*",
 
       // General options
       theme : "advanced",

data/app/views/kuztuscms/templates/_form.html.erb

@@ -30,8 +30,8 @@
     <div class="control-group">
       <%= f.label :locale, :class => 'control-label' %>
       <div class="controls">
-        <%= f.select :locale, 
-          options_for_select(@locales), :class => 'select' %>
+        <%= f.select :locale,
+          options_for_select(@locales, @template.locale), :class => 'select' %>
       </div>
     </div>
 
@@ -39,7 +39,7 @@
       <%= f.label :handler, :class => 'control-label' %>
       <div class="controls">
         <%= f.select :handler,
-          options_for_select(@handlers), :class => 'select' %>
+          options_for_select(@handlers, @template.handler), :class => 'select' %>
       </div>
     </div>
 

data/lib/kuztuscms/version.rb

@@ -1,3 +1,3 @@
 module Kuztuscms
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuztuscms
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70362717136380 !ruby/object:Gem::Requirement
+  requirement: &70246279936320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717136380
+  version_requirements: *70246279936320
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70362717135600 !ruby/object:Gem::Requirement
+  requirement: &70246279935900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717135600
+  version_requirements: *70246279935900
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70362717134900 !ruby/object:Gem::Requirement
+  requirement: &70246279935440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717134900
+  version_requirements: *70246279935440
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70362717134220 !ruby/object:Gem::Requirement
+  requirement: &70246279935000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717134220
+  version_requirements: *70246279935000
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70362717133280 !ruby/object:Gem::Requirement
+  requirement: &70246279934500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70362717133280
+  version_requirements: *70246279934500
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70362717132680 !ruby/object:Gem::Requirement
+  requirement: &70246279934080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717132680
+  version_requirements: *70246279934080
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70362717132040 !ruby/object:Gem::Requirement
+  requirement: &70246279933600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717132040
+  version_requirements: *70246279933600
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70362717131120 !ruby/object:Gem::Requirement
+  requirement: &70246279933180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362717131120
+  version_requirements: *70246279933180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70362717130580 !ruby/object:Gem::Requirement
+  requirement: &70246279932760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362717130580
+  version_requirements: *70246279932760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70362717129200 !ruby/object:Gem::Requirement
+  requirement: &70246279932340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362717129200
+  version_requirements: *70246279932340
 description: KuztusCMS for rails >= 3.1
 email:
 - dummy@email.com