trusty-cms 1.0.0 → 1.0.1

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

@@ -1,4 +1,4 @@
-- form_for [:admin, @layout], :html => {'data-onsubmit_status' => onsubmit_status(@layout)} do |f|
+= form_for [:admin, @layout], :html => {'data-onsubmit_status' => onsubmit_status(@layout)} do |f|
   = f.hidden_field :lock_version
   = render_region :form_top, :locals => {:f => f}
   .form_area
@@ -6,34 +6,33 @@
       - form.edit_title do
         %p.title
           = f.label :name, t('name')
-          = f.text_field :name, :maxlength => 100, :class => "textbox"
+          = f.text_field :name, :maxlength => 100, :class => "textbox", :required => true
       - form.edit_extended_metadata do
         .drawer
           .drawer_contents#attributes
             %table.fieldset
               %tr
-                %th.label= f.label :content_type, t('content_type')
+                %th.label= f.label :content_type, t('content_type').html_safe
                 %td.field= f.text_field :content_type, :maxlength => 40, :class => "textbox"
               = render_region :extended_metadata, :locals => {:f => f}
           .drawer_handle
             %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label
       - form.edit_content do
         %p.content
-          = f.label :layout_content, "Body"
+          = f.label :content, "Body"
           ~ f.text_area :content, :size => "40x20", :style => "width: 100%", :class => "textarea large"
-  = javascript_tag "$('layout_name').activate()"
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.reference_links do
       %p
         %span.reference_links
           Reference:
           %span{:id => "tag_reference_link"}
-            = link_to_function t('available_tags'), "loadTagReference('Page');"
+            = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
     - form_bottom.edit_buttons do
       .buttons
         = save_model_button @layout
         = save_model_and_continue_editing_button @layout
-        = t('or') 
+        = t('or')
         = link_to t('cancel'), admin_layouts_url
     - form_bottom.edit_timestamp do
       = updated_stamp @layout

data/app/views/admin/layouts/_popups.html.haml

@@ -0,0 +1,4 @@
+- content_for :popups do
+  #popup_window
+    .outer
+      .content

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

@@ -2,8 +2,10 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t('edit_layout')       
+    %h1= t('edit_layout')
   - main.edit_form do
     = render :partial => 'form'
+  - main.edit_popups do
+    = render :partial => "popups"
 
-- content_for 'page_scripts', layout_edit_javascripts
+- content_for :page_scripts

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

@@ -4,4 +4,4 @@
   - main.edit_form do
     = render :partial => 'form'
 
-- content_for 'page_scripts', layout_edit_javascripts
+- content_for :page_scripts

data/app/views/admin/layouts/remove.html.haml

@@ -1,6 +1,6 @@
 %h1= t('remove_layout')
 
-%p= t('text.layouts.remove_warning')
+%p= t('text.layouts.remove_warning').html_safe
 
 %table.index#layouts
   %tbody
@@ -9,8 +9,8 @@
         = image('layout', :alt => '')
         = h @layout.name
 
-- form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>"Removing layout…" } do
+= form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>"Removing layout…" } do
   .buttons
     %input.button{:type => "submit", :value => t('delete_layout')  }/
     = t('or')
-    = link_to t('cancel'), admin_layouts_url
+    = link_to t('cancel'), admin_layouts_url

data/app/views/admin/page_fields/_page_field.html.haml

@@ -7,6 +7,7 @@
     = hidden_field_tag "page[fields_attributes][#{page_field_counter}][_destroy]", page_field._destroy, :class => 'delete_input'
     ~ text_field_tag "page[fields_attributes][#{page_field_counter}][content]", page_field.content, :id => "page_fields_attributes_#{page_field_counter}_content", :class => "textbox", :maxlength => 200
   %td.actions
-    - link_to '#add_field_popup', :class=>'popup', :alt => t('add_field') do
+    = link_to '#add_field_popup', :class=>'popup', :alt => t('add_field') do
       = image 'plus_grey'
