locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/views/locomotive/content_assets/{_nav.html.haml → _nav.html.slim}

@@ -1,15 +1,15 @@
 - # Filter assets
-%ul.nav.nav-tabs{ role: 'tablist' }
-  %li{ class: "#{'active' if params[:types].nil? }" }
+ul.nav.nav-tabs  role='tablist'
+  li class="#{'active' if params[:types].nil? }"
     = link_to t('.types.all'), content_assets_path(current_site, query: params[:query]), remote: remote
 
   - Locomotive::ContentAsset.types_for_content_editing.each do |type|
-    %li{ class: "#{'active' if params[:types] == type }" }
+    li class="#{'active' if params[:types] == type }"
       = link_to t(".types.#{type}"), content_assets_path(current_site, types: type, query: params[:query]), remote: remote
-  %li{ class: "#{'active' if params[:types] == 'other' }" }
+  li class="#{'active' if params[:types] == 'other' }"
     = link_to t('.types.others'), content_assets_path(current_site, types: 'other', query: params[:query]), remote: remote
 
-  %li.search-bar.search-bar-in-nav.visible-md-block.visible-lg-block
+  li.search-bar.search-bar-in-nav.visible-md-block.visible-lg-block
     = render 'search_form', remote: remote
 
 .search-bar.search-bar-in-nav.visible-xs-block.visible-sm-block

data/app/views/locomotive/content_assets/{_search_form.html.haml → _search_form.html.slim}

@@ -2,4 +2,4 @@
   = hidden_field_tag :types, params[:types] if params[:types]
   .form-group
     = text_field_tag :query, params[:query], placeholder: t('.placeholder'), class: 'form-control'
-    %i.fa.fa-search.icon
+    i.fa.fa-search.icon

data/app/views/locomotive/content_assets/edit_in_drawer.html.slim

@@ -0,0 +1,27 @@
+.edit-assets-container
+  .image-container data-height=@content_asset.height data-width=@content_asset.width data-filename=@content_asset.name
+
+    = image_tag @content_asset.source.url
+
+  .resize-form style='display: none'
+    - resize_form = image_resize_form(@content_asset)
+    = locomotive_form_for resize_form, url: '#' do |f|
+      = f.inputs do
+        = f.input :width
+        = f.input :height
+
+      .text-right
+        button.btn.btn-sm.btn-success.apply-resizing-btn autocomplete='off' data-loading-text=f.submit_text(:loading_text)
+          = f.submit_text
+        |  
+        button.btn.btn-sm.btn-default.cancel-resizing-btn autocomplete="off"
+          = f.submit_text :cancel
+
+  .actions
+    .btn-group-vertical role="group"
+      button.btn.btn-sm.btn-primary.resize-btn title=t('.buttons.resize')
+        i.fa.fa-compress
+      button.btn.btn-sm.btn-primary.crop-btn  title=t('.buttons.crop')
+        i.fa.fa-crop
+      button.btn.btn-sm.btn-success.apply-btn title=t('.buttons.apply') data-url=content_assets_path(current_site, format: :json)
+        i.fa.fa-check

data/app/views/locomotive/content_assets/{index.html.haml → index.html.slim}

@@ -1,12 +1,12 @@
-.content-assets{ data: { refresh_url: content_assets_path(current_site) } }
+.content-assets  data-refresh-url=content_assets_path(current_site)
   .row
     .col-md-9.col-xs-12.col-sm-12
       .row.header-row
         .col-md-8.col-xs-9
-          %h1!= t('.title')
+          h1== t('.title')
         .col-md-4.col-xs-3.actions
           .visible-xs-block.visible-sm-block
-            %p.text-right
+            p.text-right
               = link_to t('.upload'), bulk_create_content_assets_path(current_site, :json), class: 'btn btn-sm btn-primary upload'
 
       .nav-container
@@ -14,6 +14,6 @@
 
       = render 'list', remote: false, enable_select: false
 
-    .col-md-3.dropzone.sidebar-dropzone.hidden-xs.hidden-sm{ data: { url: bulk_create_content_assets_path(current_site, :json) } }
+    .col-md-3.dropzone.sidebar-dropzone.hidden-xs.hidden-sm data-url= bulk_create_content_assets_path(current_site, :json)
       .dropzone-inner
         = render 'dropzone', remote: false

data/app/views/locomotive/content_assets/{index_in_drawer.html.haml → index_in_drawer.html.slim}

@@ -1,6 +1,6 @@
 .content-assets
 
-  .dropzone.top-dropzone{ data: { url: bulk_create_content_assets_path(current_site, :json) } }
+  .dropzone.top-dropzone data-url=bulk_create_content_assets_path(current_site, :json)
     .container-fluid
       .row
         .col-md-12

