projects / koha_fer / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge commit 'biblibre/3.2_biblibre' into to-push
[koha_fer] / koha-tmpl / opac-tmpl / prog / en / modules / opac-main.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
index e317d27..d1c5b3a 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -1,20 +1,28 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;
+<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="opac-main">
 <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
    <div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 
        <div id="yui-main">
 
-       <div class="yui-b"><div class="yui-ge">
+       <div class="yui-b">
                <!-- TMPL_IF NAME="opacuserlogin" -->
-           <!-- TMPL_UNLESS NAME="loggedinusername" -->                
-    <div class="yui-u first">
-    <!-- /TMPL_UNLESS -->
-<!-- /TMPL_IF -->      
+           <!-- TMPL_IF NAME="loggedinusername" -->
+                       <div class="yui-g">
+                       <div>
+                       <!-- TMPL_ELSE -->
+               <div class="yui-ge">
+               <div class="yui-u first">
+    <!-- /TMPL_IF -->
+       <!-- TMPL_ELSE -->
+               <div class="yui-g">
+               <div>
+       <!-- /TMPL_IF -->
+       
        <!-- TMPL_IF name="koha_news_count" -->
 <div id="news" class="container">
     <table>
@@ -27,67 +35,17 @@
 </div>
 <!-- /TMPL_IF -->
 
-       <!-- TMPL_IF NAME="OpacMainUserBlock" --><div class="container"><!-- TMPL_VAR NAME="OpacMainUserBlock" --></div><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="recentacquiloop"-->
-    <div class="searchresults">
-        <table>
-        <tr>
-            <th>Title</th>
-            <th>Author</th>
-            <th>copyright</th>
-            <th>publication year</th>
-            <th>Date</th>
-        </tr>
-        <!-- TMPL_LOOP NAME="recentacquiloop" -->
-        <tr>
-            <td><p>
-                    <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-                    <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                    <!-- TMPL_IF NAME="title"-->
-                        <!-- TMPL_VAR NAME="title" -->
-                    <!-- TMPL_ELSE -->
-                        <span class="problem">(no title)</span>
-                    <!-- /TMPL_IF -->
-                    </a>
-                    <!-- TMPL_ELSE -->
-                    <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
-                    <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                    <!-- TMPL_IF NAME="title"-->
-                        <!-- TMPL_VAR NAME="title" -->
-                    <!-- TMPL_ELSE -->
-                        <span class="problem">(no title)</span>
-                    <!-- /TMPL_IF -->
-                    </a>
-                    <!-- TMPL_ELSE -->
-                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                    <!-- TMPL_IF NAME="title"-->
-                        <!-- TMPL_VAR NAME="title" -->
-                    <!-- TMPL_ELSE -->
-                        <span class="problem">(no title)</span>
-                    <!-- /TMPL_IF -->
-                    </a>
-                    <!-- /TMPL_IF -->
-                    <!-- /TMPL_IF -->
-                </p></td>
-            <td><a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
-                    <!-- TMPL_VAR NAME="author" -->
-                </a></td>
-            <td><!-- TMPL_VAR NAME="copyrightdate" --></td>
-            <td><!-- TMPL_VAR NAME="publicationyear" --></td>
-            <td><!-- TMPL_VAR NAME="timestamp" --></td>
-        </tr>
-        <!-- /TMPL_LOOP -->
-        </table>
-     </div>
-<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="OpacMainUserBlock" --><div id="opacmainuserblock" class="container"><!-- TMPL_VAR NAME="OpacMainUserBlock" --></div><!-- /TMPL_IF -->
 
-           </div>
+</div>
+               
        <!-- TMPL_IF NAME="opacuserlogin" -->
     <!-- TMPL_UNLESS NAME="loggedinusername" -->
+    <!-- TMPL_UNLESS NAME="casAuthentication" -->
     <div class="yui-u">
-       
-<div id="login" class="container">
+       <div id="login" class="container">
        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
+    <input type="hidden" name="koha_login_context" value="opac" />
        <fieldset class="brief">
                <legend>Log in to Your Account:</legend>
                <ol>
@@ -96,17 +54,18 @@
                </ol>    <fieldset class="action">
         <input type="submit" value="Log In" class="submit" />
         </fieldset></fieldset>
-
-        </form>
-</div>
-           </div>
+       </form>
+       </div>
+        </div>
     <!-- /TMPL_UNLESS -->
+    <!-- /TMPL_UNLESS -->
+       
 <!-- /TMPL_IF -->
 </div>
 </div>
 </div>
 <!-- TMPL_IF NAME="OpacNav" --><div class="yui-b">
-<div class="container">
+<div id="opacnav" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
Unnamed repository; edit this file 'description' to name the repository.