Merge branch 'master' into stable

app/assets/stylesheets/admin.scss

@@ -68,6 +68,14 @@ body.admin {
     .filters h2 {
       margin-top: 0;
     }
+
+    .proposal-new, .proposal-edit {
+      padding-top: 0;
+    }
+
+    .proposal-show {
+      padding-top: rem-calc(54);
+    }
   }
 
   .is-featured {
@@ -293,11 +301,6 @@ body.admin {
 // 05. Management
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.postfix {
-  height: rem-calc(48);
-  line-height: rem-calc(48);
-}
-
 .user-permissions {
 
   ul {

app/assets/stylesheets/layout.scss

@@ -958,8 +958,7 @@ form {
 
     em {
       background: white;
-      display: inline-block;
-      padding-left: rem-calc(6);
+      display: block;
     }
   }
 
@@ -1147,9 +1146,9 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
   background-color: rgba(255,255,255,.5);
   color: rgba(0,0,0,.4);
   font-size: rem-calc(40);
-  left: 11px;
+  left: rem-calc(11);
   position: absolute;
-  top: 63px;
+  top: rem-calc(72);
 }
 
 .user-deleted {

app/assets/stylesheets/print.css

@@ -22,12 +22,18 @@ img.left { display: none !important; }
 
 .icon-proposals { display: none !important; }
 
+.captcha { display: none !important; }
+
 li.name span { display: none !important; }
 
 p.proposal-info span:nth-child(3) { display: none !important; }
 
 .top-links { display: none !important; }
 
+.button { display: none !important; }
+
+input[type="submit"] { display: none !important; }
+
 .select-order {
   border: 0;
   font-size: 24px;

app/views/management/dashboard/index.html.erb

@@ -1,3 +1,14 @@
 <div class="dashboard">
   <h2><%= t("management.dashboard.index.title") %></h2>
+
+  <p>Desde aquí puedes gestionar usuarios a través de las siguientes acciones:</p>
+
+  <h3>Usuarios</h3>
+
+  <h3>Crear propuesta</h3>
+
+  <h3>Apoyar propuesta</h3>
+
+  <h3>Imprimir propuestas</h3>
+
 </div>

app/views/management/proposals/new.html.erb

@@ -1,9 +1,9 @@
-<div class="proposal-new row">
+<%= render '/shared/print' %>
 
+<div class="proposal-new row">
   <div class="small-12 medium-9 column">
+    <h1><%= t("management.proposals.create_proposal") %></h1>
     <%= render "proposals/form", form_url: management_proposals_url %>
   </div>
 
 </div>
-
-<%= render '/shared/print' %>

app/views/management/proposals/show.html.erb

@@ -1,3 +1,3 @@
-<%= render template: 'proposals/show' %>
+<%= render '/shared/print' %>
 
-<%= render '/shared/print' %>
+<%= render template: 'proposals/show' %>

app/views/pages/conditions.html.erb

@@ -2,6 +2,9 @@
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">
+
+      <%= render '/shared/print' %>
+
       <h1><%= t("pages.conditions") %></h1>
       <h2>AVISO LEGAL SOBRE LAS CONDICIONES DE USO, PRIVACIDAD Y PROTECCIÓN DE DATOS PERSONALES DEL PORTAL DE GOBIERNO ABIERTO DEL AYUNTAMIENTO DE MADRID</h2>
 
@@ -95,5 +98,3 @@
     </div>
   </div>
 </div>
-
-<%= render '/shared/print' %>

app/views/pages/privacy.html.erb

@@ -2,6 +2,9 @@
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">
+
+      <%= render '/shared/print' %>
+
       <h1><%= t("pages.privacy") %></h1>
 
       <h2>AVISO DE PROTECCIÓN DE DATOS</h2>
@@ -21,5 +24,3 @@
     </div>
   </div>
 </div>
-
-<%= render '/shared/print' %>

app/views/shared/_print.html.erb

@@ -1,3 +1,3 @@
-<a href="javascript:window.print();" id="print_link" class="button warning radius">
+<a href="javascript:window.print();" id="print_link" class="button warning tiny radius right">
   <%= t("shared.print.print_button") %>
 </a>

config/locales/management.en.yml

@@ -26,6 +26,7 @@ en:
       signed_out: "Signed out successfully."
       signed_out_managed_user: "User session signed out successfully."
     proposals:
+      create_proposal: "Create proposal"
       print:
        print_button: Print
       alert:

config/locales/management.es.yml

@@ -26,6 +26,7 @@ es:
       signed_out: "Has cerrado la sesión correctamente."
       signed_out_managed_user: "Se ha cerrado correctamente la sesión del usuario."
     proposals:
+      create_proposal: "Crear propuesta"
       print:
        print_button: Imprimir
       alert: