forgeos_cms 1.9.0 → 1.9.1

data/app/views/admin/blocks/_associated_pages.html.haml

@@ -2,32 +2,31 @@
   - level = 0
 - categories.each do |category|
   %li
-    = link_to category.name, '#', :class=>'big-icons folder'
+    = link_to category.name, '#'
     - unless category.children.empty?
       %ul
         - category.children.each do |child|
           = render :partial => 'admin/blocks/associated_pages', :locals => { :categories => [child], :level => (level + 1), :block => block, :element_id => element_id }
         - category.pages.each do |_page|
-          %li.folder
-            = _page.title
+          %li{ :type => 'folder'}
+            = link_to _page.title, '#'
             %ul
-              - _page.page_cols.each_with_index do |page, index|
-                %li.page{:id => "page_col_#{page.id}", :class => block.page_cols.include?(page) ? 'clicked' : nil}
-                  = link_to '#', :class => "small-icons page #{block.page_cols.include?(page) ? 'clicked' : nil}" do
-                    #{_page.title} [#{index}]
-                    %span
-                  - if block.page_cols.include?(page)
-                    = hidden_field_tag "#{element_id}[page_col_ids][]", page.id
+              - _page.page_cols.each_with_index do |page_col, index|
+                - checked = block.page_cols.include?(page_col)
+                %li{:id => "page_col_#{page_col.id}", :class => checked ? 'jstree-checked' : 'jstree-unchecked' }
+                  = link_to t("page_col_#{index}"), '#'
+                  - if checked
+                    = hidden_field_tag "#{element_id}[page_col_ids][]", page_col.id
 
 - unless !defined?(pages) or pages.empty?
-  - pages.each do |_page|
-    %li.big-icons.folder
-      = _page.title
-      %ul
-        - _page.page_cols.each_with_index do |page, index|
-          %li.page{:id => "page_col_#{page.id}", :class => block.page_cols.include?(page) ? 'clicked' : nil}
-            = link_to '#', :class => "small-icons page #{block.page_cols.include?(page) ? 'clicked' : nil}" do
-              = t("page_col_#{index}").capitalize
-              %span
-            - if block.page_cols.include?(page)
-              = hidden_field_tag "#{element_id}[page_col_ids][]", page.id
+  - pages.each do |page|
+    %li
+      = link_to page.title, '#'
+      - unless page.page_cols.empty?
+        %ul
+          - page.page_cols.each_with_index do |page_col, index|
+            - checked = block.page_cols.include?(page_col)
+            %li{:id => "page_col_#{page_col.id}", :class => checked ? 'jstree-checked' : 'jstree-unchecked' }
+              = link_to t("page_col_#{index}").capitalize, '#'
+              - if checked
+                = hidden_field_tag "#{element_id}[page_col_ids][]", page_col.id

data/app/views/admin/blocks/_tabs.html.haml

@@ -1,8 +1,9 @@
 %ul.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header.ui-corner-all
-  %li.ui-state-default.ui-corner-top= link_to I18n.t('page', :count => 2).capitalize, forgeos_cms.admin_pages_path
+  %li.ui-state-default.ui-corner-top= link_to I18n.t('page', :count => 2).capitalize, [forgeos_cms, :admin, :pages]
   %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to I18n.t('block', :count => 2).capitalize, '#content'
-  %li.ui-state-default.ui-corner-top= link_to I18n.t('navigation').capitalize, forgeos_cms.admin_menus_path
-  %li.ui-state-default.ui-corner-top= link_to I18n.t('actuality', :count => 2).capitalize, forgeos_cms.admin_actualities_path
-#blocks-header.backgrounds
-  = link_to I18n.t('static_content_block', :count => 1).capitalize, '#', :class => 'selected'
-  = link_to I18n.t('widget', :count => 2).capitalize, forgeos_cms.admin_widgets_path
+  %li.ui-state-default.ui-corner-top= link_to I18n.t('navigation').capitalize, [forgeos_cms, :admin, :menus]
+  %li.ui-state-default.ui-corner-top= link_to I18n.t('actuality', :count => 2).capitalize, [forgeos_cms, :admin, :actualities]
+#sub-links
+  %ul
+    %li= link_to I18n.t('static_content_block', :count => 1).capitalize, '#', :class => 'selected'
+    %li= link_to I18n.t('widget', :count => 2).capitalize, [forgeos_cms, :admin, :widgets]

