elabs 3.0.0 → 4.0.0

data/app/views/elabs/member/users/_form.html.haml

@@ -34,7 +34,8 @@
           .field-hint= format(_('Your picture should be in "png" or "jpg", preferably a square of 512px.'))
 
   .actions
-    = f.submit _('Save'), class: 'btn btn--save'
+    .actions-buttons
+      = f.submit _('Save'), class: 'btn btn--save'
 
 = render 'elabs/member/layouts/markdown-preview'
 

data/app/views/elabs/notes/_note.html.haml

@@ -7,7 +7,7 @@
       .headers
         %ul.informations
           %li
-            = icon('link', ['fw'])
+            = icon('permalink', ['fw'])
             = link_to _('Permalink'), note, class: 'title'
           %li
             = icon('user', ['fw'])
@@ -28,4 +28,4 @@
           %li= render 'elabs/layouts/lists/projects', projects: note.projects
           %li= render 'elabs/layouts/lists/tags', tags: note.tags
 
-    %article{ lang: note.language.iso639_1 }= markdown note.content
+    %article{ lang: note.language.iso639_1 }= render_entity_content note, :content, true

data/app/views/elabs/notes/_note.rss.builder

@@ -0,0 +1,7 @@
+builder.item do
+  builder.title rss_title(note, 'published_at')
+  builder.description note.content
+  builder.pubDate note.published_at.to_s(:rfc822)
+  builder.link note_url(note)
+  builder.guid note_url(note)
+end

data/app/views/elabs/notes/_note_inline.haml

@@ -0,0 +1,8 @@
+- if !show_item? note
+  = render 'elabs/layouts/hidden_entry_inline', entity: note
+- else
+  %span.note.note--inline
+    = icon 'sticky-note', ['fw']
+    = link_to format(_('Note #%<id>i'), id: note.id), note
+    - if note.language.iso639_1 != locale
+      (#{note.language.iso639_1})

data/app/views/elabs/notes/index.rss.builder

@@ -0,0 +1,14 @@
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
+  xml.channel do
+    xml.title "#{Elabs.site_name} - notes"
+    xml.description "Last #{params['show_nsfw'] == 'false' ? 'SFW' : ''} notes from #{Elabs.site_name}"
+    xml.link notes_url
+
+    @notes.each do |note|
+      next if params['show_nsfw'] == 'false' && !note.sfw
+
+      render 'note', builder: xml, note: note
+    end
+  end
+end

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

@@ -13,11 +13,11 @@
         %li
           = icon('calendar-check', ['fw'])
           %b= _('Published at:')
-          = short_date @note.published_at
+          = medium_datetime @note.published_at
         %li
           = icon('calendar', ['fw'])
           %b= _('Updated at:')
-          = short_date @note.updated_at
+          = medium_datetime @note.updated_at
         %li.separator
           = icon('info', ['fw'])
           %b= _('SFW:')
@@ -36,7 +36,7 @@
 
     .content
       %article{ lang: @note.language.iso639_1 }
-        = markdown @note.content
+        = render_entity_content @note, :content
 
   = render 'elabs/comments/comments',
             entity: @note,

data/app/views/elabs/projects/_associations.html.haml

@@ -1,13 +1,21 @@
 %aside.tabs
   %ul.tabs__tabs-list
     %li.tabs__tabs-list__tab#tab-albums
-      %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }= _('Albums')
+      %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }
+        = _('Albums')
+        %span.badge.badge--notification= project.albums_count
     %li.tabs__tabs-list__tab#tab-articles
-      %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }= _('Articles')
+      %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }
+        = _('Articles')
+        %span.badge.badge--notification= project.articles_count
     %li.tabs__tabs-list__tab#tab-notes
-      %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }= _('Notes')
+      %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }
+        = _('Notes')
+        %span.badge.badge--notification= project.notes_count
     %li.tabs__tabs-list__tab#tab-uploads
-      %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }= _('Uploads')
+      %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }
+        = _('Uploads')
+        %span.badge.badge--notification= project.uploads_count
 
   %section.tabs__tab-content.albums-list#tab-content-albums
     .tabs__tab-content__title

data/app/views/elabs/projects/_project.html.haml

@@ -26,4 +26,4 @@
             = boolean_icon_tag project.sfw, 'is-sfw', 'is-nsfw'
           %li= render 'elabs/layouts/lists/tags', tags: project.tags
 
-    %article{ lang: project.language.iso639_1 }= markdown project.short_description
+    %article{ lang: project.language.iso639_1 }= render_entity_content project, :short_description, false

data/app/views/elabs/projects/_project.json.jbuilder