-    = link_to_function image('minus_grey', :alt => t('remove_field')), "event.stop(); window.removeField(this)", :title => t('remove_field')
+    = link_to "#remove_field#{page_field_counter}", :class => "remove_field", :alt => "Remove Field" do
+      = image 'minus_grey'

data/app/views/admin/page_parts/_page_part.html.haml

@@ -4,15 +4,14 @@
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][id]", page_part.id, :id => "part_#{page_part_counter}_id", :class => "id_input" unless page_part.new_record?
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_destroy]", page_part._destroy, :class => "delete_input"
     %p
-      %label{:for => "part_#{page_part.name.to_slug}_filter_id"} 
-        = t('filter') 
-      = select_tag "page[parts_attributes][#{page_part_counter}][filter_id]", filter_options_for_select(page_part.filter_id), :id => "part_#{page_part.name.to_slug}_filter_id"
+      %label
+        = "To use HTML or Radius tags, switch to plain text view by clicking the 'Source' button."
       %span.reference_links
         = t('reference')
         %span{:id => "filter_reference_link_#{page_part.name.to_slug}"}
           = link_to_function t('filter'), "loadFilterReference('#{page_part.name.to_slug}');"
         %span{:id => "tag_reference_link_#{page_part.name.to_slug}"}
-          = link_to_function t('available_tags'), "loadTagReference('#{page_part.name.to_slug}');"
+          = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
       = render_region :part_controls, :locals => {:page_part => page_part}
     %div
-      ~ text_area_tag "page[parts_attributes][#{page_part_counter}][content]", page_part.content, :class => "textarea large", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"
+      = cktext_area :page_part, page_part.content || '', :name => "page[parts_attributes][#{page_part_counter}][content]", :value => page_part.content || '', :class => "textarea large", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"

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

@@ -1,4 +1,3 @@
-- include_javascript 'admin/page_preview'
 = fields.hidden_field :lock_version
 = fields.hidden_field :parent_id
 = fields.hidden_field :class_name
@@ -9,7 +8,7 @@
   - form.edit_title do
     %p.title
       %label{:for=>"page_title"}= t('page_title')
-      = fields.text_field :title, :class => 'textbox', :maxlength => 255
+      = fields.text_field :title, :class => 'textbox', :maxlength => 255, :required => true
   - form.edit_extended_metadata do
     .drawer
       .drawer_contents#attributes
@@ -46,7 +45,7 @@
     - layout.edit_published_at do
       %p#published_at{:class => (@page.published? ? nil : 'hidden')}
         = fields.label :published_at, t('published_on')
-        = fields.text_field :published_at, :class=> "date", :value => (@page.published_at? ? I18n.localize(@page.published_at.to_date, :format =>:long) : nil)
+        = fields.text_field :published_at, :class=> "date", :type=>"date", :value => (@page.published_at? ? I18n.localize(@page.published_at.to_date, :format =>:default) : nil)
     = render_region :layout_row, :locals => {:f => fields}
 
 - render_region :form_bottom, :locals => {:f => fields} do |form_bottom|

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

@@ -4,5 +4,5 @@
   %td.field= f.send(meta_row[:type], meta_row[:field], *meta_row[:args])
   %td.actions
     - if meta_row_counter+1 == @meta.size
-      - link_to '#add_field_popup', :class=>'popup' do
-        = image 'plus_grey', :alt => t('add_field')
+      = link_to '#add_field_popup', :class=>'popup' do
+        = image 'plus_grey', :alt => t('add_field')

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

@@ -1,13 +1,13 @@
-%tr.page{:class =>"level_#{level}#{children_class}#{virtual_class}", :id => "page_#{page.id}"}
+%tr.page{:class =>"branch", :data => { :tt_branch => branch.to_s,  :tt_id => page.id, :tt_parent_id => parent_index, :tt_page_id => page.id}, :id => "page_#{page.id}"}
   - render_region :node, :locals => {:page => page, :level => level, :simple => simple} do |node|
     - node.title_column do
-      %td.name{:style => "padding-left: #{padding_left(level)}px"}
+      %td.name
         %span.w1
           - if simple
             = icon
             = node_title
           - else
