elabs 4.0.0 → 5.0.0

data/app/models/elabs/note.rb

@@ -19,5 +19,19 @@ module Elabs
     has_many :tags,     through: :notes_tags,     dependent: :destroy
     has_many :projects, through: :projects_notes, dependent: :destroy
     has_many :comments, as: 'content'
+    has_many :visible_projects, -> { where(published: true, locked: false) },
+             through: :projects_notes, source: :project
+
+    def title_to_display
+      I18n.l published_at, format: :medium
+    end
+
+    def short_text_to_display
+      content
+    end
+
+    def long_text_to_display
+      nil
+    end
   end
 end

data/app/models/elabs/project.rb

@@ -26,5 +26,17 @@ module Elabs
     has_many :comments, as: 'content'
 
     scope :for_list, -> { order(:name).pluck(:name, :id) }
+
+    def title_to_display
+      name
+    end
+
+    def short_text_to_display
+      short_description
+    end
+
+    def long_text_to_display
+      description
+    end
   end
 end

data/app/models/elabs/report.rb

@@ -7,6 +7,7 @@ module Elabs
     validates :name, presence: true, unless: :user
 
     belongs_to :user, optional: true
+    has_many :notifications, as: 'content', dependent: :destroy
 
     after_save :notify_admins
 

data/app/models/elabs/upload.rb

@@ -24,9 +24,25 @@ module Elabs
     has_many :projects, through: :projects_uploads, dependent: :destroy
     has_many :albums,   through: :albums_uploads,   dependent: :destroy
     has_many :comments, as: 'content'
+    has_many :visible_projects, -> { where(published: true, locked: false) },
+             through: :projects_uploads, source: :project
+    has_many :visible_albums, -> { where(published: true, locked: false) },
+             through: :albums_uploads, source: :album
 
     has_one_attached :file
 
     scope :for_list, -> { order(:title).pluck(:title, :id) }
+
+    def title_to_display
+      title
+    end
+
+    def short_text_to_display
+      nil
+    end
+
+    def long_text_to_display
+      description
+    end
   end
 end

data/app/models/elabs/user.rb

@@ -14,7 +14,8 @@ module Elabs
     # - not start with '-', '_' or '.'
     # - contain only a to z characters (upper/lower cased), numbers, '.', '-' or '_'
     # - not contain successive '.', '-' or '_'
-    validates_format_of :username, with: /\A(?![_.-])(?!.*[_.]{2})[a-zA-Z0-9._-]+[^_\-.]\z/
+    validates_format_of :username, with: /\A[a-zA-Z0-9]+([_-]?[a-zA-Z0-9]+)?\z/
+    validates_length_of :username, minimum: 4
 
     has_many :albums,         dependent: :destroy
     has_many :articles,       dependent: :destroy

data/app/views/elabs/acts/_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 _('Date'), 'created_at'

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

@@ -8,22 +8,11 @@
       .act__time= date_time_to_time(act.created_at)
       .act__content
         - if act.event == 'publish'
-          - case act.content_type
-          - when 'Elabs::Album'
-            = render 'elabs/albums/album', album: act.content
-          - when 'Elabs::Article'
-            = render 'elabs/articles/article', article: act.content
-          - when 'Elabs::Note'
-            = render 'elabs/notes/note', note: act.content
-          - when 'Elabs::Project'
-            = render 'elabs/projects/project', project: act.content
-          - when 'Elabs::Upload'
-            = render 'elabs/uploads/upload', upload: act.content
+          = render 'elabs/layouts/content_card', entity: act.content
         - else
-          %div{ class: "act-action act-action--#{act.event}" }
+          %div{ class: "act-status act-status--#{act.event}" }
             = act_notice_string act
             - if act.reason.present?
-              —
               %q= act.reason
 
         - previous_date = act.created_at

data/app/views/elabs/admin/announcements/_announcement.json.jbuilder

@@ -0,0 +1,10 @@
+json.extract! announcement,
+              :id,
+              :start_at,
+              :end_at,
+              :content,
+              :level,
+              :target,
+              :user_id,
+              :created_at,
+              :updated_at

data/app/views/elabs/admin/announcements/_form.html.haml

