elabs 2.0.0 → 3.0.0

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

@@ -0,0 +1,21 @@
+- @page_title = _('Notifications')
+
+- if @notifications.length.zero?
+  = render 'elabs/member/layouts/empty'
+- else
+  %table.notifications-list
+    %thead
+      %tr
+        %th
+        %th= member_order_by_link _('Date'), 'created_at'
+        %th
+    %tbody
+      - @notifications.each do |notification|
+        %tr.notification
+          %td.btn-group
+            = member_destroy_link('notification', notification, false)
+          %td= short_date notification.created_at
+          %td
+            = notification_icon notification.event
+            = notification_message notification
+

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

@@ -0,0 +1 @@
+json.array! @notifications, partial: 'notification', as: :notification

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

@@ -15,6 +15,12 @@
   .field
     = f.label :locale
     .field-input= f.collection_select(:locale, Elabs::Language.available_site_translations, :iso639_1, :name)
+  .field
+    = f.label :writing_language
+    .field-input= language_selector f, :writing_language_id
+  .field
+    = f.label :writing_license
+    .field-input= license_selector f, :writing_license_id
 
   .actions
     = f.submit 'Save', class: 'btn btn--save'

data/app/views/elabs/member/preferences/edit.html.haml

@@ -1,3 +1,4 @@
 - @page_title = _('Editing preferences')
 
-= render 'form', preference: @preference
+.w960p.center
+  = render 'form', preference: @preference

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

@@ -1,2 +1,20 @@
-json.extract! project, :id, :name, :short_description, :description, :main_url, :sfw, :published, :locked, :hidden_in_history, :license_id, :language_id, :user_id, :created_at, :updated_at
-json.url project_url(project, format: :json)
+json.extract! project,
+              :id,
+              :name,
+              :short_description,
+              :description,
+              :main_url,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :uploads_count,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

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

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

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

@@ -1 +1 @@
-json.array! @projects, partial: 'projects/project', as: :project
+json.array! @projects, partial: 'project', as: :project

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

@@ -1,2 +1,17 @@
-json.extract! upload, :id, :title, :description, :sfw, :hide_in_history, :language_id, :user_id, :license_id, :created_at, :updated_at
-json.url upload_url(upload, format: :json)
+json.extract! upload, :id,
+              :title,
+              :description,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :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

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

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

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

@@ -1 +1 @@
-json.array! @uploads, partial: 'uploads/upload', as: :upload
+json.array! @uploads, partial: 'upload', as: :upload

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

@@ -1,19 +1,13 @@
--# haml-lint:disable InstanceVariables
-- user = @user || current_user
--# haml-lint:enable InstanceVariables
-
-= form_for user, url: { controller: 'elabs/member/users', action: :update } do |f|
-
+= form_for user, url: member_update_infos_path do |f|
   - if user.errors.any?
     .error
-      %h2= format(n_('An error prevented your account from being updated:',
-                      '%<nb>i errors prevented your account from being updated:',
+      %h2= format(n_('An error prevented your infos from being updated:',
+                      '%<nb>i errors prevented your infos from being updated:',
                       user.errors.count), nb: user.errors.count)
       %ul
         - user.errors.full_messages.each do |message|
           %li= message
 
-
   .field
     = f.label :real_name
     .field-input= f.text_field :real_name
@@ -27,6 +21,17 @@
                                     _('Preview'),
                                     href: '#',
                                     onclick: 'mdPreviewBiography(event)'))
+  - if Elabs.use_avatars
+    .alert.alert--experimental
+      %p
+        = icon 'experience', ['fw']
+        = _('This feature is experimental. If you provide an invalid file, your current avatar will be deleted.')
+
+      .field
+        = f.label :avatar
+        .field-input
+          = f.file_field :avatar
+          .field-hint= format(_('Your picture should be in "png" or "jpg", preferably a square of 512px.'))
 
   .actions
     = f.submit _('Save'), class: 'btn btn--save'

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

@@ -0,0 +1,7 @@
+- @page_title = _('About you')
+
+.w960p.center
+  .page__actions
+    = link_to _('Show online'), @user, class: 'btn btn--show'
+
+  = render 'form', user: @user

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

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

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

@@ -1,2 +1,10 @@
-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,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/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/notes/show.html.haml

@@ -9,16 +9,16 @@
         %li
           = icon('user', ['fw'])
           %b= _('Author:')
-          = link_to @note.user.username, @note.user
+          = link_to @note.user.display_name, @note.user
         %li
           = icon('calendar-check', ['fw'])
           %b= _('Published at:')
-          = @note.published_at
+          = short_date @note.published_at
         %li
           = icon('calendar', ['fw'])
           %b= _('Updated at:')
-          = @note.updated_at
-        %li
+          = short_date @note.updated_at
+        %li.separator
           = icon('info', ['fw'])
           %b= _('SFW:')
           = boolean_icon_tag @note.sfw, 'is-sfw', 'is-nsfw'
