From 81ff33a8bf4e7f8955fac530330e87fd607f4cff Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 7 Jan 2010 09:47:22 -0500 Subject: [PATCH] Fix for Bug 4024, Search history template problems, and other fixes. - Markup corrections - Removing TMPL EXPR - Converting delete link to FORM ("destructive" actions shouldn't be links) - Adding "search history" link to logged-in user's sidebar menu --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 +-- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 12 +++++- koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 3 + .../prog/en/modules/opac-search-history.tmpl | 47 +++++++++++++------ opac/opac-search-history.pl | 3 + 5 files changed, 50 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 9e30270..17093e7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -611,15 +611,12 @@ body#advsearch #listsmenulink { text-decoration : none; } -#members li:first-child { - border-right : 1px solid black; -} - #members li:last-child { border-right : 0; } #members li { + border-right : 1px solid black; display : inline; list-style : none; margin : 0; diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 0112166..f3916e6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -1,6 +1,16 @@
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc index 5d1c50f..26bf502 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc @@ -12,6 +12,9 @@
  • change my password
  • + +
  • my search history
  • +
  • my reading history
  • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl index 2823501..90fc569 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl @@ -8,7 +8,8 @@ // We show table ordered by descending dates by default // (so that the more recent query is shown first) $.tablesorter.defaults.sortList = [[0,1]]; - $("#historyt").tablesorter({ + $(".historyt").tablesorter({ + widgets : ['zebra'], dateFormat: 'uk' }); }); @@ -17,20 +18,27 @@ -
    + +
    + +
    + +
    +
    -
    +

    Search history

    - +
    + + -

    Current session

    + -
    Current session
    @@ -38,7 +46,7 @@ - + @@ -47,8 +55,8 @@ -

    Previous sessions

    -
    DateSearchResults
    ">">
    +
    + @@ -56,25 +64,34 @@ - +
    Previous sessions
    DateSearchResults
    ">">
    - -

    Your search history is now empty.

    - + +

    Your search history is empty.

    +
    - + +
    -
    +
    + +
    + + +
    + + +
    diff --git a/opac/opac-search-history.pl b/opac/opac-search-history.pl index fdf0701..97db2d5 100755 --- a/opac/opac-search-history.pl +++ b/opac/opac-search-history.pl @@ -142,6 +142,9 @@ if ($loggedinuser == '') { } } + +$template->param(searchhistoryview => 1); + output_html_with_http_headers $cgi, $cookie, $template->output; -- 1.6.3.3