diff --git a/app/assets/images/header_print_proposals.jpg b/app/assets/images/header_print_proposals.jpg new file mode 100644 index 000000000..4d2eb18a5 Binary files /dev/null and b/app/assets/images/header_print_proposals.jpg differ diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 2f6b1f0c6..66adef5de 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -92,6 +92,10 @@ body.admin { } } +.for-print-only { + display: none; +} + // 02. Sidebar // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index 0c67035c8..ef76f607e 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -2,6 +2,8 @@ /* Print proposals */ +.admin-content { margin-top: 0 !important; } + .tags a { display: none !important; } .supports { display: none !important; } @@ -24,7 +26,7 @@ img.left { display: none !important; } .captcha { display: none !important; } -li.name span { display: none !important; } +li.name { display: none !important; } p.proposal-info span:nth-child(3) { display: none !important; } @@ -36,11 +38,22 @@ p.proposal-info span:nth-child(3) { display: none !important; } input[type="submit"] { display: none !important; } +.filters h2 { margin: 0 !important; font-size: 20px !important; line-height: 20px !important; width: auto !important; } + +.search-results h2 { margin: 0 !important; font-size: 20px !important; line-height: 20px !important; } + +.admin h2 { font-size: 20px !important; line-height: 20px !important; } + .select-order { - border: 0; - font-size: 24px; - font-weight: bold; - margin-left: -6px; + border: 0 !important; + font-size: 20px !important; + font-weight: bold !important; + line-height: 20px !important; + margin-left: 10px !important; + margin-top: 0 !important; + margin-bottom: 0 !important; + margin-right: 0 !important; + padding: 0 !important; } p.proposal-info { margin-left: -6px; } @@ -49,16 +62,26 @@ a { text-decoration: none !important; } a:after { content: none !important; } -.proposal .panel { min-height: auto !important; } +.proposal .panel { min-height: auto !important; margin: 0 !important; padding-bottom: 0 !important; padding-left: 0 !important; } .proposal .panel .proposal-content { min-height: auto !important; } -.proposal .panel h3 { min-height: auto !important; } +.proposal .panel h3 { min-height: auto !important; font-size: 16px !important; } -.proposal .panel .proposal-description { height: auto; } +.proposal .panel .proposal-description { height: auto !important; margin-bottom: 0 !important; } .proposal .panel { border-left: 0 !important; border-right: 0 !important; border-top: 0 !important; } + +.for-print-only { display: block !important; } + +.for-print-only p { font-size: 14px !important; line-height: 24px !important; } + +.not-print { display: none !important; } + +.date-for-print { font-size: 14px !important; line-height: 20px !important; } + +.filters { height: 48px !important;} diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb index 2501bca5f..13944e898 100644 --- a/app/views/management/proposals/print.html.erb +++ b/app/views/management/proposals/print.html.erb @@ -5,14 +5,24 @@ <%= t('management.proposals.print.print_button') %> + <%= image_tag "header_print_proposals.jpg", class: "for-print-only" %> +
+ <%= l Date.today, format: :long %> +

- <%= t("proposals.index.select_order_long") %> + <%= t("proposals.index.select_order_long") %> + <%= t("management.print.proposals_title") %>

<%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
<%= render @proposals %> + +
+

<%= t("management.print.info") %>
+ <%= t("management.print.note") %>

+
diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 936c9694d..1325ea716 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -65,3 +65,7 @@ en: "We have sent an email to the email address %{email} in order to verify that it belongs to this user. It contains a link they have to click. Then they will have to set their access password before being able to log in to the website" + print: + proposals_title: "Proposals:" + info: "Create yor proposal on http://decide.madrid.es" + note: "The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out." \ No newline at end of file diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index da38ee209..bb346fe6a 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -65,3 +65,7 @@ es: "Hemos enviado un correo electrónico a %{email} para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación." + print: + proposals_title: "Propuestas:" + info: "Haz tu propuesta en http://decide.madrid.es" + note: "Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo." \ No newline at end of file