data/app/views/admin/carousels/_attachments_popups.html.haml

@@ -24,7 +24,7 @@
     .sidebar-content
       %h2{ :class => 'small-icons picture'}
         = link_to_function I18n.t('media.picture.all').capitalize, "select_all_elements_without_category('picture-attachment-tree')"
-      #picture-attachment-tree.init-tree.a-tree
+      #picture-attachment-tree
   .media-hoverlay-content.thumbnails
     .table#thumbnail-table.datatable.media.selectable_rows
   .media-hoverlay-content.table.hidden

data/app/views/admin/carousels/_form.html.haml

@@ -28,7 +28,7 @@
       %a.small-icons.step-title{ :href => "#" }
         = "#{I18n.t('widget.link.create.action').capitalize} :"
       = hidden_field_tag 'carousel[page_col_ids][]'
-      #association-carousel-page-tree.inner-step.init-tree
+      #association-carousel-page-tree.inner-step
         %ul
           = render :partial => 'admin/blocks/associated_pages', :locals => { :categories => page_categories, :pages => pages, :block => carousel, :element_id => 'carousel' }
       .clear
@@ -36,7 +36,7 @@
       %a.small-icons.step-title{ :href => "#" }
         = "#{I18n.t('folder.associated_to').capitalize} :"
       = hidden_field_tag 'carousel[category_ids][]'
-      #association-carousel-tree.inner-step.init-tree
+      #association-carousel-tree.inner-step
         %ul
           = render :partial => 'admin/categories/associated_elements', :locals => { :association_id => 'category_ids', :element => carousel, :category_ids => carousel.category_ids, :categories => WidgetCategory.find_all_by_parent_id(nil) }
       .clear

data/app/views/admin/carousels/show.html.haml

@@ -25,14 +25,14 @@
     #carousel_show_create.step.open
       %a.small-icons.step-title{ :href => "#" }
         = "#{I18n.t('widget.link.create.action').capitalize} :"
-      .view-tree.inner-step.init-tree
+      .view-tree.inner-step
         %ul
           = render :partial => 'admin/blocks/associated_pages', :locals => { :categories => @page_categories, :pages => @pages, :block => @carousel, :element_id => 'carousel' }
       .clear
     .step
       %a.small-icons.step-title{ :href => "#" }
         = "#{I18n.t('folder.associated_to').capitalize} :"
-      .view-tree.inner-step.init-tree
+      .view-tree.inner-step
         %ul
           = render :partial => 'admin/categories/associated_elements', :locals => { :association_id => 'category_ids', :element => @carousel, :category_ids => @carousel.category_ids, :categories => WidgetCategory.find_all_by_parent_id(nil) }
       .clear

data/app/views/admin/categories/_block.html.haml

@@ -1,4 +1,4 @@
 - link_class = 'small-icons block'
 - link_class += ' active' if page.page_cols.map(&:blocks).flatten.uniq.include?(block)
 %li{ :rel => 'file', :id => "block_#{block.id}" }
-  = link_to block.title.to_s + '<span class="small-icons"></span>', '#', :class => link_class, :title => block.class.human_name.capitalize
+  = link_to block.title.to_s + '<span class="small-icons"></span>', '#', :class => link_class, :title => block.class.model_name.human.capitalize

data/app/views/admin/menus/_empty_menu_link.html.haml

@@ -25,8 +25,7 @@
         %span.linked-to
         %span.link= link_to t('menu.link.change'), '#', :class => 'change-type'
         %label= "#{t('menu.visibility').capitalize} :"
