synch'ing 2.2 and head

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
index 4380a27..8c97dfc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
@@ -44,6 +44,22 @@
                </p>
        </div>
 </form>
+<div id="bloc25">
+<h2 class="authority">Add authority</h2>
+<form name="f2" method="post" action="authorities.pl">
+       <p>Authority type
+       <select name="authtypecode">
+               <!-- TMPL_LOOP name="authtypesloop" -->
+                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                               <!-- TMPL_VAR name="authtypetext" -->
+                       </option>
+               <!-- /TMPL_LOOP -->
+       </select>
+       <input type="submit" value="Add" class="button authority">
+       </p>
+</form>
+</div>
+
 </div>
 <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
index 8b7f41a..8eb369e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
@@ -45,7 +45,7 @@
                <div id="resultnumber">
                        <p>
                                <!-- TMPL_IF name="displayprev" -->
-                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
+                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
                                                <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
                                        </a>
                                <!-- /TMPL_IF -->
@@ -53,12 +53,12 @@
                                        <!-- TMPL_IF name="highlight" -->
                                                <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
                                        <!-- TMPL_ELSE -->
-                                               <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
+                                               <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
                                                        <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
                                        <!-- /TMPL_IF -->
                                <!-- /TMPL_LOOP -->
                                <!-- TMPL_IF name="displaynext" -->
-                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
+                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
                                                <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                        </p>
@@ -100,7 +100,7 @@
                <div id="resultnumber">
                        <p>
                                <!-- TMPL_IF name="displayprev" -->
-                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
+                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
                                                <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
                                        </a>
                                <!-- /TMPL_IF -->
@@ -108,12 +108,12 @@
                                        <!-- TMPL_IF name="highlight" -->
                                                <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
                                        <!-- TMPL_ELSE -->
-                                               <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
+                                               <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
                                                        <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
                                        <!-- /TMPL_IF -->
                                <!-- /TMPL_LOOP -->
                                <!-- TMPL_IF name="displaynext" -->
-                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
+                                       <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
                                                <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                        </p>

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
index 0f68fad..b9f0594 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
@@ -4,33 +4,45 @@
        <h1 class="bull">Serials subscriptions</h1>
        <table>
                <tr>
-                       <th class="bull">Title</th>
                        <th class="bull">ISSN</th>
+                       <th class="bull">Title</th>
+                       <th class="bull">
+                               Note
+                       </td>
                        <th class="bull" colspan=2>&nbsp;</th>
                </tr>
                <tr>
                        <form action="bull-home.pl" method="post">
                        <td>
-                               <input type="text" size=40 maxlength=40 name="title" value="<!-- TMPL_VAR name="title" -->">
+                               <input type="text" size=10 maxlength=11 name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->" title="type ISSN here to filter subscription">
                        </td>
                        <td>
-                               <input type="text" size=11 maxlength=11 name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
+                               <input type="text" size=40 maxlength=40 name="title" value="<!-- TMPL_VAR name="title" -->" title="type a title -complete or partial- to filter subscription">
                        </td>
-                       <td colspan=3>
-                               <input type="submit" value="filter" class="button bull">
+                       <td>
+                               &nbsp;
+                       </td>
+                       <td colspan=2>
+                               <input type="submit" value="filter" class="button bull" title="set a filter on ISSN / title">
                        </td>
                </tr>
                <!-- TMPL_LOOP name="subscriptions" -->
                        <tr>
                                <td>
-                                       <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
+                                       <!-- TMPL_IF name="ISSN" -->
+                                               <a href="bull/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="Issues history"><!-- TMPL_VAR name="ISSN" --></a>
+                                       <!-- /TMPL_IF -->
+                                       
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR name="title" -->
                                </td>
                                <td>
-                                       <!-- TMPL_VAR name="ISSN" -->
+                                       <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                                </td>
                                <td>
-                                       <a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Detail</a>
-                                       <a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Recieve</a>
+                                       <a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="subscription detail">Detail</a>
+                                       <a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="receive issues for this subscription">Receive</a>
                                </td>
                        </tr>
                <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl
