forgeos_cms 1.9.0 → 1.9.1

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

@@ -1,219 +1,48 @@
-.tree-association_page
-  .locked li a
-    color: gray
-
+.jstree-association_page
   ul
     width: 87%
-
   li
     width: 100%
-
-    &.last
-  .rtl
-    background-position: right 1px
-
-    ul
-      background-position: right 1px
-
-    li
-      background-position: right 8px
-
-      &.last
-        background-image: url("lastli_rtl.gif")
-        background-position: right top
-
-  .no_dots
-    background: transparent
-
-    ul
-      background: transparent
-
-    li.leaf
-      background-image: none
-      background-color: transparent
-
-  li
-    &.open
+    &.jstree-open > ins.jstree-icon
       background: url("dark-blue-minus.png") 0 0 no-repeat
 
-    &.closed
+    &.jstree-closed > ins.jstree-icon
       background: url("dark-blue-plus.png") 0 1px no-repeat
+    &.jstree-checked a > ins.jstree-checkbox
+      background: url("check-checked.png") 0 1px no-repeat
+    &.jstree-unchecked a > ins.jstree-checkbox
+      background: url("check-unchecked.png") 0 1px no-repeat
 
-
-#jstree-dragged.tree-association_page li li.open
-  background: url("dark-blue-plus.png") 0 1px no-repeat
-
-
-.tree-association_page .rtl li
-  margin-right: 1px
-
-  &.last
-    margin-right: 0
-    padding-right: 16px
-
-  &.open
-    background: url("fminus_rtl.gif") right 6px no-repeat
-    margin-right: 0
-    padding-right: 16px
-
-  &.closed
-    background: url("fplus_rtl.gif") right 4px no-repeat
-    margin-right: 0
-    padding-right: 16px
-
-
-#jstree-dragged.tree-association_page .rtl li li.open
-  background: url("fplus_rtl.gif") right 4px no-repeat
-  margin-right: 0
-  padding-right: 16px
-
-
-.tree-association_page
-  li
     a
-      padding: 0px 5px 0px 24px
+      display: inline !important
       width: auto
       color: #557383 !important
       font-weight: bold
       font-size: 1em
-      height: 20px
-      position: relative
-
-      span
-        height: 13px
-        width: 19px
-        font-size: 0.7em
-        background-image: url("check-unchecked.png")
-        background-repeat: no-repeat
-        background-position: 0 0
-        text-align: center
-        color: #75491B
-        right: 5px
-        position: absolute
-        top: 2px
-
-    &.clicked a.page span
-      background-image: url("check-checked.png")
-
-    span.clicked
-      padding: 0px 3px 0px 20px
-
-    a.loading
-      background-image: url("throbber.gif")
-
-  .rtl li
-    a, span
-      padding: 1px 23px 1px 4px
-      background-position: right 1px
-      margin-right: 1px
-
-    a
-      &:hover, &.hover
-        padding: 0px 23px 0px 3px
-        background-position: right 0px
-        margin-right: 0px
 
-      &.clicked
-        padding: 0px 23px 0px 3px
-        background-position: right 0px
-        margin-right: 0px
-
-        &:hover
-          padding: 0px 23px 0px 3px
-          background-position: right 0px
-          margin-right: 0px
-
-    span.clicked
-      padding: 0px 23px 0px 3px
-      background-position: right 0px
-      margin-right: 0px
-      padding: 0px 21px 0px 3px
-
-
-.tree-association_page-context
-  width: 160px
-  background: #F0F0F0 url("context.gif") 22px 0 repeat-y
-  border: 1px solid silver
-  position: absolute
+    li
+      padding-left: 15px
+  .jstree-locked li a
+    color: gray
+  .jstree-no_dots
+    background: transparent
 
-  a
-    display: block
-    text-decoration: none
-    color: black
-    line-height: 20px
-    background-repeat: no-repeat
-    background-position: 2px center
-    padding: 1px 0 1px 25px
-    background-color: transparent
-    border: 1px solid #f0f0f0
-    border-width: 0 1px
-    margin: 0
+    ul
+      background: transparent
 
