[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en intranet-ma... [dev_week]
|
From: |
Joshua Ferraro |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en intranet-ma... [dev_week] |
|
Date: |
Sun, 24 Sep 2006 01:05:07 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/09/24 01:05:06
Modified files:
koha-tmpl/intranet-tmpl/npl/en: intranet-main.tmpl
koha-tmpl/intranet-tmpl/npl/en/bookshelves: shelves.tmpl
koha-tmpl/intranet-tmpl/npl/en/circ: branchtransfers.tmpl
returns.tmpl
koha-tmpl/intranet-tmpl/npl/en/includes: colors.npl.css
common.js.inc
doc-head-circ-close.inc
doc-head-close.inc
koha-tmpl/intranet-tmpl/npl/en/parameters:
systempreferences.tmpl
Log message:
updating local copy
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.4.2.3&r2=1.4.2.4.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6&r2=1.1.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.3&r2=1.2.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.1&r2=1.2.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/colors.npl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.1&r2=1.1.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/common.js.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.7&r2=1.2.2.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8&r2=1.1.2.8.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.5.2.1&r2=1.3.2.5.2.2
Patches:
Index: intranet-main.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/intranet-main.tmpl,v
retrieving revision 1.4.2.4.2.3
retrieving revision 1.4.2.4.2.4
diff -u -b -r1.4.2.4.2.3 -r1.4.2.4.2.4
--- intranet-main.tmpl 19 Sep 2006 13:22:11 -0000 1.4.2.4.2.3
+++ intranet-main.tmpl 24 Sep 2006 01:05:05 -0000 1.4.2.4.2.4
@@ -32,6 +32,7 @@
<!-- TMPL_IF NAME="CAN_user_parameters" --><dl><dt><a
href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration
Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System
Preferences</a></li> <li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes
generator</a></li> <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book
funds</a></li> <li><a href="/cgi-bin/koha/import/breeding.pl">Import to
reservoir</a> <li><a href="/cgi-bin/koha/label-home.pl">Spine and Barcode
Labels</a></li></ul></dd>
</dl><!-- /TMPL_IF -->
+<!-- TMPL_IF name="IntranetmainUserblock" --><!-- TMPL_VAR
name="IntranetmainUserblock" --><!-- /TMPL_IF -->
<br clear="both" /></div>
</div>
Index: bookshelves/shelves.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/Attic/shelves.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -b -r1.1.2.6 -r1.1.2.6.2.1
--- bookshelves/shelves.tmpl 24 Aug 2005 16:30:17 -0000 1.1.2.6
+++ bookshelves/shelves.tmpl 24 Sep 2006 01:05:06 -0000 1.1.2.6.2.1
@@ -113,10 +113,12 @@
<td><select name="category">
<option
value="1">Private</option>
<option
value="2">Public</option>
+ <option value="3">Free</option>
</select></td></tr>
</table></div>
<ul><li>A private bookshelf is managed by you and can be seen only by you.</li>
- <li> A public shelf can be seen by
everybody, but managed only by you.</li></ul>
+ <li> A public shelf can be seen by
everybody, but managed only by you.</li>
+ <li> A free can be managed by any
user.</li></ul>
<input type="submit" value="Add New
Shelf" class="submit" /></form>
<form action="shelves.pl" method="get"
class="inline"><input type="submit" class="submit" value="Back to Shelf List"
/></form>
<!-- TMPL_ELSE -->
Index: circ/branchtransfers.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/branchtransfers.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.3.2.1
diff -u -b -r1.2.2.3 -r1.2.2.3.2.1
--- circ/branchtransfers.tmpl 31 Aug 2005 15:43:56 -0000 1.2.2.3
+++ circ/branchtransfers.tmpl 24 Sep 2006 01:05:06 -0000 1.2.2.3.2.1
@@ -117,7 +117,7 @@
<!-- /TMPL_LOOP -->
</ul></div><!-- /TMPL_IF -->
<form method="post" name="mainform" id="mainform"
action="/cgi-bin/koha/circ/branchtransfers.pl">
- <h3>Transfer</h3><div class="data">
+ <div class="data">
<table>
<tr><th>Enter Item Barcode</th><td><input name="barcode" size="14"
maxlength="14" class="unfocus" onfocus="this.className='focus'"
onblur="this.className='unfocus'" /></td></tr>
<tr><th>Destination Branch:</th><td><select name="tobranchcd">
Index: circ/returns.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/returns.tmpl,v
retrieving revision 1.2.2.4.2.1
retrieving revision 1.2.2.4.2.2
diff -u -b -r1.2.2.4.2.1 -r1.2.2.4.2.2
--- circ/returns.tmpl 19 Sep 2006 13:22:11 -0000 1.2.2.4.2.1
+++ circ/returns.tmpl 24 Sep 2006 01:05:06 -0000 1.2.2.4.2.2
@@ -17,13 +17,16 @@
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR
NAME="borzip" --></li>
<li><!-- TMPL_VAR Name="borphone" --></li>
-<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a
href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!--
TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!--
/TMPL_UNLESS --></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a
id="reserveemail" href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!--
/TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS
NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!--
/TMPL_IF -->
<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in
doubt</li><!-- /TMPL_IF -->
</ul></td></tr>
<tr><!-- TMPL_IF NAME="intransit"
--><th> </th><td><strong>Transfer</strong> to <!-- TMPL_VAR
Name="tobranchname" --> </td><!-- TMPL_ELSE
--><th> </th><td><strong>Hold</strong> in <!-- TMPL_VAR
Name="tobranchname" --></td><!-- /TMPL_IF --></tr>
</table></div><form method="post" action="returns.pl"
name="mainform" id="mainform">
- <input type="submit" value="Confirm" class="submit"
/><!-- TMPL_LOOP Name="inputloop" -->
+ <input type="submit" value="Confirm" class="submit" />
+ <input type="hidden" name="bornum" id="bornum"
value="<!-- TMPL_VAR name="bornum" -->" />
+ <input type="hidden" name="itembiblionumber"
id="itembiblionumber" value="<!-- TMPL_VAR name="itembiblionumber" -->" /><!--
TMPL_LOOP Name="inputloop" -->
+
<input type="hidden" name="ri-<!-- TMPL_VAR
Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR
Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
<input type="hidden" name="bn-<!-- TMPL_VAR
Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
@@ -64,13 +67,15 @@
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR
NAME="borzip" --></li>
<li><!-- TMPL_VAR Name="borphone" --></li>
-<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a
href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!--
TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!--
/TMPL_UNLESS --></li><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS
NAME="intransit" --><a id="reserveemail" href="mailto:<!-- TMPL_VAR
Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!--
TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!--
/TMPL_IF -->
<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in
doubt</li><!-- /TMPL_IF -->
</ul></td></tr>
<tr><!-- TMPL_IF NAME="intransit"
--><th> </th><td><strong>Transfer</strong> to <!-- TMPL_VAR
Name="tobranchname" --> </td><!-- TMPL_ELSE
--><th> </th><td><strong>Hold</strong> in <!-- TMPL_VAR
Name="tobranchname" --></td><!-- /TMPL_IF --></tr></table>
</div> <form method="post" action="returns.pl"
name="mainform" id="mainform">
<input type="submit" class="submit" value="Confirm" />
+ <input type="hidden" name="bornum" id="bornum"
value="<!-- TMPL_VAR name="bornum" -->" />
+ <input type="hidden" name="itembiblionumber"
id="itembiblionumber" value="<!-- TMPL_VAR name="itembiblionumber" -->" />
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR
Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR
Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
Index: includes/colors.npl.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/colors.npl.css,v
retrieving revision 1.1.2.4.2.1
retrieving revision 1.1.2.4.2.2
diff -u -b -r1.1.2.4.2.1 -r1.1.2.4.2.2
--- includes/colors.npl.css 11 Jul 2006 14:03:24 -0000 1.1.2.4.2.1
+++ includes/colors.npl.css 24 Sep 2006 01:05:06 -0000 1.1.2.4.2.2
@@ -399,6 +399,10 @@
background-color : #FFF;
}
+.issued {
+ color : #999999;
+}
+
.submit {
background-color : #669999;
color : #EEF0DB;
Index: includes/common.js.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/common.js.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- includes/common.js.inc 8 Mar 2006 23:07:05 -0000 1.1.2.1
+++ includes/common.js.inc 24 Sep 2006 01:05:06 -0000 1.1.2.1.2.1
@@ -1,4 +1,17 @@
<script language="javascript" type="text/javascript">
+
+function addLoadEvent(func) {
+ var oldonload = window.onload;
+ if (typeof window.onload != 'function') {
+ window.onload = func;
+ } else {
+ window.onload = function() {
+ oldonload();
+ func();
+ }
+ }
+}
+
function Help() {
newin=window.open("/cgi-bin/koha/help.pl","Koha
Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}
@@ -49,4 +62,7 @@
document.forms['mainform'].elements[0].focus();
}
}
+
+ addLoadEvent(verify_images);
+ addLoadEvent(mainfocus);
</script>
\ No newline at end of file
Index: includes/doc-head-circ-close.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/doc-head-circ-close.inc,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.7.2.1
diff -u -b -r1.2.2.7 -r1.2.2.7.2.1
--- includes/doc-head-circ-close.inc 5 Apr 2006 14:52:52 -0000 1.2.2.7
+++ includes/doc-head-circ-close.inc 24 Sep 2006 01:05:06 -0000
1.2.2.7.2.1
@@ -10,6 +10,11 @@
<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!--
TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR
NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
</style>
<!-- TMPL_INCLUDE NAME="common.js.inc" -->
+<!-- TMPL_IF NAME="intranetuserjs" -->
+<script language="JavaScript" type="text/javascript">
+ <!-- TMPL_VAR NAME="intranetuserjs" -->
+</script>
+<!-- /TMPL_IF -->
</head>
-<body onload="verify_images(); mainfocus(); ">
+<body>
Index: includes/doc-head-close.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/doc-head-close.inc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.8.2.1
diff -u -b -r1.1.2.8 -r1.1.2.8.2.1
--- includes/doc-head-close.inc 5 Apr 2006 14:52:52 -0000 1.1.2.8
+++ includes/doc-head-close.inc 24 Sep 2006 01:05:06 -0000 1.1.2.8.2.1
@@ -26,6 +26,11 @@
// end hiding -->
</script>
+<!-- TMPL_IF NAME="intranetuserjs" -->
+<script language="JavaScript" type="text/javascript">
+ <!-- TMPL_VAR NAME="intranetuserjs" -->
+</script>
+<!-- /TMPL_IF -->
</head>
<body>
Index: parameters/systempreferences.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/Attic/systempreferences.tmpl,v
retrieving revision 1.3.2.5.2.1
retrieving revision 1.3.2.5.2.2
diff -u -b -r1.3.2.5.2.1 -r1.3.2.5.2.2
--- parameters/systempreferences.tmpl 11 Jul 2006 14:03:24 -0000
1.3.2.5.2.1
+++ parameters/systempreferences.tmpl 24 Sep 2006 01:05:06 -0000
1.3.2.5.2.2
@@ -236,14 +236,13 @@
<table>
<tr>
<th>Variable</th>
- <th>Value</th>
- <th colspan="3">Explanation</th>
+ <th>Value/Explanation</th>
+ <th colspan="2"></th>
</tr>
<!-- TMPL_LOOP NAME="loop" -->
<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
- <td><!-- TMPL_VAR NAME="variable" --></td>
- <td><!-- TMPL_VAR NAME="value" --></td>
- <td><!-- TMPL_VAR NAME="explanation" --></td>
+ <td><a href="<!-- TMPL_VAR NAME="edit" -->"><!-- TMPL_VAR
NAME="variable" --></a></td>
+ <td><strong><!-- TMPL_VAR NAME="value" --></strong><br><!--
TMPL_VAR NAME="explanation" --></td>
<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en intranet-ma... [dev_week],
Joshua Ferraro <=