-        .select-status
-          = select_tag "menu[menu_links_attributes][#{name}][active]", options_for_select([[t('menu.show').capitalize, 1], [t('menu.hide').capitalize, 0]], :selected => 1)
+        = select_tag "menu[menu_links_attributes][#{name}][active]", options_for_select([[t('menu.show').capitalize, 1], [t('menu.hide').capitalize, 0]], :selected => 1)
 
         = label_tag "menu[menu_links_attributes][#{name}][popup]", t('helpers.label.menu_link.popup')
         = check_box_tag "menu[menu_links_attributes][#{name}][popup]"

data/app/views/admin/menus/_form.html.haml

@@ -8,7 +8,7 @@
 
     .inner-content
       #menu-tree.padding-wrap
-        %ul.init-tree
+        %ul
           = render :partial => 'form_menu_links', :locals => { :menu_links => @menu.menu_links, :form => f, :has_parent => false }
       = link_to t('menu.link.add').capitalize, '#', :class => 'small-icons add-link button-menu-link'
 
@@ -16,8 +16,8 @@
     .step
       = link_to content_tag(:span, t('menu.link.add').capitalize, :class => 'small-icons add-menu-link'), '#', :class => 'backgrounds button button-menu-link'
 
-    .step
-      - unless menu.new_record?
+    - unless menu.new_record?
+      .step
         = link_to t('menu.duplicate').capitalize, forgeos_cms.duplicate_admin_menu_path(menu), :class => 'small-icons duplicate'
         = link_to t('menu.destroy.action').capitalize, [forgeos_cms, :admin, menu], :confirm => t('menu.destroy.confirm').capitalize, :method => :delete, :class => 'small-icons delete'
       .clear

data/app/views/admin/menus/_form_menu_links.html.haml

@@ -1,14 +1,13 @@
 - links = has_parent ? :children : :menu_links
 
-- form.fields_for links, :omit_hidden_fields => true do |menu_link_form|
+= form.fields_for links, :omit_hidden_fields => true do |menu_link_form|
   - menu_link = menu_link_form.object
   - link_class = menu_link.class.to_s.underscore.split('_').first
   - link_class = 'external' if link_class.eql?('menu')
 
   %li{ :class => menu_link.children.empty? ? 'file' : 'folder' }
-    - link_to menu_link.url, :class => 'tree-link' do
-      %span.small-icons.name{ :class => link_class }
-        = menu_link.title
+    = link_to menu_link.url, :class => 'tree-link' do
+      %span.small-icons.name{ :class => link_class }= menu_link.title
       %span.small-icons.status{ :class => menu_link.active ? 'see-on' : 'see-off' }
 
     .menu_link
@@ -32,13 +31,13 @@
           - if target
             = link_to target.name, [forgeos_cms, :admin, target]
           - else
-            = link_to menu_link.url
+            = link_to menu_link.url, menu_link.url
         %span.linked-to= target ? target.name : ''
         %span.link
           = link_to t('menu.link.change'), '#', :class => 'change-type'
 
         = menu_link_form.label :active
-        .select-status= menu_link_form.select :active, [[t('menu.show').capitalize, 1], [t('menu.hide').capitalize, 0]], :selected => menu_link.active ? 1 : 0
+        = menu_link_form.select :active, [[t('menu.show').capitalize, 1], [t('menu.hide').capitalize, 0]], :selected => menu_link.active ? 1 : 0
 
         = menu_link_form.label :popup
         = menu_link_form.check_box :popup
@@ -57,4 +56,3 @@
     - unless menu_link.children.nil? or menu_link.children.blank?
       %ul
         = render :partial => 'form_menu_links', :locals => { :form => menu_link_form, :has_parent => true }
-

data/app/views/admin/menus/_lang_switcher.html.haml

@@ -1,2 +1,2 @@
-- form_tag '/admin/dashboard/change_lang', :autocomplete => 'off', :id => 'lang-switcher' do
-  %div= select_tag :lang, options_for_select([['Français',:fr],['Anglais',:en]],session[:lang] || I18n.locale), :onchange => 'jQuery(this.form).submit()'
+= form_tag '/admin/dashboard/change_lang', :autocomplete => 'off', :id => 'lang-switcher' do
+  %div= select_tag :lang, options_for_select([['Français',:fr],['Anglais',:en]],session[:lang] || I18n.locale), :onchange => 'jQuery(this.form).trigger("submit")'

