forgeos_cms 1.9.4 → 1.9.5.rc1

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2011 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -1,6 +1,7 @@
 h1. ForgeosCMS
 
-ForgeosCMS is an extension of Ruby on Rails for CMS development
+ForgeosCMS is a CMS plugin for ruby on rails applications and a part of the "Forgeos Suite":http://forgeos.com
+This branch work with rails 3.1.0.rc5 and is distributed as a gem on "Rubygems.org":https://rubygems.org/gems/forgeos_cms
 
 VERSION : 1.9.4
 
@@ -11,6 +12,7 @@ h2. Install
 $ rails new my_site -d mysql
 $ cd my_site
 $ rake rails:template LOCATION=https://raw.github.com/webpulser/forgeos_cms/rails3/forgeos_cms_install.rb
+$ rails s
 </code></pre>
 #  Then go to localhost:3000/admin and Enjoy !
 

data/app/assets/javascripts/forgeos/admin/functions.js

@@ -0,0 +1,2 @@
+//= require forgeos/admin/functions/forgeos_core/all
+//= require forgeos/admin/functions/forgeos_cms/all

data/app/assets/javascripts/forgeos/admin/functions/forgeos_cms/all.js

@@ -0,0 +1 @@
+//= require_tree .

data/app/assets/javascripts/forgeos/admin/functions/forgeos_cms/carousels.js

@@ -48,9 +48,9 @@ function remove_carousel_item(destroy_link){
   update_block_container_positions(jQuery('#carousel_items'));
 }
 