new file mode 100644 (file)
index 0000000..68d4cd9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl
@@ -0,0 +1,68 @@
+<!-- TMPL_INCLUDE NAME="bull-top.inc" -->
+
+
+<!-- TMPL_UNLESS name="popup" -->
+       <h1 class="bull">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
+       <p>
+       <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Back to biblio</a>
+<!-- /TMPL_UNLESS -->
+       <!-- TMPL_LOOP NAME="years" -->
+               <!-- TMPL_IF NAME="year" -->
+                       <a  class="button bull" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
+               <!-- /TMPL_IF -->
+       <!-- /TMPL_LOOP -->
+       <a class=" button bull" href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
+       </p>
+       <!-- TMPL_LOOP NAME="years" -->
+       <div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
+               <table>
+                       <tr>
+                               <th class="bull">Information
+                               </th>
+                               <th class="bull">Date
+                               </th>
+                               <th class="bull">Number
+                               </th>
+                               <th class="bull">Status
+                               </th>
+                       </tr>
+                       <!-- TMPL_LOOP Name="serials" -->
+                       <tr>
+                               <td>
+                                       <!-- TMPL_VAR name="notes" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR Name="planneddate" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR Name="serialseq" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
+                                       <!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
+                                       <!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
+                                       <!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
+                               </td>
+                       </tr>
+                       <!-- /TMPL_LOOP -->
+               </table>
+       </div>
+       <!--/TMPL_LOOP -->
+<script language="JavaScript" type="text/javascript">
+active(<!-- TMPL_VAR name="yearmin" -->);
+function active(numlayer)
+{
+       for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
+               ong = i;
+               link = "link"+i;
+               if (numlayer==i) {
+                       document.getElementById(ong).style.visibility="visible";
+               } else {
+                       document.getElementById(ong).style.visibility="hidden";
+               }
+       }
+}
+
+</script>
+</body>
+</html>

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl
index 7135381..ca11167 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl
@@ -1,12 +1,15 @@
-<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- TMPL_INCLUDE NAME="bull-top.inc" -->
 <!--------------------------MAIN BODY OF PAGE-------------------------->
 <div id="mainbloc">
-<h1 class="catalogue">Issues for a subscription</h1>
-<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Biblio</a>
-<form method="post" name="f">
-<div id="bloc25">
-       <h2 class="catalogue">Subscription information</h2>
-               <p>For <b><!-- TMPL_VAR name="bibliotitle" --></b> that began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
+       <h1 class="bull">Issues for a subscription</h1>
+       <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Back to subscriptions</a>
+       <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Back to biblio</a>
+       <a class="button bull" href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=full">Complete view</a>
+
+       <!-- TMPL_LOOP name="subscription_LOOP" -->
+       <div id="bloc25">
+               <h2 class="bull">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
+               <p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
                <b>
                <!--TMPL_IF name="periodicity1" -->
                                day
@@ -24,10 +27,10 @@
                                month
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity6" -->
-                               2 monthes
+                               2 months
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity7" -->
-                               3 Monthes
+                               3 months
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity8" -->
                                quarter
@@ -42,46 +45,58 @@
                                2 years
                <!-- /TMPL_IF -->
                </b>
-               on
-               <b>
                <!--TMPL_IF name="arrival1" -->
-                       Monday
+                       on <b>monday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival2" -->
-                               Tuesday
+                       on <b>tuesday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival3" -->
-                               Wednesday
+                       on <b>wednesday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival4" -->
-                               Thursday
+                       on <b>thursday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival5" -->
-                               Friday
+                       on <b>friday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival6" -->
-                               Saturday
+                       on <b>saturday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival7" -->
-                               Sunday
+                       on <b>sunday</b>
                <!-- /TMPL_IF -->
-               </b>
-               </p>
-               <p>(subscription for 
+               for <b>
                        <!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
                        <!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
                        <!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
-                       )
+                       </b>
                </p>
+               <p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
+               <!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
+       <!--TMPL_UNLESS Name=fullinfo -->
                <p><!-- TMPL_VAR name="notes" --></p>
-</div>
-<div id="bloc25">
-       <h2 class="catalogue">Issues summary</h2>
-       <p>
-               <!-- TMPL_VAR name="librariannote" -->
-       </p>
-</div>
-
+               <!-- TMPL_IF name="opacnote" -->
+                       <h3 class="bull">Issues summary</h2>
+                       <p>
+                               <!-- TMPL_VAR name="opacnote" -->
+                       </p>
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF name="recievedlist" -->
+                       <h3 class="bull">Recieved issues</h2>
+                       <p>
+                               <!-- TMPL_VAR name="recievedlist" -->
+                       </p>
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF name="missinglist" -->
+                       <h3 class="bull">Missing issues</h2>
+                       <p>
+                               <!-- TMPL_VAR name="missinglist" -->
+                       </p>
+               <!-- /TMPL_IF -->
+       </div>
+       <!-- /TMPL_UNLESS -->
+<!-- /TMPL_LOOP -->
 </div>
 
