Bugfix for help editor

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/edithelp.pl b/edithelp.pl
index af3a097..0d20d7d 100755 (executable)
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -66,10 +66,10 @@ elsif ( $type eq 'create' || $type eq 'save' ) {
     #    if (! -e "$htdocs/$theme/$lang/$from") {
     # doesnt exist
     eval {
-        open( OUTFILE, ">$htdocs/$theme/$lang/$from" ) || die "Can't open file";
+        open( OUTFILE, ">$htdocs/$theme/$lang/modules/$from" ) || die "Can't open file";
     };
     if ($@) {
-        $error = "Cant open file $htdocs/$theme/$lang/$from";
+        $error = "Cant open file $htdocs/$theme/$lang/modules/$from";
     }
     else {
 
@@ -99,10 +99,10 @@ elsif ( $type eq 'modify' ) {
     my $htdocs = C4::Context->config('intrahtdocs');
     my ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet" );
     eval {
-        open( INFILE, "$htdocs/$theme/$lang/$from" ) || die "Can't open file";
+        open( INFILE, "$htdocs/$theme/$lang/modules/$from" ) || die "Can't open file";
     };
     if ($@) {
-        $error = "Cant open file $htdocs/$theme/$lang/$from";
+        $error = "Cant open file $htdocs/$theme/$lang/modules/$from";
     }
     my $help;
     while ( my $inp = <INFILE> ) {

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl
index 622f63d..9aa2526 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl
@@ -17,4 +17,4 @@
 
 <p>If the issuing is problematic, then another box will appear and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another patron, or patron having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another patron, then issuing also means make the return), then it's also done</p>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->