View | Details | Raw Unified | Return to bug 4028
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (-4 / +1 lines)
Lines 611-625 body#advsearch #listsmenulink { Link Here
611
	text-decoration : none;
611
	text-decoration : none;
612
}
612
}
613
613
614
#members li:first-child {
615
	border-right : 1px solid black;
616
}
617
618
#members li:last-child {
614
#members li:last-child {
619
	border-right : 0;
615
	border-right : 0;
620
}
616
}
621
617
622
#members li {
618
#members li {
619
	border-right : 1px solid black;
623
	display : inline;
620
	display : inline;
624
	list-style : none;
621
	list-style : none;
625
	margin : 0;
622
	margin : 0;
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (-1 / +11 lines)
Lines 1-6 Link Here
1
<div id="header-wrapper"><div id="members">
1
<div id="header-wrapper"><div id="members">
2
  <!-- TMPL_IF NAME="opacuserlogin" -->
2
  <!-- TMPL_IF NAME="opacuserlogin" -->
3
	<ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li><!-- TMPL_IF NAME="ShowOpacRecentSearchLink" --><li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="javascript:return confirm(_('Are you sure you want to delete your search history?'));">x</a>]</li> <!-- /TMPL_IF --><li><a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_IF -->
3
	<ul>
4
<!-- TMPL_UNLESS NAME="loggedinusername" -->
5
               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_UNLESS -->
6
            <!-- TMPL_IF NAME="loggedinusername" -->
7
                <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li>
8
9
            <!-- /TMPL_IF -->
10
            <!-- TMPL_IF NAME="ShowOpacRecentSearchLink" -->
11
                <li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(_('Are you sure you want to delete your search history?'));">x</a>]</li>
12
            <!-- /TMPL_IF -->
13
			<!-- TMPL_IF NAME="loggedinusername" --><li><a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- /TMPL_IF -->
4
   	</ul>	
14
   	</ul>	
5
  <!-- /TMPL_IF -->
15
  <!-- /TMPL_IF -->
6
</div>
16
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc (+3 lines)
Lines 12-17 Link Here
12
  <!-- TMPL_IF NAME="OpacPasswordChange" -->
12
  <!-- TMPL_IF NAME="OpacPasswordChange" -->
13
    <!-- TMPL_IF NAME="passwdview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a></li>
13
    <!-- TMPL_IF NAME="passwdview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a></li>
14
  <!-- /TMPL_IF -->
14
  <!-- /TMPL_IF -->
15
  <!-- TMPL_IF NAME="ShowOpacRecentSearchLink" -->
16
  <!-- TMPL_IF NAME="searchhistoryview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-search-history.pl">my search history</a></li>
17
  <!-- /TMPL_IF -->
15
  <!-- TMPL_IF NAME="opacreadinghistory" -->
18
  <!-- TMPL_IF NAME="opacreadinghistory" -->
16
  <!-- TMPL_IF NAME="readingrecview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a></li>
19
  <!-- TMPL_IF NAME="readingrecview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a></li>
17
  <!-- /TMPL_IF -->
20
  <!-- /TMPL_IF -->
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl (-15 / +32 lines)
Lines 8-14 Link Here
8
		// We show table ordered by descending dates by default
8
		// We show table ordered by descending dates by default
9
		// (so that the more recent query is shown first)
9
		// (so that the more recent query is shown first)
10
		$.tablesorter.defaults.sortList = [[0,1]]; 
10
		$.tablesorter.defaults.sortList = [[0,1]]; 
11
                $("#historyt").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
11
                $(".historyt").tablesorter({
12
						widgets : ['zebra'],<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
12
                        dateFormat: 'uk'<!-- /TMPL_IF -->
13
                        dateFormat: 'uk'<!-- /TMPL_IF -->
13
                });
14
                });
14
            });
15
            });
Lines 17-36 Link Here
17
</script>
18
</script>
18
</head>
19
</head>
19
<body>
20
<body>
20
<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
21
<!-- TMPL_IF NAME="OpacNav" -->
22
<div id="doc3" class="yui-t1">
23
<!-- TMPL_ELSIF NAME="loggedinusername" -->
24
<div id="doc3" class="yui-t1">
25
<!-- TMPL_ELSE -->
26
<div id="doc3" class="yui-t7">
27
<!-- /TMPL_IF -->
21
   <div id="bd">
28
   <div id="bd">
22
<!--TMPL_INCLUDE NAME="masthead.inc" -->
29
<!--TMPL_INCLUDE NAME="masthead.inc" -->
23
30
24
	<div id="yui-main">
31
	<div id="yui-main">
25
<div class="yui-b"><div class="yui-g">
32
<div class="yui-b"><div class="yui-g">
26
        <div class="container">
33
        <div id="searchhistory" class="container">
27
	<h1>Search history</h1>
34
	<h1>Search history</h1>
28
	<!-- TMPL_IF EXPR="recentSearches || previousSearches" -->
35
	<!-- TMPL_IF NAME="recentSearches" --><form action="/cgi-bin/koha/opac-search-history.pl" method="get"><input type="hidden" name="action" value="delete" /><input type="submit" class="deleteshelf" value="Delete your search history" onclick="return confirm(_('Are you sure you want to delete your search history?'));" /></form><!-- TMPL_ELSE --><!-- TMPL_IF NAME="previousSearches" --><form action="/cgi-bin/koha/opac-search-history.pl" method="get"><input type="hidden" name="action" value="delete" /><input type="submit" class="deleteshelf" value="Delete your search history" onclick="return confirm(_('Are you sure you want to delete your search history?'));" /></form><!-- /TMPL_IF --><!-- /TMPL_IF -->