-<!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
index d4e41f5..5defdf3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
@@ -3,7 +3,9 @@
 <!--------------------------MAIN BODY OF PAGE-------------------------->
 <div id="mainbloc">
 <h1 class="bull">Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
-<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Subscription</a>
+<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="detail of the subscription">Subscription</a>
+<a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
+<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Back to biblio</a>
 
 <div id="bloc25">
 <h2 class="bull">waited or late numbers</h2>

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
index 31fd5c1..474da4a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
@@ -2,9 +2,11 @@
 <!--------------------------MAIN BODY OF PAGE-------------------------->
 <div id="mainbloc">
 <h1 class="bull">Subscription</h1>
-<a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Edit</a>
-<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Issues</a>
-<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Biblio</a>
+<a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="Modify subscription">Edit</a>
+<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="Recieve issues">Receive</a>
+<a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="All issues on this title">Issue history</a>
+<a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
+<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Back to biblio</a>
 <!-- TMPL_UNLESS name="totalissues" -->
                <a href="javascript:confirm_deletion()" class="button bull">
                        delete
@@ -14,18 +16,11 @@
 <div id="bloc25">
        <h2 class="bull">Subscription information</h2>
                <p>Librarian identity :</td><td> <!-- TMPL_VAR name="librarian" --></p>
-               <p><label class="label100">Supplier </label><!-- TMPL_VAR name="aqbooksellername" --></p>
-               <p><label class="label100">Cost</label><!-- TMPL_VAR name="cost" --></p>
-               <p><label class="label100">Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
-               <p><label class="label100">Biblio</label><i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
-               <p><label class="label100">Notes:</label><!-- TMPL_VAR name="notes" --></p>
-               <p>
-                       <!-- TMPL_IF name="letter" -->
-                               <label class="label100">Issue alert with letter:</label><!-- TMPL_VAR name="letter" -->
-                       <!-- TMPL_ELSE -->
-                               <label class="label100">Borrowers can't subscribe to issue alerts</label>
-                       <!-- /TMPL_IF -->
-               </p>
+               <p><label>Supplier </label><!-- TMPL_VAR name="aqbooksellername" --></p>
+               <p><label>Cost</label><!-- TMPL_VAR name="cost" --></p>
+               <p><label>Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
+               <p><label>Biblio</label><i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
+               <p><label>Notes:</label><!-- TMPL_VAR name="notes" --></p>
 </div>
 <div id="bloc25">
        <h2 class="bull">Planning</h2>

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index 5e0f615..5508124 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -53,40 +53,72 @@
                <tr>
                        <td>
                                <!-- TMPL_IF name="subtitles" -->
-                                       <label class="label100"><b>Subtitle(s):</b> </label>
+                                       <p><label class="label100"><b>Subtitle(s):</b> </label>
                                        <!-- TMPL_LOOP name="subtitles" -->
                                                <!-- TMPL_VAR NAME="subtitle" --> ; 
                                        <!-- /TMPL_LOOP -->
-                                       <br />
+                                       </p>
                                <!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="author" --><label class="label100"><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="publishercode" --><label class="label100"><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
