elabs 4.0.0 → 5.0.0

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

@@ -0,0 +1,4 @@
+- unless flash.empty?
+  .page__messages
+    - flash.each do |name, message|
+      .alert{ class: "alert--#{name}" }= message

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

@@ -1,13 +1,21 @@
-%a.link-to-top{ href: '#top' }
-  %i.fa.fa-fw.fa-2x.fa-arrow-up
+- can_report = false if can_report.nil?
+
+%a.fixed-link.to-top{ href: '#top' }
+  = icon 'arrow-up', %w[fw 2x]
+
+- if can_report
+  %a.fixed-link.to-report{ href: '#', onclick: 'openModal(event, "report-modal")' }
+    = icon 'flag', %w[fw 2x]
 
 %footer.page__footer
   .page__footer__content
-    © 2018 - Experiments Labs -
-    = icon_text('rss', _('RSS:'), ['fw'])
-    = link_to _('Activity'), activities_url(format: :rss, show_nsfw: show_nsfw?)
-    = link_to _('Albums'), albums_url(format: :rss, show_nsfw: show_nsfw?)
-    = link_to _('Articles'), articles_url(format: :rss, show_nsfw: show_nsfw?)
-    = link_to _('Notes'), notes_url(format: :rss, show_nsfw: show_nsfw?)
-    = link_to _('Projects'), projects_url(format: :rss, show_nsfw: show_nsfw?)
-    = link_to _('Uploads'), uploads_url(format: :rss, show_nsfw: show_nsfw?)
+    %header
+      © 2018 - #{Elabs.site_name}
+    .rss-links
+      = icon_text('rss', _('RSS:'), ['fw'])
+      = link_to _('Activity'), activities_url(format: :rss, show_nsfw: show_nsfw?)
+      = link_to _('Albums'), albums_url(format: :rss, show_nsfw: show_nsfw?)
+      = link_to _('Articles'), articles_url(format: :rss, show_nsfw: show_nsfw?)
+      = link_to _('Notes'), notes_url(format: :rss, show_nsfw: show_nsfw?)
+      = link_to _('Projects'), projects_url(format: :rss, show_nsfw: show_nsfw?)
+      = link_to _('Uploads'), uploads_url(format: :rss, show_nsfw: show_nsfw?)

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

@@ -0,0 +1,12 @@
+- if Elabs.trap_dumb_bots?
+  .field{ id: "form-#{field}" }
+    %label{ id: "form-#{field}-label", for: 'form-body-field' }= _('Body')
+    .field-input
+      %textarea{ id: "form-#{field}-field", name: 'body' }
+      .field-hint= _("Don't fill this field if you want this form to be saved.")
+
+  :javascript
+      documentReady(function(){
+        document.getElementById('form-#{field}').style.display = 'none';
+        document.getElementById('form-#{field}-label').innerText= "#{_('Robot area')}"
+      })

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

@@ -3,4 +3,4 @@
     = icon_text 'lock', _('This content needs review and have been retired for now.'), ['fw']
 - else
   .nsfw.nsfw--large
-    = icon_text 'exclamation', _('This content might not be appropriate for every situation.'), ['fw']
+    = icon_text 'nsfw', _('This content might not be appropriate for every situation.'), ['fw']

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

@@ -1,6 +1,8 @@
 - if entity.locked?
   .locked.locked--full
-    = icon_text 'lock', _('This content needs review and have been retired for now.'), ['fw']
+    .locked__title= icon_text 'lock', _('This content needs review and have been retired for now.'), ['fw']
+    .locked__subtitle= _('Come back in a few days to give time to the author to review it.')
 - else
   .nsfw.nsfw--full
-    = icon_text 'exclamation', _('This content might not be appropriate for every situation.'), ['fw']
+    .nsfw__title= icon_text 'nsfw', _('This content might not be appropriate for every situation.'), ['fw']
+    .nsfw__subtitle= _('If you want to display NSFW content, click on "Show NSFW" in the main menu.')

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

@@ -3,4 +3,4 @@
     = icon_text 'lock', _('Sorry, content is locked for review'), ['fw']
 - else
   %span.nsfw.nsfw--inline
-    = icon_text 'exclamation', _('Sorry, NSFW content'), ['fw']
+    = icon_text 'nsfw', _('Sorry, NSFW content'), ['fw']

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

@@ -1,2 +1,2 @@
-= link_to 'English', { locale: 'en' }, lang: 'en'
-= link_to 'Français', { locale: 'fr' }, lang: 'fr'
+= link_to 'English', { locale: 'en' }, lang: 'en', class: 'menu_entry'
+= link_to 'Français', { locale: 'fr' }, lang: 'fr', class: 'menu_entry'

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

