elabs 4.0.0 → 5.0.0

data/app/views/elabs/auth/confirmations/new.html.haml

@@ -21,6 +21,6 @@
                           autocomplete: 'email',
                           value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email)
         .actions
-          = f.submit _('Resend confirmation instructions'), class: 'btn btn--brand btn--block'
+          = f.submit _('Resend confirmation instructions'), class: 'btn btn--primary btn--block'
 
   = render 'elabs/auth/shared/links'

data/app/views/elabs/auth/passwords/edit.html.haml

@@ -26,6 +26,6 @@
           = f.label :password_confirmation, _('Confirm new password')
           .field-input= f.password_field :password_confirmation, autocomplete: 'off'
         .actions
-          = f.submit _('Change my password'), class: 'btn btn--brand btn--block'
+          = f.submit _('Change my password'), class: 'btn btn--primary btn--block'
 
   = render 'elabs/auth/shared/links'

data/app/views/elabs/auth/passwords/new.html.haml

@@ -18,6 +18,6 @@
           = f.label :email
           .field-input= f.email_field :email, autofocus: true, autocomplete: 'email'
         .actions
-          = f.submit _('Send me reset password instructions'), class: 'btn btn--brand btn--block'
+          = f.submit _('Send me reset password instructions'), class: 'btn btn--primary btn--block'
 
   = render 'elabs/auth/shared/links'

data/app/views/elabs/auth/registrations/new.html.haml

@@ -14,7 +14,12 @@
                 %li= message
         .field
           = f.label :username
-          .field-input= f.text_field :username, autofocus: true, autocomplete: 'email'
+          .field-input
+            = f.text_field :username, autofocus: true, autocomplete: 'username'
+            .field-hint
+              -# haml-lint:disable LineLength
+              = _('Username can be upper/lower case ascii letters, digits, hyphens and underscores. Make it at least 4 characters. As in "super_man", "super-woman", "uberCat01"')
+              -# haml-lint:enable LineLength
         .field
           = f.label :email
           .field-input= f.email_field :email, autocomplete: 'email'
@@ -29,6 +34,6 @@
           .field-input= f.password_field :password_confirmation, autocomplete: 'off'
 
         .actions
-          = f.submit _('Sign up'), class: 'btn btn--brand btn--block'
+          = f.submit _('Sign up'), class: 'btn btn--primary btn--block'
 
   = render 'elabs/auth/shared/links'

data/app/views/elabs/auth/sessions/_new.html.haml

@@ -12,4 +12,4 @@
         = f.label :remember_me
 
   .actions
-    = f.submit _('Log in'), class: 'btn btn--block btn--brand'
+    = f.submit _('Log in'), class: 'btn btn--block btn--primary'

data/app/views/elabs/auth/unlocks/new.html.haml

@@ -18,6 +18,6 @@
           = f.label :email
           .field-input= f.email_field :email, autofocus: true, autocomplete: 'email'
         .actions
-          = f.submit _('Resend unlock instructions'), class: 'btn btn--brand btn--block'
+          = f.submit _('Resend unlock instructions'), class: 'btn btn--primary btn--block'
 
   = render 'elabs/auth/shared/links'

data/app/views/elabs/comments/_comments.html.haml

@@ -1,22 +1,31 @@
-= render 'elabs/comments/form', url: url, new_comment: new_comment
+.comments-area
+  = render 'elabs/comments/form', url: url, new_comment: new_comment, entity: entity
 