-                               <!-- TMPL_IF name="publicationyear" --><label class="label100"><b>in </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
-                               <!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-                               <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
-                               <!-- TMPL_IF name="isbn" --><label class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="issn" --><label class="label100"><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="seriestitle" --><label class="label100"><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="subjects" --><label class="label100"><b>Subject(s):</b> </label>
-                                       <!-- TMPL_LOOP name="subjects" -->
-                                               <a href="/cgi-bin/koha/search.pl?type=intra&subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
-                                       <br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="copyrightdate" --><label class="label100"><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="notes" --><label class="label100"><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="unititle" --><label class="label100"><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="dewey" --><label class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
-                               <!-- TMPL_IF name="url" --><label class="label100"><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
-                               <label class="label100"><b>Item type : </b></label>
+                               <!-- TMPL_IF name="author" --><p><label class="label100"><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="additional" --><p><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="illus" --><p><label class="label100"><b>Illus:</b></label><!-- TMPL_VAR name="illus" --></p><!-- /TMPL_IF -->
+                               <p>
+                                       <!-- TMPL_IF name="publishercode" --><label class="label100"><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+                               </p>
+                               <!-- TMPL_IF name="publicationyear" --><p><label class="label100"><b>in </b></label><!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
+                               <p>
+                                       <label class="label100">&nbsp;</label><!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+                                       <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
+                               </p>
+                               <!-- TMPL_IF name="isbn" --><p><label class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="issn" --><p><label class="label100"><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="seriestitle" --><p><label class="label100"><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" --> <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --> <!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF --><!-- TMPL_VAR name="volumedesc" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="MARCSUBJCTS" -->
+                                       <p><label class="label100"><b>Subjects:</b></label></p>
+                                       <p>
+                                               <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+                                                       <label class="label100">-</label><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
+                                                               <!-- TMPL_VAR NAME="marcsubjct" -->
+                                                       </a><br>
+                                               <!-- /TMPL_LOOP -->
+                                       </p>
+                               <!-- TMPL_ELSE -->
+                                       <!-- TMPL_IF name="subjects" --><p><label class="label100"><b>Subject(s):</b> </label></p>
+                                               <!-- TMPL_LOOP name="subjects" -->
+                                                       <p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
+                                       <!-- /TMPL_IF -->
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="copyrightdate" --><p><label class="label100"><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="MARCNOTES" -->
+                                       <p><label class="label100"><b>Notes:</b> </label></p>
+                                       <p>
+                                               <!-- TMPL_LOOP NAME="MARCNOTES" -->
+                                                       <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+                                               <!-- /TMPL_LOOP -->
+                                       </p>
+                               <!-- TMPL_ELSE -->
+                                       <!-- TMPL_IF name="notes" --><p><label class="label100"><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="unititle" --><p><label class="label100"><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="classification" --><p><label class="label100"><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="dewey" --><p><label class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="URLS" -->
+                                       <p><label class="label100"><b>URL:</b> </label>
+                                               <!-- TMPL_LOOP name="URLS" -->
+                                                       <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
+                                               <!-- /TMPL_LOOP -->
+                                       </p>
+                               <!-- /TMPL_IF -->
+                               <p><label class="label100"><b>Item type : </b></label>
                                        <!-- TMPL_IF name="description" -->
                                                <!-- TMPL_VAR name="description" -->
                                        <!-- TMPL_ELSE -->
                                                <!-- TMPL_VAR NAME="itemtype" -->
                                        <!-- /TMPL_IF -->
-                                       <br/>
-                                       <!-- TMPL_IF name="count" -->
-                                               <p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
-                                       <!-- /TMPL_IF -->
+                               </p>
+                               <!-- TMPL_IF name="count" -->
+                                       <p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
+                               <!-- /TMPL_IF -->
                        </td>
                </tr>
        </table>
@@ -126,24 +158,18 @@
                                <!-- /TMPL_IF -->
                        </tr>
                <!-- /TMPL_LOOP -->