@@ -0,0 +1,52 @@
+= form_for announcement, url: announcement.id ? admin_announcement_path : admin_announcements_path do |f|
+  - if announcement.errors.any?
+    .error
+      %h2= format(n_('An error prevented this announcement from being saved:',
+                      '%<nb>i errors prevented this announcement from being saved:',
+                      announcement.errors.count), nb: announcement.errors.count)
+      %ul
+        - announcement.errors.full_messages.each do |message|
+          %li= message
+
+  .field
+    = f.label :start_at
+    .field-input.field-input--datetime= f.datetime_select :start_at,
+      prompt: { day: _('Choose day'),
+          month: _('Choose month'),
+          year: _('Choose year'),
+          hour: _('Choose hour'),
+          minute: _('Choose minutes') }
+  .field
+    = f.label :end_at
+    .field-input.field-input--datetime= f.datetime_select :end_at,
+      prompt: { day: _('Choose day'),
+        month: _('Choose month'),
+        year: _('Choose year'),
+        hour: _('Choose hour'),
+        minute: _('Choose minutes') }
+  .field
+    = f.label :level
+    .field-input= f.select :level, _('Info') => :info, _('Warning') => :warning, _('Important') => :danger
+
+  .field
+    = f.label :target
+    .field-input= f.select :target, _('Global') => :global, _('Members') => :member, _('Admin') => :admin
+  .field
+    = f.label :content
+    .field-input
+      = f.text_area :content
+      .field-hint= raw format(_('Markdown supported. %<preview_button>s'),
+                                  preview_button: content_tag('a',
+                                    _('Preview'),
+                                    href: '#',
+                                    onclick: 'mdPreviewContent(event)'))
+
+  .actions
+    .actions-buttons
+      = f.submit _('Save'), class: 'btn btn--save'
+
+= render 'elabs/member/layouts/markdown-preview'
+
+:javascript
+  var cm = initializeCodeMirrorIn(document.getElementById('announcement_content'))
+  var mdPreviewContent = createMDPreviewer(cm)

data/app/views/elabs/admin/announcements/edit.html.haml

@@ -0,0 +1,3 @@
+- @page_title = _('Edit announcement')
+
+= render 'form', announcement: @announcement

data/app/views/elabs/admin/announcements/index.html.haml

@@ -0,0 +1,28 @@
+- @page_title = _('Announcements')
+
+.page__actions
+  = link_to _('New announcement'), new_admin_announcement_path, class: 'btn btn--new'
+
+
+%table.announcements-list
+  %thead
+    %tr
+      %th= admin_order_by_link _('Start at'), :start_at
+      %th= admin_order_by_link _('End at'), :end_at
+      %th= admin_order_by_link _('Target'), :target
+      %th= admin_order_by_link _('Level'), :level
+      %th= admin_order_by_link _('Content'), :content
+      %th= admin_order_by_link _('User'), :user
+      %th
+  %tbody
+    - @announcements.each do |announcement|
+      %tr.announcement
+        %td= announcement.start_at
+        %td= announcement.end_at
+        %td= announcement.target
+        %td= announcement.level
+        %td= announcement.content[0...100]
+        %td= announcement.user.display_name
+        %td.btn-group
+          = admin_edit_link 'announcement', announcement
+          = admin_destroy_link 'announcement', announcement

data/app/views/elabs/admin/announcements/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @announcements, partial: 'announcement', as: :announcement

data/app/views/elabs/admin/announcements/new.html.haml

@@ -0,0 +1,3 @@
+- @page_title = _('New announcement')
+
+= render 'form', announcement: @announcement

data/app/views/elabs/admin/licenses/index.html.haml

@@ -26,9 +26,9 @@
             = icon('home', ['fw'])
         %td.is-icon
           = link_to license.tldr_url do
-            = icon('meh', ['fw'])
+            = icon('cut', ['fw'])
         %td
-          = icon(license.icon, ['fw'], 'fab')
+          = license_icon license
           = license.icon
         %td.is-counter= license.albums_count
         %td.is-counter= license.articles_count

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

@@ -12,6 +12,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/albums/_card_content.html.haml

@@ -0,0 +1,8 @@
+.content__relations
+  = render 'elabs/layouts/empty' if album.uploads.length.zero?
+  .uploads-list
+    - album.uploads.published.limit(Elabs.albums_max_shown_uploads).each do |upload|
+      = render 'elabs/uploads/preview', upload: upload
+- if album.uploads_count > Elabs.albums_max_shown_uploads
+  .more
+    +#{album.uploads_count - Elabs.albums_max_shown_uploads}

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

@@ -1,8 +1,10 @@
-.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'
     = 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/albums/index.html.haml

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

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

@@ -6,43 +6,52 @@
   .album.album--full
     %aside
       %ul
-        %li
-          = icon('user', ['fw'])
-          %strong= _('Author:')
-          = link_to @album.user.display_name, @album.user
+        %li.separator
+          %ul
+            %li
+              = icon('user', ['fw'])
+              %strong= _('Author:')
+              = link_to @album.user.display_name, @album.user
 
-        %li
-          = icon('calendar-check', ['fw'])
-          %strong= _('Published at:')
-          = medium_datetime @album.published_at
+            %li
+              = icon('calendar-check', ['fw'])
+              %strong= _('Published at:')
+              = medium_datetime @album.published_at
 