-%section.comments-list
-  - if user_is_author_of entity
-    %h2= _('Comments')
-    - if entity.comments.count.zero?
-      .empty
-        = _('No comment has been left')
-    - entity.comments.each do |comment|
-      .comment.comment-card
-        %header
-          .headers
-            %ul.informations
-              %li
-                = icon('user', ['fw'])
-                = comment.name || link_to(comment.user.display_name, comment.user)
-              %li
-                = icon('calendar', ['fw'])
-                %strong= _('Posted on:')
-                = medium_datetime comment.created_at
-        %article= render_entity_content comment, :comment, false
+  %section.comments-list
+    - if user_is_author_of entity
+      %h2= _('Comments')
+      - if entity.comments.count.zero?
+        .empty
+          = _('No comment has been left')
+      - entity.comments.each do |comment|
+        .comment.comment-card{ class: comment.archived ? 'comment-card--archived' : '' }
+          %header
+            .headers
+              %ul.information
+                %li
+                  .btn-group
+                    = member_destroy_link 'comment', comment
+                    - if comment.archived
+                      %a.btn.btn--small{ disabled: true }= icon 'archive', ['fw']
+                    - else
+                      = link_to icon('archive', ['fw']),
+                                member_comment_archive_path(comment), method: :put, class: 'btn btn--small btn--primary'
+                %li
+                  = icon('user', ['fw'])
+                  = comment.name || link_to(comment.user.display_name, comment.user)
+                %li
+                  = icon('calendar', ['fw'])
+                  %strong= _('Posted on:')
+                  = medium_datetime comment.created_at
+          %article= render_entity_content comment, :comment, false
 

data/app/views/elabs/comments/_form.html.haml

@@ -1,43 +1,47 @@
 -# You must provide an url for the form
 
-%h2= _('Leave a comment')
+- unless user_is_author_of(entity)
+  %h2= _('Leave a comment')
 
-%p= _('You want to react to this content or ask something to the author? Just leave a comment here!')
+  %p= _('You want to react to this content or ask something to the author? Just leave a comment here!')
 
-.alert.alert--info
-  %p= _("Note that the comments are not publicly visible, so don't worry if you don't see yours.")
-  %p= _("All the information you give will only be visible to the author. We don't share anything with anyone.")
+  .alert.alert--info
+    %p= _("Note that the comments are not publicly visible, so don't worry if you don't see yours.")
+    %p= _("All the information you give will only be visible to the author. We don't share anything with anyone.")
 
-= form_for new_comment, url: url do |f|
-  - if new_comment.errors.any?
-    .error
-      %h2= format(n_('An error prevented your comment from being saved:',
-                      '%<nb>i errors prevented your comment from being saved:',
-                      new_comment.errors.count), nb: new_comment.errors.count)
-      %ul
-        - new_comment.errors.full_messages.each do |message|
-          %li= message
+  = form_for new_comment, url: url do |f|
+    - if new_comment.errors.any?
+      .error
+        %h2= format(n_('An error prevented your comment from being saved:',
+                        '%<nb>i errors prevented your comment from being saved:',
+                        new_comment.errors.count), nb: new_comment.errors.count)
+        %ul
+          - new_comment.errors.full_messages.each do |message|
+            %li= message
 
-  - if user_signed_in?
-    .alert.alert--info
-      -# haml-lint:disable LineLength
-      = format(_('This comment will be posted as "%<name>s". By submitting this comment, you agree to be recontacted by the author.'),
-        name: current_user.username)
-      -# haml-lint:enable LineLength
-  - else
+    - if user_signed_in?
+      .alert.alert--info
+        -# haml-lint:disable LineLength
+        = format(_('This comment will be posted as "%<name>s". By submitting this comment, you agree to be recontacted by the author.'),
+          name: current_user.username)
+        -# haml-lint:enable LineLength
+    - else
+      .field
+        = f.label :name
+        .field-input= f.text_field :name, required: true
+      .field
+        = f.label :email
+        .field-input= f.text_field :email, required: true, type: :email
+      .field
+        .field-input
+          = f.check_box :allow_contact
+          = f.label :allow_contact, _('I agree to be recontacted')
     .field
