locomotive_cms 0.0.3.3 → 0.0.4.beta1

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

@@ -3,14 +3,14 @@
 
 = f.foldable_inputs :name => :information, :style => "#{'display: none' unless @site.new_record?}" do
   = f.input :name, :required => false
-  
+
 = f.foldable_inputs :name => :meta do
 
   = f.input :meta_keywords
   = f.input :meta_description
 
 = f.foldable_inputs :name => :access_points, :class => 'editable-list off' do
-  
+
   = f.custom_input :subdomain, :css => 'path' do
     %em
       http://
@@ -18,17 +18,17 @@
     \.
     %em
       = application_domain
-  
-  - @site.domains_without_subdomain.each_with_index do |name, index|  
+
+  - @site.domains_without_subdomain.each_with_index do |name, index|
     %li{ :class => "item added #{'last' if index == @site.domains.size - 1}"}
       %em
         http://
-      = text_field_tag 'site[domains][]', name
+      = text_field_tag 'current_site[domains][]', name
        
       = error_on_domain(@site, name)
       %span.actions
         = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
-        
+
   %li.item.template
     %em
       http://
@@ -37,8 +37,8 @@
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
       %button{ :class => 'button light add', :type => 'button' }
-        %span= t('admin.buttons.new_item')
-        
+        %span!= t('admin.buttons.new_item')
+
 = f.foldable_inputs :name => :memberships, :class => 'memberships' do
   - @site.memberships.each_with_index do |membership, index|
     - account = membership.account
@@ -47,4 +47,4 @@
       %em= account.email
       - if account != current_admin
         %span.actions
-          = link_to image_tag('admin/form/icons/trash.png'), admin_membership_url(membership), :class => 'remove first', :confirm => t('admin.messages.confirm'), :method => :delete        
+          = link_to image_tag('admin/form/icons/trash.png'), admin_membership_url(membership), :class => 'remove first', :confirm => t('admin.messages.confirm'), :method => :delete

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

@@ -4,12 +4,13 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
+  = admin_button_tag :import, new_admin_import_url, :class => 'new'
   = admin_button_tag t('.new_membership'), new_admin_membership_url, :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @site, :as => :current_site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
 
   = render 'form', :f => f
-      
+
   = render 'admin/shared/form_actions', :button_label => :update

data/app/views/admin/custom_fields/_custom_form.html.haml

@@ -3,7 +3,7 @@
 = form.inputs :name => title || :attributes do
   - form.object.custom_fields.each do |field|
     - required = highlighted_field_name == field._name
-  
+
     - if field.string?
       = form.input field._alias.to_sym, :label => field.label, :hint => field.hint, :required => required
     - elsif field.text?
@@ -12,7 +12,7 @@
       = form.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'toggle' do
         = form.select field._name.to_sym, field.ordered_category_items.collect { |item| [item.name, item.id] }
         %button.button.light.edit-categories-link{ :type => 'button', :'data-url' => edit_admin_custom_field_path(parent.model_name.underscore, parent.slug, field) }
-          %span= t('.edit_categories')
+          %span!= t('.edit_categories')
     - elsif field.boolean?
       = form.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'toggle' do
         = form.check_box field._alias.to_sym
@@ -22,10 +22,10 @@
       = form.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'file' do
         = form.file_field field._name.to_sym
         - if form.object.send(:"#{field._name}?")
-          %p
+          %p.remove
             %strong
               = link_to File.basename(form.object.send(field._name).url), form.object.send(field._name).url
             %span
                / 
-              = t('.delete_file')
+              != t('.delete_file')
               = form.check_box :"remove_#{field._name}"

data/app/views/admin/custom_fields/_edit_field.html.haml

@@ -1,6 +1,6 @@
-.box-wrapper
+.fancybox-wrapper
   #edit-custom-field
-    %h2= t('.title')
+    %h2!= t('.title')
 
     = form_tag '#', :class => 'formtastic' do
       = fields_for CustomFields::Field.new, :builder => Formtastic::SemanticFormHelper.builder do |g|

data/app/views/admin/custom_fields/_index.html.haml

@@ -4,58 +4,58 @@
 
 = form.foldable_inputs :name => :custom_fields, :class => 'editable-list fields' do
   - ordered_custom_fields.each do |field|
