From ca9d876d791c8ea82fa3afb970f5590e7a9aae98 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 19 May 2008 09:34:16 -0500
Subject: [PATCH] A couple of fixes: Logs tab was not highlighted when chosen;
 Serials checkexpiration.pl linked to biblio detail rather than subscription
 detail. Also adding 'edit' and 'renew' links to those results.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/includes/sysprefs-menu.inc        |  2 +-
 .../en/modules/serials/checkexpiration.tmpl   | 33 +++++--------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
index e077103dc0..b012a5445b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
@@ -7,7 +7,7 @@
 <!-- TMPL_IF NAME="Cataloguing" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Cataloguing">Cataloguing</a></li>
 <!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a></li>
 <!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/systempreferences.pl?tab=I18N/L10N">I18N/L10N</a></li>
-<!-- TMPL_IF NAME="LOGFeatures" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Logs">Logs</a></li>
+<!-- TMPL_IF NAME="Logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Logs">Logs</a></li>
 <!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="OAI-PMH" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OAI-PMH">OAI-PMH</a></li>
 <!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a></li>
 <!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Patrons">Patrons</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index fea148e780..8912c1cb10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -4,7 +4,6 @@
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
-    
     /**
      *  Function CheckForm
      *  This function checks the form before submit
@@ -19,6 +18,11 @@
             return false;
         }
      }
+
+	function popup(subscriptionid) {
+	   newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
+	}
+
      // ]]>
 </script>
 <!-- End of additions -->
@@ -84,6 +88,7 @@
             <th>Title</th>
             <th>Note</th>
             <th>Expiration date</th>
+			<th colspan="2">&nbsp;</th>
         </tr>
     <!-- TMPL_LOOP NAME="subscriptions_loop"-->
         <!-- TMPL_IF NAME="toogle"-->
@@ -94,34 +99,12 @@
             <td>
                 <!-- TMPL_VAR NAME="issn" -->
             </td>
-            <td>
-            <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-                <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                <!-- TMPL_IF NAME="title"-->
+            <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" ESCAPE="URL" -->"><!-- TMPL_IF NAME="title"-->
                     <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_ELSE -->
                     |
                 <!-- /TMPL_IF -->
                 </a>
-                <!-- TMPL_ELSE -->
-                <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
-                <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                <!-- TMPL_IF NAME="title"-->
-                    <!-- TMPL_VAR NAME="title" -->
-                <!-- TMPL_ELSE -->
-                    |
-                <!-- /TMPL_IF -->
-                </a>
-                <!-- TMPL_ELSE -->
-                <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                <!-- TMPL_IF NAME="title"-->
-                    <!-- TMPL_VAR NAME="title" -->
-                <!-- TMPL_ELSE -->
-                    |
-                <!-- /TMPL_IF -->
-                </a>
-                <!-- /TMPL_IF -->
-            <!-- /TMPL_IF -->
             </td>
             <td>
                 <!-- TMPL_VAR NAME="notes"-->
@@ -129,6 +112,8 @@
             <td>
                 <!-- TMPL_VAR NAME="expirationdate" -->
             </td>
+			<td><a href="/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit</a></td>
+			<td><a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" onclick="popup(<!-- TMPL_VAR NAME="subscriptionid" -->); return false;">Renew</a></td>
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
-- 
2.20.1