diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 59c1271b4..c349a1c9c 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -20,6 +20,11 @@ body.admin {
.top-links {
background: darken($admin-color, 15%);
}
+
+ .back-web {
+ padding-top: $line-height/4;
+ text-decoration: underline;
+ }
}
.top-bar {
@@ -150,7 +155,7 @@ body.admin {
border-right: 1px solid $border;
@include breakpoint(medium) {
- padding-bottom: $line-height*3;
+ min-height: rem-calc(1100);
}
ul {
@@ -160,10 +165,12 @@ body.admin {
padding: 0;
[class^="icon-"] {
+ color: $admin-color;
display: inline-block;
font-size: rem-calc(24);
- padding-right: rem-calc(12);
- padding-top: rem-calc(4);
+ line-height: $line-height;
+ padding: $line-height/2 $line-height/4;
+ padding-left: 0;
vertical-align: middle;
}
@@ -172,19 +179,26 @@ body.admin {
margin: 0;
outline: 0;
+ ul {
+ margin-left: $line-height/1.5;
+ border-left: 1px solid $border;
+ padding-left: $line-height/2;
+ }
+
+ &.section-title {
+ border-bottom: 1px solid $border;
+ }
+
&.active a {
background: #f3f6f7;
+ border-radius: rem-calc(6);
+ -moz-border-radius: rem-calc(6);
+ -webkit-border-radius: rem-calc(6);
color: $admin-color;
font-weight: bold;
}
}
- li.section {
- border-bottom: 1px dotted #d5d5d5;
- border-top: 1px dotted #d5d5d5;
- height: $line-height/2;
- }
-
li a {
color: $text;
display: block;
@@ -194,10 +208,38 @@ body.admin {
&:hover {
background: #f3f6f7;
+ border-radius: rem-calc(6);
+ -moz-border-radius: rem-calc(6);
+ -webkit-border-radius: rem-calc(6);
+ color: $admin-color;
text-decoration: none;
}
}
}
+
+ .is-accordion-submenu-parent {
+
+ & > a::after {
+ border-color: $admin-color transparent transparent;
+ }
+ }
+
+ .submenu {
+ border-bottom: 0;
+ margin-left: $line-height;
+
+ li:first-child {
+ padding-top: $line-height/2;
+ }
+
+ li:last-child {
+ padding-bottom: $line-height/2;
+ }
+
+ a {
+ font-weight: normal;
+ }
+ }
}
// 03. List elements
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index a4b0da4f7..c2faa006c 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -163,6 +163,12 @@
.icon-whatsapp:before {
content: "\50";
}
+.icon-zip:before {
+ content: "\4f";
+}
+.icon-banner:before {
+ content: "\51";
+}
.icon-arrow-down:before {
content: "\52";
}
@@ -172,6 +178,12 @@
.icon-arrow-right:before {
content: "\55";
}
+.icon-check-circle:before {
+ content: "\56";
+}
+.icon-arrow-top:before {
+ content: "\57";
+}
.icon-checkmark-circle:before {
content: "\59";
}
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index f14269fb3..6c6bfbe25 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -4,6 +4,30 @@ module AdminHelper
render "/#{namespace}/menu"
end
+ def menu_tags
+ ["tags"].include? controller_name
+ end
+
+ def menu_moderated_content
+ ["proposals", "debates", "comments", "users"].include? controller_name
+ end
+
+ def menu_budget
+ ["spending_proposals"].include? controller_name
+ end
+
+ def menu_polls
+ ["polls", "questions", "officers", "booths"].include? controller_name
+ end
+
+ def menu_profiles
+ ["organizations", "officials", "moderators", "valuators", "managers"].include? controller_name
+ end
+
+ def menu_banners
+ ["banners"].include? controller_name
+ end
+
def official_level_options
options = [["",0]]
(1..5).each do |i|
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 31d3911a0..4b657939a 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,130 +1,122 @@
-
diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index 793b4e407..2a2ed1c56 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -1,4 +1,12 @@
-<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %>
+<%= link_to admin_settings_path, class: "button float-right" do %>
+
+ <%= t("admin.menu.settings") %>
+<% end %>
+
+<%= link_to admin_stats_path, class: "button float-right" do %>
+
+ <%= t("admin.menu.stats") %>
+<% end %>
<%= t("admin.dashboard.index.title") %>
diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb
index d2a5d45e0..0fc8703fd 100644
--- a/app/views/admin/moderators/index.html.erb
+++ b/app/views/admin/moderators/index.html.erb
@@ -1,4 +1,6 @@
-<%= t("admin.moderators.index.title") %>
+<%= link_to t('admin.menu.activity'), admin_activity_path, class: "button hollow float-right" %>
+
+<%= t("admin.moderators.index.title") %>
<%= form_tag search_admin_moderators_path, method: :get, remote: true do %>
diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb
index ef17536c3..cd83201a4 100644
--- a/app/views/admin/stats/show.html.erb
+++ b/app/views/admin/stats/show.html.erb
@@ -11,7 +11,8 @@
direct_messages_admin_stats_path, class: "button hollow" %>
<%= link_to t("admin.stats.show.proposal_notifications"),
proposal_notifications_admin_stats_path, class: "button hollow" %>
-
+ <%= link_to t("admin.stats.show.incomplete_verifications"),
+ admin_verifications_path, class: "button hollow" %>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 095e351d6..d8dfe9d23 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -2,6 +2,8 @@
<%= render 'shared/locale_switcher' %>
+ <%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'],
+ root_path, class: "float-right back-web" %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 95bcae3e3..e5741086a 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -30,7 +30,7 @@
<%= render 'layouts/admin_header' %>
-
+
-
+
<%= render 'layouts/flash' %>
<%= yield %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 0dffe90d9..0facc0935 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -96,12 +96,11 @@ en:
admin: Admin menu
banner: Manage banners
poll_questions: Poll questions
- debate_topics: Debate topics
+ proposals_topics: Proposals topics
hidden_comments: Hidden comments
hidden_debates: Hidden debates
hidden_proposals: Hidden proposals
hidden_users: Hidden users
- incomplete_verifications: Incomplete verifications
managers: Managers
moderators: Moderators
valuators: Valuators
@@ -112,6 +111,12 @@ en:
settings: Configuration settings
spending_proposals: Spending proposals
stats: Statistics
+ title_categories: Categories
+ title_moderated_content: Moderated content
+ title_budgets: Budgets
+ title_polls: Polls
+ title_profiles: Profiles
+ title_banners: Banners
moderators:
index:
title: Moderators
@@ -373,6 +378,7 @@ en:
visits_title: Visits
direct_messages: Direct messages
proposal_notifications: Proposal notifications
+ incomplete_verifications: Incomplete verifications
direct_messages:
title: Direct messages
total: Total
@@ -385,9 +391,9 @@ en:
create: Create Topic
destroy: Destroy Topic
index:
- add_tag: Add a new debate topic
- title: Debate topics
- mark_as_featured: Propose topic upon creating debate
+ add_tag: Add a new proposal topic
+ title: Proposal topics
+ mark_as_featured: Propose topic upon creating proposal
name:
placeholder: Type the name of the topic
update: Update Topic
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 5739d54bf..ee412368a 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -95,13 +95,12 @@ es:
activity: Actividad de moderadores
admin: Menú de administración
banner: Gestionar banners
- debate_topics: Temas de debate
+ proposals_topics: Temas de propuestas
poll_questions: Preguntas ciudadanas
hidden_comments: Comentarios ocultos
hidden_debates: Debates ocultos
hidden_proposals: Propuestas ocultas
hidden_users: Usuarios bloqueados
- incomplete_verifications: Verificaciones incompletas
managers: Gestores
moderators: Moderadores
valuators: Evaluadores
@@ -112,6 +111,12 @@ es:
settings: Configuración global
spending_proposals: Propuestas de inversión
stats: Estadísticas
+ title_categories: Categorías
+ title_moderated_content: Contenido moderado
+ title_budgets: Presupuestos
+ title_polls: Votaciones
+ title_profiles: Perfiles
+ title_banners: Banners
moderators:
index:
title: Moderadores
@@ -373,6 +378,7 @@ es:
visits_title: Visitas
direct_messages: Mensajes directos
proposal_notifications: Notificaciones de propuestas
+ incomplete_verifications: Verificaciones incompletas
direct_messages:
title: Mensajes directos
total: Total
@@ -385,9 +391,9 @@ es:
create: Crear Tema
destroy: Eliminar Tema
index:
- add_tag: Añade un nuevo tema de debate
- title: Temas de debate
- mark_as_featured: Proponer tema al crear debate
+ add_tag: Añade un nuevo tema de propuesta
+ title: Temas de propuesta
+ mark_as_featured: Proponer tema al crear propuesta
name:
placeholder: Escribe el nombre del tema
update: Actualizar Tema