-function add_picture_to_carousel_item(path,id,name){
+function add_picture_to_carousel_item(data){
   var image = current_carousel_item_link.prevAll('img');
-  image.attr('src', path);
-  image.attr('alt', name);
-  current_carousel_item_link.prevAll('input').attr('value', id);
+  image.attr('src', data.path);
+  image.attr('alt', data.name);
+  current_carousel_item_link.prevAll('input').attr('value', data.id);
 }

data/app/assets/javascripts/forgeos/admin/inits.js

@@ -0,0 +1,2 @@
+//= require forgeos/admin/inits/forgeos_core/all
+//= require forgeos/admin/inits/forgeos_cms/all

data/app/assets/javascripts/forgeos/admin/inits/forgeos_cms/all.js

@@ -0,0 +1 @@
+//= require_tree .

data/app/assets/javascripts/forgeos/admin/inits/forgeos_cms/carousels.js

@@ -5,7 +5,11 @@ jQuery(document).ready(function(){
 
   jQuery('.change-picture').live('click',function(){
     current_carousel_item_link = jQuery(this);
-    openimageUploadDialog(jQuery(this));
+    jQuery('.add-image').removeClass('current');
+    current_carousel_item_link.addClass('add-image');
+    current_carousel_item_link.addClass('current');
+    current_carousel_item_link.data('callback', 'add_picture_to_carousel_item');
+    openimageUploadDialog();
     return false;
   });
 

data/app/assets/stylesheets/forgeos/admin/forgeos_cms/_blocks.css.sass

@@ -2,7 +2,8 @@
   width: 650px !important
 .blocks-tree.hidden
   display: none
-
+#page_meta_info_attributes_title
+  width: 650px
 .block-container.widget-modify
   min-height: 4em
   height: auto !important
@@ -17,7 +18,7 @@
     background:
       color: #e0e0e0
     border: 1px solid #f3f3f3
-    +borderCorner
+    +border-radius(4px)
     overflow: hidden
   .block-type
     padding: 0 4px
@@ -98,7 +99,7 @@
     +block
     text-align: left
     margin: 8px
-    padding-left: 20px
+    padding-left: 15px
     &.picture-title
       margin-top: 40px
   .block-name
@@ -107,7 +108,7 @@
       width: 99%
       font-size: 0.7em
       border: 1px solid $lightGray
-      +borderCorner
+      +border-radius(4px)
       padding: 2px
       font-weight: bold
     textarea
@@ -115,12 +116,12 @@
       width: 99%
       font-size: 0.9em
       border: 1px solid $lightGray
-      +borderCorner
+      +border-radius(4px)
       padding: 2px
       margin-bottom: 0.8em
     .widget-url
       border: 1px solid $lightGray
-      +borderCorner
+      +border-radius(4px)
       background: #e6e6e6
       height: 1.2em
       margin: 5px 0
@@ -160,17 +161,17 @@
       margin-right: 0
       padding-right: 16px
     &.open
-      background: url("fminus_rtl.gif") right 6px no-repeat
+      background: image_url("forgeos/jstree/themes/categories/fminus_rtl.gif") right 6px no-repeat
       margin-right: 0
       padding-right: 16px
     &.closed
-      background: url("fplus_rtl.gif") right 4px no-repeat
+      background: image_url("forgeos/jstree/themes/categories/fplus_rtl.gif") right 4px no-repeat
       margin-right: 0
       padding-right: 16px
     a
       cursor: default
       padding: 0px 5px 0px 24px
-      +borderCorner
+      +border-radius(4px)
       width: auto
       color: #557383 !important
       font-weight: bold
@@ -200,7 +201,7 @@
     span.clicked
       padding: 0px 3px 0px 20px
     &.clicked
-      -moz-border-radius: 3px
+      +border-radius(3px)
       margin: 2px 0 !important
 
 #form_actuality
@@ -221,3 +222,4 @@
       padding: 2px
     .block-type
       padding: 3px
+

data/app/assets/stylesheets/forgeos/jstree/themes/association_page/style.css.sass

@@ -4,14 +4,14 @@
   li
     width: 100%
     &.jstree-open > ins.jstree-icon
-      background: url("dark-blue-minus.png") 0 0 no-repeat
+      background: image_url("forgeos/jstree/themes/association_page/dark-blue-minus.png") 0 0 no-repeat
 
     &.jstree-closed > ins.jstree-icon
-      background: url("dark-blue-plus.png") 0 1px no-repeat
+      background: image_url("forgeos/jstree/themes/association_page/dark-blue-plus.png") 0 1px no-repeat
     &.jstree-checked a > ins.jstree-checkbox
-      background: url("check-checked.png") 0 1px no-repeat
+      background: image_url("forgeos/jstree/themes/association_page/check-checked.png") 0 1px no-repeat
     &.jstree-unchecked a > ins.jstree-checkbox
-      background: url("check-unchecked.png") 0 1px no-repeat
+      background: image_url("forgeos/jstree/themes/association_page/check-unchecked.png") 0 1px no-repeat
 
     a
       display: inline !important

data/app/assets/stylesheets/forgeos/jstree/themes/block_category/style.css.sass

@@ -6,14 +6,14 @@
   width: 95%
 
   &.open
-    background: url("brown-minus.png") 0px 1px no-repeat
+    background: image_url("forgeos/jstree/themes/block_category/brown-minus.png") 0px 1px no-repeat
 
   &.closed
-    background: url("brown-plus.png") 0 1px no-repeat
+    background: image_url("forgeos/jstree/themes/block_category/brown-plus.png") 0 1px no-repeat
 
 
 #jstree-dragged.jstree-block_category li li.open
-  background: url("brown-plus.png") 0 1px no-repeat
+  background: image_url("forgeos/jstree/themes/block_category/brown-plus.png") 0 1px no-repeat
 
 
 .jstree.jstree-block_category .ltr li a
@@ -85,7 +85,7 @@
 
 
 .jstree.jstree-block_category .ltr li a.loading
-  background-image: url("throbber.gif")
+  background-image: image_url("forgeos/jstree/themes/block_category/throbber.gif")
 
 
 .jstree-block_category-context

data/app/assets/stylesheets/forgeos/jstree/themes/menu-tree/style.css.sass

@@ -4,7 +4,7 @@
   .see-on, .see-off, .editing
     display: none
   li.open
-    background: url("dark-blue-plus.png") 0 3px no-repeat
+    background: image_url("forgeos/jstree/themes/menu-tree/dark-blue-plus.png") 0 3px no-repeat
 #tree-marker
   background-color: #FBEC88
   background-position: 0 0 !important
@@ -33,9 +33,9 @@
       top: 2px
 
     &.jstree-open
-      background: url("dark-blue-minus.png") 0 2px no-repeat
+      background: image_url("forgeos/jstree/themes/menu-tree/dark-blue-minus.png") 0 2px no-repeat
     &.jstree-closed
-      background: url("dark-blue-plus.png") 0 3px no-repeat
+      background: image_url("forgeos/jstree/themes/menu-tree/dark-blue-plus.png") 0 3px no-repeat
     &.folder
       .tree-link
         background-color: #FAFAFA
@@ -50,7 +50,7 @@
       width: 500px !important
 
     .tree-link
-      background: url("drag-drop.png") no-repeat left center
+      background: image_url("forgeos/jstree/themes/menu-tree/drag-drop.png") no-repeat left center
       padding-top: 2px
       padding-bottom: 2px
       padding-left: 40px
@@ -61,16 +61,16 @@
       position: relative
       margin-right: 80px
       &.editing
-        background: url("big-drag-and-drop.png") repeat-y left center
+        background: image_url("forgeos/jstree/themes/menu-tree/big-drag-and-drop.png") repeat-y left center
     a.tree-link
 
       display: block
 
     &.jstree-leaf .tree-link
-      background: url("drag-drop.png") no-repeat left center
+      background: image_url("forgeos/jstree/themes/menu-tree/drag-drop.png") no-repeat left center
       background-color: #FFF
       &.editing
-        background: url("big-drag-and-drop.png") repeat-y left center
+        background: image_url("forgeos/jstree/themes/menu-tree/big-drag-and-drop.png") repeat-y left center
 
 
     .add-green-plus, .edit-link, .destroy-link
@@ -91,6 +91,8 @@
           display: block
 
       .actions
+        margin-left: 330px
+        padding-top: 15px
         color: #4D4D4D
         a
           color: #006EBD
@@ -108,3 +110,4 @@
       right: 2px
       top: 2px
       padding: 0
+

data/app/assets/stylesheets/forgeos/jstree/themes/page_category/style.css.sass

@@ -6,14 +6,14 @@
   width: 95%
 
   &.open
-    background: url("brown-minus.png") 0px 1px no-repeat
+    background: image_url("forgeos/jstree/themes/page_category/brown-minus.png") 0px 1px no-repeat
 
   &.closed
-    background: url("brown-plus.png") 0 1px no-repeat
+    background: image_url("forgeos/jstree/themes/page_category/brown-plus.png") 0 1px no-repeat
 
 
 #jstree-dragged.jstree-page_category li li.open
-  background: url("brown-plus.png") 0 1px no-repeat
+  background: image_url("forgeos/jstree/themes/page_category/brown-plus.png") 0 1px no-repeat
 
 
 .jstree.jstree-page_category .ltr li a
@@ -85,7 +85,7 @@
 
 
 .jstree.jstree-page_category .ltr li a.loading
-  background-image: url("throbber.gif")
+  background-image: image_url("forgeos/jstree/themes/page_category/throbber.gif")
 
 
 .jstree-page_category-context

data/app/controllers/admin/actualities_controller.rb

@@ -44,17 +44,27 @@ class Admin::ActualitiesController < Admin::BaseController
   end
 
   def activate
-    render :text => @actuality.activate
+    @actuality.activate
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :actualities])
+      end
+      wants.js
+    end
   end
 
   def destroy
     if @actuality.destroy
       flash[:notice] = t('actuality.destroy.success').capitalize
-      return redirect_to([forgeos_cms, :admin, :actualities]) if !request.xhr?
     else
       flash[:error] = t('actuality.destroy.failed').capitalize
     end
-    render :nothing => true
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :actualities])
+      end
+      wants.js
+    end
   end
 
 