-            = expander(level) + link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.path)
+            = (link_to("#{icon} #{node_title}".html_safe, edit_admin_page_url(page), :title => page.path)).html_safe
             = page_type
             = spinner
     - node.status_column do
@@ -18,9 +18,4 @@
       - unless simple
         %td.actions
           = page.add_child_option
-          = page.remove_option
-
-- if expanded
-  - page.children.each do |child|
-    - child.becomes(child.class_name.constantize) if child.class_name.present?
-    = render_node child, :level => level + 1, :simple => simple
+          = page.remove_option

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

@@ -1,8 +1,12 @@
-- content_for 'popups' do
+- content_for :popups do
+  #popup_window
+    .outer
+      .content
+
   #add_part_popup.popup{:style => "display: none"}
     #add_part_busy.busy{:style => "display: none"}= image('spinner.gif', :alt => "")
     .popup_title= t('add_part')
-    - form_for([:admin, PagePart.new], :html => { :onsubmit => "addPart(this); return false" }) do |f|
+    = form_for [:admin, PagePart.new] do |f|
       %p
         %label{:for => 'part_name_field'}= t('name')
         = f.text_field :name, :id => 'part_name_field', :maxlength => 100, :style => "width: 15em", :class => "textbox big"
@@ -10,11 +14,11 @@
       .buttons
         = submit_tag t('add_part'), :id => 'add_part_button', :class => "button"
         = t('or')
-        = link_to_function t('cancel'), "$(this).closePopup()", :class=>"cancel"
+        = link_to_function t('cancel'), "Popup.close();", :class=>"cancel"
   #add_field_popup.popup{:style=>"display: none"}
     #add_field_busy.busy{:style=>"display: none"}= image('spinner.gif', :alt => "")
     .popup_title= t('add_field')
-    - form_for [:admin, PageField.new], :html => { :onsubmit => "event.stop(); addField(this)" } do |f|
+    = form_for [:admin, PageField.new], :html => { :onsubmit => "event.stop(); addField(this)" } do |f|
       %p
         %label{:for=>"page_field_name"}= t('name')
         = f.text_field :name, :maxlength=>100, :class=>'textbox big', :style=>"width: 15em"
@@ -23,5 +27,5 @@
       .buttons
         = submit_tag t('add_field'), :class=>'button', :id=>'add_page_field_button'
         = t('or')
-        = link_to_function t('cancel'), "$(this).closePopup()", :class=>"cancel"
+        = link_to_function t('cancel'), "Popup.close();", :class=>"cancel"
   = render_region :popups

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

@@ -1,2 +1,6 @@
+- current_index = @index + 1
+- parent_index = @index
 - models.each do |child|
-  = render_node child, :expand => 1, :level => @level + 1
+  - current_index = render_node child, current_index, parent_index
+  - current_index += 1
+= @rendered_html.html_safe

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

@@ -4,9 +4,7 @@
   - main.edit_header do
     %h1= t('edit_page')
   - main.edit_form do
-    - form_for :page, @page, :url => admin_page_path(@page), :html => {:method => :put, :multipart => true, :id => 'edit_page', 'data-onsubmit_status'=>t('saving_changes')} do |fields|
+    = form_for @page, :as => :page, :url => admin_page_path(@page), :html => {:method => :put, :multipart => true, :id => 'edit_page', 'data-onsubmit_status'=>t('saving_changes')} do |fields|
       = render :partial => "fields", :object => fields
   - main.edit_popups do
     = render :partial => "popups"
-
-- content_for 'page_scripts', page_edit_javascripts

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

@@ -7,14 +7,14 @@
       %tr
         - render_region :sitemap_head do |sitemap_head|
           - sitemap_head.title_column_header do
-            %th.name= t('page') 
+            %th.name= t('page')
           - sitemap_head.status_column_header do
             %th.status= t('status')
           - sitemap_head.actions_column_header do
             %th.actions= t('modify')
     %tbody
       - if @homepage
-        = render_node @homepage
+        = render_nodes(@homepage, 0).html_safe
       - else
         %tr
           %td.empty{:colspan => admin.page.index.node.length}= t('no_pages')

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

