locomotive_cms 2.0.0.rc12 → 2.0.0

data/app/views/locomotive/my_account/edit.html.haml

@@ -9,7 +9,7 @@
 
 - if multi_sites?
   - content_for :buttons do
-    = local_action_button t('.new_site'), new_site_url, :class => 'new' if can?(:create, Locomotive::Site)
+    = local_action_button t('.new_site'), new_site_url, :icon => 'icon-plus' if can?(:create, Locomotive::Site)
 
 %p= t('.help')
 
@@ -35,6 +35,6 @@
 
               - if admin_on?(site) && site != current_site
                 %span{ :class => 'actions' }
-                  = link_to 'x', site_url(site), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
+                  = link_to_icon :trash, site_url(site), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
 
   = render 'locomotive/shared/form_actions', :button_label => :update

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

@@ -5,7 +5,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    page: #{j @page.to_presenter.as_json_for_html_view.to_json.html_safe}
+    page: #{j to_json(@page)}
 
 - if can?(:manage, @page)
 
@@ -48,10 +48,14 @@
 
     = f.input :redirect, :as => :'Locomotive::Toggle', :wrapper_html => { :style => "#{'display: none' if @page.templatized? || !@page.default_response_type?}" }
 
-    = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false, :wrapper_html => { :style => "#{'display: none' if @page.redirect?}" }
-
     = f.input :redirect_url, :required => true, :wrapper_html => { :style => "#{'display: none' unless @page.redirect?}" }
 
+    = f.input :redirect_type, :as => :select, :collection => options_for_page_redirect_type, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.redirect?}" }
+
+    = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false, :wrapper_html => { :style => "#{'display: none' if @page.redirect?}" }
+
   = f.inputs :name => :raw_template, :class => "inputs foldable #{'folded' if inputs_folded?(@page)}" do
 
-    = f.input :raw_template, :as => :'Locomotive::Code'
+    = f.input :raw_template, :as => :'Locomotive::Code', :main_locale_template_url => page_main_template_path(@page)
+
+

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

@@ -17,6 +17,12 @@
 
     = link_to truncate(page.title, :length => 80), edit_page_url(page)
 
+    - if page.templatized?
+      %i.icon-cog
+
+    - if page.redirect?
+      %i.icon-share-alt
+
     - unless page.default_response_type?
       %span.response-type= page_response_type_to_string(page)
 
@@ -28,7 +34,7 @@
       = l page.updated_at, :format => :short
 
       - if !page.index_or_not_found? && can?(:manage, page)