data/app/views/admin/menus/_types_popups.html.haml

@@ -1,8 +1,9 @@
 #menuLinkTypeDialog.media-hoverlay
-  #inner-lightbox.backgrounds
-    = link_to_function ExternalLink.model_name.human, "toggleSelectedOverlay('#inner-lightbox.backgrounds .external'); toggle_menu_types_overlays('external-link')", :class => "small-icons external selected"
-    = link_to_function PageLink.model_name.human, "toggleSelectedOverlay('#inner-lightbox.backgrounds .page'); update_current_dataTable_source('#table-files','#{escape_javascript(forgeos_cms.admin_pages_path(:mode => 'menu_link',:format => :json))}'); toggle_menu_types_overlays('target-link');", :class => "small-icons page"
-    = link_to_function CategoryLink.model_name.human, "toggleSelectedOverlay('#inner-lightbox.backgrounds .category'); update_current_dataTable_source('#table-files','#{escape_javascript(forgeos_cms.admin_page_categories_path(:mode => 'menu_link', :format => :json))}'); toggle_menu_types_overlays('target-link')", :class => "small-icons category"
+  #inner-lightbox
+    %ul
+      %li= link_to_function ExternalLink.model_name.human, "toggleSelectedOverlay('#inner-lightbox .external'); toggle_menu_types_overlays('external-link')", :class => "small-icons external selected"
+      %li= link_to_function PageLink.model_name.human, "toggleSelectedOverlay('#inner-lightbox .page'); update_current_dataTable_source('#table-menu_links','#{escape_javascript(forgeos_cms.admin_pages_path(:mode => 'menu_link',:format => :json))}'); toggle_menu_types_overlays('target-link');", :class => "small-icons page"
+      %li= link_to_function CategoryLink.model_name.human, "toggleSelectedOverlay('#inner-lightbox .category'); update_current_dataTable_source('#table-menu_links','#{escape_javascript(forgeos_cms.admin_page_categories_path(:mode => 'menu_link', :format => :json))}'); toggle_menu_types_overlays('target-link')", :class => "small-icons category"
 
   .media-hoverlay-header
     #search.right.files
@@ -10,12 +11,12 @@
     .backgrounds.search-form-files
 
   .media-hoverlay-content
-    #target-link{:style => 'display: none'}
-      %table#table-files.datatable.media.selectable_rows
-        %tr
-          %td
     #external-link
       %label= "#{t(:url).capitalize} :"
       = text_field_tag "url", '', :id => "overlay-url"
+    #target-link{:style => 'display: none'}
+      %table#table-menu_links.datatable.media.selectable_rows
+        %tr
+          %td
 
-= dataTables_tag :id => 'table-files', :url => forgeos_cms.admin_pages_path(:format => :json, :mode => 'menu_link'), :columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }","{ 'sTitle': '#{t(:name)}'}","{'bVisible': false}", "{'bVisible': false}"], :autostart => false
+= dataTables_tag :id => 'table-menu_links', :url => forgeos_cms.admin_pages_path(:format => :json, :mode => 'menu_link'), :columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }","{ 'sTitle': '#{t(:name)}'}","{'bVisible': false}", "{'bVisible': false}"]

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

@@ -5,25 +5,23 @@
       link_id = menu.id
       klass = menu.active? ? 'see-on' : 'see-off'
       [
-        content_tag(:div, content_tag(:div, content_tag(:span, " ", :class => "small-icons menu-ico"), :class=>"image"), :id => link_id),
+        content_tag(:div, content_tag(:div, tag(:span, :class => "small-icons menu-ico"), :class=>"image"), :id => link_id),
         content_tag(:div, link_to(menu.name, [forgeos_cms, :edit, :admin, menu]), :class => 'menu-name'),
-        link_to('', :url => forgeos_cms.activate_admin_menu_path(menu),
+        link_to('', [forgeos_cms, :activate, :admin, menu],
          :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, :duplicate, :admin, menu], :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_cms, :edit, :admin, menu], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_cms, :admin, menu],
