diff --git a/Gemfile b/Gemfile
index 52b931b..6632799 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,6 +46,7 @@ gem 'friendly_id'
gem 'hamlit-rails'
gem 'hiredis'
gem 'image_processing'
+gem 'inline_svg'
gem 'jekyll'
gem 'jquery-rails'
gem 'mini_magick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f30c44..e3a7a58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,6 +178,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)
@@ -453,6 +456,7 @@ DEPENDENCIES
hamlit-rails
hiredis
image_processing
+ inline_svg
jbuilder (~> 2.5)
jekyll
jquery-rails
diff --git a/app/assets/images/sutty.svg b/app/assets/images/sutty.svg
new file mode 100644
index 0000000..c916220
--- /dev/null
+++ b/app/assets/images/sutty.svg
@@ -0,0 +1,6 @@
+
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 11415a0..e0e7d15 100644
--- 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
+ }
+}
diff --git a/app/views/devise/registrations/edit.haml b/app/views/devise/registrations/edit.haml
index 31fcb34..c365d7f 100644
--- 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
diff --git a/app/views/i18n/edit.haml b/app/views/i18n/edit.haml
index 0eee60f..c8e35e3 100644
--- 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'
diff --git a/app/views/layouts/_breadcrumb.haml b/app/views/layouts/_breadcrumb.haml
index 322f416..8a0393f 100644
--- 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'
diff --git a/app/views/posts/edit.haml b/app/views/posts/edit.haml
index 15da071..6477f37 100644
--- 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
diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 646139c..00f88b9 100644
--- 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
diff --git a/app/views/posts/new.haml b/app/views/posts/new.haml
index 184227b..31df261 100644
--- 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
diff --git a/app/views/posts/show.haml b/app/views/posts/show.haml
index 1c3a75e..a75c8e1 100644
--- 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
diff --git a/app/views/sites/edit.haml b/app/views/sites/edit.haml
index a461bb5..5740b0f 100644
--- 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)
diff --git a/app/views/sites/fetch.haml b/app/views/sites/fetch.haml
index ac6c66b..04d5385 100644
--- 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')
diff --git a/app/views/sites/index.haml b/app/views/sites/index.haml
index 3bbd28c..07a0f8f 100644
--- 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
diff --git a/app/views/sites/new.haml b/app/views/sites/new.haml
index b5760f3..40bad24 100644
--- 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')
diff --git a/app/views/stats/index.haml b/app/views/stats/index.haml
index eb55c5d..347a80c 100644
--- 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')
diff --git a/app/views/usuaries/index.haml b/app/views/usuaries/index.haml
index d5df74a..6a6c89b 100644
--- 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')
diff --git a/app/views/usuaries/invite.haml b/app/views/usuaries/invite.haml
index 472d09c..16a2614 100644
--- 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)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index de3da9f..1614563 100644
--- 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 () 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 Enter to add a new one.
To empty the field, click the × 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'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4116c99..7771cb9 100644
--- 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 () y luego presionar el
@@ -196,13 +200,6 @@ es:
poner, termina de escribir y presiona Entrar para agregar
opciones que aun no existen. Para vaciar las opciones, usa el botón
× 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'