data/app/views/locomotive/content_entries/{_entry.html.haml → _entry.html.slim}

@@ -1,4 +1,4 @@
-.item.row{ data: { id: item._id } }
+.item.row data-id=item._id
 
   - if field.type == 'has_many'
     = hidden_field_tag "content_entry[#{field.name}_attributes][][_id]", item._id
@@ -11,7 +11,7 @@
   .inner-row.col-md-12
 
     .draggable
-      %i.fa.fa-bars
+      i.fa.fa-bars
 
     .text
       = item._label
@@ -19,4 +19,4 @@
     .buttons
       = link_to t(:edit, scope: 'locomotive.shared.form.array_input'), edit_content_entry_path(current_site, slug, item, _location: false), class: 'choose btn btn-primary btn-sm'
       = link_to '#', class: 'delete' do
-        %i.fa.fa-trash-o
+        i.fa.fa-trash-o

data/app/views/locomotive/content_entries/{_list.html.haml → _list.html.slim}

@@ -1,27 +1,28 @@
 - if empty_collection?(entries)
 
-  %br
+  br
 
   .alert.alert-warning
-    != t('.no_items', url: new_content_entry_path(current_site, content_type.slug))
+    == t('.no_items', url: new_content_entry_path(current_site, content_type.slug))
 
 - else
 
-  #entries-list{ class: "row big-list #{'grouped' if content_type.groupable?} #{'sortable' if content_type.order_manually?}", :'data-sort-url' => sort_content_entries_path(current_site, content_type.slug, :json) }
+  #entries-list class="row big-list #{'grouped' if content_type.groupable?} #{'sortable' if content_type.order_manually?}" data-sort-url=sort_content_entries_path(current_site, content_type.slug, :json)
     - entries.each do |entry|
-      .item{ class: 'col-md-12', data: { id: entry._id } }
+      .item.col-md-12 data-id=entry._id
         - if content_type.order_manually?
           .draggable
-            %i.fa.fa-bars.draggable
+            i.fa.fa-bars.draggable
 
         .text
-          %strong= link_to entry_label(content_type, entry), edit_content_entry_path(current_site, content_type.slug, entry)
+          .item-label
+            = entry_label(content_type, entry)
           .stamp
-            != content_entry_stamp(entry)
+            == document_stamp(entry)
 
         .actions
           = link_to content_entry_path(current_site, content_type.slug, entry), title: t('locomotive.buttons.delete'), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete do
-            %i.fa.fa-trash-o
+            i.fa.fa-trash-o
 
 
 - if entries.respond_to?(:current_page)

data/app/views/locomotive/content_entries/{edit.html.haml → edit.html.slim}

@@ -2,6 +2,11 @@
 
 = help @content_type.description
 
+- content_for :actions do
+  - if @content_type.localized?
+    = locale_picker_link
+    |  
+
 = locomotive_form_for @content_entry, as: :content_entry, url: content_entry_path(current_site, @content_type.slug, @content_entry), html: { multipart: true } do |f|
 
   = hidden_field_tag :active_tab, ''

data/app/views/locomotive/content_entries/form/_tabs.html.slim

@@ -0,0 +1,13 @@
+ul.nav.nav-tabs role='tablist'
+  = form_nav_tab :main, true do
+    = link_to t('simple_form.titles.locomotive.content'), '#main', role: 'tab', data: { toggle: 'tab' }
+
+  - if display_content_entry_tab?(@content_type, :seo)
+
+    = form_nav_tab :seo do
+      = link_to t('simple_form.titles.locomotive.seo'), '#seo', role: 'tab', data: { toggle: 'tab' }
+
+  - if display_content_entry_tab?(@content_type, :advanced)
+
+    = form_nav_tab :advanced do
+      = link_to t('simple_form.titles.locomotive.advanced'), '#advanced', role: 'tab', data: { toggle: 'tab' }

data/app/views/locomotive/content_entries/{index.html.haml → index.html.slim}

@@ -1,7 +1,20 @@
 - title t('.title', type: @content_type.name.capitalize)
 
 - content_for :actions do
-  = link_to t('.new'), new_content_entry_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm'
+  - if @content_type.localized?
+    = locale_picker_link
+
+  - if can_edit_public_submission_accounts?(@content_type)
+    = link_to edit_public_submission_accounts_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
+      i.fa.fa-pencil
+      |  
+      = t('.edit_notification_settings')
+
+  = link_to new_content_entry_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
+    i.fa.fa-plus
+    |  
+    = t('.new')
+
 
 - if @content_type.filter_fields.present?
   .row