+        link_to('', [forgeos_cms, :admin, menu],
           :remote => true,
           :method => :delete,
           :confirm => t('menu.destroy.confirm').capitalize,
           :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :html => {
           :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
-        })
+        )
       ]
     end
   }

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

@@ -7,14 +7,14 @@
         content_tag(:div, link_to(newsletter.email, [forgeos_cms, :edit, :admin, newsletter])),
         content_tag(:div, newsletter.created_at.to_s),
         link_to('', [forgeos_cms, :edit, :admin, newsletter], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_cms, :admin, newsletter],
+        link_to('', [forgeos_cms, :admin, newsletter],
           :remote => true,
           :method => :delete,
           :confirm => t('menu.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
   }

data/app/views/admin/pages/_block_popup.html.haml

@@ -1,18 +1,19 @@
 .lightbox-container
-  #inner-lightbox.backgrounds
-    = link_to I18n.t('static_content_block', :count => 1).capitalize, '#', :class => 'static-tab selected'
-    = link_to I18n.t('widget', :count => 2).capitalize, '#', :class => 'widget-tab'
+  #sub-links
+    %ul
+      %li= link_to I18n.t('static_content_block', :count => 1).capitalize, '#', :class => 'static-tab selected'
+      %li= link_to I18n.t('widget', :count => 2).capitalize, '#', :class => 'widget-tab'
   #blocks
     .blocks-tree
       - unless @static_blocks.blank?
         %ul
           = render :partial => 'admin/categories/list_blocks', :locals => { :page => page, :categories => @static_block_categories, :blocks => @static_blocks }
     .clear
-    = link_to I18n.t('page.block.add').capitalize, forgeos_cms.new_admin_page_block_path(page), :class => 'small-icons add-link'
+    = link_to I18n.t('page.block.add').capitalize, '#', :class => 'small-icons add-link'
   #widgets.hidden
     .blocks-tree
       - unless @widgets.blank?
         %ul
           = render :partial => 'admin/categories/list_blocks', :locals => { :page => page, :categories => @widget_categories, :blocks => @widgets }
     .clear
-    = link_to I18n.t('page.widget.add').capitalize, forgeos_cms.new_admin_page_block_path(page), :class => 'small-icons add-link'
+    = link_to I18n.t('page.widget.add').capitalize, '#', :class => 'small-icons add-link'

data/app/views/admin/pages/_blocks.html.haml

@@ -18,7 +18,7 @@
               %span.handler
                 %span.inner
               %span
-                = block.class.human_name.capitalize
+                = block.class.model_name.human.capitalize
             %span.block-name
               = block.title.capitalize unless block.title.nil?
 

data/app/views/admin/pages/_form.html.haml

@@ -1,15 +1,24 @@
 = render :partial => 'admin/menus/lang_switcher'
+= render :partial => 'tabs'
 = form_for [forgeos_cms, :admin, page], :html => { :id => 'wrap' } do |f|
-  = render :partial => 'tabs_show'
-  #content.grid_16.alpha.omega
-    #general{:style => 'padding: 0'}
+  #blocks-header.ui-tabs.ui-widget.ui-widget-content.ui-corner-all
+    %ul.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header.ui-corner-all
+      %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to t(:general), '#general', :class => 'selected'
+      %li.ui-state-default.ui-corner-top= link_to t(:block,:count => 2), '#blocks'
+      %li.ui-state-default.ui-corner-top= link_to t(:seo), '#seo'
+      %li.ui-state-default.ui-corner-top= link_to t(:codes), '#codes'
+    .backgrounds.big-header
+      = f.text_field :title, :class => 'field_name big_orange_input'
+      .interact-links
+        = Forgeos_save_buttons [forgeos_cms, :admin, :pages]
+    #general
       = render :partial => 'general', :locals => {:f => f, :page => page }
       .clear
-    #blocks{:style => 'padding: 0'}
+    #blocks
       = render :partial => 'blocks', :locals => { :f => f, :page => page }
     #seo{:style => 'padding: 0'}
       = render :partial => 'seo', :locals => { :f => f, :page => page }
     #codes
       = render :partial => 'codes', :locals => { :f => f, :page => page }
     .clear
-    = render :partial => 'block_popup', :locals => { :page => page } 
+= render :partial => 'block_popup', :locals => { :page => page }

data/app/views/admin/pages/_general.html.haml

@@ -1,10 +1,5 @@
 .grid_12.alpha
   .inner-content
-    = f.label :title, t(:title, :scope => [:page])
-    .clear
-    = f.text_field :title, :class => 'field_name big_orange_input'
-    .clear
-
     - i = 0
     = f.fields_for :page_cols do |page_col|
       = page_col.label :content, t("page_col_#{i}")

data/app/views/admin/pages/_tabs_show.html.haml

@@ -1,9 +1 @@
-= render :partial => 'tabs'
-#blocks-header.backgrounds.big-header.settings.ui-tabs.ui-widget.ui-widget-content.ui-corner-all
-  %ul.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header.ui-corner-all
-    %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to t(:general), '#general', :class => 'selected'
-    %li.ui-state-default.ui-corner-top= link_to t(:block,:count => 2), '#blocks'
-    %li.ui-state-default.ui-corner-top= link_to t(:seo), '#seo'
-    %li.ui-state-default.ui-corner-top= link_to t(:codes), '#codes'
-  = Forgeos_save_buttons forgeos_cms.admin_pages_path
-  .clear
+

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

@@ -23,11 +23,13 @@
           select_tag(:status, options_for_select(status, page.active ? 'published' : 'draft'), :class => 'customize published', :onchange => "jQuery.ajax({url: '#{forgeos_cms.activate_admin_page_path(page)}', data: { active: this.value }});"),
           link_to('', [forgeos_cms, :duplicate, :admin, page], :class => 'small-icons duplicate-link') +
           link_to('', [forgeos_cms, :edit, :admin, page], :class => 'small-icons edit-link') +
-          link_to('', "jQuery.ajax(url: '#{url_for([forgeos_cms, :admin, page])}',\
-              method: 'delete',
-              confirm: '#{I18n.t('page.destroy.confirm').capitalize}',
-              success: removedataTablesRow('#destroy_#{link_id}')});",
-              :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
+          link_to('', [forgeos_cms, :admin, page],
+            :remote => true,
+            :method => 'delete',
+            :confirm => I18n.t('page.destroy.confirm').capitalize,
+            :success => "removedataTablesRow('#destroy_#{link_id}')});",
+            :class => 'small-icons destroy-link',
+            :id => "destroy_#{link_id}"
           )
         ]
       end