-    = form.fields_for collection_name.to_sym, field, :child_index => field._index do |g|  
+    = form.fields_for collection_name.to_sym, field, :child_index => field._index do |g|
       %li{ :class => "item added #{'new' if form.object.new_record?} #{'error' unless field.errors.empty?}"}
         %span.handle
           = image_tag 'admin/form/icons/drag.png'
-        
+
         = g.hidden_field :position, :class => 'position'
-        
+
         = g.hidden_field :_alias, :class => 'alias'
-        
+
         = g.hidden_field :hint, :class => 'hint'
-        
+
         = g.hidden_field :text_formatting, :class => 'text-formatting'
-      
+
         = g.text_field :label, :class => 'label'
-      
+
         —
-      
+
         %em= t("admin.custom_fields.kind.#{field.kind.downcase}")
-      
+
         = g.select :kind, options_for_field_kind
-      
+
          
-      
+
         %span.actions
           = link_to image_tag('admin/form/pen.png'), '#edit-custom-field', :class => 'edit first'
           = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
-    
-  = form.fields_for collection_name.to_sym, custom_fields.build(:label => 'field name', :_alias => ''), :child_index => '-1' do |g|   
+
+  = form.fields_for collection_name.to_sym, custom_fields.build(:label => 'field name', :_alias => ''), :child_index => '-1' do |g|
     %li{ :class => 'item template' }
       %span.handle
         = image_tag 'admin/form/icons/drag.png'
-    
+
       = g.hidden_field :position, :class => 'position'
-      
+
       = g.hidden_field :_alias, :class => 'alias'
-      
+
       = g.hidden_field :hint, :class => 'hint'
-      
+
       = g.hidden_field :text_formatting, :class => 'text-formatting'
-    
+
       = g.text_field :label, :class => 'string label void'
-  
+
       —
-  
+
       %em
-  
+
       = g.select :kind, options_for_field_kind
-  
+
        
-  
+
       %span.actions
         = link_to image_tag('admin/form/pen.png'), '#edit-custom-field', :class => 'edit first'
         = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
         %button{ :class => 'button light add', :type => 'button' }
-          %span= t('admin.buttons.new_item')        
+          %span!= t('admin.buttons.new_item')

data/app/views/admin/custom_fields/edit_category.html.haml

@@ -1,43 +1,43 @@
 #edit-custom-field-category
   .inner
-    %h2= t('.title')
+    %h2!= t('.title')
 
-    %p= t('.help')
+    %p!= t('.help')
 
     = semantic_form_for @field, :as => :custom_field, :url => admin_custom_field_url(@parent.model_name.underscore, @parent.slug, @field) do |f|
       = f.foldable_inputs :name => t('.collection_label'), :class => 'editable-list off' do
         - @field.ordered_category_items.each do |item|
-          = f.fields_for :category_items, item, :child_index => item._index do |g|  
+          = f.fields_for :category_items, item, :child_index => item._index do |g|
             %li{ :class => "item added #{'error' unless item.errors.empty?}"}
               %span.handle
                 = image_tag 'admin/form/icons/drag.png'
-  
+
               = g.hidden_field :position, :class => 'position'
-  
+
               = g.text_field :name
-  
+
                
-  
+
               %span.actions
                 = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
-  
-        = f.fields_for :category_items, @field.category_items.build, :child_index => '-1' do |g|   
+
+        = f.fields_for :category_items, @field.category_items.build, :child_index => '-1' do |g|
           %li{ :class => 'item template' }
             %span.handle
               = image_tag 'admin/form/icons/drag.png'
-  
+
             = g.hidden_field :position, :class => 'position'
-  
+
             = g.text_field :name, :class => 'string name'
-  
+
              
-  
+
             %span.actions
               = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
               %button{ :class => 'button light add', :type => 'button' }
-                %span= t('admin.buttons.new_item')
-              
+                %span!= t('admin.buttons.new_item')
+
   .popup-actions
     %p
       %button.button.light{ :type => 'button' }
-        %span= t('admin.shared.form_actions.update')
+        %span!= t('admin.shared.form_actions.update')

data/app/views/admin/errors/404.html.haml

