Added new image and text. Change some style.

app/assets/stylesheets/all.css.scss

@@ -6483,7 +6483,9 @@ ul, li {
   list-style-type: none;
   padding-left: 0;
   margin-bottom: 0;
-  margin-top: 0; }
+  margin-top: 0;
+  font-size: 14px;
+}
 
 a {
   transition: all 800ms cubic-bezier(0.19, 1, 0.22, 1); }
@@ -7394,6 +7396,17 @@ select {
   }
 }
 
+.home-page{
+  .content-text{
+    ul{
+      padding-left: 1rem;
+      li{
+        list-style-type:circle;
+      }
+    }
+  }
+}
+
 #lobby-activity-event #event-category{
   display: inline-block;
 }
@@ -7608,5 +7621,4 @@ header .top-bar{
   li{
     padding-left: 1rem;
   }
-
 }

app/views/homepage/index.html.erb

@@ -1,47 +1,59 @@
 <% content_for(:body_class) { 'home-page' } %>
 
-<div class="small-12 medium-4 column">
-  <figure>
-    <%= image_tag 'homepage/agendas.png', class: '', alt:'Agenda públicas'%>
-    <div class="content">
-      <p><strong><%= t'home.agendas_title' %></strong></p>
-      <p>
-        <%= t'home.agendas_description' %>
-      </p>
-      <%= link_to t('btn_access'), visitors_path  %>
-    </div>
-  </figure>
+<div data-equalizer>
+  <div class="small-12 medium-4 column">
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/agendas.jpg', alt: t('home.agendas_title') %>
+      <div class="content">
+        <p><strong><%= t'home.agendas_title' %></strong></p>
+        <p>
+          <%= t'home.agendas_description' %>
+        </p>
+        <%= link_to t('btn_access'), visitors_path  %>
+      </div>
+    </figure>
+  </div>
+  <div class="small-12 medium-4 column">
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/lobby-register.jpg', alt: t('home.register_lobby_title') %>
+      <div class="content">
+        <p><strong><%= t'home.register_lobby_title' %> </strong></p>
+        <p>
+          <%= t'home.register_lobby_description' %>
+        </p>
+        <%= link_to t('btn_access'), organizations_path  %>
+      </div>
+    </figure>
+  </div>
+  <div class="small-12 medium-4 column">
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/normative-footprint.jpg', alt: t('home.regulations_title')%>
+      <div class="content">
+        <p><strong><%= t'home.regulations_title' %></strong></p>
+        <p>
+            <%= t'home.regulations_description' %>
+        </p>
+        <%= link_to t('btn_access'), 'https://transparencia.madrid.es/portales/transparencia/es/Informacion-juridica/Huella-normativa?vgnextfmt=default&vgnextchannel=4099508929a56510VgnVCM1000008a4a900aRCRD', target: 'blank'  %>
+      </div>
+    </figure>
+  </div>
 </div>
 
-<div class="small-12 medium-4 column">
-  <figure>
-    <%= image_tag 'homepage/lobby-register.jpg', class: '', alt:'Registro de Lobbies'%>
-    <div class="content">
-      <p><strong><%= t'home.register_lobby_title' %> </strong></p>
-      <p>
-        <%= t'home.register_lobby_description' %>
-      </p>
-      <%= link_to t('btn_access'), organizations_path  %>
-    </div>
-  </figure>
-</div>
+<div class="small-12 column content-text">
+  <hr />
+  <p>
+    <strong><%= t'home.generic_text_title' %></strong><br />
+    <%= t'home.generic_text_block_1_html' %>
+  </p>
 
-<div class="small-12 medium-4 column">
-  <figure>
-    <%= image_tag 'homepage/normative-footprint.jpg', class: '', alt:'Huella normativa'%>
-    <div class="content">
-      <p><strong><%= t'home.regulations_title' %></strong></p>
-      <p>
-          <%= t'home.regulations_description' %>
-      </p>
-      <%= link_to t('btn_access'), rules_path  %>
-    </div>
-  </figure>
-</div>
+  <ul>
+    <li><%= t'home.generic_text_list_first' %></li>
+    <li><%= t'home.generic_text_list_second' %></li>
+    <li><%= t'home.generic_text_list_third' %></li>
+  </ul>
 