@@ -89,12 +99,12 @@ private
 
 
     if params[:sSearch] && !params[:sSearch].blank?
+      options[:group] = 'id'
       @actualities = Actuality.search(params[:sSearch],options)
     else
       options[:joins] = joins
+      options[:group] = 'id'
       @actualities = Actuality.paginate(options)
     end
   end
-
-
 end

data/app/controllers/admin/import_controller.rb

@@ -1,13 +1,13 @@
 load File.join(Gem.loaded_specs['forgeos_core'].full_gem_path, 'app', 'controllers', 'admin', 'import_controller.rb')
 Admin::ImportController.class_eval do
-  map_fields :create_page, Page.new.attributes.keys
-  map_fields :create_block, Block.new.attributes.keys
   before_filter :cms_models, :only => :index
 
+  map_fields :create_page, Page.new.attributes.keys
   def create_page
     create_model(Page,'single_key')
   end
 
+  map_fields :create_block, Block.new.attributes.keys
   def create_block
     create_model(Block,'single_key')
   end

data/app/controllers/admin/menus_controller.rb

@@ -53,11 +53,22 @@ class Admin::MenusController < Admin::BaseController
     else
       flash[:error] = t('menu.destroy.failed').capitalize
     end
-    return redirect_to([forgeos_cms, :admin, :menus])
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :menus])
+      end
+      wants.js
+    end
   end
 
   def activate
