From a37daca905b288e0608823b4b396a8125ee1f0da Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 24 Sep 2007 15:17:15 -0500 Subject: [PATCH] More efforts with toolbars, nothing solved. Also corrections, and modifications to resident search to place focus on displayed form field. Signed-off-by: Chris Cormack --- circ/circulation.pl | 1 + .../prog/en/css/staff-global.css | 9 +- .../prog/en/includes/cat-menu.inc | 4 + .../prog/en/includes/circ-search.inc | 6 +- .../prog/en/includes/circ-toolbar.inc | 8 +- .../intranet-tmpl/prog/en/js/staff-global.js | 8 +- .../prog/en/modules/circ/circulation.tmpl | 145 +++++++++--------- .../prog/en/modules/members/moremember.tmpl | 9 +- .../en/modules/virtualshelves/shelves.tmpl | 19 +-- 9 files changed, 106 insertions(+), 103 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc diff --git a/circ/circulation.pl b/circ/circulation.pl index 326ea420fb..d6deedb14a 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -595,6 +595,7 @@ if ($borrowerslist) { } $CGIselectborrower = CGI::scrolling_list( -name => 'borrowernumber', + -id => 'borrowernumber', -values => \@values, -labels => \%labels, -size => 7, diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 933e1042d5..585e735cd6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -312,6 +312,11 @@ div#header_search .tip { color : Gray; } +.ex { + font-family : "Courier New", Courier, fixed-width; + font-weight : bold; +} + /* ClickMenu Overrides */ div.cmDiv @@ -453,10 +458,6 @@ ul.toolbar li a { ul.toolbar li a:hover { background-color : #FFFFCC; - border-top : 1px solid #FFFFFF; - border-left : 1px solid #FFFFFF; - border-bottom : 1px solid #BCBCBC; - border-right : 1px solid #BCBCBC; } ul.toolbar li:last-child a:hover { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc new file mode 100644 index 0000000000..73bb1c18ba --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc index cc56896938..08aac7d0ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js index 46323b2383..9b6e1692cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -4,10 +4,10 @@ $(".focus").focus(); $('#toplevelmenu').clickMenu(); $('#header_search').tabs({ - onShow: function() { - alert($('#header_search').children("div:visible").children("input:eq(0)").focus()); - } -}); + onShow: function() { + $('#header_search').find('div:visible').find('input').eq(0).focus(); + } + }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 8f8dc35907..aaddbcb8e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -52,6 +52,9 @@ } } } + $(document).ready(function() { + $('#patronlists').tabs(); + }); //]]> @@ -264,7 +267,7 @@

-No patron matched +No patron matched Add adult Add child

@@ -290,7 +293,7 @@ No patron matched Patron not found? Add adult Add child - or try another search + or try another search

@@ -692,83 +695,25 @@ No patron matched -
+ - - -
- - - - - - - - - - "> - - - - - - - -
Reserve dateBarcodeTitleAuthorLocalisation
- - - - &type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"> - - - Hold priority : - - - - ( ) - - -
- This hold is available - - -
- This hold has been transfered from library : - the : - - - -
- This hold hasn't been transfered yet from library : - -
-
- - + 0 reserves + + + - -
+

&print=page')">Print Page @@ -878,7 +823,59 @@ No patron matched

+ + +
+ + + + + + + + + + "> + + + + + + + +
Reserve dateBarcodeTitleAuthorLocalisation
+ + + + &type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"> + + + Hold priority : + + + + ( ) + + +
+ This hold is available + + +
+ This hold has been transfered from library : + the : + + + +
+ This hold hasn't been transfered yet from library : + +
+
+ + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index 2f01a725f8..c90fcfc3aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -2,6 +2,7 @@ Koha › Patrons › Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> @@ -40,6 +42,9 @@ function confirm_reregistration() { " /> " /> + + +
@@ -68,7 +73,7 @@ function confirm_reregistration() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 74003657ba..06777517d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -1,8 +1,9 @@ Koha › <!-- TMPL_IF NAME="viewshelf" -->Virtual Shelves › Contents of <!-- TMPL_VAR NAME="shelfname" --><!-- TMPL_ELSE -->Virtual Shelves<!-- /TMPL_IF --> + @@ -63,10 +64,10 @@

Contents of

- - " /> + +
@@ -114,19 +115,13 @@ " /> - + With selected items : - + -- 2.39.5