-    &.disabled:hover
-      display: block
-      text-decoration: none
-      color: black
-      line-height: 20px
-      background-repeat: no-repeat
-      background-position: 2px center
-      padding: 1px 0 1px 25px
+    li.jstree-leaf
+      background-image: none
       background-color: transparent
-      border: 1px solid #f0f0f0
-      border-width: 0 1px
-      margin: 0
-
-    &:hover
-      background-color: #e7f4f9
-      border: 1px solid #d8f0fa
-      padding: 0 0 0 25px
-      margin: 0
-
-    &.disabled
-      color: silver
-      opacity: 0.5
-      -ms-filter: 'alpha(opacity=50)'
-      filter: alpha(opacity=50)
-      zoom: 1
-
-      &:hover
-        color: silver
-        opacity: 0.5
-        -ms-filter: 'alpha(opacity=50)'
-        filter: alpha(opacity=50)
-        zoom: 1
-
-  .separator
-    background: #FFFFFF
-    border-top: 1px solid #E0E0E0
-    font-size: 1px
-    height: 1px
-    line-height: 1px
-    margin: 0 2px 0 24px
-    min-height: 1px
-    display: block
 
 
-.tree-association_page li li
-  padding-left: 15px
-
-
-.leaf
+.jstree-leaf
   -moz-border-radius: 3px
+  -webkit-border-radius: 3px
+  border-radius: 3px
   margin: 2px 0 !important
   padding-left: 5px !important
-
-  .page
-    background-color: #b0e0f1
-    background-position: 0 -1198px
-
-  &.clicked
+  &.jstree-clicked
     -moz-border-radius: 3px
+    -webkit-border-radius: 3px
+    border-radius: 3px
     margin: 2px 0 !important
-
-    .page
-      background-color: #8fc864
-
-
-.page.leaf a
-  &:hover, &.hover
-    color: #FFF !important

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

@@ -2,7 +2,7 @@
   padding: 10px
 
 
-.tree-block_category li
+.jstree-block_category li
   width: 95%
 
   &.open
@@ -12,11 +12,11 @@
     background: url("brown-plus.png") 0 1px no-repeat
 
 
-#jstree-dragged.tree-block_category li li.open
+#jstree-dragged.jstree-block_category li li.open
   background: url("brown-plus.png") 0 1px no-repeat
 
 
-.tree.tree-block_category .ltr li a
+.jstree.jstree-block_category .ltr li a
   padding: 0px 5px 0px 24px
   color: #75491B
   font-weight: bold
@@ -25,7 +25,7 @@
   display: block
 
 
-.tree-block_category li
+.jstree-block_category li
   span
     padding: 0px 5px 0px 24px
     color: #75491B
@@ -43,7 +43,7 @@
     margin-top: -16px
 
 
-.tree.tree-block_category .ltr li
+.jstree.jstree-block_category .ltr li
   a
     &.block
       padding: 3px 5px 3px 32px
@@ -80,15 +80,15 @@
     color: #FFF
 
 
-.tree-block_category li span.clicked
+.jstree-block_category li span.clicked
   padding: 0px 3px 0px 20px
 
 
-.tree.tree-block_category .ltr li a.loading
+.jstree.jstree-block_category .ltr li a.loading
   background-image: url("throbber.gif")
 
 
-.tree-block_category-context
+.jstree-block_category-context
   width: 160px
   background: #FFF
   border: 1px solid #AEB0B2

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

@@ -1,11 +1,11 @@
-#jstree-dragged.tree-menu-tree
+#tree-dragged.jstree-menu-tree
   a
     background: white
   .see-on, .see-off, .editing
     display: none
   li.open
     background: url("dark-blue-plus.png") 0 3px no-repeat
