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

data/app/views/locomotive/shared/sidebar/_content_types.html.slim

@@ -0,0 +1,16 @@
+- list = Locomotive::ContentTypeService.new(current_site).list
+
+- unless list.empty?
+  section.content-types
+    h1= t('.title')
+
+    ul
+      - list.each do |content_type|
+        - if policy(content_type).show?
+          li
+            = link_to content_entries_path(current_site, content_type.slug) do
+              span.text= content_type.name
+
+              span.badge= content_type.number_of_entries || '?'
+
+

data/app/views/locomotive/shared/sidebar/_link.html.slim

@@ -0,0 +1,10 @@
+section class="link #{defined?(section_class) ? section_class : nil}"
+
+  = link_to url, data: defined?(data) ? data : {} do
+
+    span.arrow
+      i.fa.fa-angle-right
+
+    i.icon.fa class=icon
+
+    span.text= label

data/app/views/locomotive/shared/sidebar/{_my_account.html.haml → _my_account.html.slim}

@@ -1,8 +1,8 @@
-%section.link.my-account.visible-xs-block
+section.link.my-account.visible-xs-block
 
   = link_to edit_my_account_url(_location: request.fullpath) do
 
     = image_tag account_avatar_url(current_locomotive_account, '60x60#'), class: 'img-circle', alt: @current_locomotive_account.name_was
 
-    %span.text
+    span.text
       = current_locomotive_account.name_was

data/app/views/locomotive/shared/sidebar/_page.html.slim

@@ -0,0 +1,33 @@
+li id="node-#{page._id}" class=page.class_names
+
+  i class="fa #{page.icon} icon #{page.draggable}"
+
+  - url = page.redirect? ? edit_page_path(current_site, page) : editable_elements_path(current_site, page)
+
+  = link_to url do
+    span.text= page.title
+
+  - unless page.translated?
+    i.fa.fa-globe.untranslated
+
+  - if page.children?
+
+    span.fold-unfold class=page.fold_state
+      i.fa.fa-sort-desc.unfolded
+      i.fa.fa-sort-asc.folded
+
+    ul.leaves data-url=sort_page_path(current_site, page)
+
+      - unless page.content_type && page.nodes.count == 1
+        = render partial: 'locomotive/shared/sidebar/page', collection: page.nodes
+
+      - if page.content_type
+        li.list-entries
+          i.fa.fa-list-ul.icon
+          = link_to content_entries_path(current_site, page.templatized_page.content_type.slug) do
+            span.text= t(:list_content_entries, name: page.content_type.name.pluralize, scope: 'locomotive.pages.index')
+
+        li.new-entry
+          i.fa.fa-plus.icon
+          = link_to new_content_entry_path(current_site, page.templatized_page.content_type.slug) do
+            span.text= t(:new_content_entry, name: page.content_type.name.singularize, scope: 'locomotive.pages.index')

data/app/views/locomotive/shared/sidebar/_pages.html.slim

@@ -0,0 +1,11 @@
+section.pages-tree
+  h1= t(:title, scope: 'locomotive.pages.index')
+
+  ul.root data-url=sort_page_path(current_site, root)
+
+    = render partial: 'locomotive/shared/sidebar/page', collection: nodes
+
+    li.new-page
+      i.fa.fa-plus.icon
+      = link_to new_page_path(current_site) do
+        span.text= t(:new, scope: 'locomotive.pages.index')

data/app/views/locomotive/sites/{_site.html.haml → _site.html.slim}

@@ -2,14 +2,14 @@
   = link_to dashboard_url(site), class: 'media' do
 
     .pull-right.arrow
-      %span
-        %i.fa.fa-angle-right
+      span
+        i.fa.fa-angle-right
 
     .pull-left
       = image_tag site_picture_url(site), class: 'img-circle', alt: site.name
 
     .media-body
-      %h2= site.name.truncate(22)
+      h2= site.name.truncate(22)
 
       .domain
         = site.main_domain.try(:truncate, 28) || t('.no_domain')

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

@@ -9,11 +9,11 @@
       = link_to new_site_url, class: 'media' do
 
         .pull-right.arrow
-          %span
-            %i.fa.fa-plus
+          span
+            i.fa.fa-plus
 
         .media-body
