diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index f242e8757..76c4405ed 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -138,10 +138,6 @@ // 02. Index // - - - - - - - - - - - - - - - - - - - - - - - - - -.featured-debates { - margin-top: rem-calc(23); -} - .debate-featured { .panel { @@ -244,7 +240,6 @@ .debates-list { margin-bottom: rem-calc(48); - margin-top: rem-calc(24); } .debate { diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 6e5ad3d7b..49ac151fe 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -10,6 +10,7 @@ // 08. Forms // 09. Alerts // 10. User account +// 11. Filters // // 01. Variables @@ -111,7 +112,6 @@ h1, h2, h3, h4, h5, h6 { } .sidebar { - margin-top: rem-calc(24); margin-bottom: rem-calc(48); } @@ -556,3 +556,36 @@ form { } } } + +// 11. Filters +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.filters { + + h2 { + display: inline-block; + font-size: rem-calc(24); + margin: rem-calc(24) 0; + } + + select { + height: auto; + margin: rem-calc(24) rem-calc(6); + min-width: rem-calc(180); + outline: 0; + padding: rem-calc(12); + width: auto; + + optgroup { + font-size: rem-calc(14); + } + + option { + + &:after { + content: "a"; + font-family: "icons"; + } + } + } +} diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 3a3881b76..6fa0db61c 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -1,6 +1,67 @@
+ + +
+
+

<%= t("debates.index.showing") %>

+ + + + +
+
+ + + +
+
+

<%= t("debates.index.showing") %>

+ + + +

<%= t("debates.index.tag") %>

+ + + +

(43)

+
+
+ +
-
+
<%= render @debates %>
@@ -10,4 +71,4 @@
-
\ No newline at end of file + diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 434499859..ada595c02 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,5 +1,10 @@
-
\ No newline at end of file + diff --git a/config/locales/en.yml b/config/locales/en.yml index f1d7ba646..4ae370798 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -27,6 +27,14 @@ en: debates: index: create_debate: Create a debate + showing: You are seeing + tag: with the topic + filter_debates: debates + filter_initiatives: initiatives + filter_debates_and_initiatives: debates and initiatives + filter_news: the newest + filter_votes: the most voted + filter_rated: the best rated debate: debate: Debate comments: @@ -124,3 +132,5 @@ en: default: "You are not authorized to access this page." manage: all: "You are not authorized to %{action} %{subject}." + welcome: + featured_debates: Features debates diff --git a/config/locales/es.yml b/config/locales/es.yml index 45cfac0d5..bc5ee7df1 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -27,6 +27,14 @@ es: debates: index: create_debate: Crea un debate + showing: "Estás viendo" + tag: "con el tema" + filter_debates: debates + filter_initiatives: iniciativas + filter_debates_and_initiatives: debates e iniciativas + filter_news: "más nuevos" + filter_votes: "más votados" + filter_rated: mejor valorados debate: debate: Debate comments: @@ -122,17 +130,7 @@ es: subject: Alguien ha respondido a tu comentario unauthorized: default: "No tienes permiso para acceder a esta página." - index: - all: "No tienes permiso para listar %{subject}" - show: - all: "No tienes permiso para ver %{subject}" - edit: - all: "No tienes permiso para editar %{subject}" - update: - all: "No tienes permiso para modificar %{subject}" - create: - all: "No tienes permiso para crear %{subject}" - delete: - all: "No tienes permiso para borrar %{subject}" manage: all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}." + welcome: + featured_debates: Debates destacados