-               <!-- TMPL_LOOP NAME="WEB_RESULTS" -->
-                       <tr>
-                               <td><!-- TMPL_VAR NAME="itemtype" --></td>
-                               <td>Website</td>
-                               <td>Online</td>
-                               <td>Available</td>
-                               <td></td>
-                               <td>
-                                       <a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">http://<!-- TMPL_VAR NAME="url" --></a>
-                               </td>
-                       </tr>
-               <!-- /TMPL_LOOP -->
        </table>
 </div>
 <script language="javascript" type="text/javascript">
 function Dopop(link) {
        newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
+function confirm_deletion() {
+       var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+       if (is_confirmed) {
+               window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
+       }
+}
 </script>
 
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl
index 2cbc61b..d50db0b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl
@@ -2,7 +2,12 @@
        <h1>Serials subscription add & modify help</h1>
        <ul>
                <h2>Subscription information bloc</h2>
-               <p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
+               <p>It contains :</p>
+               <ul>
+                       <li>The name of the librarian that created the subscription, and the name of the supplier providing the subscription.</li>
+                       <li>The title of the biblio managed by the subscription.</li>
+                       <li>The name of the letter for issue alert. Letters are defined in parameters section. If you choose one, then every identified borrower will be able to subscribe to "issue alert" for this subscription : every time you issue something, he will recieve the "letter" as mail</li>
+               </ul>
                <h2>Planning information bloc</h2>
                <p>it contains various information to calculate arrival dates.</p>
                <h2>Subscription length</h2>

diff --git a/koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl
new file mode 100644 (file)
index 0000000..1e845fa
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl
@@ -0,0 +1,13 @@
+<!-- TMPL_INCLUDE name="help-top.inc" -->
+<h1>Import iso2709 file</h1>
+<p>This is one of the screens you will see frequently if you are starting from scratch.</p>
+<p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
+<p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
+<p>Choose File to browse.</p>
+<p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
+<p>Ignore this one, keep the existing one.</p>
+<p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
+<p>You can also change char encoding between MARC21 and UNIMARC</p>
+<p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
+<p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl
index eff5dee..8776631 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Add member help</h1>
 
+
 <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
 
 <h2>Add Member, person</h2>

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
index c87077a..5db9f8a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
@@ -17,34 +17,20 @@ function Help() {
        background-color: #86c268;
        color: #FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        }
 a.about:hover {
        background-color: #86c268;
        color: #FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        }
 </style>
 </head>
 <body>
 
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
 
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
index 010bc6d..f450663 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc
@@ -28,33 +28,21 @@ function Help() {
        color:#000000;
        background-image:none;
        text-decoration: normal;
-       font-weight: bold;
        }
 a.acquisition:hover {
        background-color: #ffdf61;
        color: #000000;
        text-decoration: normal;
-       font-weight: bold;
        }
 </style>
 </head>
 <body>
 
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
+
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->
+

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc
index 4fe3f32..de6b538 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc
@@ -36,60 +36,21 @@ function searchauthority() {
        background-color: #6b7cbe;
        color:#FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        background-image:none;
        }
 a.authority:hover {
        background-color: #6b7cbe;
        color: #FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        }
 </style>
 </head>
 
 <body>
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<form>
-<div id="submenu">
-       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-       <select name="authtype2">
-               <!-- TMPL_LOOP name="authtypesloop" -->
-                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
-                               <!-- TMPL_VAR name="authtypetext" -->
-                       </option>
-               <!-- /TMPL_LOOP -->
-       </select>
-       <input type="text" size="10" maxlength="100" name="value">
-       <a href="javascript:searchauthority()" class="submenu">
-               Search
-       </a>
-       <select name="authtype">
-               <!-- TMPL_LOOP name="authtypesloop" -->
-                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
-                               <!-- TMPL_VAR name="authtypetext" -->
-                       </option>
-               <!-- /TMPL_LOOP -->
-       </select>
-       <a href="javascript:addauthority()" class="submenu2">
-               Add authority
-       </a>
-</div>
-</form>
+
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc
index 0b5d5a6..bfced7f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc
@@ -16,40 +16,20 @@ function Help() {
        background-color: #803010;
        color:#FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        background-image:none;
        }
 a.bull:hover {
        background-color: #803010;
        color: #FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        }
 </style>
 </head>
 <body>
 
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<div id="submenu">
-       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-       <a href="/cgi-bin/koha/bull-home.pl" class="submenu">Search subscription</a>
-       <a href="/cgi-bin/koha/bull/lateissues.pl" class="submenu2">Late issues</a>
-</div>
-
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
index 0e7c2f9..630fc1b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
@@ -33,28 +33,11 @@ a.catalogue:hover {
 </head>
 
 <body>
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<div id="submenu">
-       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-       <a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet" class="submenu2">search</a>
-       <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Add biblio</a>
-       <a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serial</a>
-       <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtual shelves</a>
-</div>
+
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->
+

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
index 1fd3aa2..11cdfd3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
@@ -31,41 +31,20 @@ function Help() {
        color:#FFFFFF;
        background-image:none;
        text-decoration: normal;
-       font-weight: bold;
        }
 a.circulation:hover {
        background-color: #be6170;
        color: #FFFFFF;
        text-decoration: normal;
-       font-weight: bold;
        }
 </style>
 </head>
 
 <body onload="javascript:focusOnFirst()">
 
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<div id="submenu">
-       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-       <a href="/cgi-bin/koha/circ/circulation.pl" class="submenu">Issues</a>
-       <a href="/cgi-bin/koha/circ/returns.pl" class="submenu2">Returns</a>
-       <a href="/cgi-bin/koha/circ/branchtransfers.pl" class="submenu">Branch transfers</a>
-</div>
-
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
index e76da14..e2f4282 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
@@ -24,6 +24,10 @@ p {
        clear:left;
 }
 
+textarea {
+       font-size:10pt;
+       font-family:arial,sans-serif;
+}
 .center {
        text-align:center;
 }
@@ -47,23 +51,26 @@ label {
 
 .button {
        text-align: center;
-       font: 1.2em sans-serif;
+       font-family: Arial;
+       font-size:12px;
        padding: 0px 5px 0px 5px;
        margin:2px;
        display:inline;
        position:static;
-       border-style: solid;
-       border-width: 1px;
-       border-color: black;
+       border : 1px solid black;
+/*     border-width: 1px;
+       border-color: black;*/
        text-decoration: none;
-       color: black;
        cursor:pointer;
        vertical-align:middle;
-       -moz-border-radius: 6px;
        background-color:#FFFFFF;
        background-image:url("/intranet-tmpl/default/images/background-mem.gif");
 }
 
+.button:hover {
+       background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+}
+
 /* TABLES */
 table {
        border:1px solid #000000;
@@ -140,7 +147,7 @@ h1 {
        font-size: 150%;
        text-align:center;
        padding: 4px;
-       border: 4px inset #666666;
+/*     border: 1px solid #666666; */
 }
 
 h2 {
@@ -188,6 +195,10 @@ h3 {
        background-color:red;
 }
 
+tr.hilighted td.problem {
+       background-color : #ff9999;
+}
+
 #mainbloc {
        float:left;
        width:90%;
@@ -196,6 +207,7 @@ h3 {
        border-right:3px solid #000000;
        border-bottom:3px solid #000000;
        background-color:#FFFFFF;
+       margin-top:10px;
        margin-left:10px;
        margin-right:10px;
        padding-bottom:100px;
@@ -277,62 +289,91 @@ a:hover {
        text-decoration: none;
 }
 
-a.submenu {
-       text-decoration: none;
-       cursor : pointer;
-       color:#777777;
-       background-color:#EEEEEE;
-       font-weight: bold;
-       margin:0;
-}
-a.submenu:hover {
-       text-decoration: none;
-       cursor:pointer;
-       color:#777777;
-       background-color:#EEEEEE;
-       font-weight: bold;
-       margin:0;
-       background-image:url("/intranet-tmpl/default/images/background-mem.gif");
-}
-
-a.submenu2 {
-       text-decoration: none;
-       cursor:pointer;
-       color:#777777;
-       background-color:#CCCCCC;
-       font-weight: bold;
-       margin:0;
-}
-a.submenu2:hover {
-       text-decoration: none;
-       cursor:pointer;
-       color:#777777;
-       background-color:#CCCCCC;
-       font-weight: bold;
-       background-image:url("/intranet-tmpl/default/images/background-mem.gif");
-       margin:0;
-}
-
 #menubar {
+       z-index:2;
+       position:absolute;
+       top:0px;
+       left:0px;
        border-top:1px solid #666666;
-       font: 125% bold sans-serif;
+       font-size: 14px;
        background-color:#DDDDDD;
        padding-bottom:5px;
 }
-#submenu {
-       background-color:#EEEEEE;
-       border-left:1px solid #000000;
-       padding-bottom:5px;
-       font-size:110%;
+html>body #menubar {
+position: fixed;
 }
 
 #menubar a {
        padding:5px;
 }
-#submenu a {
-       padding:5px;
+
+a.submenu {
+       padding:0px 10px 0px 10px;
+       display:block;
+       background-color:#FFFFFF;
+       color:#000000;
+}
+a.submenu:hover {
+       padding:0px 10px 0px 10px;
+       display:block;
+       background-color:#DDDDDD;
+       color:#000000;
+}
+#Subm1 {
+       z-index: 11; left: 75px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm1 {
+position: fixed;
+}
+#Subm2 {
+       z-index: 12; left: 150px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm2 {
+position: fixed;
+}
+#Subm3 {
+       z-index: 12; left: 250px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm3 {
+position: fixed;
+}
+#Subm4 {
+       z-index: 12; left: 320px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm4 {
+position: fixed;
+}
+#Subm5 {
+       z-index: 12; left: 400px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm5 {
+position: fixed;
+}
+#Subm6 {
+       z-index: 12; left: 480px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm6 {
+position: fixed;
 }
 
+#Subm7 {
+       z-index: 12; left: 550px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm7 {
+position: fixed;
+}
+
+.user {
+       padding-top: 30px;
+       padding-bottom:0px;
+       text-align:right;
+}
+
+.user {
+       padding-top: 30px;
+       padding-bottom:0px;
+       text-align:right;
+}
 .koha {
        text-align:center;
        background-image:url("/intranet-tmpl/default/images/background-mem.gif");

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/favicon.ico b/koha-tmpl/intranet-tmpl/default/en/includes/favicon.ico
new file mode 100644 (file)
index 0000000..586bd55
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/default/en/includes/favicon.ico differ