-          %h2= t('.new')
+          h2= t('.new')
 
     .clearfix
 

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

@@ -0,0 +1,9 @@
+- (params[:_location] || {}).each do |name, value|
+  = hidden_field_tag "_location[#{name}]", value
+
+= f.inputs do
+
+  = f.simple_fields_for :values, OpenStruct.new(@translation.values) do |g|
+
+    - current_site.locales.each do |l|
+      = g.input l, label: flag_tag(l) + t(l, scope: 'locomotive.locales'), required: false, placeholder: t('.not_translated')

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

@@ -0,0 +1,7 @@
+- title t('.title', key: @translation.key )
+
+= locomotive_form_for @translation, url: translation_path(current_site, @translation) do |f|
+
+  = render 'form', f: f
+
+  = f.actions back_url: translations_path(current_site, params[:_location] || {}), use_stored_location: false

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

@@ -0,0 +1,41 @@
+- title t('.title')
+
+.row
+  .col-md-7
+    = help t('.help')
+  .col-md-5
+    .search-bar
+      = form_tag translations_path(current_site), method: :get do
+        .form-group
+          = hidden_field_tag :filter_by, params[:filter_by]
+          = text_field_tag :q, params[:q], placeholder: t('.search_placeholder'), class: 'form-control'
+          i.fa.fa-search.icon
+
+.nav-container
+  ul.nav.nav-tabs role='tablist'
+    - %w(all done partially none).each_with_index do |name, index|
+
+      li class="#{'active' if params[:filter_by] == name || (index == 0 && params[:filter_by].blank?)}"
+        = link_to t(".filter_by.#{name}"), translations_path(current_site, q: params[:q], filter_by: index == 0 ? '' : name)
+
+- if @translations.empty?
+  br
+
+  .alert.alert-warning
+    == t('.no_items')
+
+- else
+
+  #translations-list.row.big-list
+    - @translations.each do |translation|
+      .item.col-md-12 class=translation_completion_to_class(current_site, translation)
+        .text
+          strong= link_to translation.key, edit_translation_path(current_site, translation, _location: params.slice(:filter_by, :q))
+          .stamp
+            == document_stamp(translation)
+
+        .actions
+          span.completion
+            i.fa.fa-circle
+
+    = paginate @translations, theme: 'twitter-bootstrap-3', pagination_class: 'pagination-sm'

data/config/initializers/slim.rb

@@ -0,0 +1 @@
+Slim::Engine.set_options pretty: false

data/config/initializers/time_format.rb

@@ -0,0 +1,15 @@
+# Note: http://stackoverflow.com/questions/13950005/rails-formatting-a-date-hhmm-for-today-yesterday-for-yesterday-weekday
+Time::DATE_FORMATS[:humanized_ago]  = ->(time) do
+  start_time  = Time.now.beginning_of_day
+  end_time    = Time.now.end_of_day
+
+  if time.between?(start_time, end_time)
+    I18n.t('date.today_at') + ' ' + I18n.l(time, format: :time)
+  elsif time.between?(start_time - 1.day, end_time - 1.day)
+    I18n.t('date.yesterday_at') + ' ' + I18n.l(time, format: :time)
+  elsif time.between?(start_time - 6.day, end_time - 2.day)
+    I18n.l(time, format: :short)
+  else
+    I18n.l(time, format: :default)
+  end
+end

data/config/locales/admin_ui.en.yml

@@ -3,8 +3,8 @@ en:
     buttons:
       sign_in: Sign in
       sign_up: Sign up
-      send_password: Send
-      change_password: Update
+      send_password: Forgot password
+      change_password: Update my password
       new_item: "+ add"
       switch_to_site: Go
       delete: "Delete"
@@ -46,16 +46,9 @@ en:
         dashboard: Dashboard
         assets: Assets
         settings: General Settings
-      menu:
-        contents: Contents
-        assets: Assets
-        settings: Settings
-        pages: Pages
-        snippets: Snippets
-        account: My account
-        site: Site
-        theme_assets: Theme files
-        translations: Translations
+        developers: Developers
+        content_types:
+          title: Models
       form_actions:
         back: Back without saving
         create: Create
