elabs 2.0.0 → 3.0.0

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

@@ -1 +1 @@
-json.array! @users, partial: 'admin_users/admin_user', as: :user
+json.array! @users, partial: 'user', as: :user

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

@@ -20,7 +20,7 @@
     = @user.real_name
   %li
     %strong= _('Subscription date:')
-    = @user.created_at
+    = short_date @user.created_at
 
 %dt= _('Bio')
 = markdown(@user.biography || '')

data/app/views/elabs/admin/users/show.json.jbuilder

@@ -1 +1 @@
-json.partial! 'admin_users/admin_user', user: @user
+json.partial! 'user', user: @user

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

@@ -11,13 +11,13 @@
           %li
             = icon('user', ['fw'])
             %strong= _('User:')
-            = link_to album.user.username, album.user
+            = link_to album.user.display_name, album.user
           %li
             = icon('language', ['fw'])
             %strong= _('Language:')
             = link_to album.language.name, album.language
           %li
-            = icon('copyright', ['fw'])
+            = icon('license', ['fw'])
             %strong= _('License:')
             = link_to album.license.name, album.license
           %li

data/app/views/elabs/albums/_album.json.jbuilder

@@ -1,2 +1,12 @@
-json.extract! album, :id, :name, :description, :sfw, :published, :hidden_in_history, :user_id, :language, :license_id, :created_at, :updated_at
-json.url album_url(album, format: :json)
+json.extract! album,
+              :id,
+              :name,
+              :description,
+              :sfw,
+              :uploads_count,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/albums/index.json.jbuilder

@@ -1 +1 @@
-json.array! @albums, partial: 'albums/album', as: :album
+json.array! @albums, partial: 'album', as: :album

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

@@ -9,19 +9,19 @@
         %li
           = icon('user', ['fw'])
           %strong= _('Author:')
-          = link_to @album.user.username, @album.user
+          = link_to @album.user.display_name, @album.user
 
         %li
           = icon('calendar-check', ['fw'])
           %strong= _('Published at:')
-          .date= @album.published_at
+          = short_date @album.published_at
 
         %li
           = icon('calendar', ['fw'])
           %strong= _('Updated at:')
-          .date= @album.updated_at
+          = short_date @album.updated_at
 
-        %li
+        %li.separator
           = icon('info', ['fw'])
           %strong= _('SFW:')
           = boolean_icon_tag @album.sfw, 'is-sfw', 'is-nsfw'
@@ -32,11 +32,11 @@
           = link_to @album.language.name, @album.language
 
         %li
-          = icon('copyright', ['fw'])
+          = icon('license', ['fw'])
           %strong= _('License:')
-          .license= link_to @album.license.name, @album.license
+          = link_to @album.license.name, @album.license
 
-        %li
+        %li.separator
           = icon('upload', ['fw'])
           %strong= _('Uploads:')
           = @album.uploads_count

data/app/views/elabs/albums/show.json.jbuilder

@@ -1 +1 @@
-json.partial! 'albums/album', album: @album
+json.partial! 'album', album: @album

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

@@ -11,13 +11,13 @@
           %li
             = icon('user', ['fw'])
             %strong= _('User:')
-            = link_to article.user.username, article.user
+            = link_to article.user.display_name, article.user
           %li
             = icon('language', ['fw'])
             %strong= _('Language:')
             = link_to article.language.name, article.language
           %li
-            = icon('copyright', ['fw'])
+            = icon('license', ['fw'])
             %strong= _('License:')
             = link_to article.license.name, article.license
           %li

data/app/views/elabs/articles/_article.json.jbuilder

@@ -1,2 +1,12 @@
-json.extract! article, :id, :title, :excerpt, :content, :sfw, :locked, :published_at, :hidden_in_history, :user_id, :license_id, :language_id, :created_at, :updated_at
-json.url article_url(article, format: :json)
+json.extract! article,
+              :id,
+              :title,
+              :excerpt,
+              :content,
+              :sfw,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/articles/index.json.jbuilder

@@ -1 +1 @@
-json.array! @articles, partial: 'articles/article', as: :article
+json.array! @articles, partial: 'article', as: :article

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

@@ -9,25 +9,25 @@
         %li
           = icon('user', ['fw'])
           %strong= _('Author:')
-          = link_to @article.user.username, @article.user
+          = link_to @article.user.display_name, @article.user
         %li
           = icon('calendar-check', ['fw'])
           %strong= _('Published at:')
-          = @article.published_at
+          = short_date @article.published_at
         %li
           = icon('calendar', ['fw'])
           %strong= _('Updated at:')
-          = @article.updated_at
-        %li
+          = short_date @article.updated_at
+        %li.separator
           = icon('info', ['fw'])
           %strong= _('SFW:')
