diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 51161d55f..85423df75 100644 --- a/app/assets/stylesheets/admin.scss +++ b/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 { diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 866daf600..5e7c189bb 100644 --- a/app/assets/stylesheets/layout.scss +++ b/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 { diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index 77b51c441..9418d5ee0 100644 --- a/app/assets/stylesheets/print.css +++ b/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; diff --git a/app/views/management/proposals/new.html.erb b/app/views/management/proposals/new.html.erb index d79197ca7..28c150e86 100644 --- a/app/views/management/proposals/new.html.erb +++ b/app/views/management/proposals/new.html.erb @@ -1,9 +1,9 @@ -
+<%= render '/shared/print' %> +
+

<%= t("management.proposals.create_proposal") %>

<%= render "proposals/form", form_url: management_proposals_url %>
- -<%= render '/shared/print' %> \ No newline at end of file diff --git a/app/views/management/proposals/show.html.erb b/app/views/management/proposals/show.html.erb index 7d8e22804..cc20459d4 100644 --- a/app/views/management/proposals/show.html.erb +++ b/app/views/management/proposals/show.html.erb @@ -1,3 +1,3 @@ -<%= render template: 'proposals/show' %> +<%= render '/shared/print' %> -<%= render '/shared/print' %> \ No newline at end of file +<%= render template: 'proposals/show' %> diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb index 2893830c5..8cf4d5bf0 100644 --- a/app/views/pages/conditions.html.erb +++ b/app/views/pages/conditions.html.erb @@ -2,6 +2,9 @@
+ + <%= render '/shared/print' %> +

<%= t("pages.conditions") %>

AVISO LEGAL SOBRE LAS CONDICIONES DE USO, PRIVACIDAD Y PROTECCIÓN DE DATOS PERSONALES DEL PORTAL DE GOBIERNO ABIERTO DEL AYUNTAMIENTO DE MADRID

@@ -95,5 +98,3 @@
- -<%= render '/shared/print' %> \ No newline at end of file diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb index 093e68c28..895fdbc76 100644 --- a/app/views/pages/privacy.html.erb +++ b/app/views/pages/privacy.html.erb @@ -2,6 +2,9 @@
+ + <%= render '/shared/print' %> +

<%= t("pages.privacy") %>

AVISO DE PROTECCIÓN DE DATOS

@@ -21,5 +24,3 @@
- -<%= render '/shared/print' %> \ No newline at end of file diff --git a/app/views/shared/_print.html.erb b/app/views/shared/_print.html.erb index 652c26832..471cf6692 100644 --- a/app/views/shared/_print.html.erb +++ b/app/views/shared/_print.html.erb @@ -1,3 +1,3 @@ - + <%= t("shared.print.print_button") %> \ No newline at end of file diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 34a30a832..d4eb2e262 100644 --- a/config/locales/management.en.yml +++ b/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: diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index d56fb625d..dde24a2c6 100644 --- a/config/locales/management.es.yml +++ b/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: