Merge branch 'master' into legislation-module-stable

app/assets/stylesheets/layout.scss

@@ -1104,11 +1104,12 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
 // --------------------
 
 [class^="level-"] {
-  color: white;
+  color: black;
 }
 
 .is-author {
-  background: #008CCF;
+  background: #00A5F1;
+  color: black;
 }
 
 .is-association {
@@ -1167,6 +1168,9 @@ table {
 .button.button-twitter,
 .button.button-facebook,
 .button.button-google {
+  background: white;
+  color: $text;
+  font-weight: bold;
   height: $line-height*2;
   line-height: $line-height*2;
   padding: 0;
@@ -1174,9 +1178,11 @@ table {
 }
 
 .button.button-twitter {
-  background: #45B0E3;
+  background: #ECF7FC;
+  border-left: 3px solid #45B0E3;
 
   &:before {
+    color: #45B0E3;
     content: "f";
     font-family: "icons" !important;
     font-size: rem-calc(24);
@@ -1214,9 +1220,11 @@ table {
 }
 
 .button.button-facebook {
-  background: #3B5998;
+  background: #EBEEF4;
+  border-left: 3px solid #3B5998;
 
   &:before {
+    color: #3B5998;
     content: "A";
     font-family: "icons" !important;
     font-size: rem-calc(24);
@@ -1254,9 +1262,11 @@ table {
 }
 
 .button.button-google {
-  background: #DE4C34;
+  background: #FCEDEA;
+  border-left: 3px solid #DE4C34;
 
   &:before {
+    color: #DE4C34;
     content: "B";
     font-family: "icons" !important;
     font-size: rem-calc(24);

app/assets/stylesheets/participation.scss

@@ -457,7 +457,7 @@
 }
 
 .bullet {
-  color: $border;
+  color: $text;
 }
 
 .investment-project-show p, .budget-investment-show p {

app/controllers/management/budgets_controller.rb

@@ -7,6 +7,11 @@ class Management::BudgetsController < Management::BaseController
 
   def create_investments
     @budgets = Budget.accepting.order(created_at: :desc).page(params[:page])
+
+    if current_manager_administrator?
+      @budgets += Budget.reviewing.order(created_at: :desc) +
+                  Budget.selecting.order(created_at: :desc)
+    end
   end
 
   def support_investments
@@ -23,4 +28,8 @@ class Management::BudgetsController < Management::BaseController
       check_verified_user t("management.budget_investments.alert.unverified_user")
     end
 
+    def current_manager_administrator?
+      session[:manager]["login"].match("admin")
+    end
+
 end

app/models/budget/investment.rb

@@ -259,7 +259,7 @@ class Budget
     private
 
       def set_denormalized_ids
-        self.group_id ||= self.heading.try(:group_id)
+        self.group_id = self.heading.try(:group_id) if self.heading_id_changed?
         self.budget_id ||= self.heading.try(:group).try(:budget_id)
       end
   end

app/views/devise/menu/_login_items.html.erb

@@ -1,6 +1,6 @@
 <% if user_signed_in? %>
   <li>
-    <%= link_to notifications_path, class: "notifications", accesskey: "n" do %>
+    <%= link_to notifications_path, class: "notifications" do %>
       <span class="sr-only"><%= t("layouts.header.notifications") %></span>
       <% if current_user.notifications_count > 0 %>
         <span class="icon-circle" aria-hidden="true"></span>
@@ -12,19 +12,19 @@
     <% end %>
   </li>
   <li>
-    <%= link_to(t("layouts.header.my_activity_link"), user_path(current_user), accesskey: "a") %>
+    <%= link_to t("layouts.header.my_activity_link"), user_path(current_user) %>
   </li>
   <li>
-    <%= link_to(t("layouts.header.my_account_link"), account_path, accesskey: "m") %>
+    <%= link_to t("layouts.header.my_account_link"), account_path %>
   </li>
   <li>
-    <%= link_to(t("devise_views.menu.login_items.logout"), destroy_user_session_path, method: :delete) %>
+    <%= link_to t("devise_views.menu.login_items.logout"), destroy_user_session_path, method: :delete %>
   </li>
 <% else %>
   <li>
-    <%= link_to(t("devise_views.menu.login_items.login"), new_user_session_path)  %>
+    <%= link_to t("devise_views.menu.login_items.login"), new_user_session_path %>
   </li>
   <li>
-    <%= link_to(t("devise_views.menu.login_items.signup"), new_user_registration_path, class: "button") %>
+    <%= link_to t("devise_views.menu.login_items.signup"), new_user_registration_path, class: "button" %>
   </li>
 <% end %>

app/views/devise/sessions/new.html.erb

@@ -11,18 +11,18 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="row">
     <div class="small-12 column">
-      <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label"), tabindex: "1" %>
+      <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %>
     </div>
 
     <div class="small-12 column">
-      <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right", tabindex: "3" %>
-      <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label"), tabindex: "2" %>
+      <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
+      <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right" %>
     </div>
 
     <% if devise_mapping.rememberable? -%>
       <div class="small-12 column">
         <%= f.label :remember_me do %>
-          <%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false, tabindex: "4" %>
+          <%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false %>
           <span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span>
         <% end %>
       </div>
@@ -35,5 +35,3 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-
-

app/views/layouts/_header.html.erb

@@ -21,7 +21,7 @@
 
       <div id="responsive-menu">
         <div class="top-bar-title">
-          <%= link_to root_path, class: "hide-for-small-only", accesskey: "/" do %>
+          <%= link_to root_path, class: "hide-for-small-only", accesskey: "0" do %>
             <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
             <%= setting['org_name'] %>
           <% end %>

app/views/layouts/application.html.erb

@@ -20,9 +20,11 @@
                      type: "image/png" %>
     <%= content_for :social_media_meta_tags %>
 
-    <%= setting['per_page_code'].try(:html_safe) %>
+    <%= setting['per_page_code_head'].try(:html_safe) %>
   </head>
   <body>
+    <%= setting['per_page_code_body'].try(:html_safe) %>
+
     <h1 class="sr-only"><%= setting['org_name'] %></h1>
 
     <div class="wrapper">

app/views/pages/accessibility.html.erb

@@ -19,48 +19,37 @@
 
   <div class="small-12 medium-6">
     <table>
+      <caption class="sr-only">Atajos de teclado para el menú de navegación</caption>
       <thead>
         <tr>
-          <th class="text-center">Tecla</th>
-          <th>Página</th>
+          <th scope="col" class="text-center">Tecla</th>
+          <th scope="col">Página</th>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <td class="text-center">/</td>
+          <td class="text-center">0</td>
           <td>Inicio</td>
         </tr>
         <tr>
-          <td class="text-center">D</td>
+          <td class="text-center">1</td>
           <td>Debates</td>
         </tr>
         <tr>
-          <td class="text-center">P</td>
+          <td class="text-center">2</td>
           <td>Propuestas</td>
         </tr>
         <tr>
-          <td class="text-center">L</td>
-          <td>Procesos legislativos</td>
+          <td class="text-center">3</td>
+          <td>Votaciones</td>
         </tr>
         <tr>
-          <td class="text-center">S</td>
+          <td class="text-center">4</td>
           <td>Presupuestos participativos</td>
         </tr>
         <tr>
-          <td class="text-center">I</td>
-          <td>Más información</td>
-        </tr>
-        <tr>
-          <td class="text-center">N</td>
-          <td>Notificaciones</td>
-        </tr>
-        <tr>
-          <td class="text-center">A</td>
-          <td>Mi actividad</td>
-        </tr>
-        <tr>
-          <td class="text-center">M</td>
-          <td>Mi cuenta</td>
+          <td class="text-center">5</td>
+          <td>Procesos legislativos</td>
         </tr>
       </tbody>
     </table>
@@ -70,10 +59,11 @@
 
   <div class="small-12 medium-6">
     <table>
+      <caption class="sr-only">Combinación de teclas dependiendo del sistema operativo y navegador</caption>
       <thead>
         <tr>
-          <th>Navegador</th>
-          <th>Combinación de teclas</th>
+          <th scope="col">Navegador</th>
+          <th scope="col">Combinación de teclas</th>
         </tr>
       </thead>
       <tbody>
@@ -108,8 +98,8 @@
     <table>
       <thead>
         <tr>
-          <th>Navegador</th>
-          <th>Acción a realizar </th>
+          <th scope="col">Navegador</th>
+          <th scope="col">Acción a realizar </th>
         </tr>
       </thead>
       <tbody>

app/views/shared/_advanced_search.html.erb

@@ -37,7 +37,6 @@
               <%= text_field_tag 'advanced_search[date_min]',
                                   params[:advanced_search].try(:[], :date_min),
                                   type: "date",
-                                  placeholder: t("shared.advanced_search.date_placeholder"),
                                   class: 'js-calendar' %>
             </div>
             <div class='small-12 large-6 column'>
@@ -47,7 +46,6 @@
               <%= text_field_tag 'advanced_search[date_max]',
                                   params[:advanced_search].try(:[], :date_max),
                                   type: "date",
-                                  placeholder: t("shared.advanced_search.date_placeholder"),
                                   class: 'js-calendar' %>
             </div>
           </div>

app/views/shared/_subnavigation.html.erb

@@ -5,20 +5,20 @@
         <%= layout_menu_link_to t("layouts.header.debates"),
                                 debates_path,
                                 controller_name == 'debates',
-                                accesskey: "d" %>
+                                accesskey: "1" %>
       </li>
     <% end %>
     <li>
       <%= layout_menu_link_to t("layouts.header.proposals"),
                                 proposals_path,
                                 controller_name == 'proposals',
-                                accesskey: "p" %>
+                                accesskey: "2" %>
     </li>
     <li>
       <%= layout_menu_link_to t("layouts.header.proposal_ballot"),
                                 proposal_ballots_path,
                                 controller_name == 'proposal_ballots',
-                                accesskey: "v" %>
+                                accesskey: "3" %>
     </li>
     <% if feature?(:legislation) %>
       <li>
@@ -41,7 +41,7 @@
         <%= layout_menu_link_to t("layouts.header.budgets"),
                                   budgets_path,
                                   controller_name == "budgets" || controller_name == "investments",
-                                  accesskey: "b" %>
+                                  accesskey: "4" %>
       </li>
     <% end %>
   </ul>

app/views/shared/_tags.html.erb

@@ -5,8 +5,7 @@
     <% taggable.tag_list_with_limit(limit).each do |tag| %>
       <li class="inline-block">
         <%= link_to sanitize(tag.name),
-                    taggables_path(taggable.class.name.underscore, tag.name),
-                    search: tag.name %></li>
+                    taggables_path(taggable.class.name.underscore, tag.name) %></li>
     <% end %>
 
     <% if taggable.tags_count_out_of_limit(limit) > 0 %>

app/views/shared/_top_links.html.erb

@@ -2,8 +2,7 @@
   <li>
     <%= link_to t("layouts.header.more_information"),
                 page_path('more_information'),
-                class: ("selected" if current_page?("/more_information")),
-                accesskey: "i"  %>
+                class: ("selected" if current_page?("/more_information")) %>
   </li>
   <li>
     <%= link_to t("layouts.header.external_link_transparency"),

app/views/users/registrations/new.html.erb

@@ -19,7 +19,7 @@
 
       <%= f.label :username %>
       <p class="note"><%= t("devise_views.users.registrations.new.username_note") %></p>
-      <%= f.text_field  :username, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>
+      <%= f.text_field :username,  autofocus: true, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>
 
       <%= f.invisible_captcha :family_name %>