@@ -0,0 +1,7 @@
+- title t('.title')
+
+.inner
+  %p.notice= t('.notice')
+
+  %p.link.tright
+    = link_to preserve(t('.link')), admin_root_url

data/app/views/admin/errors/500.html.haml

@@ -0,0 +1,7 @@
+- title t('.title')
+
+.inner
+  %p.notice= t('.notice')
+
+  %p.link.tright
+    = link_to preserve(t('.link')), admin_root_url

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

@@ -0,0 +1,21 @@
+- title t('.title')
+
+- content_for :submenu do
+  = render 'admin/shared/menu/settings'
+
+%p!= t('.help')
+
+= form_tag admin_import_url, :multipart => true, :class => 'formtastic import' do
+
+  %fieldset.inputs
+    %legend
+      %span= t('formtastic.titles.upload')
+    %ol
+      %li{ :class => "file #{'error' if @error} required" }
+        = label_tag 'zipfile', t('formtastic.labels.import.new.source')
+        = file_field_tag 'zipfile'
+        - if @error
+          %p.inline-errors= @error
+        %p.inline-hints= t('formtastic.hints.import.source')
+
+  = render 'admin/shared/form_actions', :button_label => :send

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

@@ -0,0 +1,19 @@
+- content_for :head do
+  = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/smartupdater', 'admin/import'
+
+- title t('.title')
+
+- content_for :submenu do
+  = render 'admin/shared/menu/settings'
+
+%p!= t('.help')
+
+%ul{ :id => 'import-steps', :class => 'list', :'data-url' => admin_import_url(:json), :'data-success-message' => t('.messages.success'), :'data-failure-message' => t('.messages.failure') }
+  - %w(site content_types assets asset_collections snippets pages).each do |step|
+    %li{ :id => "#{step}-step" }
+      %em
+      %strong
+        = link_to t(".steps.#{step}"), '#'
+      .more
+        .states
+           

data/app/views/admin/mailer/confirmation_instructions.html.haml

@@ -1,8 +1,8 @@
 %p
-  = t('admin.mailer.common.hello')
+  != t('admin.mailer.common.hello')
   = @resource.email
   \!
 %p