-#jstree-marker
+#tree-marker
   background-color: #FBEC88
   background-position: 0 0 !important
   height: 2px
@@ -14,7 +14,7 @@
   &.marker_plus
     width: 45px !important
 
-.tree-menu-tree
+.jstree-menu-tree
   margin: 20px 0px 20px 0
   padding: 0
   font-size: .8em
@@ -23,21 +23,6 @@
   ul
     display: block
     margin-top: 0
-
-  .rtl
-    background-position: right 1px
-
-    ul
-      background-position: right 1px
-
-    li
-      background-position: right 8px
-      position: relative
-
-      &.last
-        background-image: url("lastli_rtl.gif")
-        background-position: right top
-
   li
     display: block !important
     position: relative !important
@@ -47,9 +32,9 @@
       left: 15px
       top: 2px
 
-    &.open
+    &.jstree-open
       background: url("dark-blue-minus.png") 0 2px no-repeat
-    &.closed
+    &.jstree-closed
       background: url("dark-blue-plus.png") 0 3px no-repeat
     &.folder
       .tree-link
@@ -59,13 +44,11 @@
         image: none
       .tree-link
         background-color: #FFF
-    &.last
+    &.jstree-last
       float: none !important
     &.marker
       width: 500px !important
 
-
-
     .tree-link
       background: url("drag-drop.png") no-repeat left center
       padding-top: 2px
@@ -74,18 +57,21 @@
       border: 1px solid #E7E7E7
       -moz-border-radius: 3px
       -webkit-border-radius: 3px
+      border-radius: 3px
       position: relative
       margin-right: 80px
+      &.editing
+        background: url("big-drag-and-drop.png") repeat-y left center
     a.tree-link
+
       display: block
-    div.tree-link
-      background: url("big-drag-and-drop.png") repeat-y left center
-      &.editing
-        display: none
 
-    &.leaf .tree-link
+    &.jstree-leaf .tree-link
       background: url("drag-drop.png") no-repeat left center
       background-color: #FFF
+      &.editing
+        background: url("big-drag-and-drop.png") repeat-y left center
+
 
     .add-green-plus, .edit-link, .destroy-link
       width: 16px
@@ -96,7 +82,7 @@
         top: 2px
         right: 0px
         display: none
-        
+
         a
           width: 16px
           padding: 0
@@ -122,65 +108,3 @@
       right: 2px
       top: 2px
       padding: 0
-
-.tree-menu-tree-context
-  width: 160px
-  background: #F0F0F0 url("context.gif") 22px 0 repeat-y
-  border: 1px solid silver
-  position: absolute
-
-  a
-    display: block
-    text-decoration: none
-    color: black
-    line-height: 20px
-    background-repeat: no-repeat
-    background-position: 2px center
-    padding: 1px 0 1px 25px
-    background-color: transparent
-    border: 1px solid #f0f0f0
-    border-width: 0 1px
-    margin: 0
-
-    &.disabled:hover
-      display: block
-      text-decoration: none
-      color: black
-      line-height: 20px
-      background-repeat: no-repeat
-      background-position: 2px center
-      padding: 1px 0 1px 25px
-      background-color: transparent
-      border: 1px solid #f0f0f0
-      border-width: 0 1px
-      margin: 0
-
-    &:hover
-      background-color: #e7f4f9
-      border: 1px solid #d8f0fa
-      padding: 0 0 0 25px
-      margin: 0
-
-    &.disabled
-      color: silver
-      opacity: 0.5
-      -ms-filter: 'alpha(opacity=50)'
-      filter: alpha(opacity=50)
-      zoom: 1
-
-      &:hover
-        color: silver
-        opacity: 0.5
-        -ms-filter: 'alpha(opacity=50)'
-        filter: alpha(opacity=50)
-        zoom: 1
-
-  .separator
-    background: #FFFFFF
-    border-top: 1px solid #E0E0E0
-    font-size: 1px
-    height: 1px
-    line-height: 1px
-    margin: 0 2px 0 24px
-    min-height: 1px
-    display: block

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