-      = f.label :name
-      .field-input= f.text_field :name, required: true
-    .field
-      = f.label :email
-      .field-input= f.text_field :email, required: true
-    .field
-      .field-input
-        = f.check_box :allow_contact
-        = f.label :allow_contact, _('I agree to be recontacted')
-  .field
-    = f.label :comment
-    .field-input= f.text_area :comment, required: true
-  .actions
-    .actions-buttons
-      = f.submit 'Save', class: 'btn btn--save'
+      = f.label :comment
+      .field-input= f.text_area :comment, required: true, class: 'textarea--large'
+
+    = render 'elabs/layouts/form_honeypot', field: 'body'
+
+    .actions
+      .actions-buttons
+        = f.submit 'Save', class: 'btn btn--save'

data/app/views/elabs/languages/_filters.html.haml

@@ -1,6 +1,4 @@
-.filter-links
-  .filter-links__group
+.page__header__actions__filters
+  .page__header__actions__filters__group
+    .page__header__actions__filters__group__title= _('Sort by…')
     = order_link _('Name'), 'name'
-
-  .filter-links__group
-    = with_content_filter_links

data/app/views/elabs/languages/index.html.haml

@@ -6,28 +6,27 @@
       %header
         .icon= icon 'language', %w[3x fw]
         .headers
-          %h3{ lang: language.iso639_1 }= link_to language.name, language, class: 'title'
+          %h3.title{ lang: language.iso639_1 }= link_to language.name, language
 
-          %ul.informations
+          %ul.information
             %li
-              = icon('info', ['fw'])
               %strong= _('ISO 639-1 code:')
               = language.iso639_1
       .content
         = link_to language_projects_path(language), class: 'btn btn--block' do
-          = icon 'cog'
-          = format(n_('%<nb>i project', '%<nb>i projects', language.projects_count), nb: language.projects_count)
+          = icon 'cog', %w[fw icon]
+          .text= format(n_('%<nb>i project', '%<nb>i projects', language.projects_count), nb: language.projects_count)
         = link_to language_articles_path(language), class: 'btn btn--block' do
-          = icon 'font'
-          = format(n_('%<nb>i article', '%<nb>i articles', language.articles_count), nb: language.articles_count)
+          = icon 'font', %w[fw icon]
+          .text= format(n_('%<nb>i article', '%<nb>i articles', language.articles_count), nb: language.articles_count)
         = link_to language_notes_path(language), class: 'btn btn--block' do
-          = icon 'sticky-note'
-          = format(n_('%<nb>i note', '%<nb>i notes', language.notes_count), nb: language.notes_count)
+          = icon 'sticky-note', %w[fw icon]
+          .text= format(n_('%<nb>i note', '%<nb>i notes', language.notes_count), nb: language.notes_count)
         = link_to language_uploads_path(language), class: 'btn btn--block' do
-          = icon 'image'
-          = format(n_('%<nb>i upload', '%<nb>i uploads', language.uploads_count), nb: language.uploads_count)
+          = icon 'image', %w[fw icon]
+          .text= format(n_('%<nb>i upload', '%<nb>i uploads', language.uploads_count), nb: language.uploads_count)
         = link_to language_albums_path(language), class: 'btn btn--block' do
-          = icon 'book'
-          = format(n_('%<nb>i album', '%<nb>i albums', language.albums_count), nb: language.albums_count)
+          = icon 'book', %w[fw icon]
+          .text= format(n_('%<nb>i album', '%<nb>i albums', language.albums_count), nb: language.albums_count)
 
 = paginate @languages

data/app/views/elabs/languages/show.html.haml

@@ -1,38 +1,43 @@
 - @page_title = @language.name
 
 .language.language--full
-  %aside
+  %aside.always--inline
     %ul
-      %li
-        = icon('info', ['fw'])
-        %strong= _('ISO 639-1 code')
-        = @language.iso639_1
       %li.separator