-<div class="small-12 column">
-  <hr />
   <p>
-    <%= t'home.generic_text' %>
+    <br />
+    <%= t'home.generic_text_finish_html' %>
   </p>
 </div>

app/views/infringement_emails/new.html.erb

@@ -8,6 +8,9 @@
     <%= f.label :subject, t('infringement_mailbox.subject_title') %>
     <%= f.text_field :subject, placeholder: t('infringement_mailbox.subject_placeholder') %>
 
+    <%= f.label :description, t('infringement_mailbox.description_title') %>
+    <%= f.text_area :description, class: 'tinymce'%>
+    <br>
     <%= f.invisible_captcha :subsubject %>
 
     <%= f.label :link, t('infringement_mailbox.link_title') %>
@@ -20,11 +23,6 @@
       <span class="form-info"><%= t('infringement_mailbox.attachment_info') %></span>
     </div>
 
-    <div>
-    <%= f.label :description, t('infringement_mailbox.description_title') %>
-    <%= f.text_area :description, class: 'tinymce'%>
-    </div>
-
     <div>
       <hr>
       <p><%= t('infringement_mailbox.contact_option_title') %> </p>
@@ -43,6 +41,34 @@
       <%= f.label :phone, t('infringement_mailbox.phone') %>
       <%= f.text_field :phone, placeholder: t('infringement_mailbox.phone_placeholder') %>
     </div>
+    <hr />
+    <p>
+      <%= t('infringement_mailbox.text_block_first_html') %>
+    </p>
+    <p>
+      <%= t('infringement_mailbox.text_block_second_html') %>
+    </p>
+    <p>
+      <%= t('infringement_mailbox.text_block_third.title') %>
+      <ul>
+        <li>
+          <%= t('infringement_mailbox.text_block_third.first') %>
+        </li>
+        <li>
+          <%= t('infringement_mailbox.text_block_third.second') %>
+        </li>
+        <li>
+          <%= t('infringement_mailbox.text_block_third.third') %>
+        </li>
+        <li>
+          <%= t('infringement_mailbox.text_block_third.four') %>
+        </li>
+      </ul>
+    </p>
+    <p>
+      <%= t('infringement_mailbox.text_block_fourth') %>
+    </p>
+
   </fieldset>
   <%= f.submit t('infringement_mailbox.send'), class: "button radius success right" %>
 <% end %>

app/views/layouts/_footer.html.erb

@@ -13,26 +13,15 @@
           <%= link_to t('footer.btn_cover_page'), root_path  %>
         </li>
         <li>
-          <%= link_to t('footer.btn_organization'), organizations_path  %>
+          <%= link_to t('footer.btn_agendas'), visitors_path  %>
         </li>
         <li>
-          <%= link_to t('footer.btn_human_resources'), nil  %>
+          <%= link_to t('footer.btn_registration'), nil  %>
         </li>
         <li>
-          <%= link_to t('footer.btn_legal_information'), nil  %>
-        </li>
-        <li>
-          <%= link_to t('footer.btn_economy_budgets'), nil  %>
-        </li>
-        <li>
-          <%= link_to t('footer.btn_relationship_citizens'), nil  %>
-        </li>
-        <li>
-          <%= link_to t('footer.btn_environmen_urbanism'), nil  %>
-        </li>
-        <li>
-          <%= link_to t('footer.btn_access_information'), nil  %>
+          <%= link_to t('footer.btn_normative'), nil  %>
         </li>
+
       </ul>
     </div>
     <div class="small-12 medium-3 mb20 columns">
@@ -50,6 +39,9 @@
         <li>
           <%= link_to 'decide.madrid.es', 'http://decide.madrid.es', target: 'blank'  %>
         </li>
+        <li>
+          <%= link_to 'transparencia.madrid.es', 'http://transparencia.madrid.es', target: 'blank'  %>
+        </li>
       </ul>
     </div>
   </div>
@@ -62,19 +54,19 @@
       <div class="small-12 medium-8 columns">
         <ul class="inline-list right">
           <li>
-            <%= link_to t('footer.btn_accessibility'), nil  %>
+            <%= link_to t('footer.btn_accessibility'), 'Esperando texto'  %>
           </li>
           <li>
-            <%= link_to t('footer.btn_contact'), nil  %>
+            <%= link_to t('footer.btn_contact'), 'http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Contactar?vgnextfmt=default&vgnextchannel=2ff5891b0ed86210VgnVCM2000000c205a0aRCRD', target: 'blank'  %>
           </li>
           <li>
-            <%= link_to t('footer.btn_web_map'), nil  %>
+            <%= link_to t('footer.btn_web_map'), 'Crear sitemap con link clikable'  %>
           </li>
           <li>
-            <%= link_to t('footer.btn_legal_warning'), nil  %>
+            <%= link_to t('footer.btn_legal_warning'), 'https://transparencia.madrid.es/portales/transparencia/es/Aviso-legal?vgnextfmt=default&vgnextchannel=20d8508929a56510VgnVCM1000008a4a900aRCRD', target: 'blank'  %>
           </li>
           <li>
-            <%= link_to t('footer.btn_privacy_policy'), nil  %>
+            <%= link_to t('footer.btn_privacy_policy'), 'http://www.madrid.es/portales/munimadrid/es/Inicio/Proteccion-de-datos?vgnextfmt=default&vgnextoid=2c241e7b0f578010VgnVCM100000dc0ca8c0RCRD&vgnextchannel=251f43db40317010VgnVCM100000dc0ca8c0RCRD' , target: 'blank' %>
           </li>
         </ul>
       </div>

app/views/layouts/_header.html.erb

@@ -2,9 +2,10 @@
   <div class="row hide-for-small-only">
     <div class="small-12 columns text-right">
       <ul class="header__menu">
-        <li><a href="<%= t('header.participation_url') %>" target="_blank"><%= t('header.participation') %></a></li>
+
         <li><a href="<%= t('header.transparency_url') %>" target="_blank"><%= t('header.transparency') %></a></li>
         <li><a href="<%= t('header.open_data_url') %>" target="_blank"><%= t('header.open_data') %></a></li>
+        <li><a href="<%= t('header.participation_url') %>" target="_blank"><%= t('header.participation') %></a></li>
       </ul>
     </div>
   </div>

app/views/registration_lobbies/index.html.erb

@@ -1,67 +1,80 @@
 <% content_for(:body_class) { 'registration-lobbies' } %>
-<div class="row">
+<div class="row" data-equalizer>
   <div class="small-12 medium-4 column">
-    <figure>
-      <%= image_tag 'homepage/query-documents.jpg', class: '', alt:'Agenda públicas'%>
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/query-documents.jpg', alt: t('registration_lobbies_index.registration_lobbies.registry_query_title') %>
       <div class="content">
-        <p><strong><%= t 'registration_lobbies.registry_query_title' %></strong></p>
+        <p><strong><%= t 'registration_lobbies_index.registration_lobbies.registry_query_title' %></strong></p>
         <p>
-          <%= t 'registration_lobbies.registry_query_description' %>
+          <%= t 'registration_lobbies_index.registration_lobbies.registry_query_description' %>
         </p>
         <%= link_to t('btn_access'), organizations_path  %>
       </div>
     </figure>
   </div>
 
   <div class="small-12 medium-4 column">
-    <figure>
-      <%= image_tag 'homepage/drop-out.jpg', class: '', alt:'Registro de Lobbies'%>
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/drop-out.jpg', alt: t('registration_lobbies_index.subscribe_unsubscribe.subscribe_unsubscribe_title')%>
       <div class="content">
-        <p><strong><%= t'subscribe_unsubscribe.subscribe_unsubscribe_title' %></strong></p>
+        <p><strong><%= t'registration_lobbies_index.subscribe_unsubscribe.subscribe_unsubscribe_title' %></strong></p>
         <p>
-          <%= t'subscribe_unsubscribe.subscribe_unsubscribe_description' %>
+          <%= t'registration_lobbies_index.subscribe_unsubscribe.subscribe_unsubscribe_description' %>
         </p>
-        <%= link_to t('btn_access'), organizations_path  %>
+        <%= link_to t('btn_access'), 'https://sede.madrid.es', taget: 'blank'  %>
       </div>
     </figure>
   </div>
 
   <div class="small-12 medium-4 column">
-    <figure>
-      <%= image_tag 'homepage/regulations.jpg', class: '', alt:'Huella normativa'%>
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/regulations.jpg', alt: t('registration_lobbies_index.normative.normative_title') %>
       <div class="content">
-        <p><strong><%= t'normative.normative_title' %></strong></p>
+        <p><strong><%= t'registration_lobbies_index.normative.normative_title' %></strong></p>
         <p>
-          <%= t'normative.normative_description' %>
+          <%= t'registration_lobbies_index.normative.normative_description' %>
         </p>
-        <%= link_to t('btn_access'), code_of_conduct_path  %>
+        <%= link_to t('btn_access'), faq_path  %>
       </div>
     </figure>
   </div>
 </div>
 
-<div class="row">
+<div class="row" data-equalizer>
   <br />
   <div class="small-12 medium-4 column">
-    <figure>
-      <%= image_tag 'homepage/faq.jpg', class: '', alt:'Huella normativa'%>
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/faq.jpg', alt: t('registration_lobbies_index.questions.question_title') %>
       <div class="content">
-        <p><strong><%= t'questions.question_title' %></strong></p>
+        <p><strong><%= t'registration_lobbies_index.questions.question_title' %></strong></p>
         <p>
-          <%= t'questions.question_description' %>
+          <%= t'registration_lobbies_index.questions.question_description' %>
         </p>
         <%= link_to t('btn_access'), faq_path  %>
       </div>
     </figure>
   </div>
 
   <div class="small-12 medium-4 column">
-    <figure>
-      <%= image_tag 'homepage/breaches.jpg', class: '', alt:'Huella normativa'%>
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/stats.jpg',  alt: t('registration_lobbies_index.stats.stats_title') %>
       <div class="content">
-        <p><strong><%= t'defaults_mailbox.mailbox_title' %></strong></p>
+        <p><strong><%= t'registration_lobbies_index.stats.stats_title' %></strong></p>
         <p>
-          <%= t'defaults_mailbox.mailbox_description' %>
+          <%= t'registration_lobbies_index.stats.stats_description' %>
+        </p>
+        <%= link_to t('btn_access'), 'falta link'  %>
+      </div>
+    </figure>
+  </div>
+
+  <div class="small-12 medium-4 column">
+    <figure data-equalizer-watch>
+      <%= image_tag 'homepage/breaches.jpg', alt: t('registration_lobbies_index.defaults_mailbox.mailbox_title') %>
+      <div class="content">
+        <p><strong><%= t'registration_lobbies_index.defaults_mailbox.mailbox_title' %></strong></p>
+        <p>
+          <%= t'registration_lobbies_index.defaults_mailbox.mailbox_description' %>
         </p>
         <%= link_to t('btn_access'), new_infringement_email_path  %>
       </div>
@@ -71,7 +84,17 @@
   <div class="small-12 column">
     <hr />
     <p>
-      <%= t'generic_style' %>
+      <strong><%= t'registration_lobbies_index.generic_text_title' %></strong>
+    </p>
+    <p>
+      <%= t'registration_lobbies_index.generic_text_block_first' %>
+    </p>
+    <p>
+      <%= t'registration_lobbies_index.generic_text_block_second' %>
+    </p>
+    <p>
+      <%= t'registration_lobbies_index.generic_text_block_third_html' %>
+
     </p>
   </div>
 </div>