@@ -2,7 +2,7 @@
   padding: 10px
 
 
-.tree-page_category li
+.jstree-page_category li
   width: 95%
 
   &.open
@@ -12,11 +12,11 @@
     background: url("brown-plus.png") 0 1px no-repeat
 
 
-#jstree-dragged.tree-page_category li li.open
+#jstree-dragged.jstree-page_category li li.open
   background: url("brown-plus.png") 0 1px no-repeat
 
 
-.tree.tree-page_category .ltr li a
+.jstree.jstree-page_category .ltr li a
   padding: 0px 5px 0px 24px
   color: #75491B
   font-weight: bold
@@ -25,7 +25,7 @@
   display: block
 
 
-.tree-page_category li
+.jstree-page_category li
   span
     padding: 0px 5px 0px 24px
     color: #75491B
@@ -43,7 +43,7 @@
     margin-top: -16px
 
 
-.tree.tree-page_category .ltr li
+.jstree.jstree-page_category .ltr li
   a
     &.page
       padding: 3px 5px 3px 32px
@@ -80,15 +80,15 @@
     color: #FFF
 
 
-.tree-page_category li span.clicked
+.jstree-page_category li span.clicked
   padding: 0px 3px 0px 20px
 
 
-.tree.tree-page_category .ltr li a.loading
+.jstree.jstree-page_category .ltr li a.loading
   background-image: url("throbber.gif")
 
 
-.tree-page_category-context
+.jstree-page_category-context
   width: 160px
   background: #FFF
   border: 1px solid #AEB0B2

data/app/controllers/admin/actualities_controller.rb

@@ -74,7 +74,7 @@ private
     per_page = params[:iDisplayLength] ? params[:iDisplayLength].to_i : 10
     offset = params[:iDisplayStart] ? params[:iDisplayStart].to_i : 0
     page = (offset / per_page) + 1
-    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:iSortDir_0] ? params[:iSortDir_0].upcase : 'ASC'}"
+    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:sSortDir_0] ? params[:sSortDir_0].upcase : 'ASC'}"
 
     conditions = {}
     includes = []

data/app/controllers/admin/carousels_controller.rb

@@ -76,7 +76,7 @@ private
   end
 
   def get_pages_and_categories
-    @page_categories = PageCategory.find_all_by_parent_id(nil,:joins => :translations, :order => 'name')
+    @page_categories = PageCategory.find_all_by_parent_id(nil, :group => 'category_id', :joins => :translations, :order => 'name')
     @pages = Page.all(:include => :categories, :conditions => { :categories_elements => { :category_id => nil }})
   end
 

data/app/controllers/admin/menus_controller.rb

@@ -79,7 +79,7 @@ private
     offset =  params[:iDisplayStart].to_i
     page = (offset / per_page) + 1
     order_column = params[:iSortCol_0].to_i
-    order = "#{columns[order_column]} #{params[:iSortDir_0].upcase}"
+    order = "#{columns[order_column]} #{params[:sSortDir_0].upcase}"
 
     conditions = {}
     includes = []

data/app/controllers/admin/newsletters_controller.rb

@@ -86,7 +86,7 @@ private
     per_page = params[:iDisplayLength] ? params[:iDisplayLength].to_i : 10
     offset = params[:iDisplayStart] ? params[:iDisplayStart].to_i : 0
     page = (offset / per_page) + 1
-    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:iSortDir_0] ? params[:iSortDir_0].upcase : 'ASC'}"
+    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:sSortDir_0] ? params[:sSortDir_0].upcase : 'ASC'}"
 
     conditions = {}
     includes = []

data/app/controllers/admin/pages_controller.rb

@@ -134,7 +134,7 @@ private
     per_page = params[:iDisplayLength].to_i
     offset =  params[:iDisplayStart].to_i
     page = (offset / per_page) + 1
