elabs 4.0.0 → 5.0.0

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

@@ -25,6 +25,8 @@
     = f.label :reason
     .field-input= f.text_area :reason
 
+  = render 'elabs/layouts/form_honeypot', field: 'body'
+
   .actions
     .actions-buttons
       = f.submit _('Save'), class: 'btn btn--save'

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

@@ -1,3 +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'

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

@@ -8,21 +8,21 @@
       %header
         .icon= icon 'tag', %w[2x fw]
         .headers
-          %h3= link_to tag.name, tag, class: 'title'
+          %h3.title= link_to tag.name, tag
 
       .content
         = link_to tag_projects_path(tag), class: 'btn btn--block' do
-          = icon 'cog'
-          = format(n_('%<nb>i project', '%<nb>i projects', tag.projects_count), nb: tag.projects_count)
+          = icon 'cog', %w[fw icon]
+          .text= format(n_('%<nb>i project', '%<nb>i projects', tag.projects_count), nb: tag.projects_count)
         = link_to tag_articles_path(tag), class: 'btn btn--block' do
-          = icon 'font'
-          = format(n_('%<nb>i article', '%<nb>i articles', tag.articles_count), nb: tag.articles_count)
+          = icon 'font', %w[fw icon]
+          .text= format(n_('%<nb>i article', '%<nb>i articles', tag.articles_count), nb: tag.articles_count)
         = link_to tag_notes_path(tag), class: 'btn btn--block' do
-          = icon 'sticky-note'
-          = format(n_('%<nb>i note', '%<nb>i notes', tag.notes_count), nb: tag.notes_count)
+          = icon 'sticky-note', %w[fw icon]
+          .text= format(n_('%<nb>i note', '%<nb>i notes', tag.notes_count), nb: tag.notes_count)
         = link_to tag_uploads_path(tag), class: 'btn btn--block' do
-          = icon 'image'
-          = format(n_('%<nb>i upload', '%<nb>i uploads', tag.uploads_count), nb: tag.uploads_count)
+          = icon 'image', %w[fw icon]
+          .text= format(n_('%<nb>i upload', '%<nb>i uploads', tag.uploads_count), nb: tag.uploads_count)
         = link_to tag_albums_path(tag), class: 'btn btn--block' do
-          = icon 'book'
-          = format(n_('%<nb>i album', '%<nb>i albums', tag.albums_count), nb: tag.albums_count)
+          = icon 'book', %w[fw icon]
+          .text= format(n_('%<nb>i album', '%<nb>i albums', tag.albums_count), nb: tag.albums_count)

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

@@ -1,34 +1,37 @@
 - @page_title = @tag.name
 
 .tag.tag--full
-  %aside
+  %aside.always--inline
     %ul
-      %li
-        = icon('info', ['fw'])
-        %strong= _('Albums:')
-        = @tag.albums_count
-      %li
-        = icon('info', ['fw'])
-        %strong= _('Articles:')
-        = @tag.articles_count
-      %li
-        = icon('info', ['fw'])
-        %strong= _('Notes:')
-        = @tag.notes_count
-      %li
-        = icon('info', ['fw'])
-        %strong= _('Projects:')
-        = @tag.projects_count
-      %li
-        = icon('info', ['fw'])
-        %strong= _('Uploads:')
-        = @tag.uploads_count
+      %li.separator
+        %ul
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Albums:')
+            = @tag.albums_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Articles:')
+            = @tag.articles_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Notes:')
+            = @tag.notes_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Projects:')
+            = @tag.projects_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Uploads:')
+            = @tag.uploads_count
 
   .content
-    = render 'associations',
-        tag: @tag,
-        tag_albums: @tag_albums,
-        tag_articles: @tag_articles,
-        tag_notes: @tag_notes,
-        tag_projects: @tag_projects,
-        tag_uploads: @tag_uploads
+    = render 'elabs/layouts/content_associations',
+        is_section: true,
+        entity: @tag,
+        albums: @tag_albums,
+        articles: @tag_articles,
+        notes: @tag_notes,
+        projects: @tag_projects,
+        uploads: @tag_uploads

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

@@ -1,7 +1,9 @@
-.filter-links
-  .filter-links__group
+.page__header__actions__filters
+  .page__header__actions__filters__group
+    .page__header__actions__filters__group__title= _('Sort by…')
     = order_link _('Pub. date'), 'published_at'
     = order_link _('Upd. date'), 'updated_at'
 
-  .filter-links__group
+  .page__header__actions__filters__group
+    .page__header__actions__filters__group__title= _('NSFW content')
     = sfw_status_links

data/app/views/elabs/uploads/_preview.html.haml

@@ -1,12 +1,13 @@
 .upload__preview
   .preview
+    .upload__title= upload.title
     - if !show_item? upload
-      = image_tag 'preview_placeholder_nsfw.png'
+      = image_tag '/assets/elabs/preview_placeholder_nsfw.png', class: 'upload-object'
     - else
       = link_to upload_url(upload) do
-        = image_tag thumbnail_center_crop(upload.file)
+        = image_tag thumbnail_center_crop(upload.file), class: 'upload-object'
     .content