-  = t('.you_can_confirm_your_account_through_the_link_below')
+  != t('.you_can_confirm_your_account_through_the_link_below')
 %p
   = link_to t('.confirm_my_account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)

data/app/views/admin/mailer/reset_password_instructions.html.haml

@@ -1,12 +1,12 @@
 %p
-  = t('admin.mailer.common.hello')
+  != t('admin.mailer.common.hello')
   = @resource.email
   \!
 %p
-  = t('.reset_password_instruction')
+  != t('.reset_password_instruction')
 %p
   = link_to t('.change_my_password'), edit_admin_password_url(@resource, :reset_password_token => @resource.reset_password_token)
 %p
-  = t('.wrong_request_instruction')
+  != t('.wrong_request_instruction')
 %p
-  = t('.unchange_password_message')
+  != t('.unchange_password_message')

data/app/views/admin/mailer/unlock_instructions.html.haml

@@ -1,10 +1,10 @@
 %p
-  = t('admin.mailer.common.hello')
+  != t('admin.mailer.common.hello')
   = @resource.email
   \!
 %p
-  = t('.locked_account_message')
+  != t('.locked_account_message')
 %p
-  = t('.unlock_account_instruction')
+  != t('.unlock_account_instruction')
 %p
   = link_to t('.unlock_my_account'), unlock_url(@resource, :unlock_token => @resource.unlock_token)

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

@@ -3,13 +3,13 @@
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @membership, :url => admin_memberships_url do |f|
 
   = f.inputs :name => :membership_email, :class => 'inputs email' do
-  
+
     = f.custom_input :email, { :css => 'string full', :with_label => false } do
       = f.text_field :email
-  
+
   = render 'admin/shared/form_actions', :back_url => edit_admin_current_site_url, :button_label => :create

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

@@ -15,31 +15,32 @@
 
   = f.foldable_inputs :name => :information, :style => 'display: none' do
     = f.input :name
-    
+
   = f.foldable_inputs :name => :credentials do
     = f.input :email
     = f.custom_input :password, :label => :new_password do
-      = f.password_field :password  
+      = f.password_field :password, :autocomplete => "off"
     = f.custom_input :password_confirmation, :label => :new_password_confirmation do
-      = f.password_field :password_confirmation
+      = f.password_field :password_confirmation, :autocomplete => "off"
 
   = f.foldable_inputs :name => :sites, :class => 'sites off' do
     - @account.sites.each do |site|
       %li{ :class => 'item' }
         %strong= link_to site.name, main_site_url(site, :uri => true)
         %em= site.domains.join(', ')
-      
+
         - if admin_on?(site) && site != current_site
           %span{ :class => 'actions' }
             = link_to image_tag('admin/form/icons/trash.png'), admin_site_url(site), :class => 'remove first', :confirm => t('admin.messages.confirm'), :method => :delete
-    
+
   = f.foldable_inputs :name => :language, :class => 'language' do
     = f.custom_input :language, { :css => 'full', :with_label => false } do
       - Locomotive.config.locales.each do |locale|
         %span
-          = image_tag "admin/icons/flags/#{locale}.png"
-          = f.radio_button :locale, locale
-           
-          = t(".#{locale}")
-      
+          %label
+            = image_tag "admin/icons/flags/#{locale}.png"
+            = f.radio_button :locale, locale
+             
+            = t(".#{locale}")
+
   = render 'admin/shared/form_actions', :button_label => :update

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

@@ -0,0 +1,35 @@
+- grouped_editable_elements = @page.editable_elements_grouped_by_blocks
+
+= semantic_fields_for(@page) do |f|
+  - unless grouped_editable_elements.empty?
+    #editable-elements
+      .nav
+        - grouped_editable_elements.keys.each_with_index do |name, index|
+          = link_to content_tag(:span, name.try(:humanize) || t('admin.pages.form.default_block')), "#block-#{index}", :id => "block-nav-#{index}", :class => "#{'on' if index == 0}"
+        .clear
+
+      .wrapper
+        %ul{ :id => "blocks" }
+          - grouped_editable_elements.keys.each_with_index do |name, index|
+            - elements = grouped_editable_elements[name]
+            %li{ :id => "block-#{index}", :class => 'block', :style => "display: #{index == 0 ? 'block' : 'none' }" }
+              %fieldset.inputs
+                %ol
+                  - elements.each_with_index do |el, index|
+                    = f.fields_for 'editable_elements', el, :child_index => el._index do |g|
+                      - case el
+                        - when EditableLongText
+                          = g.input :content, :label => el.slug.humanize, :hint => el.hint, :as => :text, :input_html => { :class => 'html' }
+                        - when EditableShortText
+                          = g.input :content, :label => el.slug.humanize, :hint => el.hint
+                        - when EditableFile
+                          = g.custom_input :source, :label => el.slug.humanize, :hint => el.hint, :css => 'file' do
+                            = g.file_field :source
+                            - if el.source?
+                              %p.remove
+                                %strong
+                                  = link_to File.basename(el.source.url), el.source.url
+                                %span
+                                   / 
+                                  != t('admin.pages.form.delete_file')
+                                  = g.check_box :remove_source

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

@@ -1,39 +1,34 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/codemirror/codemirror', 'admin/plugins/wslide', 'admin/pages', 'admin/page_parts'
-  = stylesheet_link_tag 'admin/page_parts'
+  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/codemirror/codemirror', 'admin/pages', 'admin/editable_elements'
+  = stylesheet_link_tag 'admin/editable_elements'
+  = image_picker_include_tags
 
 = f.foldable_inputs :name => :information do
-  
+
   = f.input :title
-  
-  = f.input :layout_id, :as => :select, :collection => current_site.layouts.all.to_a, :input_html => { :data_url => admin_layout_page_parts_url('_id_to_replace_') }
-  
+
   - if not @page.index? and not @page.not_found?
     = f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false
-      
+
   = f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized?}" }
-        
+
   = f.custom_input :templatized, :css => 'toggle' do
     = f.check_box :templatized
-    
+
   = f.input :content_type_id, :as => :select, :collection => current_site.content_types.all.to_a, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized?}" }
-      
+
   = f.custom_input :published, :css => 'toggle' do
     = f.check_box :published
-    
+
   = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false