@@ -1,10 +1,8 @@
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t('new_page')    
+    %h1= t('new_page')
   - main.edit_form do
-    - form_for :page, @page, :url => admin_pages_path, :html => {:id => 'new_page', :multipart => true, 'data-onsubmit_status'=>"Creating page…"} do |f|
+    = form_for @page, :as => :page, :url => admin_pages_path, :html => {:id => 'new_page', :multipart => true, 'data-onsubmit_status'=>"Creating page…"} do |f|
       = render :partial => "fields", :object => f
   - main.edit_popups do
     = render :partial => "popups"
-
-- content_for 'page_scripts', page_edit_javascripts

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

@@ -3,16 +3,17 @@
 %h1
   = t('remove_pages', :pages => pages)
 
-%p 
-  = t('text.pages.remove_warning', :pages => pages)
-    
+%p
+  = t('text.pages.remove_warning', :pages => pages).html_safe
+
 .inset
   %table.index#site_map
     %tbody
-      = render_node @page, :simple => true
+      - render_nodes @page, @page.id
+      = @rendered_html.html_safe
 
-- form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing pages…"} do
+= form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing pages…"} do
   .buttons
     %input.button{:type=>"submit", :value => t('delete_pages', :pages => pages) }/
-    = t('or')    
-    = link_to t('cancel'), admin_pages_url
+    = t('or')
+    = link_to t('cancel'), admin_pages_url

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

@@ -3,39 +3,39 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t('personal_preferences') 
+    %h1= t('personal_preferences')
 
   - main.edit_form do
-    - form_for @user, :url => admin_preferences_url, :html => { :method => :put, 'data-onsubmit_status' => "#{t('saving_preferences')}…" } do |f|
-      
+    = form_for @user, :url => admin_preferences_url, :html => { :method => :put, 'data-onsubmit_status' => "#{t('saving_preferences')}…" } do |f|
+
       = render :partial => 'admin/users/avatar'
-      
+
       = render_region :form_top, :locals => {:f => f}
-      
+
       - render_region :form, :locals => {:f => f} do |form|
         - form.edit_name do
           %p
             = f.label :name, t("name")
-            = f.text_field :name, :class => "textbox activate", :size => 32, :maxlength => 100 
-        
+            = f.text_field :name, :class => "textbox", :size => 32, :maxlength => 100
+
         - form.edit_email do
           %p
             = f.label :email,  t("email_address"), :class => "optional"
             = f.text_field "email", :class => 'textbox', :size => 32, :maxlength => 255
-        
+
         - form.edit_username do
           %p
             = f.label :login, t("username")
-            = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40
-        
+            = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40, :required => true
+
         - form.edit_password do
-          = render "admin/users/password_fields", :f => f        
-        
+          = render "admin/users/password_fields", :f => f
+
         - form.edit_locale do
           %p
-            = f.label :locale, t('language') 
+            = f.label :locale, t('language')
             = f.select "locale", available_locales_select
-      
+
       - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
         - form_bottom.edit_buttons do
           .buttons

data/app/views/admin/references/_tag_reference.haml

@@ -1,3 +1,3 @@
 .tag_description
   %h4== <r:#{tag_name} />
-  %div= description 
+  %div= description.html_safe

data/app/views/admin/references/filters.haml

@@ -3,4 +3,4 @@
     = _display_name
     Reference
   .reference=filter_reference
-  %p.close_link=link_to_function "Close Help", "$(this).closePopup();"
+  %p.close_link=link_to_function "Close Help", "$(this).closePopup();"

data/app/views/admin/references/tags.haml

@@ -1,30 +1,12 @@
-.popup
+#tag_reference_popup.popup
   .popup_title
     =t('available_tags_for', :name =>  _display_name)
   %p
