elabs 4.0.0 → 5.0.0

data/app/views/elabs/layouts/{_shortcode_infinite_loop.html.haml → shortcodes/_infinite_loop.html.haml}

@@ -1,2 +1,2 @@
 .infinite-loop.infinite-loop--large
-  = icon_text 'infinity', _('The author wanted to put something here, but it may create an infinite loop...')
+  = icon_text 'infinity', _('The author wanted to put something here, but it may create an infinite loop…')

data/app/views/elabs/layouts/{_shortcode_missing_content.html.haml → shortcodes/_missing_content.html.haml}

@@ -1,2 +1,2 @@
 .missing.missing--large
-  = icon_text 'frown', _('The author wanted to put something here, but it was not found...')
+  = icon_text 'frown', _('The author wanted to put something here, but it was not found…')

data/app/views/elabs/layouts/shortcodes/_open_to_see.html.haml

@@ -0,0 +1,2 @@
+.open-to-see
+  = icon_text 'eye', _('Display the full element to display this content…')

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/_github_repo_card.html.haml

@@ -2,7 +2,7 @@
 - repo_url ||= nil
 
 - if repo_url.nil?
-  = render 'elabs/layouts/shortcode_missing_content'
+  = render 'elabs/layouts/shortcodes/missing_content'
 - else
   %div{ id: "gh-repo-widget-#{widget_id}" }
 

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/_gitlab_group_card.html.haml

@@ -1,7 +1,7 @@
 - widget_id = random_string
 - url_matches ||= nil
 - if url_matches.nil? || url_matches.length < 3
-  = render 'elabs/layouts/shortcode_missing_content'
+  = render 'elabs/layouts/shortcodes/missing_content'
 - else
   %div{ id: "gl-group-widget-#{widget_id}" }
 

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/_gitlab_repo_card.html.haml

@@ -2,7 +2,7 @@
 - url_matches ||= nil
 
 - if url_matches.nil? || url_matches.length < 3
-  = render 'elabs/layouts/shortcode_missing_content'
+  = render 'elabs/layouts/shortcodes/missing_content'
 - else
   %div{ id: "gl-repo-widget-#{widget_id}" }
 

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/_gitlab_user_card.html.haml

@@ -1,7 +1,7 @@
 - widget_id = random_string
 - url_matches ||= nil
 - if url_matches.nil? || url_matches.length < 3
-  = render 'elabs/layouts/shortcode_missing_content'
+  = render 'elabs/layouts/shortcodes/missing_content'
 - else
   %div{ id: "gl-user-widget-#{widget_id}" }
 

data/app/views/elabs/layouts/shortcodes/widgets/vue/_all_widgets.html.haml

@@ -0,0 +1,5 @@
+= render 'elabs/layouts/shortcodes/widgets/vue/github_repo_card_vue'
+= render 'elabs/layouts/shortcodes/widgets/vue/github_user_card_vue'
+= render 'elabs/layouts/shortcodes/widgets/vue/gitlab_repo_card_vue'
+= render 'elabs/layouts/shortcodes/widgets/vue/gitlab_user_card_vue'
+= render 'elabs/layouts/shortcodes/widgets/vue/gitlab_group_card_vue'

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/vue/_github_repo_card_vue.html.haml

@@ -1,5 +1,5 @@
 %script{ type: 'text/x-template', id: 'template-github-repo-card' }
-  .github-card{ ':disabled': 'failed' }
+  .github-card.github-card--repo{ ':disabled': 'failed' }
     .content{ 'v-if': 'ready && !failed' }
       %h2
         = icon 'github', ['fw'], 'fab'
@@ -7,23 +7,23 @@
           %a{ ':href': '"https://github.com/" + repo.owner.login', target: '_blank' } {{repo.owner.login}}
         \/
         %a{ ':href': '"https://github.com/" + repo_name', target: '_blank' } {{repo.name}}
-      %ul.infos
-        %li
+      .infos
+        %div
           = icon_text 'code-branch', _('Fork:'), ['fw']
           {{repo.fork ? '#{_('Yes')}' : '#{_('No')}'}}
-        %li{ 'v-if': 'repo.homepage' }
+        %div{ 'v-if': 'repo.homepage' }
           = icon 'home', ['fw']
           %a{ ':href': 'repo.homepage', target: '_blank' }= _('Home page')
-        %li
+        %div
           = icon 'star'
           {{repo.stargazers_count}}
-        %li
+        %div
           = icon 'license'
           %template{ 'v-if': 'repo.license' } {{repo.license.name}}
-        %li
+        %div
           = icon_text 'code-branch', _('Forks:'), ['fw']
           {{repo.forks}}
-        %li
+        %div
           = icon 'exclamation-circle'
           {{repo.open_issues}}
       %pre.description{ 'v-if': 'repo.description' } {{repo.description}}

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/vue/_github_user_card_vue.html.haml

@@ -1,5 +1,5 @@
 %script{ type: 'text/x-template', id: 'template-github-user-card' }