-  
-#page-parts
-  .nav
-    - @page.parts.each_with_index do |part, index|
-      = link_to content_tag(:span, part.name), "#parts-#{index + 1}", :id => "control-part-#{part.slug}", :class => "part-#{index} #{'on' if index == 0}", :style => "#{'display: none' if part.disabled?}"
-    .clear
-
-  .wrapper
-    %ul{ :id => "parts" }
-      = f.fields_for :parts do |g|
-        %li{ :style => "#{'display: none' if g.object.disabled?}" }
-          %code= g.text_area :value
-          = g.hidden_field :name
-          = g.hidden_field :slug
-          = g.hidden_field :disabled, :class => 'disabled'
+
+= render 'editable_elements', :page => @page
+
+= f.foldable_inputs :name => :raw_template do
+  = f.custom_input :value, :css => 'code full', :with_label => false do
+    = f.label :raw_template
+    %code{ :class => 'html' }
+      = f.text_area :raw_template
+    = f.errors_on :template
+    .more
+      = link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link'

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

@@ -3,14 +3,14 @@
     = image_tag 'admin/list/icons/node_closed.png', :class => 'toggler'
   %em
   %strong= link_to truncate(page.title, :length => 80), edit_admin_page_url(page)
-  
-  .more    
-    %span= t('.updated_at')
+
+  .more
+    %span!= t('.updated_at')
     = l page.updated_at, :format => :short
-		
+
     - if not page.index? and not page.not_found?
       = link_to image_tag('admin/list/icons/trash.png'), admin_page_url(page), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete
-    
+
   - if not page.children.empty?
     %ul{ :id => "folder-#{page._id}", :class => "folder depth-#{(page.depth || 0) + 1}", :data_url => sort_admin_page_url(page), :style => "display: #{cookies["folder-#{page._id}"] || 'block'}" }
       = render page.children

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

@@ -6,10 +6,10 @@
 - content_for :buttons do
   = admin_button_tag :show, "/#{@page.fullpath}", :class => 'show'
 
-%p= t('.help')
+%p!= t('.help')
 
-= semantic_form_for @page, :url => admin_page_url(@page), :html => { :class => 'save-with-shortcut' } do |form|
+= semantic_form_for @page, :url => admin_page_url(@page), :html => { :class => 'save-with-shortcut', :multipart => true } do |form|
 
   = render 'form', :f => form
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_pages_url, :button_label => :update

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

@@ -9,10 +9,10 @@
 - content_for :buttons do
   = admin_button_tag :new, new_admin_page_url, :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
 - if @pages.empty?
-  %p.no-items= t('.no_items', :url => new_admin_page_url)
+  %p.no-items!= t('.no_items', :url => new_admin_page_url)
 - else
   %ul#pages-list
     = render @pages

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

@@ -3,10 +3,10 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @page, :url => admin_pages_url do |form|
 
   = render 'form', :f => form
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_pages_url, :button_label => :create

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

@@ -6,13 +6,13 @@
 
   .inner
     = login_flash_message
-    
+
     = f.inputs do
       = f.input :password, :label => t('.password'), :required => false
       = f.input :password_confirmation, :label => t('.password_confirmation'), :required => false
-  
+
     %p.link
-      = link_to t('.link'), new_admin_session_path
-        
+      = link_to preserve(t('.link')), new_admin_session_path
+
   .footer
     = login_button_tag t('admin.buttons.change_password')

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

@@ -1,17 +1,17 @@
 - title t('.title')
 
 = semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
-  
+
   = f.hidden_field :reset_password_token
-  
+
   .inner
     = login_flash_message
-  
+
     = f.inputs do
       = f.input :email, :label => t('.email'), :required => false
-    
+
     %p.link
-      = link_to t('.link'), new_admin_session_path
-        
+      = link_to preserve(t('.link')), new_admin_session_path
+
   .footer
     = login_button_tag t('admin.buttons.send_password')

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

@@ -1,7 +1,7 @@
 - title t('.title')
 
 = semantic_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-  = f.hidden_field :remember_me, :value => "true"
+  = f.hidden_field :remember_me, :value => 'true'
 
   .inner
     = login_flash_message
@@ -12,6 +12,6 @@
 
     %p.link
       = link_to t('.link'), new_admin_password_path
-        
+
   .footer
     = login_button_tag t('admin.buttons.login')