@@ -4,6 +4,8 @@ json.extract! project,
               :short_description,
               :description,
               :main_url,
+              :sources_url,
+              :docs_url,
               :sfw,
               :albums_count,
               :articles_count,

data/app/views/elabs/projects/_project.rss.builder

@@ -0,0 +1,7 @@
+builder.item do
+  builder.title rss_title(project, 'name')
+  builder.description "#{project.short_description}\n\n#{project.description}"
+  builder.pubDate project.published_at.to_s(:rfc822)
+  builder.link project_url(project)
+  builder.guid project_url(project)
+end

data/app/views/elabs/projects/_project_inline.html.haml

@@ -0,0 +1,9 @@
+- if !show_item? project
+  = render 'elabs/layouts/hidden_entry_inline', entity: project
+- else
+  %span.project.project--inline
+    = icon 'cog', ['fw']
+    = link_to project.name, project, lang: project.language.iso639_1
+    - if project.language.iso639_1 != locale
+      (#{project.language.iso639_1})
+

data/app/views/elabs/projects/index.rss.builder

@@ -0,0 +1,14 @@
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
+  xml.channel do
+    xml.title "#{Elabs.site_name} - projects"
+    xml.description "Last #{params['show_nsfw'] == 'false' ? 'SFW' : ''} projects from #{Elabs.site_name}"
+    xml.link projects_url
+
+    @projects.each do |project|
+      next if params['show_nsfw'] == 'false' && !project.sfw
+
+      render 'project', builder: xml, project: project
+    end
+  end
+end

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

@@ -10,19 +10,30 @@
           = icon('user', ['fw'])
           %strong= _('Creator:')
           = link_to @project.user.display_name, @project.user
-        - if @project.main_url.present?
-          %li
-            = icon('home', ['fw'])
-            %strong= _('Main url:')
-            = @project.main_url
         %li
           = icon('calendar-check', ['fw'])
           %strong= _('Published at:')
-          = short_date @project.published_at
+          = medium_datetime @project.published_at
         %li
           = icon('calendar', ['fw'])
           %strong= _('Updated at:')
-          = short_date @project.updated_at
+          = medium_datetime @project.updated_at
+
+        - if @project.main_url.present?
+          %li.separator
+            = icon('home', ['fw'])
+            %strong= _('Home page:')
+            = @project.main_url
+        - if @project.sources_url.present?
+          %li{ class: @project.main_url.present? ? '' : 'separator' }
+            = icon('code', ['fw'])
+            %strong= _('Sources:')
+            = @project.sources_url
+        - if @project.docs_url.present?
+          %li{ class: @project.main_url.present? || @project.sources_url.present? ? '' : 'separator' }
+            = icon('book', ['fw'])
+            %strong= _('Documentation:')
+            = @project.docs_url
 
         %li.separator
           = icon('info', ['fw'])
@@ -58,8 +69,8 @@
 
     .content
       %article{ lang: @project.language.iso639_1 }
-        = markdown @project.short_description
-        = markdown @project.description
+        = render_entity_content @project, :short_description
+        = render_entity_content @project, :description
 
       = render 'associations',
               project: @project,

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

@@ -26,4 +26,5 @@
     .field-input= f.text_area :reason
 
   .actions
-    = f.submit _('Save'), class: 'btn btn--save'
+    .actions-buttons
+      = f.submit _('Save'), class: 'btn btn--save'

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

@@ -1,15 +1,25 @@
 %aside.tabs
   %ul.tabs__tabs-list
     %li.tabs__tabs-list__tab#tab-albums
-      %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }= _('Albums')
+      %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }
+        = _('Albums')
+        .badge.badge--notification= tag.albums_count
     %li.tabs__tabs-list__tab#tab-articles
-      %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }= _('Articles')
+      %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }
+        = _('Articles')
+        .badge.badge--notification= tag.articles_count
     %li.tabs__tabs-list__tab#tab-notes
-      %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }= _('Notes')
+      %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }
+        = _('Notes')
+        .badge.badge--notification= tag.notes_count
     %li.tabs__tabs-list__tab#tab-projects
-      %a{ href: '#tab-content-projects', onclick: 'selectTab(event, "projects")' }= _('Projects')
+      %a{ href: '#tab-content-projects', onclick: 'selectTab(event, "projects")' }
+        = _('Projects')
+        .badge.badge--notification= tag.projects_count
     %li.tabs__tabs-list__tab#tab-uploads
-      %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }= _('Uploads')
+      %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }
+        = _('Uploads')
+        .badge.badge--notification= tag.uploads_count
 
   %section.tabs__tab-content.albums-list#tab-content-albums
     .tabs__tab-content__title

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

