elabs 4.0.0 → 5.0.0

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

@@ -0,0 +1,55 @@
+:ruby
+  has_albums = false if has_albums.nil?
+  has_projects = true if has_projects.nil?
+  has_uploads = false if has_uploads.nil?
+
+.field
+  .field-input
+    = form.check_box :sfw
+    = form.label :sfw
+.field
+  .field-input
+    = form.check_box :published
+    = form.label :published
+.field
+  .field-input
+    = form.check_box :hidden_in_history
+    = form.label :hidden_in_history
+.field
+  = form.label :license
+  .field-input= license_selector form
+.field
+  = form.label :language
+  .field-input= language_selector form
+- if has_uploads
+  .field
+    = form.label :uploads
+    .field-input= uploads_selector form
+- if has_projects
+  .field
+    = form.label :projects
+    .field-input= projects_selector form
+- if has_albums
+  .field
+    = form.label :albums
+    .field-input= album_selector form
+.field
+  = form.label :tags, for: :tags_list
+  .field-input
+    = form.text_field :tags_list
+    .field-hint= _('List of comma-separated tags')
+
+.actions
+  - if entity.id
+    .field
+      .field-input
+        = form.check_box :minor_update,
+          onchange: "toggleUpdateMessageField(event, '#{entity.class.table_name.singularize}_update_description')"
+        = form.label :minor_update, _('This is a minor edition')
+    .field
+      = form.label :update_description, _('Update message')
+      .field-input
+        = form.text_field :update_description
+        .field-hint= _('If this is not a minor modification, you can specify the changes here.')
+  .actions-buttons
+    = form.submit _('Save'), class: 'btn btn--save'

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

@@ -16,46 +16,8 @@
                                   _('Preview'),
                                   href: '#',
                                   onclick: 'mdPreviewContent(event)'))
-  .field
-    .field-input
-      = f.check_box :sfw
-      = f.label :sfw
-  .field
-    .field-input
-      = f.check_box :published
-      = f.label :published
-  .field
-    .field-input
-      = f.check_box :hidden_in_history
-      = f.label :hidden_in_history
-  .field
-    = f.label :license
-    .field-input= license_selector f
-  .field
-    = f.label :language
-    .field-input= language_selector f
-  .field
-    = f.label :projects
-    .field-input= project_selector f
-  .field
-    = f.label :tags, for: :tags_list
-    .field-input
-      = f.text_field :tags_list
-      .field-hint= _('List of comma-separated tags')
 
-  .actions
-    - if note.id
-      .field
-        .field-input
-          = f.check_box :minor_update, onchange: "toggleUpdateMessageField(event, 'note_update_description')"
-          = f.label :minor_update, _('This is a minor edition')
-      .field
-        = f.label :update_description, _('Update message')
-        .field-input
-          = f.text_field :update_description
-          .field-hint= _('If this is not a minor modification, you can specify the changes here.')
-    .actions-buttons
-      = f.submit _('Save'), class: 'btn btn--save'
+  = render 'elabs/member/layouts/form_commons', form: f, entity: note
 
 = render 'elabs/member/layouts/markdown-preview'
 

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

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

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

@@ -19,7 +19,7 @@
                                 preview_button: content_tag('a',
                                   _('Preview'),
                                   href: '#',
-                                  onclick: 'shortDescriptionCM(event)'))
+                                  onclick: 'mdPreviewShortDescription(event)'))
   .field
     = f.label :description
     .field-input
@@ -28,7 +28,7 @@
                                 preview_button: content_tag('a',
                                   _('Preview'),
                                   href: '#',
-                                  onclick: 'descriptionCM(event)'))
+                                  onclick: 'mdPreviewDescription(event)'))
   .field
     = f.label :main_url
     .field-input= f.text_field :main_url
@@ -38,43 +38,8 @@
   .field
     = f.label :docs_url
     .field-input= f.text_field :docs_url
-  .field
-    .field-input
-      = f.check_box :sfw
-      = f.label :sfw
-  .field
-    .field-input
-      = f.check_box :published
-      = f.label :published
-  .field
-    .field-input
-      = f.check_box :hidden_in_history
-      = f.label :hidden_in_history
-  .field
-    = f.label :license
-    .field-input= license_selector f
-  .field
-    = f.label :language
-    .field-input= language_selector f
-  .field
-    = f.label :tags, for: :tags_list
-    .field-input
-      = f.text_field :tags_list
-      .field-hint= _('List of comma-separated tags')
 
-  .actions
-    - if project.id
-      .field
-        .field-input
-          = f.check_box :minor_update, onchange: "toggleUpdateMessageField(event, 'project_update_description')"
-          = f.label :minor_update, _('This is a minor edition')
-      .field
-        = f.label :update_description, _('Update message')
-        .field-input
-          = f.text_field :update_description
-          .field-hint= _('If this is not a minor modification, you can specify the changes here.')
-    .actions-buttons
-      = f.submit _('Save'), class: 'btn btn--save'
+  = render 'elabs/member/layouts/form_commons', form: f, entity: project, has_projects: false
 
 = render 'elabs/member/layouts/markdown-preview'
 

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

@@ -20,55 +20,14 @@
                                   _('Preview'),
                                   href: '#',
                                   onclick: 'mdPreviewDescription(event)'))
