From d1f6407baa52881af435bf15e47337aa520c18ac Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Thu, 23 Aug 2007 21:02:20 -0500 Subject: [PATCH] moved images to img fixed installer path for templates perl -pi~ -e 's/\/prog\/images\//\/prog\/img\//' * perl -pi~ -e 's/\/prog\/en\/images\//\/prog\/img\//' * Signed-off-by: Chris Cormack --- installer/InstallAuth.pm | 4 ++-- .../prog/en/includes/intranet.css | 2 +- .../prog/en/includes/intranet2.css | 6 +++--- .../prog/en/includes/intranet2popup.css | 4 ++-- .../intranet-tmpl/prog/en/includes/login.css | 4 ++-- .../intranet-tmpl/prog/en/includes/menus.inc | 2 +- .../prog/en/modules/catalogue/advsearch.tmpl | 18 +++++++++--------- .../prog/en/modules/installer/step1.tmpl | 2 +- .../prog/en/modules/installer/step2.tmpl | 2 +- .../prog/en/modules/installer/step3.tmpl | 2 +- .../prog/{images => img}/bg-tab.png | Bin .../prog/{en => }/img/checkall.gif | Bin .../prog/{images => img}/css_header.png | Bin .../prog/{en => }/img/fade-butt.png | Bin .../prog/{images => img}/koha-logo-white.png | Bin .../prog/{en => }/img/koha-logo.gif | Bin .../prog/{images => img}/koha-logo.png | Bin .../prog/{en => }/img/koha.org-logo.gif | Bin .../prog/{en => }/img/patron-blank.png | Bin .../prog/{en => }/img/regularDay.jpg | Bin .../prog/{en => }/img/regularHoliday.jpg | Bin .../prog/{en => }/img/repeatable.jpg | Bin .../prog/{en => }/img/search-audio-books.gif | Bin .../prog/{en => }/img/search-books.gif | Bin .../prog/{en => }/img/search-kids.gif | Bin .../prog/{en => }/img/search-large-print.gif | Bin .../{en => }/img/search-local-history.gif | Bin .../prog/{en => }/img/search-movies.gif | Bin .../prog/{en => }/img/search-music.gif | Bin .../prog/{en => }/img/search-reference.gif | Bin .../prog/{en => }/img/search-software-web.gif | Bin .../intranet-tmpl/prog/{en => }/img/up.png | Bin 32 files changed, 23 insertions(+), 23 deletions(-) rename koha-tmpl/intranet-tmpl/prog/{images => img}/bg-tab.png (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/checkall.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{images => img}/css_header.png (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/fade-butt.png (100%) rename koha-tmpl/intranet-tmpl/prog/{images => img}/koha-logo-white.png (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/koha-logo.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{images => img}/koha-logo.png (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/koha.org-logo.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/patron-blank.png (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/regularDay.jpg (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/regularHoliday.jpg (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/repeatable.jpg (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-audio-books.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-books.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-kids.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-large-print.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-local-history.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-movies.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-music.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-reference.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/search-software-web.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/img/up.png (100%) diff --git a/installer/InstallAuth.pm b/installer/InstallAuth.pm index 5c983bd7fe..632b8bdb78 100644 --- a/installer/InstallAuth.pm +++ b/installer/InstallAuth.pm @@ -119,7 +119,7 @@ sub get_template_and_user { C4::Context->config('intrahtdocs') . "/prog/" . ( $language ? $language : "en" ); my $template = HTML::Template::Pro->new( - filename => "$path/" . $in->{template_name}, + filename => "$path/modules/" . $in->{template_name}, die_on_bad_params => 1, global_vars => 1, case_sensitive => 1, @@ -361,7 +361,7 @@ sub checkauth { C4::Context->config('intrahtdocs') . "/prog/" . ( $query->param('language') ? $query->param('language') : "en" ); my $template = HTML::Template::Pro->new( - filename => "$path/$template_name", + filename => "$path/modules/$template_name", die_on_bad_params => 1, global_vars => 1, case_sensitive => 1, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css index fcca02e2a3..a2a9a70212 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css @@ -52,7 +52,7 @@ select { } input[type=submit], input[type=button], input[type=reset] { - background: url( /intranet-tmpl/prog/images/fade-butt.png ); + background: url( /intranet-tmpl/prog/img/fade-butt.png ); border: 3px double #999; border-left-color: #ccc; border-top-color: #ccc; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css index df2115bb5b..8b30047788 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css @@ -2,7 +2,7 @@ body { font-family : Verdana, Geneva, Arial, sans-serif; font-size : .9em; color:#494949; - background: url( /intranet-tmpl/prog/images/css_header.png ); + background: url( /intranet-tmpl/prog/img/css_header.png ); background-repeat:repeat-x; background-color:#EDF5FA; } @@ -75,7 +75,7 @@ input[type=submit], input[type=button], input[type=reset] { border:0px; color: #0072b9; font-weight:bold; - background: url( /intranet-tmpl/prog/images/bg-tab.png ); + background: url( /intranet-tmpl/prog/img/bg-tab.png ); font-size : 0.8em; padding:3px; text-decoration:none; @@ -329,7 +329,7 @@ legend { #action a { color: #0072b9; font-weight:bold; - background: url( /intranet-tmpl/prog/images/bg-tab.png ); + background: url( /intranet-tmpl/prog/img/bg-tab.png ); font-size : 0.8em; padding:3px; margin-bottom:2px; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2popup.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2popup.css index b06504ff2a..3ba849f9ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2popup.css +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2popup.css @@ -73,7 +73,7 @@ input[type=submit], input[type=button], input[type=reset] { border:0px; color: #0072b9; font-weight:bold; - background: url( /intranet-tmpl/prog/images/bg-tab.png ); + background: url( /intranet-tmpl/prog/img/bg-tab.png ); font-size : 0.8em; padding:3px; text-decoration:none; @@ -313,7 +313,7 @@ legend { #action a { color: #0072b9; font-weight:bold; - background: url( /intranet-tmpl/prog/images/bg-tab.png ); + background: url( /intranet-tmpl/prog/img/bg-tab.png ); font-size : 0.8em; padding:3px; margin-bottom:2px; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/login.css b/koha-tmpl/intranet-tmpl/prog/en/includes/login.css index b98f13f138..53e19fa70c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/login.css +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/login.css @@ -65,7 +65,7 @@ label { } #login h1 { - background: url(/intranet-tmpl/prog/en/images/koha-logo.gif) no-repeat top left; + background: url(/intranet-tmpl/prog/img/koha-logo.gif) no-repeat top left; margin-top: 0; } @@ -110,7 +110,7 @@ label { } .submit input, .submit input:focus, .button { - background: url(/intranet-tmpl/prog/en/images/fade-butt.png ); + background: url(/intranet-tmpl/prog/img/fade-butt.png ); border: 3px double #999; border-left-color: #ccc; border-top-color: #ccc; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc index 392c4ec79e..b520be386c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc @@ -1,5 +1,5 @@
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl index f931cab361..500af0b7b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl @@ -117,19 +117,19 @@ Limit type to: match any of the following - - - + + + - - - + + + - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl index 34132124b5..e1738385d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl @@ -2,7 +2,7 @@ Koha › Web Installer › Step 1
-

Koha

+

Koha

Koha › Web Installer › Step 1

You are about to install Koha.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl index 6e53cda49b..6ffe676add 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl @@ -1,7 +1,7 @@ Koha › Web Installer › Step 2
-

Koha

+

Koha

Koha › Web Installer › Step 2

Database settings:

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl index d8307b1f11..d7d88bdcce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl @@ -2,7 +2,7 @@
    -

    Koha

    +

    Koha

    Koha › Web Installer › Step 3