-        %li
-          = icon('calendar', ['fw'])
-          %strong= _('Updated at:')
-          = medium_datetime @album.updated_at
+            %li
+              = icon('calendar', ['fw'])
+              %strong= _('Updated at:')
+              = medium_datetime @album.updated_at
 
         %li.separator
-          = icon('info', ['fw'])
-          %strong= _('SFW:')
-          = boolean_icon_tag @album.sfw, 'is-sfw', 'is-nsfw'
+          %ul
+            %li
+              = icon('info', ['fw'])
+              %strong= _('SFW:')
+              = boolean_icon_tag @album.sfw, 'is-sfw', 'is-nsfw'
 
-        %li
-          = icon('language', ['fw'])
-          %strong= _('Language:')
-          = link_to @album.language.name, @album.language
+            %li
+              = icon('language', ['fw'])
+              %strong= _('Language:')
+              = link_to @album.language.name, @album.language
 
-        %li
-          = icon('license', ['fw'])
-          %strong= _('License:')
-          = link_to @album.license.name, @album.license
+            %li
+              = icon('license', ['fw'])
+              %strong= _('License:')
+              = link_to @album.license do
+                = license_icon @album.license
+                = @album.license.name
 
         %li.separator
-          = icon('upload', ['fw'])
-          %strong= _('Uploads:')
-          = @album.uploads_count
-
-        %li.separator= render 'elabs/layouts/lists/projects', projects: @album.projects
-        %li.separator= render 'elabs/layouts/lists/tags', tags: @album.tags
+          %ul
+            %li
+              = icon('upload', ['fw'])
+              %strong= _('Uploads:')
+              = @album.uploads_count
+        %li.separator
+          %ul
+            %li= render 'elabs/layouts/content_classifiers_lists/projects', projects: @album.visible_projects
+            %li.separator= render 'elabs/layouts/content_classifiers_lists/tags', tags: @album.tags
 
     .content
       %article{ lang: @album.language.iso639_1 }

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

@@ -1,8 +1,10 @@
-.filter-links
-  .filter-links__group
+.page__header__actions__filters
+  .page__header__actions__filters__group
+    .page__header__actions__filters__group__title= _('Sort by…')
     = order_link _('Title'), 'title'
     = 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/articles/index.html.haml

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

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

@@ -6,33 +6,41 @@
   .article.article--full
     %aside
       %ul
-        %li
-          = icon('user', ['fw'])
-          %strong= _('Author:')
-          = link_to @article.user.display_name, @article.user
-        %li
-          = icon('calendar-check', ['fw'])
-          %strong= _('Published at:')
-          = medium_datetime @article.published_at
-        %li
-          = icon('calendar', ['fw'])
-          %strong= _('Updated at:')
-          = medium_datetime @article.updated_at
         %li.separator
-          = icon('info', ['fw'])
-          %strong= _('SFW:')
-          = boolean_icon_tag @article.sfw, 'is-sfw', 'is-nsfw'
-        %li
-          = icon('language', ['fw'])
-          %strong= _('Language:')
-          = link_to @article.language.name, @article.language
-        %li
-          = icon('license', ['fw'])
-          %strong= _('License:')
-          = link_to @article.license.name, @article.license
+          %ul
+            %li
+              = icon('user', ['fw'])
+              %strong= _('Author:')
+              = link_to @article.user.display_name, @article.user
+            %li
+              = icon('calendar-check', ['fw'])
+              %strong= _('Published at:')
+              = medium_datetime @article.published_at
+            %li
+              = icon('calendar', ['fw'])
+              %strong= _('Updated at:')
+              = medium_datetime @article.updated_at
 
-        %li.separator= render 'elabs/layouts/lists/projects', projects: @article.projects
-        %li.separator= render 'elabs/layouts/lists/tags', tags: @article.tags
+        %li.separator
+          %ul
+            %li
+              = icon('info', ['fw'])
+              %strong= _('SFW:')
+              = boolean_icon_tag @article.sfw, 'is-sfw', 'is-nsfw'
+            %li
+              = icon('language', ['fw'])
+              %strong= _('Language:')
+              = link_to @article.language.name, @article.language
+            %li
+              = icon('license', ['fw'])
+              %strong= _('License:')
+              = link_to @article.license do
+                = license_icon @article.license
+                = @article.license.name
+        %li.separator
+          %ul
+            %li= render 'elabs/layouts/content_classifiers_lists/projects', projects: @article.visible_projects
+            %li.separator= render 'elabs/layouts/content_classifiers_lists/tags', tags: @article.tags
 
     .content
       %article{ lang: @article.language.iso639_1 }