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 <crc@liblime.com>

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,

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;

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;

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;

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;

koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc

@@ -1,5 +1,5 @@
 <div id="kohalogo">
-    <img src="/intranet-tmpl/prog/images/koha-logo-white.png" height="60px"/>
+    <img src="/intranet-tmpl/prog/img/koha-logo-white.png" height="60px"/>
     <h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
 </div>
 <div id="onlinehelp">

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl

@@ -117,19 +117,19 @@
     <legend>Limit type to: match any of the following</legend>
     <table class="itemtypes">
             <tr>
-                <td><input type="checkbox" id="mc-bks" name="limit" value="mc:t"/><label for="mc-bks" title="Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books" />Books</label></td>
-                <td><input type="checkbox" id="mc-vis" name="limit" value="mc:v"/><label for="mc-vis" title="Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings"><img border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif" alt="Visual Materials" />Visual Materials</label></td>
-                <td><input type="checkbox" id="mc-sr" name="limit" value="mc-rtype:i"/><label for="mc-sr" title="Spoken, Books on CD and Cassette"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books on Tape" />Books on Tape</label></td>
+                <td><input type="checkbox" id="mc-bks" name="limit" value="mc:t"/><label for="mc-bks" title="Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations"><img border="0" src="/intranet-tmpl/prog/img/AF.gif" alt="Books" />Books</label></td>
+                <td><input type="checkbox" id="mc-vis" name="limit" value="mc:v"/><label for="mc-vis" title="Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings"><img border="0" src="/intranet-tmpl/prog/img/AV Aids.gif" alt="Visual Materials" />Visual Materials</label></td>
+                <td><input type="checkbox" id="mc-sr" name="limit" value="mc-rtype:i"/><label for="mc-sr" title="Spoken, Books on CD and Cassette"><img border="0" src="/intranet-tmpl/prog/img/AF.gif" alt="Books on Tape" />Books on Tape</label></td>
             </tr>
             <tr>
-                <td><input type="checkbox" id="mc-cf" name="limit" value="mc:c"/><label for="mc-cf" title="Computer files, Data, Software"><img border="0" src="/intranet-tmpl/prog/en/images/CD-ROM software.gif" alt="Computer Files" />Computer Files</label></td>
-                <td><input type="checkbox" id="mc-lh" name="limit" value="mc-collection:LH"/><label for="mc-lh" title="Local History Materials"><img border="0" src="/intranet-tmpl/prog/en/images/Local history.gif" alt="Local History Materials" />Local History Materials</label></td>
-                <td><input type="checkbox" id="mc-map" name="limit" value="mc:a"/><label for="mc-map" title="Maps, Globes"><img border="0" src="/intranet-tmpl/prog/en/images/PF.gif " alt="Maps" />Maps</label></td>
+                <td><input type="checkbox" id="mc-cf" name="limit" value="mc:c"/><label for="mc-cf" title="Computer files, Data, Software"><img border="0" src="/intranet-tmpl/prog/img/CD-ROM software.gif" alt="Computer Files" />Computer Files</label></td>
+                <td><input type="checkbox" id="mc-lh" name="limit" value="mc-collection:LH"/><label for="mc-lh" title="Local History Materials"><img border="0" src="/intranet-tmpl/prog/img/Local history.gif" alt="Local History Materials" />Local History Materials</label></td>
+                <td><input type="checkbox" id="mc-map" name="limit" value="mc:a"/><label for="mc-map" title="Maps, Globes"><img border="0" src="/intranet-tmpl/prog/img/PF.gif " alt="Maps" />Maps</label></td>
             </tr>
             <tr>
-                <td><input type="checkbox" id="mc-mus" name="limit" value="mc-rtype:j"/><label for="mc-mus" title="Music"><img border="0" src="/intranet-tmpl/prog/en/images/CDM.gif" alt="Music" />Music</label></td>
-                <td><input type="checkbox" id="mc-kit" name="limit" value="mc-rtype:o"/><label for="mc-kit" title="Kits"><img border="0" src="/intranet-tmpl/prog/en/images/KIT.gif" alt="Kits" />Kits</label></td>
-                <td><input type="checkbox" id="mc-ref" name="limit" value="mc-collection:REF"/><label for="mc-ref" title="Reference"><img border="0" src="/intranet-tmpl/prog/en/images/REF.gif" alt="Reference" />Reference</label></td>
+                <td><input type="checkbox" id="mc-mus" name="limit" value="mc-rtype:j"/><label for="mc-mus" title="Music"><img border="0" src="/intranet-tmpl/prog/img/CDM.gif" alt="Music" />Music</label></td>
+                <td><input type="checkbox" id="mc-kit" name="limit" value="mc-rtype:o"/><label for="mc-kit" title="Kits"><img border="0" src="/intranet-tmpl/prog/img/KIT.gif" alt="Kits" />Kits</label></td>
+                <td><input type="checkbox" id="mc-ref" name="limit" value="mc-collection:REF"/><label for="mc-ref" title="Reference"><img border="0" src="/intranet-tmpl/prog/img/REF.gif" alt="Reference" />Reference</label></td>
                 
             </tr>
             

koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl

@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Web Installer &rsaquo; Step 1</title>
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
 <div>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /></h1>
 <h1>Koha &rsaquo; Web Installer &rsaquo; Step 1</h1>
 <!--TMPL_UNLESS Name="language"-->
 <p>You are about to install Koha.</p>

koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl

@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Web Installer &rsaquo; Step 2</title>
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
 <div>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /></h1>
 <h1>Koha &rsaquo; Web Installer &rsaquo; Step 2</h1>
 <h2 align="center">Database settings:</h2>
 <ul>

koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl

@@ -2,7 +2,7 @@
 <!--TMPL_IF Name="finish"--><meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl"><!--/TMPL_IF-->
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
 <div>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /></h1>
 <h1>Koha &rsaquo; Web Installer &rsaquo; Step 3</h1>
 <!--TMPL_IF NAME="selectframeworks"-->
 <script language="JavaScript">