-        = icon('amount', ['fw'])
-        %b= _('Albums:')
-        = @language.albums_count
-      %li
-        = icon('amount', ['fw'])
-        %b= _('Articles:')
-        = @language.articles_count
-      %li
-        = icon('amount', ['fw'])
-        %b= _('Notes:')
-        = @language.notes_count
-      %li
-        = icon('amount', ['fw'])
-        %b= _('Projects:')
-        = @language.projects_count
-      %li
-        = icon('amount', ['fw'])
-        %b= _('Uploads:')
-        = @language.uploads_count
+        %ul
+          %li
+            = icon('info', ['fw'])
+            %strong= _('ISO 639-1 code')
+            = @language.iso639_1
+      %li.separator
+        %ul
+          %li
+            = icon('amount', ['fw'])
+            %b= _('Albums:')
+            = @language.albums_count
+          %li
+            = icon('amount', ['fw'])
+            %b= _('Articles:')
+            = @language.articles_count
+          %li
+            = icon('amount', ['fw'])
+            %b= _('Notes:')
+            = @language.notes_count
+          %li
+            = icon('amount', ['fw'])
+            %b= _('Projects:')
+            = @language.projects_count
+          %li
+            = icon('amount', ['fw'])
+            %b= _('Uploads:')
+            = @language.uploads_count
 
   .content
-    = render 'associations',
-        language: @language,
-        language_albums: @language_albums,
-        language_articles: @language_articles,
-        language_notes: @language_notes,
-        language_projects: @language_projects,
-        language_uploads: @language_uploads
+    = render 'elabs/layouts/content_associations',
+        is_section: true,
+        entity: @language,
+        albums: @language_albums,
+        articles: @language_articles,
+        notes: @language_notes,
+        projects: @language_projects,
+        uploads: @language_uploads

data/app/views/elabs/layouts/_announcements.html.haml

@@ -0,0 +1,9 @@
+- annoucements = Elabs::Announcement.for_user(current_user)
+
+- if annoucements.count.positive?
+  .announcements
+    - annoucements.each do |a|
+      .announcement{ class: "announcement--#{a.level}", id: "announce-#{a.id}" }
+        .close-button{ onclick: "hideAnnounce(#{a.id})" }
+          = icon 'times', ['fw']
+        = markdown a.content

data/app/views/elabs/layouts/_content_associations.html.haml

@@ -0,0 +1,89 @@
+- is_section = false if is_section.nil?
+
+%aside.tabs{ class: is_section ? 'is-section' : '' }
+  %ul.tabs__tabs-list
+    - if entity.respond_to?(:albums)
+      %li.tabs__tabs-list__tab#tab-albums
+        %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }
+          = _('Albums')
+          %span.badge= entity.albums_count
+    - if entity.respond_to?(:articles)
+      %li.tabs__tabs-list__tab#tab-articles
+        %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }
+          = _('Articles')
+          %span.badge= entity.articles_count
+    - if entity.respond_to?(:notes)
+      %li.tabs__tabs-list__tab#tab-notes
+        %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }
+          = _('Notes')
+          %span.badge= entity.notes_count
+    - if entity.respond_to?(:projects)
+      %li.tabs__tabs-list__tab#tab-projects
+        %a{ href: '#tab-content-projects', onclick: 'selectTab(event, "projects")' }
+          = _('Projects')
+          %span.badge= entity.projects_count
+    - if entity.respond_to?(:uploads)
+      %li.tabs__tabs-list__tab#tab-uploads
+        %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }
+          = _('Uploads')
+          %span.badge= entity.uploads_count
+
+  - if entity.respond_to?(:albums)
+    %section.tabs__tab-content.albums-list#tab-content-albums
+      .tabs__tab-content__title
+        %h2= format _('Last %<amount>i albums:'), amount: Elabs.max_related_items
+        .actions= related_content_show_all_link entity.albums_count, entity_nested_resource_url(entity, :albums)
+
+      - entity.albums.each do |a|
+        = render 'elabs/layouts/content_card', entity: a
+      - if entity.albums_count.zero?
+        = render 'elabs/layouts/empty'
+
+  - if entity.respond_to?(:articles)
+    %section.tabs__tab-content.articles-list#tab-content-articles
+      .tabs__tab-content__title
+        %h2= format _('Last %<amount>i articles:'), amount: Elabs.max_related_items
+        .actions= related_content_show_all_link entity.articles_count, entity_nested_resource_url(entity, :articles)
+
+      - articles.each do |a|
+        = render 'elabs/layouts/content_card', entity: a
+      - if entity.articles_count.zero?
+        = render 'elabs/layouts/empty'
+
+
+  - if entity.respond_to?(:notes)
+    %section.tabs__tab-content.notes-list#tab-content-notes
+      .tabs__tab-content__title
+        %h2= format _('Last %<amount>i notes:'), amount: Elabs.max_related_items
+        .actions= related_content_show_all_link entity.notes_count, entity_nested_resource_url(entity, :notes)
+
+      - notes.each do |n|
+        = render 'elabs/layouts/content_card', entity: n
+      - if entity.notes_count.zero?
+        = render 'elabs/layouts/empty'
+
+  - if entity.respond_to?(:projects)
+    %section.tabs__tab-content.projects-list#tab-content-projects
+      .tabs__tab-content__title
+        %h2= format _('Last %<amount>i projects:'), amount: Elabs.max_related_items
+        .actions= related_content_show_all_link entity.projects_count, entity_nested_resource_url(entity, :projects)
+
+      - projects.each do |p|
+        = render 'elabs/layouts/content_card', entity: p
+      - if entity.projects_count.zero?
+        = render 'elabs/layouts/empty'
+
+  - if entity.respond_to?(:uploads)
+    %section.tabs__tab-content.uploads-list#tab-content-uploads
+      .tabs__tab-content__title
+        %h2= format _('Last %<amount>i uploads:'), amount: Elabs.max_related_items
+        .actions= related_content_show_all_link entity.uploads_count, entity_nested_resource_url(entity, :uploads)
+
+      - uploads.each do |u|
+        = render 'elabs/layouts/content_card', entity: u
+      - if entity.uploads_count.zero?
+        = render 'elabs/layouts/empty'
+
+:javascript
+  initializeTabs ()
+  selectTab('#{first_type_with_content(entity)}')