@@ -14,30 +27,30 @@
             = hidden_field_tag :group, params[:group]
             = hidden_field_tag :where, params[:where]
             = text_field_tag :q, params[:q], placeholder: t('.search_placeholder'), class: 'form-control'
-            %i.fa.fa-search.icon
+            i.fa.fa-search.icon
 
 - else
   = help @content_type.description
 
 - if @content_type.groupable?
   .nav-container
-    %ul.nav.nav-tabs{ role: 'tablist' }
-      %li{ class: "#{'active' if params[:group].nil? }" }
+    ul.nav.nav-tabs role='tablist'
+      li class="#{'active' if params[:group].nil?}"
         = link_to t('.group_by.all'), content_entries_path(current_site, @content_type.slug, query: params[:query])
 
       - each_content_entry_group(@content_type) do |group|
-        %li{ class: "#{'active' if params[:group] == group[:name] }" }
+        li class="#{'active' if params[:group] == group[:name]}"
           = link_to group[:name], group[:url]
 
 = render 'list', content_type: @content_type, entries: @content_entries
 
-
 - unless empty_collection?(@content_entries)
   .row
     .col-md-12
-      %br
-      %p.text-right
+      br
+      p.text-right
         = link_to export_content_entries_path(current_site, @content_type.slug, :csv), class: 'btn btn-primary btn-sm' do
-          %i.fa.fa-download
+          i.fa.fa-download
+          |  
           = t('.download')
 

data/app/views/locomotive/current_site/{_domain.html.haml → _domain.html.slim}

@@ -1,15 +1,15 @@
-.item.row{ data: { id: domain } }
+.item.row data-id=domain
 
   = hidden_field_tag 'site[domains][]', domain
 
   .inner-row.col-md-12
 
     .draggable
-      %i.fa.fa-bars
+      i.fa.fa-bars
 
     .text
       = domain
 
     .buttons
       = link_to '#', class: 'delete' do
-        %i.fa.fa-trash-o
+        i.fa.fa-trash-o

data/app/views/locomotive/current_site/{_locale.html.haml → _locale.html.slim}

@@ -1,18 +1,18 @@
-.item.row{ data: { id: locale } }
+.item.row data-id=locale
 
   = hidden_field_tag 'site[locales][]', locale
 
   .inner-row.col-md-12
 
     .draggable
-      %i.fa.fa-bars
+      i.fa.fa-bars
 
     .text
       = image_tag "locomotive/icons/flags/#{locale}.png", alt: locale, size: '24x24'
-
+      |  
       = I18n.t("locomotive.locales.#{locale}")
 
     .buttons
       - if current_site.default_locale != locale
         = link_to '#', class: 'delete' do
-          %i.fa.fa-trash-o
+          i.fa.fa-trash-o

data/app/views/locomotive/current_site/{_membership.html.haml → _membership.html.slim}

@@ -6,16 +6,17 @@
       = image_tag account_avatar_url(membership.account), class: 'media-object img-circle'
 
     .text
-      %strong= membership.account.name
-      %small
-        %span.label.label-default
+      strong= membership.account.name
+      |  
+      small
+        span.label.label-default
           = t(membership.role, scope: 'locomotive.memberships.roles')
-      %br
-      %small
+      br
+      small
         = membership.account.email
 
     .buttons
       - if membership.account != current_locomotive_account && policy(membership).edit?
         = link_to t(:edit, scope: 'locomotive.shared.form.array_input'), edit_membership_path(current_site, membership), class: 'choose btn btn-primary btn-sm'
         = link_to membership_path(current_site, membership), class: 'delete', data: { confirm: t('locomotive.messages.confirm') }, method: :delete do
-          %i.fa.fa-trash-o
+          i.fa.fa-trash-o

data/app/views/locomotive/current_site/{edit.html.haml → edit.html.slim}

@@ -2,7 +2,7 @@
 
 = help t('.help', default: '')
 
-= locomotive_form_for @site, url: current_site_path(current_site), html: { multipart: true } do |f|
+= locomotive_form_for @site, url: current_site_path(current_site), html: { multipart: true }, defaults: { placeholder: false } do |f|
 
   = hidden_field_tag :active_tab, ''
 

data/app/views/locomotive/current_site/form/{_access_points.html.haml → _access_points.html.slim}

@@ -1,6 +1,7 @@
 - if policy(@site).point?
   = f.inputs :access_points do
     = f.input :handle
+
     = f.input :domains, as: :array, placeholder: true, collection: f.object.domains, template: :domain, template_url: new_domain_current_site_path(current_site)
 
   = f.actions do