@@ -1,77 +1,60 @@
-%header.page__menu.page__menu--main
-  = link_to Elabs.site_name, main_app.root_path, class: 'page__menu__title'
+%header.page__menu
+  .page__menu__title
+    = link_to Elabs.site_name, main_app.root_path, class: 'brand_link menu_entry'
+    %a.menu_entry.menu_button.menu_button--for-tiny{ href: '#', onclick: 'toggleSecondaryMenu()' }= icon 'bars', ['fw']
 
   .page__menu__group
-    = icon('users', ['page__menu__group__icon'])
-    = active_link_to _('Authors'), :users
-
-  .page__menu__group
-    = icon('file', ['page__menu__group__icon'])
-    = active_link_to _('Projects'), :projects
-    = active_link_to _('Articles'), :articles
-    = active_link_to _('Notes'), :notes
-    = active_link_to _('Albums'), :albums
-    = active_link_to _('Uploads'), :uploads
-
-  .page__menu__group
-    = icon('tags', ['page__menu__group__icon'])
-    = active_link_to _('Languages'), :languages
-    = active_link_to _('Licenses'), :licenses
-    = active_link_to _('Tags'), :tags
-
-  .page__menu__group
-    = icon('exclamation', ['page__menu__group__icon'])
-    = link_to (show_nsfw? ? _('Hide NSFW') : _('Show NSFW')), params: { show_nsfw: !show_nsfw? }
-
-  .page__menu__group
-    = icon('language', ['page__menu__group__icon'])
-    = render 'elabs/layouts/language_menu'
-
-  - unless user_signed_in?
-    .page__menu__group
-      = active_link_to _('Login'), new_user_session_path
-
-- if user_signed_in?
-  %header.page__menu.page__menu--member
-    %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 _('Albums'), :member_albums
-      = 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?
-    %header.page__menu.page__menu--admin
-      %span.page__menu__title= _('Administration:')
-
-      .page__menu__group
-        = active_link_to _('Projects'), :admin_projects
-        = active_link_to _('Articles'), :admin_articles
-        = active_link_to _('Notes'), :admin_notes
-        = active_link_to _('Albums'), :admin_albums
-        = active_link_to _('Uploads'), :admin_uploads
-      .page__menu__group
-        = active_link_to _('Tags'), :admin_tags
-        = active_link_to _('Languages'), :admin_languages
-        = active_link_to _('Licenses'), :admin_licenses
-      .page__menu__group
-        = active_link_to _('Users'), :admin_users
-      .page__menu__group
-        = active_link_to _('Reports'), :admin_reports
-
-- unless flash.empty?
-  .page__messages
-    - flash.each do |name, message|
-      .alert{ class: "alert--#{name}" }= message
+    = active_link_to :projects, class: 'menu_entry' do
+      = icon 'cogs', %w[fw icon]
+      = _('Projects')
+    = active_link_to :articles, class: 'menu_entry' do
+      = icon 'font', %w[fw icon]
+      = _('Articles')
+    = active_link_to :notes, class: 'menu_entry' do
+      = icon 'sticky-note', %w[fw icon]
+      = _('Notes')
+    = active_link_to :albums, class: 'menu_entry' do
+      = icon 'book', %w[fw icon]
+      = _('Albums')
+    = active_link_to :uploads, class: 'menu_entry' do
+      = icon 'file', %w[fw icon]
+      = _('Uploads')
+
+    .menu_entry.dropdown
+      %a{ href: '#' }
+        = icon 'ellipsis-h', ['fw']
+      .dropdown__menu.dropdown__menu--right
+        = active_link_to :users, class: 'menu_entry' do
+          = icon 'users', %w[fw icon]
+          = _('Authors')
+        = active_link_to :tags, class: 'menu_entry' do
+          = icon 'tags', %w[fw icon]
+          = _('Tags')
+        = active_link_to :licenses, class: 'menu_entry' do
+          = icon 'license', %w[fw icon]
+          = _('Licenses')
+        = active_link_to :languages, class: 'menu_entry' do
+          = icon 'language', %w[fw icon]
+          = _('Languages')
+
+  %a.menu_entry.menu_button.menu_button--for-small{ href: '#', onclick: 'toggleSecondaryMenu()' }= icon 'bars', ['fw']
+
+  .page__menu__group.page__menu__group--secondary#secondary-menu
+    %a.close_menu_button{ onclick: 'toggleSecondaryMenu()' }= icon 'times', %w[fw 2x]
+    %a.menu_entry{ href: url_for(params: { show_nsfw: !show_nsfw? }) }
+      = icon show_nsfw? ? 'eye-slash' : 'eye', %w[fw icon]
+      = show_nsfw? ? _('Hide NSFW') : _('Show NSFW')
+    .menu_entry.dropdown
+      %a{ href: '#' }
+        = icon 'language', ['fw']
+        = _('Language')
+      .dropdown__menu
+        = render 'elabs/layouts/language_menu'
+    - unless user_signed_in?
+      = active_link_to new_user_session_path, class: 'menu_entry' do
+        = icon 'sign-in-alt', %w[fw icon]
+        = _('Login')
+    - if user_signed_in?
+      = render 'elabs/layouts/menu_member'
+      - if current_user.admin?
+        = render 'elabs/layouts/menu_admin'

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

@@ -0,0 +1,40 @@
+.menu_entry.dropdown
+  %a{ href: '#' }
+    = icon 'wrench', ['fw']
+    %span.menu_entry_description= _('Administration')
+  .dropdown__menu.dropdown__menu--right
+    = active_link_to :admin_projects, class: 'menu_entry' do
+      = icon 'cogs', %w[fw icon]
+      = _('Projects')
+    = active_link_to :admin_articles, class: 'menu_entry' do
+      = icon 'font', %w[fw icon]
+      = _('Articles')
+    = active_link_to :admin_notes, class: 'menu_entry' do
+      = icon 'sticky-note', %w[fw icon]
+      = _('Notes')
+    = active_link_to :admin_albums, class: 'menu_entry' do
+      = icon 'book', %w[fw icon]
+      = _('Albums')
+    = active_link_to :admin_uploads, class: 'menu_entry' do
+      = icon 'file', %w[fw icon]
+      = _('Uploads')
+
+    = active_link_to :admin_tags, class: 'menu_entry is-separator' do
+      = icon 'tags', %w[fw icon]
+      = _('Tags')
+    = active_link_to :admin_languages, class: 'menu_entry' do
+      = icon 'language', %w[fw icon]
+      = _('Languages')
+    = active_link_to :admin_licenses, class: 'menu_entry' do
+      = icon 'license', %w[fw icon]
+      = _('Licenses')
+
+    = active_link_to :admin_users, class: 'menu_entry is-separator' do
+      = icon 'users', %w[fw icon]
+      = _('Users')
+    = active_link_to :admin_reports, class: 'menu_entry' do
+      = icon 'flag', %w[fw icon]
+      = _('Reports')
+    = active_link_to :admin_announcements, class: 'menu_entry' do
+      = icon 'announcement', %w[fw icon]
+      = _('Announcements')

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

@@ -0,0 +1,57 @@
+= active_link_to :member_notifications, class: 'menu_entry' do
+  = icon 'bell', ['fw']
+  - if notification_count.positive?
+    %span.badge.badge--notification= notification_count
+  %span.menu_entry_description= _('Notifications')
+.menu_entry.dropdown
+  %a{ href: '#' }
+    = icon 'pen', ['fw']
+    %span.menu_entry_description= _('Your content')
+  .dropdown__menu.dropdown__menu--right
+    .has-action
+      = active_link_to :member_projects, class: 'menu_entry' do
+        = icon 'cogs', %w[fw icon]
+        = _('Projects')
+      = link_to :new_member_project, class: 'action' do
+        = icon 'plus', ['fw']
+    .has-action
+      = active_link_to :member_articles, class: 'menu_entry' do
+        = icon 'font', %w[fw icon]
+        = _('Articles')
+      = link_to :new_member_article, class: 'action' do
+        = icon 'plus', ['fw']
+    .has-action
+      = active_link_to :member_notes, class: 'menu_entry' do
+        = icon 'sticky-note', %w[fw icon]
+        = _('Notes')
+      = link_to :new_member_note, class: 'action' do
+        = icon 'plus', ['fw']
+    .has-action
+      = active_link_to :member_albums, class: 'menu_entry' do
+        = icon 'book', %w[fw icon]
+        = _('Albums')
+      = link_to :new_member_album, class: 'action' do
+        = icon 'plus', ['fw']
+    .has-action
+      = active_link_to :member_uploads, class: 'menu_entry' do
+        = icon 'file', %w[fw icon]
+        = _('Uploads')
+      = link_to :new_member_upload, class: 'action' do
+        = icon 'plus', ['fw']
+.menu_entry.dropdown
+  %a{ href: '#' }
+    = icon 'user', ['fw']
+    %span.menu_entry_description= _('You')
+  .dropdown__menu.dropdown__menu--right
+    = active_link_to :member_edit_infos, class: 'menu_entry is-separator' do
+      = icon 'info', %w[fw icon]
+      = _('Infos')
+    = active_link_to :member_edit_preferences, class: 'menu_entry' do
+      = icon 'sliders-h', %w[fw icon]
+      = _('Preferences')
+    = active_link_to :edit_user_registration, class: 'menu_entry' do
+      = icon 'pen', %w[fw icon]
+      = _('Account')
+    = active_link_to :destroy_user_session, method: :delete, class: 'menu_entry' do
+      = icon 'sign-out-alt', %w[fw icon]
+      = _('Log out')

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