data/app/views/admin/pages/new.html.haml

@@ -1,2 +1 @@
 = render :partial => 'form', :locals => { :page => @page }
-= observe_field('page_title', :frequency => 1, :loading => "$('#page_url').addClass('loading')", :success => "$('#page_url').val(request); $('#page_url').removeClass('loading')", :url => forgeos_cms.url_admin_pages_path, :with => "'url=' + value", :datatype => 'text')

data/app/views/admin/pages/show.html.haml

@@ -12,10 +12,9 @@
     .grid_12.alpha
       .inner-content
         %h2.permalink
-          - permalink = "#{request.protocol}#{request.host_with_port}/#{@page.url}"
           = t(:permalink, :count => 1).capitalize
           \:
-          = permalink 
+          = forgeos_cms.page_url(@page.url)
         .fieldset
           %h2= t :content
           .page-content
@@ -26,7 +25,7 @@
             - @page.blocks.each do |block|
               %div.block-container
                 %span.block-type
-                  = block.class.human_name.capitalize
+                  = block.class.model_name.human.capitalize
                 %span.block-name
                   = block.title
     #right-sidebar.grid_4.omega
@@ -38,41 +37,19 @@
         %p
           - unless @page.new_record? or !@page.active or @page.published_at.nil?
             = t('page.published_on').capitalize
-            %span.last-date
-              = @page.published_at.to_date
-              %br
-              -# by
-              -# %em
-                -# Quentin Tousart
+            %span.last-date= @page.published_at.to_date
       .step
