last commits before 2.2.3
* css fixes for better IE compliance * adding LibraryName parameter in login screen
This commit is contained in:
tipaul
parent
8bcf402af5
commit
4e595b2226
|
|
@ -399,7 +399,7 @@ sub checkauth {
|
|||
$template->param(loginprompt => 1) unless $info{'nopermission'};
|
||||
|
||||
my $self_url = $query->url(-absolute => 1);
|
||||
$template->param(url => $self_url);
|
||||
$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
|
||||
$template->param(\%info);
|
||||
$cookie=$query->cookie(-name => 'sessionID',
|
||||
-value => $sessionID,
|
||||
|
|
|
|||
|
|
@ -400,8 +400,10 @@ border:4px;
|
|||
|
||||
/* for MARC view */
|
||||
div.tabs {
|
||||
width:10px;
|
||||
width:15px;
|
||||
display:block;
|
||||
margin-top:70px;
|
||||
margin-left:40px;
|
||||
}
|
||||
|
||||
div.tabs a {
|
||||
|
|
@ -416,9 +418,11 @@ div.tabs a {
|
|||
div.tabbloc {
|
||||
position:absolute;
|
||||
display:block;
|
||||
top:123px;
|
||||
left:42px;
|
||||
top:140px;
|
||||
left:62px;
|
||||
margin-right:0px;
|
||||
border: 1px solid black;
|
||||
background-color:none;
|
||||
}
|
||||
|
||||
div.tab {
|
||||
|
|
@ -427,6 +431,8 @@ div.tab {
|
|||
visibility:hidden;
|
||||
position:absolute;
|
||||
float:left;
|
||||
margin-right:0px;
|
||||
background-color:none;
|
||||
}
|
||||
|
||||
.MARCtag { /* style for tag definition (700 - Statement of responsability) */
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
<!-- /TMPL_IF -->
|
||||
<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
|
||||
</div>
|
||||
<div id="mainbloc">
|
||||
<div class="tabs">
|
||||
<!-- TMPL_IF name="0XX" -->
|
||||
<a href="javascript:active(0)"><div id="link0">0</div></a>
|
||||
|
|
@ -320,7 +319,6 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
function active(numlayer)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,38 +1,39 @@
|
|||
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
|
||||
<div id="mainbloc">
|
||||
<!-- TMPL_IF NAME="nopermission" -->
|
||||
<!-- This is what is displayed if user doesnt have permission -->
|
||||
<h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="timed_out" -->
|
||||
<!-- This is what is displayed if login has timed out -->
|
||||
<h2>Sorry, your session has timed out, please login again.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="different_ip" -->
|
||||
<!-- This is what is displayed if user doesnt have permission -->
|
||||
<h2>You are accessing koha from a different ip address! please login again.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="invalid_username_or_password" -->
|
||||
<!-- This is what is displayed if user doesnt have permission -->
|
||||
<h2>You entered an incorrect username or password, please try again.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="loginprompt" -->
|
||||
<!-- login prompt time-->
|
||||
|
||||
<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
|
||||
<h1>Koha Login</h1>
|
||||
<p><label>Cardnumber</label><input name="userid" /></p>
|
||||
<p><label>Password</label><input type="password" name="password" /></p>
|
||||
<!-- TMPL_LOOP NAME="INPUTS" -->
|
||||
<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
|
||||
<!-- /TMPL_LOOP -->
|
||||
<p><label> </label><input type="submit" value="login" class="button" /></p>
|
||||
</form>
|
||||
|
||||
<!-- /TMPL_IF -->
|
||||
<div id="bloc60">
|
||||
<!-- TMPL_IF NAME="nopermission" -->
|
||||
<!-- This is what is displayed if user doesnt have permission -->
|
||||
<h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="timed_out" -->
|
||||
<!-- This is what is displayed if login has timed out -->
|
||||
<h2>Sorry, your session has timed out, please login again.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="different_ip" -->
|
||||
<!-- This is what is displayed if user doesnt have permission -->
|
||||
<h2>You are accessing koha from a different ip address! please login again.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="invalid_username_or_password" -->
|
||||
<!-- This is what is displayed if user doesnt have permission -->
|
||||
<h2>You entered an incorrect username or password, please try again.<h2>
|
||||
<!-- /TMPL_IF -->
|
||||
</div>
|
||||
<div id="bloc60">
|
||||
<!-- TMPL_IF NAME="loginprompt" -->
|
||||
<!-- login prompt time-->
|
||||
<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
|
||||
<h2>Koha Login</h2>
|
||||
<p><label>Cardnumber</label><input name="userid" /></p>
|
||||
<p><label>Password</label><input type="password" name="password" /></p>
|
||||
<!-- TMPL_LOOP NAME="INPUTS" -->
|
||||
<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
|
||||
<!-- /TMPL_LOOP -->
|
||||
<p><label> </label><input type="submit" value="login" class="button" /></p>
|
||||
</form>
|
||||
</div>
|
||||
<!-- /TMPL_IF -->
|
||||
</div>
|
||||
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
|
||||
|
|
|
|||
|
|
@ -40,79 +40,79 @@
|
|||
|
||||
<!-- /TMPL_LOOP -->
|
||||
|
||||
<!-- TMPL_IF NAME="waiting_count" -->
|
||||
<div class="bloc60">
|
||||
<h2>You have reserved items waiting:</h2>
|
||||
<ul>
|
||||
<!-- TMPL_LOOP NAME="WAITING" -->
|
||||
<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- TMPL_IF NAME="waiting_count" -->
|
||||
<div class="bloc60">
|
||||
<h2>You have reserved items waiting:</h2>
|
||||
<ul>
|
||||
<!-- TMPL_LOOP NAME="WAITING" -->
|
||||
<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<div class="bloc60">
|
||||
<!-- TMPL_IF NAME="issues_count" -->
|
||||
<h2>You have <b><!-- TMPL_VAR NAME="issues_count" --></b> items currently issued.</h2>
|
||||
<table>
|
||||
<div class="bloc60">
|
||||
<!-- TMPL_IF NAME="issues_count" -->
|
||||
<h2>You have <b><!-- TMPL_VAR NAME="issues_count" --></b> items currently issued.</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Title</th>
|
||||
<th>Author</th>
|
||||
<th>Due date</th>
|
||||
<th>Itemtype</th>
|
||||
<th>Barcode</th>
|
||||
<th>Charges</th>
|
||||
<th>Renewable</th>
|
||||
</tr>
|
||||
<!-- TMPL_LOOP NAME="ISSUES" -->
|
||||
<!-- TMPL_IF name="overdue"-->
|
||||
<tr>
|
||||
<td><!-- TMPL_VAR NAME="title" --></td>
|
||||
<td><!-- TMPL_VAR NAME="author" --></td>
|
||||
<td><b>OVERDUE <!-- TMPL_VAR NAME="date_due" --></b></td>
|
||||
<td><!-- TMPL_VAR NAME="itemtype" --></td>
|
||||
<td><!-- TMPL_VAR NAME="barcode" --></td>
|
||||
<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
</tr>
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr>
|
||||
<td><!-- TMPL_VAR NAME="title" --></td>
|
||||
<td><!-- TMPL_VAR NAME="author" --></td>
|
||||
<td><!-- TMPL_VAR NAME="date_due" --></td>
|
||||
<td><!-- TMPL_VAR NAME="itemtype" --></td>
|
||||
<td><!-- TMPL_VAR NAME="barcode" --></td>
|
||||
<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
</tr>
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- /TMPL_LOOP -->
|
||||
</table>
|
||||
<!-- TMPL_ELSE -->
|
||||
<h2>You have no items on issue.</h2>
|
||||
<!-- /TMPL_IF -->
|
||||
</div>
|
||||
|
||||
<!-- TMPL_IF NAME="reserves_count" -->
|
||||
<div class="bloc60">
|
||||
<h2>You have <b><!-- TMPL_VAR NAME="reserves_count" --></b> items currently reserved.</h2>
|
||||
<table cellspacing="0" align="center">
|
||||
<tr>
|
||||
<th>Title</th>
|
||||
<th>Author</th>
|
||||
<th>Due date</th>
|
||||
<th>Itemtype</th>
|
||||
<th>Barcode</th>
|
||||
<th>Charges</th>
|
||||
<th>Renewable</th>
|
||||
<th>Reserve date</th>
|
||||
</tr>
|
||||
<!-- TMPL_LOOP NAME="ISSUES" -->
|
||||
<!-- TMPL_IF name="overdue"-->
|
||||
<tr>
|
||||
<td><!-- TMPL_VAR NAME="title" --></td>
|
||||
<td><!-- TMPL_VAR NAME="author" --></td>
|
||||
<td><b>OVERDUE <!-- TMPL_VAR NAME="date_due" --></b></td>
|
||||
<td><!-- TMPL_VAR NAME="itemtype" --></td>
|
||||
<td><!-- TMPL_VAR NAME="barcode" --></td>
|
||||
<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
</tr>
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr>
|
||||
<td><!-- TMPL_VAR NAME="title" --></td>
|
||||
<td><!-- TMPL_VAR NAME="author" --></td>
|
||||
<td><!-- TMPL_VAR NAME="date_due" --></td>
|
||||
<td><!-- TMPL_VAR NAME="itemtype" --></td>
|
||||
<td><!-- TMPL_VAR NAME="barcode" --></td>
|
||||
<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
|
||||
</tr>
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- TMPL_LOOP NAME="RESERVES" -->
|
||||
<tr valign="top">
|
||||
<td><!-- TMPL_VAR NAME="btitle" --></td>
|
||||
<td><!-- TMPL_VAR NAME="author" --></td>
|
||||
<td><!-- TMPL_VAR NAME="reservedate" --></td>
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</table>
|
||||
<!-- TMPL_ELSE -->
|
||||
<h2>You have no items on issue.</h2>
|
||||
<br />
|
||||
</div>
|
||||
<!-- /TMPL_IF -->
|
||||
</div>
|
||||
|
||||
<!-- TMPL_IF NAME="reserves_count" -->
|
||||
<div class="bloc60">
|
||||
<h2>You have <b><!-- TMPL_VAR NAME="reserves_count" --></b> items currently reserved.</h2>
|
||||
<table cellspacing="0" align="center">
|
||||
<tr>
|
||||
<th>Title</th>
|
||||
<th>Author</th>
|
||||
<th>Reserve date</th>
|
||||
</tr>
|
||||
<!-- TMPL_LOOP NAME="RESERVES" -->
|
||||
<tr valign="top">
|
||||
<td><!-- TMPL_VAR NAME="btitle" --></td>
|
||||
<td><!-- TMPL_VAR NAME="author" --></td>
|
||||
<td><!-- TMPL_VAR NAME="reservedate" --></td>
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</table>
|
||||
<br />
|
||||
</div>
|
||||
<!-- /TMPL_IF -->
|
||||
</div>
|
||||
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue