Merge branch 'diseño' into rails

2024-06-01 19:04:16 +00:00 · 2019-09-07 14:22:00 -03:00 · 2019-09-07 14:22:00 -03:00 · d3781e1cc8
parent d6367dea8a 48d295cbf4
commit d3781e1cc8
24 changed files with 212 additions and 115 deletions
--- a/1
+++ b/1
@ -45,6 +45,7 @@ gem 'friendly_id'
 gem 'hamlit-rails'
 gem 'hiredis'
 gem 'image_processing'
+gem 'inline_svg'
 gem 'jekyll'
 gem 'mini_magick'
 gem 'mobility'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -176,6 +176,9 @@ GEM
    image_processing (1.9.3)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.13, < 3)
+    inline_svg (1.5.2)
+      activesupport (>= 3.0)
+      nokogiri (>= 1.6)
    jaro_winkler (1.5.3)
    jbuilder (2.9.1)
      activesupport (>= 4.2.0)
@ -446,6 +449,7 @@ DEPENDENCIES
  hamlit-rails
  hiredis
  image_processing
+  inline_svg
  jbuilder (~> 2.5)
  jekyll
  letter_opener
--- a/app/assets/fonts/saira/v3/LICENSE
+++ b/app/assets/fonts/saira/v3/LICENSE
@ -0,0 +1,101 @@
+Copyright (c) 2014, Gatti & Omnibus-Type Team
+(https://www.omnibus-type.com/fonts/saira/), with Reserved Font Name
+Saira.
+
+This Font Software is licensed under the SIL Open Font License, Version
+1.1.  This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free
+and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to any
+document created using the fonts or their derivatives.
+
+DEFINITIONS
+
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+   Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the
+   user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the
+   corresponding Copyright Holder. This restriction only applies to the
+   primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must
+   be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+TERMINATION
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
--- a/app/assets/fonts/saira/v3/Saira.ttf
+++ b/app/assets/fonts/saira/v3/Saira.ttf
--- a/app/assets/fonts/saira/v3/SairaBold.ttf
+++ b/app/assets/fonts/saira/v3/SairaBold.ttf
--- a/app/assets/fonts/saira/v3/SairaMedium.ttf
+++ b/app/assets/fonts/saira/v3/SairaMedium.ttf
--- a/app/assets/images/sutty.svg
+++ b/app/assets/images/sutty.svg
@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31.335 11.988" height="45" role="img" aria-labelledby="title">
+  <title>Sutty</title>
+  <path d="M9.028 9.107c-.836 0-1.506-.254-2.017-.765-.51-.51-.77-1.148-.783-1.913V2.41h1.336v3.97c0 .38.14.708.418.98.278.273.625.41 1.04.41.381 0 .712-.134.992-.407.28-.272.421-.6.421-.984V2.41h1.328v4.02c-.013.767-.272 1.404-.777 1.912-.509.511-1.162.765-1.958.765M13.88 2.498h1.188V.018h1.33v2.48h1.186v1.328H16.4v5.278h-1.331V3.826H13.88zM19.367 2.477h1.188V0h1.331v2.477h1.186v1.33h-1.186v5.279h-1.33V3.807h-1.189zM1.503 7.567c.159.154.346.23.566.23a.773.773 0 0 0 .561-.23.77.77 0 0 0 .235-.571.763.763 0 0 0-.23-.559c-.108-.108-.336-.272-.688-.494-.479-.262-.82-.493-1.021-.694A1.723 1.723 0 0 1 .4 3.985c0-.498.174-.921.526-1.276.352-.352.775-.529 1.27-.529.497 0 .91.167 1.238.5.236.236.387.498.45.791l-1.291.373a.584.584 0 0 0-.09-.211.417.417 0 0 0-.307-.117.448.448 0 0 0-.33.138.448.448 0 0 0-.138.33c0 .13.045.239.135.329.082.076.264.209.553.391.531.291.915.556 1.156.797.415.42.622.918.622 1.495 0 .59-.207 1.095-.62 1.513a2.038 2.038 0 0 1-1.505.627 2.033 2.033 0 0 1-1.503-.63A2.085 2.085 0 0 1 0 7.435l1.323-.283c.037.193.098.333.18.415" class="is-path-magenta" fill="#f206f9"/>
+  <path d="M26.777 11.988h-1.404l4.53-9.506h1.436z" class="is-path-magenta" fill="#f206f9"/>
+  <path d="M26.954 6.468h1.435l-.145-.306h-1.439zm-1.793-3.68h1.49l-.146-.306H25.01zm.297.614h1.483l-.145-.307H25.31zm.3.613h1.47l-.141-.307h-1.48zm.298.613h1.464l-.146-.306h-1.467zm.3.614h1.455l-.146-.307h-1.46zm.297.613h1.445l-.142-.307h-1.451zm.598 1.227h1.429l-.145-.307h-1.433zm.152.306l.076.162-.07.145h1.42l.07-.145-.074-.162zm-.275.91l-.007.01h1.414l.148-.306h-1.416zm-.3.624h1.413l.148-.307h-1.413zm-.291.613h1.41l.148-.307h-1.413zm-.291.613h1.41l.145-.306h-1.41zm-.294.614h1.41l.145-.307h-1.41zm-.291.613h1.407l.145-.307h-1.407zm1.113.613l.145-.306h-1.407l-.145.306z" class="is-path-magenta" fill="#13fefe"/>
+</svg>
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@ -214,3 +214,9 @@ textarea.post-content {
    }
  }
 }
+
+svg {
+  .is-path-magenta {
+    fill: black
+  }
+}
--- a/app/views/devise/registrations/edit.haml
+++ b/app/views/devise/registrations/edit.haml
@ -1,7 +1,5 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('.index'), sites_path), t('.title')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('.index'), sites_path), t('.title')]

 .row.align-items-center.justify-content-center.full-height
  .col-md-6.align-self-center
--- a/app/views/i18n/edit.haml
+++ b/app/views/i18n/edit.haml
@ -1,9 +1,7 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [ link_to(t('sites.index'), sites_path),
-                link_to(@site.name, site_path(@site)),
-                t('i18n.index'),
-                t('i18n.edit')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+           link_to(@site.name, site_path(@site)),
+           t('i18n.index'),
+           t('i18n.edit')]

 = render 'i18n/form'
--- a/app/views/layouts/_breadcrumb.haml
+++ b/app/views/layouts/_breadcrumb.haml
@ -1,20 +1,26 @@
-%nav{ 'aria-label': 'breadcrumb', role: 'navigation' }
-  %ol.breadcrumb
-    %li.breadcrumb-item
-      = link_to destroy_usuarie_session_path, method: :delete,
-        data: { toggle: 'tooltip' }, title: t('help.logout'),
-        role: 'button', class: 'btn-text' do
-        = fa_icon 'sign-out', title: t('help.logout')
-    %li.breadcrumb-item
-      = link_to edit_usuarie_registration_path,
-        data: { toggle: 'tooltip' }, title: t('help.usuarie.edit') do
-        = current_usuarie.email
+%nav.navbar
+  %a.navbar-brand.d-none.d-sm-block{ href: '/' }
+    = inline_svg 'sutty.svg', class: 'black', aria: true,
+      title: t('svg.sutty.title'), desc: t('svg.sutty.desc')

-    - if @site.try(:persisted?) && (help = @site.try(:config).try(:dig, 'help'))
-      %li.breadcrumb-item= link_to t('.help'), help, target: '_blank'
+  %nav{ aria: { label: t('.title') }, role: 'navigation' }
+    %ol.breadcrumb
+      %li.breadcrumb-item
+        = link_to edit_usuarie_registration_path,
+          data: { toggle: 'tooltip' }, title: t('help.usuarie.edit') do
+          = current_usuarie.email

-    - crumbs.compact.each do |crumb|
-      - if crumb == crumbs.last
-        %li.breadcrumb-item.active{ 'aria-current': 'page' }= crumb
-      - else
-        %li.breadcrumb-item= crumb
+      - if @site
+        - if @site.persisted? && (help = @site.config.dig('help'))
+          %li.breadcrumb-item= link_to t('.help'), help, target: '_blank'
+
+      - crumbs.compact.each do |crumb|
+        - if crumb == crumbs.last
+          %li.breadcrumb-item.active{ 'aria-current': 'page' }= crumb
+        - else
+          %li.breadcrumb-item= crumb
+
+  %ul.navbar-nav
+    %li
+      = link_to t('.logout'), destroy_usuarie_session_path,
+        method: :delete, role: 'button', class: 'btn btn-primary'
--- a/app/views/posts/edit.haml
+++ b/app/views/posts/edit.haml
@ -1,11 +1,9 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path),
-               link_to(@site.name, site_posts_path(@site)),
-               link_to(t('posts.index'), site_posts_path(@site)),
-               link_to(@post.title.value, site_post_path(@site, @post.id)),
-               t('posts.edit')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+            link_to(@site.name, site_posts_path(@site)),
+            link_to(t('posts.index'), site_posts_path(@site)),
+            link_to(@post.title.value, site_post_path(@site, @post.id)),
+            t('posts.edit')]

 .row.justify-content-center
  .col-md-8
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@ -1,11 +1,10 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path),
-        @site.name,
-        link_to(t('posts.index'),
-        site_posts_path(@site)),
-        @category]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+    @site.name,
+    link_to(t('posts.index'),
+    site_posts_path(@site)),
+    @category]
+
 .row
  .col
    %h1= @site.title
--- a/app/views/posts/new.haml
+++ b/app/views/posts/new.haml
@ -1,10 +1,8 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path),
-        @site.name,
-        link_to(t('posts.index'),
-        site_posts_path(@site)), t('posts.new')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+    @site.name,
+    link_to(t('posts.index'),
+    site_posts_path(@site)), t('posts.new')]

 .row.justify-content-center
  .col-md-8
--- a/app/views/posts/show.haml
+++ b/app/views/posts/show.haml
@ -1,10 +1,8 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path),
-               @site.name,
-               link_to(t('posts.index'), site_posts_path(@site)),
-               @post.title.value]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+            @site.name,
+            link_to(t('posts.index'), site_posts_path(@site)),
+            @post.title.value]

 .row
  .col
--- a/app/views/sites/edit.haml
+++ b/app/views/sites/edit.haml
@ -1,8 +1,6 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path),
-               t('.title', site: @site.name)]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+            t('.title', site: @site.name)]
 .row
  .col
    %h1= t('.title', site: @site.name)
--- a/app/views/sites/fetch.haml
+++ b/app/views/sites/fetch.haml
@ -1,7 +1,6 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path), t('.title')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path), t('.title')]
+
 .row.justify-content-center
  .col-md-8#pull
    %h1= t('.title')
--- a/app/views/sites/index.haml
+++ b/app/views/sites/index.haml
@ -1,6 +1,5 @@
-.row
-  .col
-    = render 'layouts/breadcrumb', crumbs: [t('sites.index')]
+= render 'layouts/breadcrumb', crumbs: [t('sites.index')]
+
 .row
  .col
    %h1
--- a/app/views/sites/new.haml
+++ b/app/views/sites/new.haml
@ -1,7 +1,6 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path), t('.title')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path), t('.title')]
+
 .row
  .col
    %h1= t('.title')
--- a/app/views/stats/index.haml
+++ b/app/views/stats/index.haml
@ -1,8 +1,7 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [link_to(t('sites.index'), sites_path),
-      link_to(@site.name, site_path(@site)), t('.title')]
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+  link_to(@site.name, site_path(@site)), t('.title')]
+
 .row
  .col
    %h1= t('.title')
--- a/app/views/usuaries/index.haml
+++ b/app/views/usuaries/index.haml
@ -1,11 +1,9 @@
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [ link_to(t('sites.index'), sites_path),
-      @site.name,
-      link_to(t('posts.index'),
-      site_usuaries_path(@site)) ]
-    = render 'layouts/help', help: t('help.breadcrumbs')
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+           @site.name,
+           link_to(t('posts.index'),
+           site_usuaries_path(@site))]
+
 .row
  .col
    %h1= t('.title')
--- a/app/views/usuaries/invite.haml
+++ b/app/views/usuaries/invite.haml
@ -1,13 +1,11 @@
 - invite_as = t("usuaries.invite_as.#{params[:invite_as]}")
-.row
-  .col
-    = render 'layouts/breadcrumb',
-      crumbs: [ link_to(t('sites.index'), sites_path),
-      @site.name,
-      link_to(t('posts.index'),
-      site_usuaries_path(@site)),
-      t('.title', invite_as: invite_as) ]
-    = render 'layouts/help', help: t('help.breadcrumbs')
+
+= render 'layouts/breadcrumb',
+  crumbs: [link_to(t('sites.index'), sites_path),
+           @site.name,
+           link_to(t('posts.index'), site_usuaries_path(@site)),
+           t('.title', invite_as: invite_as)]
+
 .row
  .col
    %h1= t('.title', invite_as: invite_as)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -2,6 +2,10 @@ en:
  _true: Yes
  _false: No
  dir: ltr
+  svg:
+    sutty:
+      title: Sutty
+      desc: Sutty's logo, the Y is composed by > and /
  site_service:
    create: 'Created %{name}'
    update: 'Updated %{name}'
@ -85,7 +89,8 @@ en:
    mailer:
      signature: 'With love, Sutty'
    breadcrumb:
-      help: Help
+      title: 'Your location in Sutty'
+      logout: Exit
  collaborations:
    collaborate:
      submit: Register
@ -98,7 +103,6 @@ en:
    usuarie:
      edit: Edit my profile
    category: 'Category'
-    logout: 'Close the session'
    posts:
      reorder: 'You can drag and drop articles by the arrow icon (<i class="fa fa-arrows-v"></i>) and then press the "Reorder posts" button to save them in different order.'
    i18n:
@ -187,13 +191,6 @@ en:
    auto-complete will suggest available options.  If the option doesn't
    exist, finish writing and press <kbd>Enter</kbd> to add a new one.
    To empty the field, click the &times; button on your right."
-  login:
-    email: 'E-mail'
-    password: 'Password'
-    submit: 'Log in'
-    logout: 'Log out'
-    lang: 'Language'
-    error: 'There was an error during log in.  Did you type your credentials correctly?'
  deploys:
    deploy_local:
      title: 'Host at Sutty'
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -2,6 +2,10 @@ es:
  _true: Sí
  _false: No
  dir: ltr
+  svg:
+    sutty:
+      title: Sutty
+      desc: Logo de Sutty, la Y está compuesta de un > y una /
  site_service:
    create: 'Creado %{name}'
    update: 'Actualizado %{name}'
@ -87,7 +91,8 @@ es:
    mailer:
      signature: 'Con cariño, Sutty'
    breadcrumb:
-      help: Ayuda
+      title: 'Tu ubicación en Sutty'
+      logout: Salir
  collaborations:
    collaborate:
      submit: Registrarme
@ -100,7 +105,6 @@ es:
    usuarie:
      edit: Editar mi perfil
    category: 'Categoría'
-    logout: 'Cierra la sesión'
    posts:
      reorder: 'Puedes arrastrar y soltar los artículos por el ícono de
      las flechas (<i class="fa fa-arrows-v"></i>) y luego presionar el
@ -196,13 +200,6 @@ es:
    poner, termina de escribir y presiona <kbd>Entrar</kbd> para agregar
    opciones que aun no existen.  Para vaciar las opciones, usa el botón
    &times; a la derecha.'
-  login:
-    email: 'Dirección de correo'
-    password: 'Contraseña'
-    submit: 'Ingresar'
-    lang: 'Idioma'
-    logout: 'Salir'
-    error: 'Hubo un error al iniciar la sesión.  ¿Escribiste bien tus credenciales?'
  deploys:
    deploy_local:
      title: 'Alojar en Sutty'