@@ -1,5 +1,7 @@
 - @page_title = _('Tags list')
 
+= render 'elabs/layouts/empty' if @tags.length.zero?
+
 .tags-list
   - @tags.each do |tag|
     .tag.tag-card

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

@@ -4,12 +4,7 @@
       = image_tag 'preview_placeholder_nsfw.png'
     - else
       = link_to upload_url(upload) do
-        - if upload.file.variable?
-          = image_tag main_app.url_for(upload.file.variant(thumbnail_center_crop_properties).processed)
-        - elsif upload.file.previewable?
-          = image_tag main_app.url_for(upload.file.preview(thumbnail_center_crop_properties).processed)
-        - else
-          = image_tag thumbnail_preview_placeholder_file
+        = image_tag thumbnail_center_crop(upload.file)
     .content
       .upload__title `#{upload.title} (#{upload.file.content_type})`
       = link_to main_app.url_for(upload.file), class: 'action' do

data/app/views/elabs/uploads/_upload.rss.builder

@@ -0,0 +1,7 @@
+builder.item do
+  builder.title rss_title(upload, 'title')
+  builder.description upload.description
+  builder.pubDate upload.published_at.to_s(:rfc822)
+  builder.link upload_url(upload)
+  builder.guid upload_url(upload)
+end

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

@@ -0,0 +1,8 @@
+- if !show_item? upload
+  = render 'elabs/layouts/hidden_entry_inline', entity: upload
+- else
+  %span.upload.upload--inline
+    = image_tag thumbnail_center_crop(upload.file, :small), class: 'icon'
+    = link_to upload.title, upload
+    - if upload.language.iso639_1 != locale
+      (#{upload.language.iso639_1})

data/app/views/elabs/uploads/index.rss.builder

@@ -0,0 +1,14 @@
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
+  xml.channel do
+    xml.title "#{Elabs.site_name} - uploads"
+    xml.description "Last #{params['show_nsfw'] == 'false' ? 'SFW' : ''} uploads from #{Elabs.site_name}"
+    xml.link uploads_url
+
+    @uploads.each do |upload|
+      next if params['show_nsfw'] == 'false' && !upload.sfw
+
+      render 'upload', builder: xml, upload: upload
+    end
+  end
+end

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

@@ -13,11 +13,11 @@
         %li
           = icon('calendar-check', ['fw'])
           %b= _('Published at:')
-          = short_date @upload.published_at
+          = medium_datetime @upload.published_at
         %li
           = icon('calendar', ['fw'])
           %b= _('Updated at:')
-          = short_date @upload.updated_at
+          = medium_datetime @upload.updated_at
         %li
           = icon('font', ['fw'])
           %b= _('Original name:')
@@ -51,13 +51,12 @@
 
     .content
       %article{ lang: @upload.language.iso639_1 }
-        = markdown @upload.description
-        - if @upload.file.variable?
-          = image_tag main_app.url_for(@upload.file.variant(image_resize_properties).processed), class: 'thumbnail'
-        - elsif playable? @upload.file
+        = render_entity_content @upload, :description
+        - if playable? @upload.file
           = render 'player', file: @upload.file
-        - elsif @upload.file.previewable?
-          = image_tag main_app.url_for(@upload.file.preview(image_resize_properties).processed), class: 'thumbnail'
+        - elsif @upload.file.representable?
+          = image_tag main_app.url_for(@upload.file.representation(image_resize_properties).processed),
+             class: 'thumbnail'
         - else
           = image_tag main_app.url_for(thumbnail_preview_placeholder_file), class: 'thumbnail'
 

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

@@ -1,15 +1,25 @@
 %aside.tabs
   %ul.tabs__tabs-list
     %li.tabs__tabs-list__tab#tab-albums
-      %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }= _('Albums')
+      %a{ href: '#tab-content-albums', onclick: 'selectTab(event, "albums")' }
+        = _('Albums')
+        %span.badge.badge--notification= user.albums_count
     %li.tabs__tabs-list__tab#tab-articles
-      %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }= _('Articles')
+      %a{ href: '#tab-content-articles', onclick: 'selectTab(event, "articles")' }
+        = _('Articles')
+        %span.badge.badge--notification= user.articles_count
     %li.tabs__tabs-list__tab#tab-notes
-      %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }= _('Notes')
+      %a{ href: '#tab-content-notes', onclick: 'selectTab(event, "notes")' }
+        = _('Notes')
+        %span.badge.badge--notification= user.notes_count
     %li.tabs__tabs-list__tab#tab-projects