data/app/views/elabs/layouts/_content_card.html.haml

@@ -0,0 +1,41 @@
+- entity_type = entity.class.table_name.singularize
+
+- if !show_item? entity
+  = render 'elabs/layouts/hidden_entry', entity: entity
+- else
+  %div{ class: "#{entity_type} #{entity_type}-card" }
+    %header
+      .header
+        %h3.title{ lang: entity.language.iso639_1 }
+          = content_type_icon_from_entity entity, %w[fw]
+          = link_to entity.title_to_display, entity
+        .subtitle= format(_('by %<name>s'), name: link_to(entity.user.display_name, entity.user)).html_safe
+
+      %ul.information
+        %li
+          = icon('language', ['fw'])
+          %strong= _('Language:')
+          = link_to entity.language.name, entity.language
+        %li
+          = icon('license', ['fw'])
+          %strong= _('License:')
+          = link_to entity.license do
+            = license_icon entity.license
+            = entity.license.name
+        %li
+          = icon('info', ['fw'])
+          %strong= _('SFW:')
+          = boolean_icon_tag entity.sfw, 'is-sfw', 'is-nsfw'
+        - if entity.respond_to? :visible_projects
+          %li= render 'elabs/layouts/content_classifiers_lists/projects', projects: entity.visible_projects
+        - if entity.respond_to? :tags
+          %li= render 'elabs/layouts/content_classifiers_lists/tags', tags: entity.tags
+        - if entity.respond_to? :visible_albums
+          %li= render 'elabs/layouts/content_classifiers_lists/albums', albums: entity.visible_albums
+
+    - if entity.short_text_to_display.present?
+      %article{ lang: entity.language.iso639_1 }= render_entity_content entity, :short_text_to_display, false
+    - if entity.class.name == 'Elabs::Album'
+      = render 'elabs/albums/card_content', album: entity
+    - if entity.class.name == 'Elabs::Upload'
+      = render 'elabs/uploads/thumbnail', upload: entity