-    %label.inline{:for => "search_#{class_of_page.name.underscore}_tag_reference"} Filter Tags
-    %input{:id => "search_#{class_of_page.name.underscore}_tag_reference", :type => "search", :name => "search_tag_reference"}/
-    %span#tag_search_found_count.info
-  .reference= tag_reference
-  %p.close_link= link_to_function "Close Help", "$(this).closePopup()"
-  :javascript
-    var tags, searchingOn = "";
-    var found_count = 0;
-    var popup = $('search_#{class_of_page.name.underscore}_tag_reference').up('.popup');
-    new Form.Element.Observer('search_#{class_of_page.name.underscore}_tag_reference', 0.5, function(element, value) {
-      if (!tags) tags = popup.select('.reference .tag_description');
-      if (value.length < 3 && searchingOn != "") {
-        searchingOn = "";
-        found_count = tags.length;
-        tags.invoke('show');
-        $('tag_search_found_count').update('Found '+found_count+' tags').highlight();
-      } else if (value.length >= 3 && searchingOn != value) {
-        searchingOn = value;
-        found_count = tags.length;
-        tags.each(function(div) {
-          if (!div.hasWord(value)) found_count=--found_count;
-          div[div.hasWord(value) ? 'show' : 'hide']();
-        });
-        $('tag_search_found_count').update('Found '+found_count+' tags').highlight();
-      }
-    });
+    %fieldset{:id => "live-search"}
+      %label.inline{:for => "search_#{class_of_page.name.underscore}_tag_reference"} Filter Tags
+      %input{:id => "filter", :type => "text", :name => "search_tag_reference", :value => ""}/
+      %span{:id => "filter-count"}
+  .reference= tag_reference.html_safe
+  %p.close_link
+    %a.close_tags{href:'#'}
+      Close Help

data/app/views/admin/users/_avatar.html.haml

@@ -1,5 +1,5 @@
 #avatar
   = image_tag(gravatar_url(@user.email, :size=>"96px"), :class=>"avatar", :width=>96, :height=>96, :alt=>"")
   %p.caption
-    Avatar provided by 
-    = link_to "gravatar.com", 'http://gravatar.com/site/signup/'
+    Avatar provided by
+    = link_to "gravatar.com", 'http://gravatar.com/site/signup/'

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

@@ -1,29 +1,29 @@
-- form_for [:admin, @user] do |f|
+= form_for [:admin, @user], :html => {class: "user_form"} do |f|
   = hidden_field "user", "lock_version"
-  
+
   = render :partial => 'avatar' unless @user.new_record?
-  
+
   = render_region :form_top, :locals => {:f => f}
-  
+
   - render_region :form, :locals => {:f => f} do |form|
     - form.edit_name do
       %p
-        = f.label :name, t('name') 
-        = f.text_field :name, :class => "textbox activate", :size => 32, :maxlength => 100 
-    
+        = f.label :name, t('name')
+        = f.text_field :name, :class => "textbox", :size => 32, :maxlength => 100
+
     - form.edit_email do
       %p
         = f.label :email, t('email_address') , :class => "optional"
         = f.text_field "email", :class => 'textbox', :size => 32, :maxlength => 255
-    
+
     - form.edit_username do
       %p
-        = f.label :login, t('username') 
+        = f.label :login, t('username')
         = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40, :autocomplete => 'off'
-    
+
     - form.edit_password do
       = render "password_fields", :f => f
-    
+
     - form.edit_roles do
       %p
         %label.multi_option= t('roles')
@@ -31,23 +31,23 @@
         = f.label :admin, t('admin'), :class => "checkbox"
         = f.check_box "designer", :class => "checkbox"
         = f.label :designer, t('designer'), :class => "checkbox"
-    
+
     - form.edit_locale do
       %p
-        = f.label :locale, t('language') 
+        = f.label :locale, t('language')
         = f.select "locale", available_locales_select
-    
+
     - form.edit_notes do
       %p
         = f.label :notes, t('notes'), :class => "optional"
         ~ f.text_area "notes", :size => "53x4", :class => "textarea"
-  
+
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.edit_buttons do
       .buttons
         = save_model_button(@user)
         = save_model_and_continue_editing_button(@user)
-        = t('or')   
+        = t('or')
         = link_to t('cancel'), admin_users_path
     - form_bottom.edit_timestamp do
       = updated_stamp @user