-          = @article.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('copyright', ['fw'])
+          = icon('license', ['fw'])
           %strong= _('License:')
           = link_to @article.license.name, @article.license
 

data/app/views/elabs/articles/show.json.jbuilder

@@ -1 +1 @@
-json.partial! 'articles/article', article: @article
+json.partial! 'article', article: @article

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

@@ -1,13 +1,16 @@
 - @page_title = _('Account')
 
-%h2= _('About')
-= render 'elabs/member/users/form'
-
 = form_for(resource, as: resource_name, url: { controller: 'elabs/auth/registrations', action: :update },
   html: { method: :put }) do |f|
-  = devise_error_messages!
+  - if resource.errors.any?
+    .error
+      %h2= format(n_('An error prevented your account from being updated:',
+                          '%<nb>i errors prevented your account from being updated:',
+                          resource.errors.count), nb: resource.errors.count)
+      %ul
+        - resource.errors.full_messages.each do |message|
+          %li= message
 
-  %h2.separator= _('Sensitive changes')
   .field
     = f.label :current_password
     .field-input

data/app/views/elabs/comments/_comment.json.jbuilder

@@ -1,2 +1,10 @@
-json.extract! comment, :id, :content_id, :content_type, :name, :email, :comment, :allow_contact, :user_id, :deleted, :created_at, :updated_at
-json.url comment_url(comment, format: :json)
+json.extract! comment,
+              :id,
+              :content_id,
+              :content_type,
+              :name,
+              :comment,
+              :user,
+              :deleted,
+              :created_at,
+              :updated_at

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

@@ -11,11 +11,11 @@
             %ul.informations
               %li
                 = icon('user', ['fw'])
-                = comment.name || link_to("@#{comment.user.username}", comment.user)
+                = comment.name || link_to(comment.user.display_name, comment.user)
               %li
                 = icon('calendar', ['fw'])
                 %strong= _('Posted on:')
-                = comment.created_at
+                = short_date comment.created_at
         %article= markdown comment.comment
 
   = render 'elabs/comments/form', url: url, new_comment: new_comment

data/app/views/elabs/languages/_language.json.jbuilder

@@ -1,2 +1,9 @@
-json.extract! language, :id, :iso639_1, :name
-json.url language_url(language, format: :json)
+json.extract! language,
+              :id,
+              :iso639_1,
+              :name,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

data/app/views/elabs/languages/index.json.jbuilder

@@ -1 +1 @@
-json.array! @languages, partial: 'languages/language', as: :language
+json.array! @languages, partial: 'language', as: :language

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

@@ -7,7 +7,7 @@
         = icon('info', ['fw'])
         %strong= _('ISO 639-1 code')
         = @language.iso639_1
-      %li
+      %li.separator
         = icon('amount', ['fw'])
         %b= _('Albums:')
         = @language.albums_count

data/app/views/elabs/languages/show.json.jbuilder

@@ -1 +1 @@
-json.partial! 'languages/language', language: @language
+json.partial! 'language', language: @language

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

@@ -33,18 +33,23 @@
 
 - if user_signed_in?
   %header.page__menu.page__menu--member
-    %span.page__menu__title= format(_('%<s>s:'), s: current_user.username)
+    %span.page__menu__title= format(_('%<s>s:'), s: current_user.display_name)
 
     .page__menu__group
+      = active_link_to _('Projects'), :member_projects
       = active_link_to _('Articles'), :member_articles
       = active_link_to _('Notes'), :member_notes
-      = active_link_to _('Uploads'), :member_uploads
       = active_link_to _('Albums'), :member_albums
-      = active_link_to _('Projects'), :member_projects
+      = active_link_to _('Uploads'), :member_uploads
 
     .page__menu__group
+      = active_link_to _('Infos'), :member_edit_infos
       = active_link_to _('Preferences'), :member_edit_preferences
       = active_link_to _('Account'), edit_user_registration_path
+      = active_link_to member_notifications_path do
+        = _('Notifications')
+        - if notification_count.positive?
+          %span.badge.badge--notification= notification_count
       = active_link_to _('Log out'), destroy_user_session_path, method: :delete
 
   - if current_user.admin?
@@ -52,10 +57,10 @@
       %span.page__menu__title= _('Administration:')
 
       .page__menu__group
-        = active_link_to _('Albums'), :admin_albums
+        = active_link_to _('Projects'), :admin_projects
         = active_link_to _('Articles'), :admin_articles
         = active_link_to _('Notes'), :admin_notes
-        = active_link_to _('Projects'), :admin_projects
+        = active_link_to _('Albums'), :admin_albums
         = active_link_to _('Uploads'), :admin_uploads
       .page__menu__group
         = active_link_to _('Tags'), :admin_tags

data/app/views/elabs/licenses/_license.json.jbuilder