-        -# = link_to t('page.preview'), '#', :class => 'small-icons preview'
         = content_tag :span, t('page.preview'), :class => 'small-icons preview disabled'
         = link_to t('page.duplicate').capitalize, [forgeos_cms, :duplicate, :admin, @page], :class => 'small-icons duplicate'
         = link_to t('page.delete'), [forgeos_cms, :admin, @page], :confirm => t('page.destroy.confirm').capitalize, :method => :delete, :class => 'small-icons delete'
       .step.disabled
         = link_to t('page.modification_history').capitalize, '#', :class => 'small-icons step-title'
         .inner-step
-          %p
-            Modified on
-            %span.last-date
-              12/11/2009
-            %br
-            by
-            %em
-              Quentin Tousart
-          %p
-            Created on 11/11/2009
-            %br
-            by
-            %em
-              Quentin Tousart
       #pages_show_tags.step.open
         = link_to t('tag', :count => 2).capitalize, '#', :class => 'small-icons step-title'
         .inner-step.tags
           - @page.tags_on(:tags).each do |tag|
-            -#%a{ :href => "#" }
-            %label
-              = tag.name
+            %label= tag.name
       #pages_show_meta.step.open
         = link_to t('page.meta_description').capitalize, '#', :class => 'small-icons step-title'
         .inner-step.meta
@@ -91,10 +68,7 @@
               = t(:keyword, :count => 2).capitalize
               \:
             = @page.meta_info.keywords if @page.meta_info
-      /
-        .step.disabled
-          = link_to t(:graphic_template, :count => 1).capitalize, '#', :class => 'small-icons step-title'
-          .inner-step.glossy
-            = select_tag :template, options_for_select([['Template 1',0],['Template 2',1]])
-          .clear
+      .step.disabled
+        = link_to t(:graphic_template, :count => 1).capitalize, '#', :class => 'small-icons step-title'
+        .inner-step.glossy
     .clear

data/app/views/admin/static_content_blocks/_form.html.haml

@@ -26,7 +26,7 @@
       %a.small-icons.step-title{ :href => "#" }
         = "#{I18n.t('static_content_block.link.create.action').capitalize} :"
       = hidden_field_tag 'static_content_block[page_col_ids][]'
-      #association-static-content-page-tree.inner-step.init-tree
+      #association-static-content-page-tree.inner-step
         %ul
           = render :partial => 'admin/blocks/associated_pages', :locals => { :categories => @page_categories, :pages => @pages, :block => static_content_block, :element_id => 'static_content_block' }
       .clear
@@ -34,7 +34,7 @@
       %a.small-icons.step-title{ :href => "#" }
         = "#{I18n.t('folder.associated_to').capitalize} :"
       = hidden_field_tag 'static_content_block[category_ids][]'
-      #association-static-content-tree.inner-step.init-tree
+      #association-static-content-tree.inner-step
         %ul
           = render :partial => 'admin/categories/associated_elements', :locals => { :association_id => 'category_ids', :element => static_content_block, :category_ids => static_content_block.category_ids, :categories => StaticContentCategory.find_all_by_parent_id(nil) }
       .clear

data/app/views/admin/static_content_blocks/index.html.haml

@@ -11,6 +11,6 @@
 
 = dataTables_tag :url => forgeos_cms.admin_blocks_path(:format => :json), :columns => ["{'sClass': 'image_product_td', 'bSearchable':false,'bSortable':false}","{'sTitle':'#{I18n.t 'static_content_block.name'}'}","{'sTitle':'#{I18n.t :linked_to}','bSearchable':false}","{'sClass':'actions-td','bSearchable':false,'bSortable':false}"]
 .lightbox-container
-  .pages-tree.init-tree
+  .pages-tree
     %ul
       = render :partial => 'admin/categories/list_pages', :locals => { :categories => @page_categories, :pages => @pages }

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

@@ -13,14 +13,14 @@
 
         link_to('', forgeos_cms.duplicate_admin_static_content_block_path(block), :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_cms, :edit, :admin, block], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_cms, :admin, block],