@@ -27,7 +27,7 @@
           %b= _('Language:')
           = link_to @note.language.name, @note.language
         %li
-          = icon('copyright', ['fw'])
+          = icon('license', ['fw'])
           %b= _('License:')
           = link_to @note.license.name, @note.license
 

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

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

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

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

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

@@ -0,0 +1,17 @@
+json.extract! project,
+              :id,
+              :name,
+              :short_description,
+              :description,
+              :main_url,
+              :sfw,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :uploads_count,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

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

@@ -1 +1 @@
-json.array! @projects, partial: 'projects/project', as: :project
+json.array! @projects, partial: 'project', as: :project

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

@@ -8,33 +8,36 @@
       %ul
         %li
           = icon('user', ['fw'])
-          %strong= _('Author:')
-          = link_to @project.user.username, @project.user
-        %li
-          = icon('home', ['fw'])
-          %strong= _('Main url:')
-          = @project.main_url
+          %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:')
-          = @project.published_at
+          = short_date @project.published_at
         %li
           = icon('calendar', ['fw'])
           %strong= _('Updated at:')
-          = @project.updated_at
-        %li
+          = short_date @project.updated_at
+
+        %li.separator
           = icon('info', ['fw'])
           %strong= _('SFW:')
           = boolean_icon_tag @project.sfw, 'is-sfw', 'is-nsfw'
         %li
-          = icon('copyright', ['fw'])
+          = icon('license', ['fw'])
           %strong= _('License:')
           = link_to @project.license.name, @project.license
         %li
           = icon('language', ['fw'])
           %strong= _('Language:')
           = link_to @project.language.name, @project.language
-        %li
+
+        %li.separator
           = icon('amount', ['fw'])
           %strong= _('Albums:')
           = @project.albums_count

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

@@ -1 +1 @@
-json.partial! 'projects/project', project: @project
+json.partial! 'project', project: @project

data/app/views/elabs/tags/_tag.json.jbuilder

@@ -1,2 +1,8 @@
-json.extract! tag, :id, :name
-json.url tag_url(tag, format: :json)
+json.extract! tag,
+              :id,
+              :name,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

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

@@ -1 +1 @@
-json.array! @tags, partial: 'tags/tag', as: :tag
+json.array! @tags, partial: 'tag', as: :tag

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

@@ -1 +1 @@
-json.partial! 'tags/tag', tag: @tag
+json.partial! 'tag', tag: @tag

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

@@ -11,7 +11,7 @@
           %li
             = icon('user', ['fw'])
             %strong= _('User:')
-            = link_to upload.user.username, upload.user
+            = link_to upload.user.display_name, upload.user
           %li
             = icon('language', ['fw'])
             %b= _('Language:')

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

@@ -1,2 +1,14 @@
-json.extract! upload, :id, :title, :description, :sfw, :hide_in_history, :language_id, :user_id, :license_id, :created_at, :updated_at
-json.url upload_url(upload, format: :json)
+json.extract! upload, :id,
+              :title,
+              :description,
+              :sfw,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :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

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

@@ -1 +1 @@
-json.array! @uploads, partial: 'uploads/upload', as: :upload
+json.array! @uploads, partial: 'upload', as: :upload

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

@@ -9,16 +9,25 @@
         %li
           = icon('user', ['fw'])
           %b= _('Author:')
-          = link_to @upload.user.username, @upload.user
+          = link_to @upload.user.display_name, @upload.user
         %li
           = icon('calendar-check', ['fw'])
           %b= _('Published at:')
-          = @upload.published_at
+          = short_date @upload.published_at
         %li
           = icon('calendar', ['fw'])
           %b= _('Updated at:')
-          = @upload.updated_at
+          = short_date @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

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

@@ -1 +1 @@
-json.partial! 'uploads/upload', upload: @upload
+json.partial! 'upload', upload: @upload

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

@@ -1,17 +1,24 @@
 .user.user-card
   %header
-    .icon= icon 'user', %w[3x fw]
+    .icon
+      - if Elabs.use_avatars && user.avatar.attached?
+        = image_tag main_app.url_for(avatar_image(user.avatar, :small).processed)
+      - else
+        = icon 'user', %w[3x fw]
     .headers
-      %h3= link_to user.username, user, class: 'title'
+      %h3= link_to user.display_name, user, class: 'title'
 
       %ul.informations
+        - if user.real_name
+          %li
+            %b @#{user.username}
         %li
           %b= _('Role:')
           = user.role
 
         %li
           %b= _('Since:')
-          = user.created_at
+          = short_date user.created_at
 
   .content
     = link_to user_projects_path(user), class: 'btn btn--block' do

data/app/views/elabs/users/_user.json.jbuilder

@@ -1,2 +1,14 @@
-json.extract! user, :id, :created_at, :updated_at
-json.url user_url(user, format: :json)
+json.extract! user,
+              :id,
+              :confirmed_at,
+              :created_at,
+              :updated_at,
+              :username,
+              :real_name,
+              :biography,
+              :role,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count