data/app/views/locomotive/current_site/form/_tabs.html.slim

@@ -0,0 +1,14 @@
+ul.nav.nav-tabs role='tablist'
+  = form_nav_tab :information, true do
+    = link_to t('simple_form.titles.locomotive.site.information'), '#main', role: 'tab', data: { toggle: 'tab' }
+
+  - if policy(@site).point?
+    = form_nav_tab :access_points do
+      = link_to t('simple_form.titles.locomotive.site.access_points'), '#access_points', role: 'tab', data: { toggle: 'tab' }
+
+  = form_nav_tab :seo do
+    = link_to t('simple_form.titles.locomotive.site.seo'), '#seo', role: 'tab', data: { toggle: 'tab' }
+
+  - if policy(@site).update_advanced?
+    = form_nav_tab :advanced do
+      = link_to t('simple_form.titles.locomotive.site.advanced'), '#advanced', role: 'tab', data: { toggle: 'tab' }

data/app/views/locomotive/custom_fields/select_options/{_option.html.haml → _option.html.slim}

@@ -1,24 +1,24 @@
-.item.row{ data: { id: select_option._id } }
+.item.row data-id=select_option._id
 
   .inner-row.col-md-12
 
     .draggable
-      %i.fa.fa-bars
+      i.fa.fa-bars
 
     .text.editable
-      %span
+      span
         = select_option.name
 
       = text_field_tag 'select_options[][name]', select_option.name, class: 'hide'
 
-      %a.apply.btn.btn-sm.btn-primary.hide= t('.apply')
-      %a.cancel.btn.btn-default.btn-sm.hide= t('.cancel')
+      a.apply.btn.btn-sm.btn-primary.hide= t('.apply')
+      a.cancel.btn.btn-default.btn-sm.hide= t('.cancel')
 
     .buttons
       = link_to t('.edit'), '#', class: 'btn btn-sm btn-primary edit'
-       
+      |  
       = link_to '#', class: 'delete foo' do
-        %i.fa.fa-trash-o
+        i.fa.fa-trash-o
 
   - if select_option.persisted?
     = hidden_field_tag 'select_options[][_id]', select_option._id

data/app/views/locomotive/dashboard/show.html.slim

@@ -0,0 +1,28 @@
+- title t('.title')
+
+.row
+  .col-md-12
+    ul.activity-feed
+      - @activities.each do |activity|
+        li class=activity.domain
+          span.icon.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-stack-1x.fa-inverse class=activity_to_icon(activity)
+
+          p
+            = account_avatar_and_name(activity.actor, size = '70x70#')
+            |  
+            | ·
+            |  
+            span.time= activity.created_at.to_s(:humanized_ago)
+            |  
+            | ·
+            |  
+            span.sentence= render_activity_sentence(activity)
+
+          - if info = render_activity_additional_information(activity)
+            .additional-information= info
+
+    - if @activities.current_page < @activities.total_pages
+      p.text-center
+        = link_to t('.load_more'), { page: @activities.current_page + 1 }, class: 'btn btn-primary btn-sm', data: { behavior: 'load-more', loading_text: t('.loading_activity_feed') }, remote: true

data/app/views/locomotive/developers_documentation/_api.html.slim

@@ -0,0 +1,44 @@
+.alert.alert-info
+  | <a href="https://github.com/locomotivecms/coal"><strong>Coal</strong></a> is our Ruby API client for Locomotive. You can still use curl to fetch our Restful API. See our <a href="http://doc.locomotivecms.com" />documentation site</a> for more information.
+
+h3 Install Coal
+
+pre
+  code.bash
+    | gem install locomotivecms_coal --pre
+
+h3 Authentication
+
+p Load the gem
+
+pre
+  code.ruby
+    | require 'locomotive/coal'
+
+p Authenticate
+
+pre
+  code.ruby
+    | client = Locomotive::Coal::Client.new('#{current_request_url}', { email: '#{current_locomotive_account.email}', api_key: '#{current_locomotive_account.api_key}' })
+
+p Set the site context
+
+pre
+  code.ruby
+    | site_client = client.scope_by('#{current_site.handle}')
+
+h3 Get the name of the site and update it
+
+pre
+  code.ruby
+    | puts "Old name is \#{site_client.current_site.get.name}"<br/>
+    | site_client.current_site.update name: "A better #{current_site.name}"
+
+- current_site.content_types.each do |content_type|
+  h3 Get entries of the #{content_type.name} model
+
+  p Example: get the first 10 entries
+
+  pre
+    code.ruby
+      | #{content_type.slug} = site_client.contents.#{content_type.slug}.all