36
29
	    <!-- TMPL_IF NAME="recentSearches" -->
37
	    <!-- TMPL_IF NAME="recentSearches" -->
38
	    <table class="historyt">
30
	    <!-- TMPL_IF NAME="previousSearches" -->
39
	    <!-- TMPL_IF NAME="previousSearches" -->
31
	    <h2>Current session</h2>
40
	    <caption>Current session</caption>
32
	    <!-- /TMPL_IF -->
41
	    <!-- /TMPL_IF -->
33
	    <table id="historyt">
34
		<thead>
42
		<thead>
35
		    <tr><th>Date</th><th>Search</th><th>Results</th></tr>
43
		    <tr><th>Date</th><th>Search</th><th>Results</th></tr>
36
		</thead>
44
		</thead>
Lines 38-44 Link Here
38
		    <!-- TMPL_LOOP NAME="recentSearches" -->
46
		    <!-- TMPL_LOOP NAME="recentSearches" -->
39
		    <tr>
47
		    <tr>
40
			<td><!-- TMPL_VAR NAME="time" --></td>
48
			<td><!-- TMPL_VAR NAME="time" --></td>
41
			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->"><!-- TMPL_VAR NAME="query_desc" --></a></td>
49
			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi"  -->"><!-- TMPL_VAR NAME="query_desc" --></a></td>
42
			<td><!-- TMPL_VAR NAME="total" --></td>
50
			<td><!-- TMPL_VAR NAME="total" --></td>
43
		    </tr>
51
		    </tr>
44
		    <!-- /TMPL_LOOP -->
52
		    <!-- /TMPL_LOOP -->
Lines 47-54 Link Here
47
	    <!-- /TMPL_IF -->
55
	    <!-- /TMPL_IF -->
48
56
49
	    <!-- TMPL_IF NAME="previousSearches" -->
57
	    <!-- TMPL_IF NAME="previousSearches" -->
50
	    <h2>Previous sessions</h2>
58
	    <table class="historyt">
51
	    <table id="historyt">
59
	    <caption>Previous sessions</caption>
52
		<thead>
60
		<thead>
53
		    <tr><th>Date</th><th>Search</th><th>Results</th></tr>
61
		    <tr><th>Date</th><th>Search</th><th>Results</th></tr>
54
		</thead>
62
		</thead>
Lines 56-80 Link Here
56
		    <!-- TMPL_LOOP NAME="previousSearches" -->
64
		    <!-- TMPL_LOOP NAME="previousSearches" -->
57
		    <tr>
65
		    <tr>
58
			<td><!-- TMPL_VAR NAME="time" --></td>
66
			<td><!-- TMPL_VAR NAME="time" --></td>
59
			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->"><!-- TMPL_VAR NAME="query_desc" --></a></td>
67
			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi"  -->"><!-- TMPL_VAR NAME="query_desc" --></a></td>
60
			<td><!-- TMPL_VAR NAME="total" --></td>
68
			<td><!-- TMPL_VAR NAME="total" --></td>
61
		    </tr>
69
		    </tr>
62
		    <!-- /TMPL_LOOP -->
70
		    <!-- /TMPL_LOOP -->
63
		</tbody>
71
		</tbody>
64
	    </table>
72
	    </table>
65
	    <!-- /TMPL_IF -->
73
	    <!-- /TMPL_IF -->
66
	<!-- TMPL_ELSE -->
74
67
	<p>Your search history is now empty.</p> 
75
<!-- TMPL_IF NAME="recentSearches" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="previousSearches" --><!-- TMPL_ELSE --><p>Your search history is empty.</p><!-- /TMPL_IF --><!-- /TMPL_IF -->
68
	<!-- /TMPL_IF -->
76
69
     </div>
77
     </div>
70
     </div>
78
     </div>
71
     </div>
79
     </div>
72
     </div>
80
     </div>
73
<!-- TMPL_IF EXPR="OpacNav||loggedinusername" -->
81
82
<!-- TMPL_IF NAME="OpacNav" -->
74
<div class="yui-b"><div class="container">
83
<div class="yui-b"><div class="container">
75
<!--TMPL_INCLUDE NAME="navigation.inc" -->
84
<!--TMPL_INCLUDE NAME="navigation.inc" -->
76
<!--TMPL_INCLUDE NAME="usermenu.inc" -->
85
<!--TMPL_INCLUDE NAME="usermenu.inc" -->
77
</div></div></div>
86
</div></div>
87
<!-- TMPL_ELSIF NAME="loggedinusername" -->
88
<div class="yui-b"><div class="container">
89
<!--TMPL_INCLUDE NAME="navigation.inc" -->
90
<!--TMPL_INCLUDE NAME="usermenu.inc" -->
91
</div></div>
92
<!-- TMPL_ELSE -->
78
<!-- /TMPL_IF -->
93
<!-- /TMPL_IF -->
79
94
95
96
</div>
80
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
97
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
(-)a/opac/opac-search-history.pl (-1 / +3 lines)
Lines 142-147 if ($loggedinuser == '') { Link Here
142
    }
142
    }
143
143
144
}
144
}
145
146
$template->param(searchhistoryview => 1);
147
145
output_html_with_http_headers $cgi, $cookie, $template->output;
148
output_html_with_http_headers $cgi, $cookie, $template->output;
146
149
147
150
148
- 

Return to bug 4028