-  .field
-    .field-input
-      = f.check_box :sfw
-      = f.label :sfw
-  .field
-    .field-input
-      = f.check_box :published
-      = f.label :published
-  .field
-    .field-input
-      = f.check_box :hidden_in_history
-      = f.label :hidden_in_history
-  .field
-    = f.label :license
-    .field-input= license_selector f
-  .field
-    = f.label :language
-    .field-input= language_selector f
   .field
     = f.label :file
     .field-input
       = f.file_field :file
       .field-hint= format(_('The following formats will be viewable online; other will need a download: %<formats>s'),
                           formats: available_formats.join(', '))
-  .field
-    = f.label :albums
-    .field-input= album_selector f
-  .field
-    = f.label :projects
-    .field-input= project_selector f
-  .field
-    = f.label :tags, for: :tags_list
-    .field-input
-      = f.text_field :tags_list
-      .field-hint= _('List of comma-separated tags')
 
-  .actions
-    - if upload.id
-      .field
-        .field-input
-          = f.check_box :minor_update, onchange: "toggleUpdateMessageField(event, 'upload_update_description')"
-          = f.label :minor_update, _('This is a minor edition')
-      .field
-        = f.label :update_description, _('Update message')
-        .field-input
-          = f.text_field :update_description
-          .field-hint= _('If this is not a minor modification, you can specify the changes here.')
-    .actions-buttons
-      = f.submit _('Save'), class: 'btn btn--save'
+  = render 'elabs/member/layouts/form_commons', form: f, entity: upload, has_albums: true
 
 = render 'elabs/member/layouts/markdown-preview'
 

data/app/views/elabs/member/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/member/users/edit.html.haml

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

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

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

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

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

data/app/views/elabs/projects/_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/projects/index.html.haml

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

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

@@ -6,78 +6,84 @@
   .project.project--full
     %aside
       %ul
-        %li
-          = icon('user', ['fw'])
-          %strong= _('Creator:')
-          = link_to @project.user.display_name, @project.user
-        %li
-          = icon('calendar-check', ['fw'])
-          %strong= _('Published at:')
-          = medium_datetime @project.published_at
-        %li
-          = icon('calendar', ['fw'])
-          %strong= _('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'])
-          %strong= _('SFW:')
-          = boolean_icon_tag @project.sfw, 'is-sfw', 'is-nsfw'
-        %li
-          = 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
+          %ul
+            %li
+              = icon('user', ['fw'])
+              %strong= _('Creator:')
+              = link_to @project.user.display_name, @project.user
+            %li
+              = icon('calendar-check', ['fw'])
+              %strong= _('Published at:')
+              = medium_datetime @project.published_at
+            %li
+              = icon('calendar', ['fw'])
+              %strong= _('Updated at:')
+              = medium_datetime @project.updated_at
 
         %li.separator
-          = icon('amount', ['fw'])
-          %strong= _('Albums:')
-          = @project.albums_count
-        %li
-          = icon('amount', ['fw'])
-          %strong= _('Articles:')
-          = @project.articles_count
-        %li
-          = icon('amount', ['fw'])
-          %strong= _('Notes:')
-          = @project.notes_count
-        %li
-          = icon('amount', ['fw'])
-          %strong= _('Uploads:')
-          = @project.uploads_count
+          %ul
+            - if @project.main_url.present?
+              %li
+                = icon('home', ['fw'])
+                %strong= link_to _('Home page'), @project.main_url, target: '_blank'
+            - if @project.sources_url.present?
+              %li
+                = icon('code', ['fw'])
+                %strong= link_to _('Sources'), @project.sources_url, target: '_blank'
+            - if @project.docs_url.present?
+              %li
+                = icon('book', ['fw'])
+                %strong= link_to _('Documentation'), @project.docs_url, target: '_blank'
+            %li.separator
+              %ul
+                %li
+                  = icon('info', ['fw'])
+                  %strong= _('SFW:')
+                  = boolean_icon_tag @project.sfw, 'is-sfw', 'is-nsfw'
+                %li
+                  = icon('license', ['fw'])
+                  %strong= _('License:')
+                  = link_to @project.license do
+                    = license_icon @project.license
+                    = @project.license.name
+                %li
+                  = icon('language', ['fw'])
+                  %strong= _('Language:')
+                  = link_to @project.language.name, @project.language
 
-        %li.separator= render 'elabs/layouts/lists/tags', tags: @project.tags
+          %li.separator
+            %ul
+              %li
+                = icon('amount', ['fw'])
+                %strong= _('Albums:')
+                = @project.albums_count
+              %li
+                = icon('amount', ['fw'])
+                %strong= _('Articles:')
+                = @project.articles_count
+              %li
+                = icon('amount', ['fw'])
+                %strong= _('Notes:')
+                = @project.notes_count
+              %li
+                = icon('amount', ['fw'])
+                %strong= _('Uploads:')
+                = @project.uploads_count
+              %li.separator= render 'elabs/layouts/content_classifiers_lists/tags', tags: @project.tags
 
     .content
       %article{ lang: @project.language.iso639_1 }
         = render_entity_content @project, :short_description
         = render_entity_content @project, :description
 
-      = render 'associations',
-              project: @project,
-              project_albums: @project_albums,
-              project_articles: @project_articles,
-              project_notes: @project_notes,
-              project_uploads: @project_uploads
+      = render 'elabs/layouts/content_associations',
+              is_section: true,
+              entity: @project,
+              albums: @project_albums,
+              articles: @project_articles,
+              notes: @project_notes,
+              uploads: @project_uploads
 
   = render 'elabs/comments/comments',
             entity: @project,