@@ -64,16 +57,25 @@ en:
         disable_with: Pending...
       list:
         untranslated: untranslated
+        created_at: "Created %{distance} ago"
+        created_by: "Created %{distance} ago by %{who}"
+        updated_at: "Last modified %{distance} ago"
+        updated_by: "Last modified %{distance} ago by %{who}"
 
     errors:
       "500":
         title: Application Error
-        notice: "We're sorry, but something went wrong"
-        link: "→ Back to the application"
+        message: "We're sorry, but something went wrong"
       "404":
         title: Page not found
-        notice: "The page you requested does not exist."
-        link: "→ Back to the application"
+        message: "The page you requested does not exist."
+      no_site:
+        title: Site not found
+        next: "Next →"
+        message:
+          create_account: "Please create first an account and then create a site."
+          add_domain: "Add the <strong>%{host}</strong> domain to the list of domains of one of your sites."
+          sign_in: "Please sign in first. Then, add the <strong>%{host}</strong> domain to the list of domains of one of your sites."
 
     notifications:
       new_content_entry:
@@ -81,6 +83,28 @@ en:
         title: "Hi %{name}, just to let you know that a new instance has been created on %{date} for the site <b>%{domain}</b>"
         type: "Model: %{type}"
 
+    activity:
+      site:
+        created: 'created the site'
+      page:
+        created: 'created the %{page} page'
+        updated: 'updated the %{page} page'
+        destroyed: 'deleted the %{page} page'
+        sorted: 'sorted pages'
+      editable_element:
+        updated_bulk: 'modified the content of %{pages}'
+      content_entry:
+        created: 'added %{entry} to %{content_type}'
+        created_public: 'added %{entry} to %{content_type} from a public form'
+        updated: 'updated %{entry} from %{content_type}'
+        destroyed: 'deleted %{entry} from %{content_type}'
+        sorted: 'sorted %{content_type}'
+      content_asset:
+        created_bulk: 'uploaded %{count} asset(s)'
+        destroyed: 'deleted the %{name} asset'
+      membership:
+        created: 'added %{name} to the site'
+
     pagination:
       first: "&laquo;"
       last: "&raquo;"
@@ -138,6 +162,13 @@ en:
         select_options:
           ask_name: "Type the label of the option"
 
+    dashboard:
+      show:
+        title: 'Activity'
+        unknown_account: Someone
+        load_more: Loading more
+        loading_activity_feed: Loading...
+
     sessions:
       new:
         title: "Log in"
@@ -152,11 +183,9 @@ en:
 
     passwords:
       new:
-        title: Forgot password
         link: "&rarr; Back to login page"
         email: "Your email"
       edit:
-        title: Update my password
         link: "&rarr; Back to login page"
         password: "Your new password"
         password_confirmation: "Confirmation of your new password"
@@ -190,6 +219,11 @@ en:
         title: "%{title} &mdash; <small>%{fullpath}</small>"
       edit:
         settings_link: 'Settings'
+      form:
+        model:
+          buttons:
+            list: Manage
+            edit: Edit
 
     sites:
       index:
@@ -237,15 +271,13 @@ en:
       untranslated: "Untranslated locales: %{list}"
       index:
         title: Translations
-        new: new translation
-        no_items: "There are no translations for now. Just click <a href=\"%{url}\">here</a> to create the first one."
-        remove: Remove %{key}
-      new:
-        title: "New translation"
-        help: "Pages/snippets can share the same template for all the locales except for some labels which can be handled by the <b>translate</b> liquid tag."
+        no_items: "We have not found any translations."
+        search_placeholder: "Enter a key or a translation"
+        help: "Translate all the entries with a orange (partially localized) or red (not localized) dots."
       edit:
-        title: "Editing %{key}"
-        help: "You can use that translation key with the following liquid code : <span class='code'>{{ '%{key}' | translate }}</span>."
+        title: "Translations &mdash; editing %{key}"
+      form:
+        not_translated: "Not translated"
 
     content_assets:
       index:
@@ -278,38 +310,22 @@ en:
       search_form:
         placeholder: Search by filename
 