-    render :text => @menu.activate
+    @menu.activate
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :menus])
+      end
+      wants.js
+    end
   end
 
 private

data/app/controllers/admin/newsletters_controller.rb

@@ -56,21 +56,24 @@ class Admin::NewslettersController < Admin::BaseController
   end
 
   def destroy
-     @deleted = @newsletter.destroy
-    if @deleted
+    if @newsletter.destroy
       flash[:notice] = I18n.t('newsletter.destroy.success').capitalize
-      return redirect_to([forgeos_cms, :admin, :newsletters]) if !request.xhr?
     else
       flash[:error] = I18n.t('newsletter.destroy.failed').capitalize
     end
-    render :nothing => true
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :newsletter])
+      end
+      wants.js
+    end
   end
 
 private
 
   def get_newsletter
     unless @newsletter = Newsletter.find_by_id(params[:id])
-      flash[:error] = I18n.t('Newsletter non trouvée').capitalize
+      flash[:error] = I18n.t('newsletter.not_found').capitalize
       return redirect_to([forgeos_cms, :admin, :newsletters])
     end
   end

data/app/controllers/admin/pages_controller.rb

@@ -61,10 +61,14 @@ class Admin::PagesController < Admin::BaseController
     if @page.destroy
       flash[:notice] = I18n.t('page.destroy.success').capitalize
     else
-      flash[:error] = @page.errors if @page
       flash[:error] = I18n.t('page.destroy.failed').capitalize
     end
-    render :nothing => true
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :pages])
+      end
+      wants.js
+    end
   end
 
   def link

data/app/controllers/admin/static_content_blocks_controller.rb

@@ -52,10 +52,14 @@ class Admin::StaticContentBlocksController < Admin::BaseController
     if @static_content_block.destroy
       flash[:notice] = I18n.t('static_content_block.destroy.success').capitalize
     else
-      flash[:error] = @static_content_block.errors if @static_content_block
       flash[:error] = I18n.t('static_content_block.destroy.failed').capitalize
     end
-    redirect_to([forgeos_cms, :admin, :static_content_blocks])
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :static_content_blocks])
+      end
+      wants.js
+    end
   end
 
   def link