-        = link_to 'x', page_url(page), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
+        = link_to_icon :trash, page_url(page), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
 
   - if with_children
     %ul{ :id => "folder-#{page._id}", :class => "page folder depth-#{(page.depth || 0) + 1}", :'data-url' => sort_page_url(page), :style => "display: #{cookies["folder-#{page._id}"] || 'block'}" }

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

@@ -7,7 +7,7 @@
   = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
-  = local_action_button :show, "/#{@page.fullpath}", :class => 'show'
+  = local_action_button :show, "/#{current_site.localized_page_fullpath(@page, ::Mongoid::Fields::I18n.locale)}", :icon => 'icon-eye-open'
 
 %p!= t('.help')
 

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

@@ -8,7 +8,7 @@
 
 - if can? :create, Locomotive::Page
   - content_for :buttons do
-    = local_action_button :new, new_page_url, :class => 'new', :id => 'newpage'
+    = local_action_button :new, new_page_url, :icon => 'icon-plus', :id => 'newpage'
 
 %p!= t('.help')
 

data/app/views/locomotive/public/pages/show_toolbar.html.haml

@@ -45,7 +45,7 @@
         %h1{ :class => 'loading', :'data-disabled-status' => t('.statuses.disabled'), :'data-loading-status' => t('.statuses.loading') }= t('.statuses.loading')
 
         .back.col
-          = link_to image_tag('locomotive/inline_editor/back.png'), '#', :class => 'button back', :title => t('.buttons.back'), :alt => t('.buttons.back')
+          = link_to_icon :home, '#', :class => 'button back', :title => t('.buttons.back'), :alt => t('.buttons.back')
 
         - if current_site.locales.size > 1
           .lang.col
@@ -61,5 +61,4 @@
           = link_to t('.buttons.confirm'), '#', :class => 'button blue save'
           = link_to t('.buttons.cancel'), '#', :class => 'button cancel'
 
-    = render_cell 'locomotive/content_locale_picker', :show, :site => current_site, :locale => current_content_locale
-
+    = render_cell 'locomotive/content_locale_picker', :show, :site => current_site, :locale => current_content_locale

data/app/views/locomotive/public/sitemaps/show.xml.builder

@@ -2,23 +2,23 @@ xml.instruct!
 xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
 
   xml.url do
-    xml.loc current_site_url
+    xml.loc current_site_public_url
     xml.priority 1.0
   end
 
   @pages.each do |page|
     if not page.index_or_not_found?
       if page.templatized?
-        page.content_type.entries.visible.each do |c|
+        page.fetch_target_entries(_visible: true).each do |c|
           xml.url do
-            xml.loc page_url(page, { :content => c })
+            xml.loc public_page_url(page, { content: c })
             xml.lastmod c.updated_at.to_date.to_s('%Y-%m-%d')
             xml.priority 0.9
           end
         end
       else
         xml.url do
-          xml.loc page_url(page)
+          xml.loc public_page_url(page)
           xml.lastmod page.updated_at.to_date.to_s('%Y-%m-%d')
           xml.priority 0.9
         end

data/app/views/locomotive/shared/_head.html.haml

@@ -16,8 +16,9 @@
 
 %script{ :type => 'text/javascript' }
   :plain
-    window.locale         = '#{I18n.locale}';
-    window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
+    window.locale                 = '#{I18n.locale}';
+    window.content_locale         = '#{::Mongoid::Fields::I18n.locale}';
+    window.permalink_service_url  = '#{Locomotive.mounted_on}/_permalink.json';
 
     Locomotive.current_site     = new Locomotive.Models.Site(#{j current_site.to_presenter.as_json_for_html_view.to_json.html_safe});
     Locomotive.current_account  = new Locomotive.Models.Account(#{j current_locomotive_account.to_json.html_safe});

data/app/views/locomotive/shared/_locale_picker_link.html.haml

@@ -1,7 +1,6 @@
 = link_to '#', :id => 'content-locale-picker-link', :class => 'button' do
-  %span.hand
-     
+  = flag_tag current_content_locale
 
-  = image_tag "locomotive/icons/flags/#{current_content_locale}.png", :class => 'flag'
+  %span.text= current_content_locale
 
-  %span.text= current_content_locale
+  %i.caret.icon-caret-down

data/app/views/locomotive/shared/actions/_contents.html.haml

@@ -1,5 +1,7 @@
 - if can? :manage, Locomotive::ContentType
   .action
-    = link_to content_tag(:em) + content_tag(:span, t('locomotive.content_types.index.new')), new_content_type_url, :class => 'button'
+    = link_to new_content_type_url, :class => 'button' do
+      %i.icon-plus
+      = t('locomotive.content_types.index.new')
 
 = locale_picker_link

data/app/views/locomotive/shared/menu/_contents.html.haml

@@ -2,12 +2,16 @@
   .wrapper
     - if can? :manage, @page
       .header
-        %p= link_to t('locomotive.pages.index.new'), new_page_url
+        %p
+          = link_to new_page_url do
+            %i.icon-plus
+            = t('locomotive.pages.index.new')
     .inner
       %h2!= t('locomotive.pages.index.latest_entries')
       %ul
         - current_site.pages.unscoped.latest_updated.minimal_attributes.each do |page|
           %li
+            %i.icon-chevron-right
             = link_to truncate(page.title, :length => 25), edit_page_url(page)
             %span= time_ago_in_words(page.updated_at)
 
@@ -26,15 +30,22 @@
     = submenu_entry truncate(content_type.name, :length => 15), content_entries_url(content_type.slug), :i18n => false, :css => "#{'on' if is_content_type_selected(content_type)}" do
       .wrapper
         .header
-          %p= link_to t('locomotive.content_entries.index.new'), new_content_entry_url(content_type.slug)
+          %p
+            = link_to new_content_entry_url(content_type.slug) do
+              %i.icon-plus
+              = t('locomotive.content_entries.index.new')
 
           - if can? :manage, content_type
-            %p.edit= link_to t('locomotive.content_types.index.edit'), edit_content_type_url(content_type)
+            %p.edit
+              = link_to edit_content_type_url(content_type) do
+                %i.icon-pencil
+                = t('locomotive.content_types.index.edit')
 
         .inner
           %h2!= t('locomotive.content_entries.index.latest_entries')
           %ul
             - content_type.entries.latest_updated.each do |entry|
               %li
+                %i.icon-chevron-right
                 = link_to truncate(entry._label(content_type), :length => 20), edit_content_entry_url(content_type.slug, entry)
                 %span= time_ago_in_words(entry.updated_at)

data/app/views/locomotive/sites/_domains.html.haml

@@ -19,4 +19,4 @@
   = text_field_tag 'site[domains][]', '{{name}}', :id => '', :class => 'path'
 
   %span.actions
-    = link_to 'x', '#', :class => 'remove'
+    = link_to_icon :trash, '#', :title => t('locomotive.buttons.delete'), :class => 'remove'

data/app/views/locomotive/sites/_form.html.haml

@@ -1,12 +1,12 @@
 - content_for :head do
   = render 'locomotive/sites/domains'
 
-= f.inputs :name => :information do
-  = f.input :name
+= f.inputs name: :information do
+  = f.input :name, wrapper_html: { class: 'highlighted' }
 
 - if manage_subdomain_or_domains?
-  = f.inputs :name => :access_points do
-    = f.input :subdomain, :as => :'Locomotive::Subdomain', :domain => application_domain, :input_html => { :readonly => !manage_subdomain? }
+  = f.inputs name: :access_points do
+    = f.input :subdomain, as: :'Locomotive::Subdomain', domain: application_domain, input_html: { readonly: !manage_subdomain? }
 
     - if manage_domains?
-      = f.input :domains, :as => :'Locomotive::Empty'
+      = f.input :domains, as: :'Locomotive::Empty'

data/app/views/locomotive/sites/_memberships.html.haml

@@ -9,6 +9,7 @@
 
   {{#if can_update}}
   .role
+    %i.icon-edit
     {{#if grant_admin}}
     = select_tag 'site[memberships_attributes][{{index}}][role]', options_for_membership_roles
     {{else}}
@@ -16,10 +17,11 @@
     {{/if}}
 
   %span.actions
-    = link_to 'x', '#', :class => 'remove'
+    = link_to_icon :trash, '#', :title => t('locomotive.buttons.delete'), :class => 'remove'
 
   {{else}}
   .role
-    %em.locked {{role_name}}
+    %i.icon-lock
+    {{role_name}}
 
   {{/if}}

data/app/views/locomotive/snippets/_form.html.haml

@@ -3,11 +3,11 @@
 
 - content_for :backbone_view_data do
   :plain
-    snippet: #{j @snippet.persisted? ? @snippet.to_presenter.as_json_for_html_view.to_json.html_safe : 'null'}
+    snippet: #{j @snippet.persisted? ? to_json(@snippet) : 'null'}
 
 = f.inputs :name => :information do
   = f.input :name, :wrapper_html => { :class => 'highlighted' }
   = f.input :slug, :required => false
 
 = f.inputs :name => :code do
-  = f.input :template, :as => :'Locomotive::Code'
+  = f.input :template, :as => :'Locomotive::Code', :main_locale_template_url => snippet_main_template_path(@snippet)

data/app/views/locomotive/snippets/_snippet.html.haml

@@ -5,4 +5,4 @@
     %span!= t('.updated_at')
     {{updated_at}}
 
-    = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+    = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }

data/app/views/locomotive/snippets/edit.html.haml

@@ -7,7 +7,7 @@
   = locale_picker_link
 
 - content_for :buttons do
-  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, :class => 'new'
+  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, :icon => 'icon-plus'
 
 %p!= t('.help', :slug => @snippet.slug)
 

data/app/views/locomotive/theme_assets/_asset.html.haml

@@ -7,5 +7,5 @@
     %span.date {{updated_at}}
 
     {{#if can_be_deleted}}
-    = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+    = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
     {{/if}}

data/app/views/locomotive/theme_assets/_form.html.haml

@@ -12,7 +12,9 @@
     = f.input :source
 
   - if allow_plain_text_editing?(@theme_asset)
-    = link_to t('locomotive.theme_assets.form.choose_plain_text'), '#', :class => 'alt'
+    = link_to '#', :class => 'alt' do
+      %i.icon-share
+      = t('locomotive.theme_assets.form.choose_plain_text')
 
 - if allow_plain_text_editing?(@theme_asset)
   #text-selector{ :class => "selector #{'hidden' unless display_plain_text?(@theme_asset)}", :style => "#{'display: none' unless display_plain_text?(@theme_asset)}" }
@@ -25,7 +27,9 @@
 
       = f.input :plain_text, :as => :'Locomotive::Code', :type => plain_text_type(@theme_asset)
 
-    = link_to t('locomotive.theme_assets.form.choose_file'), '#', :class => 'alt'
+    = link_to '#', :class => 'alt' do
+      %i.icon-share
+      = t('locomotive.theme_assets.form.choose_file')
 
 = f.inputs :name => :options, :class => "inputs foldable #{'folded' if inputs_folded?(@theme_asset)}" do
   = f.input :folder

data/app/views/locomotive/theme_assets/edit.html.haml

@@ -5,7 +5,7 @@
 
 - if can?(:manage, Locomotive::ThemeAsset)
   - content_for :buttons do
-    = local_action_button t('locomotive.theme_assets.index.new'), new_theme_asset_url, :class => 'new'
+    = local_action_button t('locomotive.theme_assets.index.new'), new_theme_asset_url, :icon => 'icon-plus'
 
 %p.help
   - if %w(image javascript stylesheet).include?(@theme_asset.content_type.to_s)

data/app/views/locomotive/theme_assets/index.html.haml

@@ -3,22 +3,24 @@
 - content_for :head do
   = render 'asset'
 
-  = render 'list', :name => 'images', :title => t('.images'), :empty_message => t('.no_items', :url => new_theme_asset_url)
-  = render 'list', :name => 'media', :title => t('.media'), :empty_message => t('.no_items', :url => new_theme_asset_url)
+  = render 'list', name: 'images', title: t('.images'), empty_message: t('.no_items', url: new_theme_asset_url)
+  = render 'list', name: 'media', title: t('.media'), empty_message: t('.no_items', url: new_theme_asset_url)
+  = render 'list', name: 'others', title: t('.others'), empty_message: t('.no_items', url: new_theme_asset_url)
 
   - if can?(:manage, Locomotive::Snippet)
     = render '/locomotive/snippets/snippet'
-    = render 'list', :name => 'snippets', :title => t('.snippets'), :empty_message => t('locomotive.snippets.index.no_items', :url => new_snippet_url)
+    = render 'list', name: 'snippets', title: t('.snippets'), empty_message: t('locomotive.snippets.index.no_items', url: new_snippet_url)
 
   - if can?(:manage, Locomotive::ThemeAsset)
-    = render 'list', :name => 'js_and_css', :title => t('.css_and_js'), :empty_message => t('.no_items', :url => new_theme_asset_url)
-    = render 'list', :name => 'fonts', :title => t('.fonts'), :empty_message => t('.no_items', :url => new_theme_asset_url)
+    = render 'list', name: 'js_and_css', title: t('.css_and_js'), empty_message: t('.no_items', url: new_theme_asset_url)
+    = render 'list', name: 'fonts', title: t('.fonts'), empty_message: t('.no_items', url: new_theme_asset_url)
 
 - content_for :backbone_view_data do
   :plain
     snippets:           #{j can?(:manage, Locomotive::Snippet) ? @snippets.map { |snippet| snippet.to_presenter.as_json_for_html_view }.to_json.html_safe : 'null'},
     images:             #{j theme_assets_to_json(@assets[:images]).html_safe},
     media:              #{j theme_assets_to_json(@assets[:media]).html_safe},
+    others:             #{j theme_assets_to_json(@assets[:others]).html_safe},
     js_and_css_assets:  #{j can?(:manage, Locomotive::ThemeAsset) ? theme_assets_to_json(@js_and_css_assets).html_safe : 'null'},
     fonts:              #{j can?(:manage, Locomotive::ThemeAsset) ? theme_assets_to_json(@assets[:fonts]).html_safe : 'null'}
 
@@ -27,12 +29,12 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ThemeAsset)
-    = form_tag theme_assets_url(:json), :id => 'theme-assets-quick-upload', :class => 'quick-upload', :'data-sending-form-message' => t('locomotive.messages.sending_form')  do
-      = file_field_tag 'theme_asset[source]', :multiple => 'multiple'
-      = local_action_button :quick_upload, '#', :class => 'new'
+    = form_tag theme_assets_url(:json), id: 'theme-assets-quick-upload', class: 'quick-upload', :'data-sending-form-message' => t('locomotive.messages.sending_form')  do
+      = file_field_tag 'theme_asset[source]', multiple: 'multiple'
+      = local_action_button :quick_upload, '#', icon: :upload, class: 'new'
 
-  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, :class => 'new' if can?(:manage, Locomotive::Snippet)
-  = local_action_button :new, new_theme_asset_url, :class => 'new' if can?(:manage, Locomotive::ThemeAsset)
+  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, icon: 'icon-plus' if can?(:manage, Locomotive::Snippet)
+  = local_action_button :new, new_theme_asset_url, icon: :plus if can?(:manage, Locomotive::ThemeAsset)
 
 %p!= t('.help')
 
@@ -47,4 +49,6 @@
 - if can?(:manage, Locomotive::ThemeAsset)
   #fonts-anchor
 
-#media-anchor
+#media-anchor
+
+#others-anchor

data/app/views/locomotive/translations/_form.html.haml

@@ -0,0 +1,12 @@
+- content_for :backbone_view_data do
+  :plain
+    translation: #{j @translation.to_json.html_safe}
+
+= f.inputs :name => :information do
+
+  = f.input :key, :wrapper_html => { :class => 'highlighted' }
+
+  - current_site.locales.each do |l|
+    %li.input.string
+      = f.label "values[#{l}]", flag_tag(l) + t("locomotive.locales.#{l}")
+      = f.text_field "values[#{l}]", value: @translation.values[l]

data/app/views/locomotive/translations/edit.html.haml

@@ -0,0 +1,15 @@
+- title t('.title', :key => @translation.key )
+
+- content_for :submenu do
+  = render_cell 'locomotive/settings_menu', :show
+
+- content_for :buttons do
+  = local_action_button t('locomotive.translations.index.new'), new_translation_url, :icon => 'icon-plus'
+
+%p!= t('.help', :key => @translation.key)
+
+= semantic_form_for @translation, :html => { :class => 'save-with-shortcut' } do |form|
+
+  = render 'form', :f => form
+
+  = render 'locomotive/shared/form_actions', :back_url => translations_url, :button_label => :update

data/app/views/locomotive/translations/index.html.haml

@@ -0,0 +1,28 @@
+- title t('.title')
+
+- content_for :submenu do
+  = render_cell 'locomotive/settings_menu', :show
+
+- if can? :create, Locomotive::Translation
+  - content_for :buttons do
+    = local_action_button t('.new'), new_translation_path, icon: 'icon-plus' if can?(:create, Locomotive::Translation)
+
+- if @translations.empty?
+  %p.no-items!= t('.no_items', url: new_translation_path)
+- else
+  %ul.list
+    - @translations.each do |translation|
+      %li.item
+
+        %strong
+          = link_to "#{translation.key}", edit_translation_path(translation)
+
+        %em= translation.values[I18n.locale.to_s]
+
+        - untranslated_locales(current_site, translation)
+
+        .more
+          %span!= t('.updated_at')
+          = l translation.updated_at, format: :short
+
+          = link_to_icon :trash, translation_url(translation), title: t('.remove', key: translation.key, default: ''), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete