From 892587bccf8db2e5d369e33616157eabded53a45 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 4 Dec 2013 09:50:20 -0500 Subject: [PATCH] web staff: drive css from templates (like tpac) Signed-off-by: Bill Erickson --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm | 2 +- .../staff/base.css => src/templates/staff/css/style.css.tt2} | 9 +++++++++ Open-ILS/src/templates/staff/t_base.tt2 | 2 +- Open-ILS/src/templates/staff/t_splash.tt2 | 7 ------- 4 files changed, 11 insertions(+), 9 deletions(-) rename Open-ILS/{web/css/skin/default/staff/base.css => src/templates/staff/css/style.css.tt2} (92%) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm index 57cb02b4dd..2e557db87a 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm @@ -239,7 +239,7 @@ sub find_template { my @parts = split('/', $path); my $localpath = $path; - if ($localpath =~ m|opac/css|) { + if ($localpath =~ m|/css/|) { $r->content_type('text/css; encoding=utf8'); } else { $r->content_type('text/html; encoding=utf8'); diff --git a/Open-ILS/web/css/skin/default/staff/base.css b/Open-ILS/src/templates/staff/css/style.css.tt2 similarity index 92% rename from Open-ILS/web/css/skin/default/staff/base.css rename to Open-ILS/src/templates/staff/css/style.css.tt2 index f46456026a..fc45281101 100644 --- a/Open-ILS/web/css/skin/default/staff/base.css +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -69,3 +69,12 @@ .form-validated input.ng-valid.ng-dirty { background-color: #78FA89; } + +/* -------------------------------------------------------------------------- + * Local style + */ + +#splash-nav .panel-body div { + padding-bottom: 10px; +} + diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/t_base.tt2 index 325f1d9526..49b259ac8d 100644 --- a/Open-ILS/src/templates/staff/t_base.tt2 +++ b/Open-ILS/src/templates/staff/t_base.tt2 @@ -9,7 +9,7 @@ - + [% INCLUDE "staff/t_navbar.tt2" %] diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2 index bf8a7b7676..f27e041dea 100644 --- a/Open-ILS/src/templates/staff/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/t_splash.tt2 @@ -1,10 +1,3 @@ - -

-- 2.11.0