-      .upload__title `#{upload.title} (#{upload.file.content_type})`
-      = link_to main_app.url_for(upload.file), class: 'action' do
+      = link_to main_app.url_for(upload.file), class: 'btn btn--block btn--primary' do
         %i.fa.fa-fw.fa-download
         = _('Download')
+        (#{upload.file.content_type})

data/app/views/elabs/uploads/_thumbnail.html.haml

@@ -0,0 +1,9 @@
+= link_to upload_url(upload) do
+  - if upload.file.variable?
+    = image_tag main_app.url_for(upload.file.variant(image_resize_properties).processed), class: 'upload-object'
+  - elsif playable? upload.file
+    = render 'elabs/uploads/player', file: upload.file
+  - elsif upload.file.previewable?
+    = image_tag main_app.url_for(upload.file.preview(image_resize_properties).processed), class: 'upload-object'
+  - else
+    = image_tag main_app.url_for(thumbnail_preview_placeholder_file), class: 'upload-object'

data/app/views/elabs/uploads/_upload.json.jbuilder

@@ -9,6 +9,6 @@ json.extract! upload, :id,
               :created_at,
               :updated_at
 json.file content_type: upload.file.content_type,
-          url: main_app.url_for(upload.file),
-          filename: upload.file.filename,
-          metadata: upload.file.metadata
+          url:          main_app.url_for(upload.file),
+          filename:     upload.file.filename,
+          metadata:     upload.file.metadata

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

@@ -4,6 +4,6 @@
   = render 'elabs/layouts/empty' if @uploads.length.zero?
 
   - @uploads.each do |u|
-    = render 'upload', upload: u
+    = render 'elabs/layouts/content_card', entity: u
 
 = paginate @uploads

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

@@ -6,48 +6,54 @@
   .upload.upload--full
     %aside
       %ul
-        %li
-          = icon('user', ['fw'])
-          %b= _('Author:')
-          = link_to @upload.user.display_name, @upload.user
-        %li
-          = icon('calendar-check', ['fw'])
-          %b= _('Published at:')
-          = medium_datetime @upload.published_at
-        %li
-          = icon('calendar', ['fw'])
-          %b= _('Updated at:')
-          = medium_datetime @upload.updated_at
-        %li
-          = icon('font', ['fw'])
-          %b= _('Original name:')
-          = @upload.file.filename
-        %li
-          = icon('mime-type', ['fw'])
-          %b= _('Mime type:')
-          = @upload.file.content_type
-
         %li.separator
-          = icon('info', ['fw'])
-          %b= _('Is SFW:')
-          = @upload.sfw
-        %li
-          = icon('language', ['fw'])
-          %b= _('Language:')
-          = link_to @upload.language.name, @upload.language
-        %li
-          = icon('license', ['fw'])
-          %b= _('License:')
-          = link_to @upload.license.name, @upload.license
-
-        %li.separator= render 'elabs/layouts/lists/projects', projects: @upload.projects
-        %li.separator= render 'elabs/layouts/lists/albums', albums: @upload.albums
-        %li.separator= render 'elabs/layouts/lists/tags', tags: @upload.tags
+          %ul
+            %li
+              = icon('user', ['fw'])
+              %b= _('Author:')
+              = link_to @upload.user.display_name, @upload.user
+            %li
+              = icon('calendar-check', ['fw'])
+              %b= _('Published at:')
+              = medium_datetime @upload.published_at
+            %li
+              = icon('calendar', ['fw'])
+              %b= _('Updated at:')
+              = medium_datetime @upload.updated_at
+            %li
+              = icon('font', ['fw'])
+              %b= _('Original name:')
+              = @upload.file.filename
+            %li
+              = icon('mime-type', ['fw'])
+              %b= _('Mime type:')
+              = @upload.file.content_type
 
         %li.separator
-          = link_to main_app.url_for(@upload.file), class: 'btn btn--download btn--block', target: '_blank' do
-            = icon 'download', ['fw']
-            = _('Download')
+          %ul
+            %li
+              = icon('info', ['fw'])
+              %b= _('Is SFW:')
+              = @upload.sfw
+            %li
+              = icon('language', ['fw'])
+              %b= _('Language:')
+              = link_to @upload.language.name, @upload.language
+            %li
+              = icon('license', ['fw'])
+              %b= _('License:')
+              = link_to @upload.license do
+                = license_icon @upload.license
+                = @upload.license.name
+        %li.separator
+          %ul
+            %li= render 'elabs/layouts/content_classifiers_lists/projects', projects: @upload.visible_projects
+            %li.separator= render 'elabs/layouts/content_classifiers_lists/albums', albums: @upload.visible_albums
+            %li.separator= render 'elabs/layouts/content_classifiers_lists/tags', tags: @upload.tags
+            %li.separator
+              = link_to main_app.url_for(@upload.file), class: 'btn btn--download btn--block', target: '_blank' do
+                = icon 'download', ['fw']
+                = _('Download')
 
     .content
       %article{ lang: @upload.language.iso639_1 }

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

@@ -1,4 +1,5 @@
-.filter-links
-  .filter-links__group
+.page__header__actions__filters
+  .page__header__actions__filters__group
+    .page__header__actions__filters__group__title= _('Sort by…')
     = order_link _('Username'), 'username'
     = order_link _('Insc. date'), 'created_at'

data/app/views/elabs/users/_user.html.haml

@@ -6,13 +6,13 @@
       - else
         = icon 'user', %w[3x fw]
     .headers
-      %h3= link_to user.display_name, user, class: 'title'
+      %h3.title= link_to user.display_name, user
 
-      %ul.informations
+      %ul.information
         - if user.real_name.present?
           %li
             %b @#{user.username}
-      %ul.informations
+      %ul.information
         %li
           %b= _('Role:')
           = user.role

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

@@ -1,53 +1,58 @@
 - @page_title = @user.display_name
 .user.user--full
-  %aside
+  %aside.has-image.always--inline
+    - if Elabs.use_avatars && @user.avatar.attached?
+      = image_tag avatar_image(@user.avatar, :medium), class: 'image'
     %ul
-      - if Elabs.use_avatars && @user.avatar.attached?
-        %li.image
-          = image_tag avatar_image(@user.avatar, :medium)
-      %li
-        = icon('user', ['fw'])
-        %strong= _('Username:')
-        = @user.username
-      - if @user.real_name.present?
-        %li
-          = icon('user', ['fw'])
-          %strong= _('Real name:')
-          = @user.real_name
-      %li
-        = icon('calendar-check', ['fw'])
-        %strong= _('Since:')
-        = short_date @user.created_at
+      %li.separator
+        %ul
+          %li
+            = icon('user', ['fw'])
+            %strong= _('Username:')
+            = @user.username
+          - if @user.real_name.present?
+            %li
+              = icon('user', ['fw'])
+              %strong= _('Real name:')
+              = @user.real_name
+          %li
+            = icon('calendar-check', ['fw'])
+            %strong= _('Since:')
+            = short_date @user.created_at
 
       %li.separator
-        = icon('amount', ['fw'])
-        %strong= _('Albums:')
-        = @user.albums_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Articles:')
-        = @user.articles_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Notes:')
-        = @user.notes_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Projects:')
-        = @user.projects_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Uploads:')
-        = @user.uploads_count
+        %ul
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Albums:')
+            = @user.albums_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Articles:')
+            = @user.articles_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Notes:')
+            = @user.notes_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Projects:')
+            = @user.projects_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Uploads:')
+            = @user.uploads_count
+
   .content
     - if @user.biography.present?
       %article
         = render_entity_content @user, :biography
 
-    = render 'associations',
-              user: @user,
-              user_albums: @user_albums,
-              user_articles: @user_articles,
-              user_notes: @user_notes,
-              user_projects: @user_projects,
-              user_uploads: @user_uploads
+    = render 'elabs/layouts/content_associations',
+              is_section: true,
+              entity: @user,
+              albums: @user_albums,
+              articles: @user_articles,
+              notes: @user_notes,
+              projects: @user_projects,
+              uploads: @user_uploads

data/config/routes.rb

@@ -2,10 +2,10 @@ Elabs::Engine.routes.draw do
   # Devise routes: use Elabs custom controllers (adds support for username and preferences)
   devise_for :users, path: 'auth', controllers: {
     confirmations: 'elabs/auth/confirmations',
-    passwords: 'elabs/auth/passwords',
+    passwords:     'elabs/auth/passwords',
     registrations: 'elabs/auth/registrations',
-    sessions: 'elabs/auth/sessions',
-    unlocks: 'elabs/auth/unlocks'
+    sessions:      'elabs/auth/sessions',
+    unlocks:       'elabs/auth/unlocks'
   }
   # Resources
   resources :albums,    only: %i[index show], param: :slug do
@@ -85,6 +85,10 @@ Elabs::Engine.routes.draw do
 
     resources :notifications, only: %i[index destroy]
 
+    resources :comments, only: %i[destroy] do
+      put '/archive', to: 'comments#archive', as: :archive
+    end
+
     get '/preferences', to: 'preferences#edit', as: :edit_preferences
     patch '/preferences', to: 'preferences#update', as: :update_preferences
 
@@ -114,10 +118,11 @@ Elabs::Engine.routes.draw do
     end
 
     # Basic resources
-    resources :languages, except: %i[show], param: :iso639_1
-    resources :licenses,  except: %i[show], param: :slug
-    resources :reports,   only:   %i[index destroy]
-    resources :tags,      except: %i[create show], param: :slug
-    resources :users,     only:   %i[index show destroy], param: :username
+    resources :announcements, except: %i[show]
+    resources :languages,     except: %i[show], param: :iso639_1
+    resources :licenses,      except: %i[show], param: :slug
+    resources :reports,       only:   %i[index destroy]
+    resources :tags,          except: %i[create show], param: :slug
+    resources :users,         only:   %i[index show destroy], param: :username
   end
 end

data/db/migrate/20181025084232_add_archived_field_to_comments.rb

@@ -0,0 +1,5 @@
+class AddArchivedFieldToComments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :comments, :archived, :boolean, null: false, default: false
+  end
+end