@@ -1,2 +1,10 @@
-json.extract! license, :id, :name, :url, :tldr_url, :icon, :created_at, :updated_at
-json.url license_url(license, format: :json)
+json.extract! license, :id,
+              :name,
+              :url,
+              :tldr_url,
+              :icon,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

data/app/views/elabs/licenses/index.json.jbuilder

@@ -1 +1 @@
-json.array! @licenses, partial: 'licenses/license', as: :license
+json.array! @licenses, partial: 'license', as: :license

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

@@ -1,19 +1,15 @@
-- @page_title = @license.name
+- @page_title = "#{icon @license.icon, ['fw'], 'fab'} #{@license.name}".html_safe
 
 .license.license--full
   %aside
     %ul
-      %li
-        = icon('info', ['fw'])
-        %strong= _('Icon:')
-        = icon @license.icon, ['fw'], 'fab'
       %li
         = icon('home', ['fw'])
         = link_to _('Home page'), @license.url, target: '_blank'
       %li
         = icon('meh', ['fw'])
         = link_to _('TL; DR'), @license.tldr_url, target: '_blank'
-      %li
+      %li.separator
         = icon('amount', ['fw'])
         %strong= _('Albums:')
         = @license.albums_count

data/app/views/elabs/member/albums/_album.json.jbuilder

@@ -1,2 +1,15 @@
-json.extract! album, :id, :name, :description, :sfw, :published, :hidden_in_history, :user_id, :language, :license_id, :created_at, :updated_at
-json.url album_url(album, format: :json)
+json.extract! album,
+              :id,
+              :name,
+              :description,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :uploads_count,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/member/albums/index.html.haml

@@ -30,7 +30,7 @@
           %td.is-icon= boolean_icon_tag album.published
           %td.is-icon= boolean_icon_tag album.locked, 'lock', 'unlock'
           %td.is-icon= boolean_icon_tag album.hidden_in_history
-          %td= album.published_at
+          %td= short_date album.published_at
           %td= album.language.name
           %td
             = license_icon album.license

data/app/views/elabs/member/albums/index.json.jbuilder

@@ -1 +1 @@
-json.array! @albums, partial: 'albums/album', as: :album
+json.array! @albums, partial: 'album', as: :album

data/app/views/elabs/member/articles/_article.json.jbuilder

@@ -1,2 +1,15 @@
-json.extract! article, :id, :title, :excerpt, :content, :sfw, :published, :locked, :published_at, :hidden_in_history, :user_id, :license_id, :language_id, :created_at, :updated_at
-json.url article_url(article, format: :json)
+json.extract! article,
+              :id,
+              :title,
+              :excerpt,
+              :content,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/member/articles/index.html.haml

@@ -29,7 +29,7 @@
           %td.is-icon= boolean_icon_tag article.published
           %td.is-icon= boolean_icon_tag article.locked, 'lock', 'unlock'
           %td.is-icon= boolean_icon_tag article.hidden_in_history
-          %td= article.published_at
+          %td= short_date article.published_at
           %td
             = license_icon article.license
             = article.license.name

data/app/views/elabs/member/articles/index.json.jbuilder

@@ -1 +1 @@
-json.array! @articles, partial: 'articles/article', as: :article
+json.array! @articles, partial: 'article', as: :article

data/app/views/elabs/member/layouts/_empty.html.haml

@@ -1,4 +1,5 @@
 .empty.empty--big
   .empty__title= _('This space is empty')
-  .empty__subtitle
-    = link_to _('Create some content'), link, class: 'btn btn--large, btn--new'
+  - if defined? link
+    .empty__subtitle
+      = link_to _('Create some content'), link, class: 'btn btn--large, btn--new'

data/app/views/elabs/member/notes/_note.json.jbuilder

@@ -1,2 +1,13 @@
-json.extract! note, :id, :content, :sfw, :hidden_in_history, :user_id, :license_id, :language_id, :created_at, :updated_at
-json.url note_url(note, format: :json)
+json.extract! note,
+              :id,
+              :content,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/member/notes/index.html.haml

@@ -29,7 +29,7 @@
           %td.is-icon= boolean_icon_tag note.published
           %td.is-icon= boolean_icon_tag note.locked, 'lock', 'unlock'
           %td.is-icon= boolean_icon_tag note.hidden_in_history
-          %td= note.published_at
+          %td= short_date note.published_at
           %td
             = license_icon note.license
             = note.license.name

data/app/views/elabs/member/notes/index.json.jbuilder

@@ -1 +1 @@
-json.array! @notes, partial: 'notes/note', as: :note
+json.array! @notes, partial: 'note', as: :note

data/app/views/elabs/member/notifications/_notification.json.jbuilder

@@ -0,0 +1,8 @@
+json.extract! notification,
+              :id,
+              :content,
+              :event,
+              :user_id,
+              :source_user_id,
+              :created_at,
+              :updated_at