-    content_types:
-      index:
-        title: Models
-        new: new model
-        edit: edit model
-      new:
-        title: New model
-        help: "Create your own data model (Projects, People, ...etc). Your model should have one field at least. The items created from this content type would have their first field mandatory."
+    public_submission_accounts:
       edit:
-        title: Editing model
-        help: "Your model should have one field at least. The items created from this content type would have their first field mandatory."
-        show_entries: show entries
-        new_entry: new entry
-      form:
-        order_by:
-          created_at: 'By creation date'
-          updated_at: 'By updating date'
-          position_in_list: Manually
-        order_direction:
-          asc: Ascending
-          desc: Descending
+        title: "%{name} &mdash; Notification settings"
+
+    developers_documentation:
+      show:
+        title: Developers
 
     content_entries:
       index:
         title: '%{type}'
         download: download entries
         new: new entry
+        edit_notification_settings: Edit notification settings
         category_noname: "No name"
         latest_entries: "Latest entries"
-        created_by: "Created %{distance} by %{who}"
-        updated_at: "Last modified %{distance}"
-        updated_by: "Last modified %{distance} by %{who}"
         search_placeholder: "Enter your search keywords here"
         group_by:
           all: All

data/config/locales/default.en.yml

@@ -2,10 +2,13 @@ en:
   date:
     formats:
       default: "%m/%d/%Y"
+    today_at: "today at"
+    yesterday_at: "yesterday at"
 
   time:
     formats:
       default: "%m/%d/%Y %H:%M"
+      time: "%H:%M"
 
   mongoid:
     errors:

data/config/locales/default.fr.yml

@@ -137,6 +137,9 @@ fr:
     abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
     order: [ day, month, year ]
 
+    today_at: "aujourd'hui à"
+    yesterday_at: "hier à"
+
   pagination:
     previous: "« Précédent"
     next: "Suivant »"
@@ -226,4 +229,4 @@ fr:
       skip_last_comma: true
       words_connector: ", "
       two_words_connector: " et "
-      last_word_connector: " et "
+      last_word_connector: " et "

data/config/locales/simple_form.en.yml

@@ -1,6 +1,16 @@
 en:
   simple_form:
     titles:
+      locomotive:
+        account:
+          information: Main
+          api: API
+        site:
+          information: Main
+          access_points: Access points
+          seo: SEO
+          advanced: Advanced
+
       defaults:
         locomotive:
           information: General information
@@ -24,7 +34,7 @@ en:
           presentation: Presentation
           attributes: Attributes
           upload: Upload
-          api: API
+          api: API3
     labels:
       locomotive:
         theme_asset:
@@ -38,7 +48,7 @@ en:
           field:
             name: Alias
         content_type:
-          raw_item_template: Item template
+          entry_template: Entry template
           public_submission_enabled: Public submission
           public_submission_accounts: Notified Accounts
           "custom_fields/field":
@@ -56,7 +66,7 @@ en:
           seo_title: Title
           target_klass_name: Model
         editable_element:
-          region: Region
+          region: Sections
         site:
           locales: Languages
           timezone_name: Timezone
@@ -133,12 +143,8 @@ en:
           name: "We suggest you to type the plural form of the model. Ex: Projects, Recipes, Posts, Articles, ...etc"
           slug: "It will be used as the name of the collection in the liquid templates. Ex: <span class='code'>{{ contents.my_projects }}</span>"
           raw_item_template: "You can customize the text displayed for each item in the list. Simply use Liquid. Ex: <span class='code'>{{ entry.name }})</span>"
-          filter_fields: "If not empty, a filter bar will be displayed on the page listing the entries. The entries will be then filtered by the field(s) selected in the select box above."
           public_submission_enabled: "It is used to let people from outside to create new entries (example: messages in a contact form)"
-          public_submission_accounts: "If the public submission option is enabled and for each entry created, sends a notification email to the accounts listed above."
-          "custom_fields/field":
-            name: "Name of the property for liquid templates. Ex: <span class='code'>&#123;&#123; your_object.&lt;name_of_your_field&gt; &#125;&#125;</span>"
-            hint: "Text displayed in the model form just below the field"
+          public_submission_accounts: "When an entry is created, send a notification email to the accounts listed below."
         content_type_entry_field:
           select_options: "Add/edit/re-arrange the options."