-      %a{ href: '#tab-content-projects', onclick: 'selectTab(event, "projects")' }= _('Projects')
+      %a{ href: '#tab-content-projects', onclick: 'selectTab(event, "projects")' }
+        = _('Projects')
+        %span.badge.badge--notification= user.projects_count
     %li.tabs__tabs-list__tab#tab-uploads
-      %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }= _('Uploads')
+      %a{ href: '#tab-content-uploads', onclick: 'selectTab(event, "uploads")' }
+        = _('Uploads')
+        %span.badge.badge--notification= user.uploads_count
 
   %section.tabs__tab-content.albums-list#tab-content-albums
     .tabs__tab-content__title

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

@@ -2,37 +2,43 @@
   %header
     .icon
       - if Elabs.use_avatars && user.avatar.attached?
-        = image_tag main_app.url_for(avatar_image(user.avatar, :small).processed)
+        = image_tag avatar_image(user.avatar, :small)
       - else
         = icon 'user', %w[3x fw]
     .headers
       %h3= link_to user.display_name, user, class: 'title'
 
       %ul.informations
-        - if user.real_name
+        - if user.real_name.present?
           %li
             %b @#{user.username}
+      %ul.informations
         %li
           %b= _('Role:')
           = user.role
-
         %li
           %b= _('Since:')
           = short_date user.created_at
 
   .content
-    = link_to user_projects_path(user), class: 'btn btn--block' do
-      = icon 'cog'
-      = format(n_('%<nb>i project', '%<nb>i projects', user.projects_count), nb: user.projects_count)
-    = link_to user_articles_path(user), class: 'btn btn--block' do
-      = icon 'font'
-      = format(n_('%<nb>i article', '%<nb>i articles', user.articles_count), nb: user.articles_count)
-    = link_to user_notes_path(user), class: 'btn btn--block' do
-      = icon 'sticky-note'
-      = format(n_('%<nb>i note', '%<nb>i notes', user.notes_count), nb: user.notes_count)
-    = link_to user_uploads_path(user), class: 'btn btn--block' do
-      = icon 'image'
-      = format(n_('%<nb>i upload', '%<nb>i uploads', user.uploads_count), nb: user.uploads_count)
-    = link_to user_albums_path(user), class: 'btn btn--block' do
-      = icon 'book'
-      = format(n_('%<nb>i album', '%<nb>i albums', user.albums_count), nb: user.albums_count)
+    .btn-group.btn-group--block
+      = link_to user_projects_path(user),
+          class: 'btn btn--small',
+          title: format(n_('%<nb>i project', '%<nb>i projects', user.projects_count), nb: user.projects_count) do
+        = icon_text 'cog', user.projects_count, ['fw']
+      = link_to user_articles_path(user),
+          class: 'btn btn--small',
+          title: format(n_('%<nb>i article', '%<nb>i articles', user.articles_count), nb: user.articles_count) do
+        = icon_text 'font', user.articles_count, ['fw']
+      = link_to user_notes_path(user),
+          class: 'btn btn--small',
+          title: format(n_('%<nb>i note', '%<nb>i notes', user.notes_count), nb: user.notes_count) do
+        = icon_text 'sticky-note', user.notes_count, ['fw']
+      = link_to user_uploads_path(user),
+          class: 'btn btn--small',
+          title: format(n_('%<nb>i upload', '%<nb>i uploads', user.uploads_count), nb: user.uploads_count) do
+        = icon_text 'image', user.uploads_count, ['fw']
+      = link_to user_albums_path(user),
+          class: 'btn btn--small',
+          title: format(n_('%<nb>i album', '%<nb>i albums', user.albums_count), nb: user.albums_count) do
+        = icon_text 'book', user.albums_count, ['fw']

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

@@ -0,0 +1,7 @@
+%span.user.user--inline
+  - if Elabs.use_avatars && user.avatar.attached?
+    = image_tag avatar_image(user.avatar, :small), class: 'avatar'
+  - else
+    = icon 'user', ['fw']
+
+  = link_to user.display_name, user

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

@@ -4,7 +4,7 @@
     %ul
       - if Elabs.use_avatars && @user.avatar.attached?
         %li.image
-          = image_tag main_app.url_for(avatar_image(@user.avatar, :medium).processed)
+          = image_tag avatar_image(@user.avatar, :medium)
       %li
         = icon('user', ['fw'])
         %strong= _('Username:')
@@ -42,7 +42,7 @@
   .content
     - if @user.biography.present?
       %article
-        = markdown @user.biography
+        = render_entity_content @user, :biography
 
     = render 'associations',
               user: @user,