-    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:iSortDir_0].upcase}"
+    order = "#{columns[params[:iSortCol_0].to_i]} #{params[:sSortDir_0].upcase}"
 
     conditions = {}
     options = { :order => order, :page => page, :per_page => per_page }
@@ -142,7 +142,7 @@ private
     includes = []
     if params[:category_id]
       conditions[:categories_elements] = { :category_id => params[:category_id] }
-      includes << :page_categories
+      includes << :categories
     end
 
     if params[:ids]

data/app/controllers/admin/static_content_blocks_controller.rb

@@ -134,7 +134,7 @@ private
     offset =  params[:iDisplayStart].to_i
     page = (offset / per_page) + 1
     order_column = params[:iSortCol_0].to_i
-    order = "#{columns[order_column]} #{params[:iSortDir_0].upcase}"
+    order = "#{columns[order_column]} #{params[:sSortDir_0].upcase}"
 
     conditions = {}
     includes = []

data/app/controllers/admin/widgets_controller.rb

@@ -44,7 +44,7 @@ private
     offset =  params[:iDisplayStart].to_i
     page = (offset / per_page) + 1
     order_column = params[:iSortCol_0].to_i
-    order = "#{columns[order_column]} #{params[:iSortDir_0].upcase}"
+    order = "#{columns[order_column]} #{params[:sSortDir_0].upcase}"
 
     conditions = {}
     includes = []

data/app/controllers/forgeos/application_controller.rb

@@ -15,7 +15,7 @@ Forgeos::ApplicationController.class_eval do
 end
 
 # Rails Bug fix on Nested inheritance models : Load nested models to use it parent class
-#Carousel
-#WidgetActuality
-#WidgetFaq
-#LinkPage
+Carousel
+WidgetActuality
+WidgetFaq
+LinkPage

data/app/helpers/admin/base_helper.rb

@@ -0,0 +1,16 @@
+load File.join(Gem.loaded_specs['forgeos_core'].full_gem_path, 'app', 'helpers', 'admin', 'base_helper.rb')
+
+module Admin::BaseHelper
+  def block_container(model_name, block_name, block, &proc)
+    content_tag :div, :class => 'block-container ui-corner-all' do
+      content_tag(:span, :class => 'block-type') do
+        content_tag(:span, content_tag(:span, ' ', :class => 'inner'), :class => 'handler') +
+        block.model_name.human
+      end +
+      content_tag(:span, capture(&proc), :class => 'block-name') +
+      link_to('', [:edit, :admin, block], :class => 'small-icons edit-link', :popup => true) +
+      link_to('', '#', :class => 'big-icons gray-destroy') +
+      hidden_field_tag("#{model_name}[#{block_name}_ids][]", block.id, :class => 'block-selected')
+    end
+  end
+end

data/app/views/admin/actualities/index.json.erb

@@ -11,22 +11,21 @@
         content_tag(:div, actuality.date),
         content_tag(:div, link_to(actuality.title, [forgeos_cms, :admin, actuality]), :class => 'actuality-name'),
         content_tag(:div, author || 'not found'),
-        link_to('', :url => forgeos_cms.activate_admin_actuality_path(actuality),
+        link_to('', [forgeos_cms, :activate, :admin, actuality],
          :remote => true,
          :complete => "toggleActivate('#show_#{link_id}')",
-         :html => {
-           :class => "small-icons #{klass}",
-           :id => "show_#{link_id}"
-        }),
+         :class => "small-icons #{klass}",
+         :id => "show_#{link_id}"
+        ),
         link_to('', [forgeos_cms, :edit, :admin, actuality], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_cms, :admin, actuality],
+        link_to('', [forgeos_cms, :admin, actuality],
           :remote => true,
           :method => :delete,
           :confirm => t('actuality.destroy.confirm').capitalize,
           :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :html => {
-            :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
-          })
+          :class => 'small-icons destroy-link',
+          :id => "destroy_#{link_id}"
+        )
       ]
     end
   }