-  .github-card{ 'v-if': 'ready && !failed' }
+  .github-card.github-card--user{ 'v-if': 'ready && !failed' }
     .icon.icon--avatar
       = icon 'github', %w[fw avatar-badge], 'fab'
       %img.avatar{ ':src': 'user.avatar_url' }
@@ -7,14 +7,14 @@
       %h2
         %a{ ':href': 'user.url', target: '_blank' } {{user.name}}
         %small ({{user.login}})
-      %ul.infos
-        %li{ 'v-if': 'user.blog' }
+      .infos
+        %div{ 'v-if': 'user.blog' }
           = icon 'home', ['fw']
           %a{ ':href': 'user.blog', target: '_blank' }= _('Home page')
-        %li
+        %div
           = icon_text 'book', _('Public repos:'), ['fw']
           {{user.public_repos}}
-        %li
+        %div
           = icon_text 'pencil-alt', _('Public gists:'), ['fw']
           {{user.public_gists}}
   .github-card{ 'v-else-if': 'failed', ':disabled': 'failed' }

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/vue/_gitlab_group_card_vue.html.haml

@@ -1,5 +1,5 @@
 %script{ type: 'text/x-template', id: 'template-gitlab-group-card' }
-  .gitlab-card{ 'v-if': 'ready && !failed' }
+  .gitlab-card.gitlab-card--group{ 'v-if': 'ready && !failed' }
     .icon.icon--avatar
       = icon 'gitlab', %w[fw avatar-badge], 'fab'
       %img.avatar{ ':src': 'group.avatar_url' }