@@ -2,8 +2,11 @@
 %html{ lang: locale }
   %head
     %meta{ content: 'text/html; charset=UTF-8', 'http-equiv': 'Content-Type' }/
-    %title= page_title(@page_title)
+    %meta{ name: 'viewport',
+           content: 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' }
+    %meta{ 'http-equiv': 'X-UA-Compatible', content: 'ie=edge' }
     = csrf_meta_tags
+    %title= page_title(@page_title)
     = stylesheet_link_tag    'application', media: 'all'
     = javascript_include_tag 'application'
     = auto_discovery_link_tag :rss, albums_url(format: :rss, show_nsfw: show_nsfw?)
@@ -16,18 +19,26 @@
       = _('Javascript seems to be disabled.')
     = render 'elabs/layouts/menu'
 
-    - if @page_title # This variable should be set in views (or controllers)
-      %h1.page__title= @page_title
+    .page__wrapper
+
+      = render 'elabs/layouts/announcements'
+
+      .page__header
+
+        - if @page_title # This variable should be set in views (or controllers)
+          %h1.page__header__title= @page_title
+
+        - if render_filters?
+          .page__header__actions
+            %a.page__header__actions_button{ href: '#' }
+              = icon 'filter', ['fw']
+            = render "elabs/#{controller_name}/filters"
 
-    .page__actions
-      = render "elabs/#{controller_name}/filters" if render_filters?
-      %a.btn--report{ href: '#', onclick: 'openModal(event, "report-modal")' }
-        %i.fa.fa-flag
-        = _('Report this page')
+      = render 'elabs/layouts/flash_messages'
 
-    .page__content
-      .page__content__container
-        = yield
+      .page__content
+        .page__content__container
+          = yield
 
     .modal#report-modal
       .modal__overlay{ onclick: 'closeModal("report-modal")' }
@@ -39,7 +50,7 @@
         .modal__window__content
           = render 'elabs/reports/form', new_report: @new_report
 
-    = render 'elabs/layouts/footer'
+    = render 'elabs/layouts/footer', can_report: true
 
   -# Widget templates
-  = render 'elabs/layouts/widgets/vue/all_widgets'
+  = render 'elabs/layouts/shortcodes/widgets/vue/all_widgets'

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

@@ -0,0 +1,33 @@
+!!!
+%html
+  %head
+    %meta{ content: 'text/html; charset=UTF-8', 'http-equiv': 'Content-Type' }/
+    %meta{ name: 'viewport',
+           content: 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' }
+    %meta{ 'http-equiv': 'X-UA-Compatible', content: 'ie=edge' }
+    = csrf_meta_tags
+    %title= page_title(@page_title, _('Admin'))
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
+  %body.page.page--admin
+    %noscript
+      = _('Javascript seems to be disabled.')
+    = render 'elabs/layouts/menu'
+
+    .page__wrapper
+
+      .screen_size_warning
+        = _('You may want to use a real device to do administrative things. Content here will be a mess.')
+
+      .page__header
+        - if @page_title # This variable should be set in views (or controllers)
+          %h1.page__header__title= @page_title
+
+
+      = render 'elabs/layouts/flash_messages'
+
+      .page__content
+        .page__content__container
+          = yield
+
+    = render 'elabs/layouts/footer'

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

@@ -0,0 +1,36 @@
+!!!
+%html
+  %head
+    %meta{ content: 'text/html; charset=UTF-8', 'http-equiv': 'Content-Type' }/
+    %meta{ name: 'viewport',
+           content: 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' }
+    %meta{ 'http-equiv': 'X-UA-Compatible', content: 'ie=edge' }
+    = csrf_meta_tags
+    %title= page_title(@page_title, _('Member'))
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
+  %body.page.page--member
+    %noscript
+      = _('Javascript seems to be disabled.')
+    = render 'elabs/layouts/menu'
+
+    .page__wrapper
+
+      .screen_size_warning= _('You may want to use a real device to manage things. Content here will be a mess.')
+
+      .page__header
+
+        - if @page_title # This variable should be set in views (or controllers)
+          %h1.page__header__title= @page_title
+
+
+      = render 'elabs/layouts/flash_messages'
+
+      .page__content
+        .page__content__container
+          = yield
+
+    = render 'elabs/layouts/footer'
+
+  -# Widget templates
+  = render 'elabs/layouts/shortcodes/widgets/vue/all_widgets'