+        link_to('', [forgeos_cms, :admin, block],
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('static_content_block.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
   }

data/app/views/admin/widget_actualities/_form.html.haml

@@ -25,7 +25,7 @@
       %a.small-icons.step-title{ :href => "#" }
         = "#{t('widget.link.create.action').capitalize} :"
       = hidden_field_tag 'widget_actuality[page_col_ids][]'
-      #association-widget-actuality-page-tree.inner-step.init-tree
+      #association-widget-actuality-page-tree.inner-step
         %ul
           = render :partial => 'admin/blocks/associated_pages', :locals => { :categories => page_categories, :pages => pages, :block => widget_actuality, :element_id => 'widget_actuality' }
       .clear
@@ -33,7 +33,7 @@
       %a.small-icons.step-title{ :href => "#" }
         = "#{t('folder.associated_to').capitalize} :"
       = hidden_field_tag 'widget_actuality[category_ids][]'
-      #association-widget-actuality-tree.inner-step.init-tree
+      #association-widget-actuality-tree.inner-step
         %ul
           = render :partial => 'admin/categories/associated_elements', :locals => { :association_id => 'category_ids', :element => widget_actuality, :category_ids => widget_actuality.category_ids, :categories => WidgetCategory.find_all_by_parent_id(nil) }
       .clear
@@ -80,8 +80,8 @@
       = text_field_tag "widget_actuality[items_attributes][#{id}][title]", '', :style => 'display: none;'
       = text_area_tag "widget_actuality[items_attributes][#{id}][content]", '', :class => 'mceEditor', :style => 'display: none;'
     .widget-actions
-      = link_to_function '','duplicate_actuality("item_'+id+'")', '', :class => 'small-icons duplicate-link duplicate-actuality'
-      = link_to_function '','edit_actuality($(this))', '', :class => 'small-icons edit-link edit-actuality'
-      = link_to_function '', "remove_actuality($(this));", :class => 'small-icons destroy-link'
+      = link_to_function '', 'duplicate_actuality("item_'+id+'")', :class => 'small-icons duplicate-link duplicate-actuality'
+      = link_to_function '', 'edit_actuality(jQuery(this))', :class => 'small-icons edit-link edit-actuality'
+      = link_to_function '', 'remove_actuality(jQuery(this));', :class => 'small-icons destroy-link'
     .clear
 

data/app/views/admin/widget_actualities/_form_item.html.haml

@@ -1,4 +1,4 @@
-- form.fields_for :items do |item_form|
+= form.fields_for :items do |item_form|
   - item = item_form.object
   - link_id = item.id.to_s
 
@@ -22,7 +22,7 @@
         = item_form.text_area :content
 
       .widget-actions
-        = link_to_function '',"duplicate_actuality('item_#{link_id}')", '', :class => 'small-icons duplicate-link duplicate-actuality'
-        = link_to_function '','edit_actuality($(this))', '', :class => 'small-icons edit-link edit-actuality'
-        = link_to_function '', "remove_actuality($(this));", :class => 'small-icons destroy-link'
+        = link_to_function '',"duplicate_actuality('item_#{link_id}')", :class => 'small-icons duplicate-link duplicate-actuality'
+        = link_to_function '','edit_actuality(jQuery(this))', :class => 'small-icons edit-link edit-actuality'
+        = link_to_function '', "remove_actuality(jQuery(this));", :class => 'small-icons destroy-link'
       .clear

data/app/views/admin/widget_actualities/edit.html.haml

@@ -1,2 +1,2 @@
-= render :partial => 'tabs'
+= render :partial => 'admin/widgets/tabs'
 = render :partial => 'form', :locals => { :widget_actuality => @widget_actuality, :page_id => params[:page_id], :page_categories => @page_categories, :pages => @pages }

data/app/views/admin/widget_actualities/new.html.haml

@@ -1,2 +1,2 @@
-= render :partial => 'tabs'
+= render :partial => 'admin/widgets/tabs'
 = render :partial => 'form', :locals => { :widget_actuality => @widget_actuality, :page_id => params[:page_id], :page_categories => @page_categories, :pages => @pages }