@@ -7,14 +7,14 @@
       %h2
         %a{ ':href': 'group.web_url', target: '_blank' } {{group.name}}
         %small (#{format _('group on %<link>s'), link: '{{url.site}}'})
-      %ul.infos
-        %li{ 'v-if': 'group.website_url' }
+      .infos
+        %div{ 'v-if': 'group.website_url' }
           = icon 'home', ['fw']
           %a{ ':href': 'group.website_url', target: '_blank' }= _('Home page')
-        %li
+        %div
           = icon_text 'book', _('Public repos:'), ['fw']
           {{group.projects.length}}
-        %li
+        %div
           = icon_text 'book', _('Shared repos:'), ['fw']
           {{group.shared_projects.length}}
       %pre.description{ 'v-if': 'group.description' } {{group.description}}

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/vue/_gitlab_repo_card_vue.html.haml

@@ -1,26 +1,26 @@
 %script{ type: 'text/x-template', id: 'template-gitlab-repo-card' }
-  .gitlab-card{ ':disabled': 'failed' }
+  .gitlab-card.gitlab-card--repo{ ':disabled': 'failed' }
     .content{ 'v-if': 'ready && !failed' }
       %h2
         = icon 'gitlab', ['fw'], 'fab'
         %template{ 'v-if': 'repo.namespace' }
           %small
-            %a{ ':href': '"https://" + url.site + "/" + repo.namespace.full_path', target: '_blank' }
-              {{repo.namespace.name}}
+            %a{ ':href': '"https://" + url.site + "/" + repo.namespace.full_path',
+                target: '_blank' } {{repo.namespace.name}}
           \/
         %a{ ':href': 'repo.web_url', target: '_blank' } {{repo.name}}
         %small (#{format _('project on %<link>s'), link: '{{url.site}}'})
-      %ul.infos
-        %li
+      .infos
+        %div
           = icon_text 'calendar', _('Last activity:'), ['fw']
           {{repo.last_activity_at}}
-        %li{ 'v-if': 'repo.homepage' }
+        %div{ 'v-if': 'repo.homepage' }
           = icon 'home', ['fw']
           %a{ ':href': 'repo.homepage', target: '_blank' }= _('Home page')
-        %li
+        %div
           = icon 'star'
           {{repo.star_count}}
-        %li
+        %div
           = icon_text 'code-branch', _('Forks:'), ['fw']
           {{repo.forks_count}}
       %pre.description{ 'v-if': 'repo.description' } {{repo.description}}

data/app/views/elabs/layouts/{widgets → shortcodes/widgets}/vue/_gitlab_user_card_vue.html.haml

@@ -1,5 +1,5 @@
 %script{ type: 'text/x-template', id: 'template-gitlab-user-card' }
-  .gitlab-card{ 'v-if': 'ready && !failed' }
+  .gitlab-card.gitlab-card--user{ 'v-if': 'ready && !failed' }
     .icon.icon--avatar
       = icon 'gitlab', %w[fw avatar-badge], 'fab'
       %img.avatar{ ':src': 'user.avatar_url' }
@@ -7,11 +7,11 @@
       %h2
         %a{ ':href': 'user.web_url', target: '_blank' } {{user.name}}
         %small (#{format _('@%<user>s on %<link>s'), user: '{{user.username}}', link: '{{url.site}}'})
-      %ul.infos
-        %li{ 'v-if': 'user.website_url' }
+      .infos
+        %div{ 'v-if': 'user.website_url' }
           = icon 'home', ['fw']
           %a{ ':href': 'user.website_url', target: '_blank' }= _('Home page')
-        %li
+        %div
           = icon_text 'book', _('Public repos:'), ['fw']
           {{repos.length}}
   .gitlab-card{ 'v-else-if': 'failed', ':disabled': 'failed' }

data/app/views/elabs/licenses/_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 _('Name'), 'name'

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

@@ -4,24 +4,26 @@
   - @licenses.each do |license|
     .license.license-card
       %header
-        .icon= icon license.icon, %w[2x fw], 'fab'
+        .icon= license_icon license, %w[3x]
         .headers
-          %h3= link_to license.name, license, class: 'title'
+          %h3.title= link_to license.name, license
+          %ul.information
+            %li= link_to _('Official documentation'), license.url, target: '_blank'
 
       .content
         = link_to license_projects_path(license), class: 'btn btn--block' do
-          = icon 'cog'
-          = format(n_('%<nb>i project', '%<nb>i projects', license.projects_count), nb: license.projects_count)
+          = icon 'cog', %w[fw icon]
+          .text= format(n_('%<nb>i project', '%<nb>i projects', license.projects_count), nb: license.projects_count)
         = link_to license_articles_path(license), class: 'btn btn--block' do
-          = icon 'font'
-          = format(n_('%<nb>i article', '%<nb>i articles', license.articles_count), nb: license.articles_count)
+          = icon 'font', %w[fw icon]
+          .text= format(n_('%<nb>i article', '%<nb>i articles', license.articles_count), nb: license.articles_count)
         = link_to license_notes_path(license), class: 'btn btn--block' do
-          = icon 'sticky-note'
-          = format(n_('%<nb>i note', '%<nb>i notes', license.notes_count), nb: license.notes_count)
+          = icon 'sticky-note', %w[fw icon]
+          .text= format(n_('%<nb>i note', '%<nb>i notes', license.notes_count), nb: license.notes_count)
         = link_to license_uploads_path(license), class: 'btn btn--block' do
-          = icon 'image'
-          = format(n_('%<nb>i upload', '%<nb>i uploads', license.uploads_count), nb: license.uploads_count)
+          = icon 'image', %w[fw icon]
+          .text= format(n_('%<nb>i upload', '%<nb>i uploads', license.uploads_count), nb: license.uploads_count)
         = link_to license_albums_path(license), class: 'btn btn--block' do
-          = icon 'book'
-          = format(n_('%<nb>i album', '%<nb>i albums', license.albums_count), nb: license.albums_count)
+          = icon 'book', %w[fw icon]
+          .text= format(n_('%<nb>i album', '%<nb>i albums', license.albums_count), nb: license.albums_count)
 

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

@@ -1,40 +1,46 @@
-- @page_title = "#{icon @license.icon, ['fw'], 'fab'} #{@license.name}".html_safe
+- @page_title = "License: #{@license.name}".html_safe
 
 .license.license--full
-  %aside
+  %aside.always--inline
     %ul
-      %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.separator
-        = icon('amount', ['fw'])
-        %strong= _('Albums:')
-        = @license.albums_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Articles:')
-        = @license.articles_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Notes:')
-        = @license.notes_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Projects:')
-        = @license.projects_count
-      %li
-        = icon('amount', ['fw'])
-        %strong= _('Uploads:')
-        = @license.uploads_count
+        %ul
+          %li
+            = icon('home', ['fw'])
+            = link_to _('Home page'), @license.url, target: '_blank'
+          %li
+            = icon('cut', ['fw'])
+            = link_to _('TL; DR'), @license.tldr_url, target: '_blank'
+
+      %li.separator
+        %ul
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Albums:')
+            = @license.albums_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Articles:')
+            = @license.articles_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Notes:')
+            = @license.notes_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Projects:')
+            = @license.projects_count
+          %li
+            = icon('amount', ['fw'])
+            %strong= _('Uploads:')
+            = @license.uploads_count
 
   .content
-    = render 'associations',
-      license: @license,
-      license_albums: @license_albums,
-      license_articles: @license_articles,
-      license_notes: @license_notes,
-      license_projects: @license_projects,
-      license_uploads: @license_uploads
+    = render 'elabs/layouts/content_associations',
+      is_section: true,
+      entity: @license,
+      albums: @license_albums,
+      articles: @license_articles,
+      notes: @license_notes,
+      projects: @license_projects,
+      uploads: @license_uploads

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

@@ -21,49 +21,7 @@
                                   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 :uploads
-    .field-input= uploads_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 album.id
-      .field
-        .field-input
-          = f.check_box :minor_update, onchange: "toggleUpdateMessageField(event, 'album_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: album, has_uploads: true
 
 = render 'elabs/member/layouts/markdown-preview'
 

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

@@ -28,46 +28,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 article.id
-      .field
-        .field-input
-          = f.check_box :minor_update, onchange: "toggleUpdateMessageField(event, 'article_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: article
 
 = render 'elabs/member/layouts/markdown-preview'