From 4662ba0958bca753f5966b4ce3d979c57329bb0a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 9 Oct 2007 16:46:51 -0500 Subject: [PATCH] Refining navigation in MARC Framework pages; Fixing unfinished YUI-based toolbar on catalogue detail page: functional now, with some tweaks yet to be done. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- admin/marc_subfields_structure.pl | 3 +- .../prog/en/css/staff-global.css | 74 ++++++++++----- .../prog/en/includes/cat-toolbar.inc | 25 ++--- .../prog/en/modules/admin/admin-home.tmpl | 4 +- .../en/modules/admin/biblio_framework.tmpl | 6 +- .../admin/marc_subfields_structure.tmpl | 72 ++++++++------- .../en/modules/admin/marctagstructure.tmpl | 22 ++--- .../prog/en/modules/catalogue/detail.tmpl | 87 ++++++++---------- .../intranet-tmpl/prog/img/opac-buttons.gif | Bin 979 -> 0 bytes .../prog/img/toolbar-add-to-shelf.gif | Bin 0 -> 130 bytes .../intranet-tmpl/prog/img/toolbar-delete.gif | Bin 0 -> 107 bytes .../intranet-tmpl/prog/img/toolbar-edit.gif | Bin 0 -> 116 bytes .../intranet-tmpl/prog/img/toolbar-hold.gif | Bin 0 -> 106 bytes .../intranet-tmpl/prog/img/toolbar-new.gif | Bin 0 -> 100 bytes .../intranet-tmpl/prog/img/toolbar-print.gif | Bin 0 -> 115 bytes 15 files changed, 155 insertions(+), 138 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-delete.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-hold.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-new.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-print.gif diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index ae3d94b2ab..c40f5f0e88 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -382,8 +382,7 @@ if ( $op eq 'add_form' ) { $template->param( 'heading-edit-subfields-p' => 1 ); $template->param( action => "Edit subfields", - tagfield => -"$tagfield", + tagfield => $tagfield, loop => \@loop_data, more_subfields => $more_subfields, more_tag => $tagfield 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 bd7b23fed1..f80f84ba15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -415,37 +415,22 @@ dd { div#toolbar { background-color : #F3F3F3; + margin-bottom : .7em; } ul.toolbar { + padding-left : 0; +} + +.yui-menu-button { + } ul.toolbar li { display : inline; - float : left; list-style : none; } -ul.toolbar li a { - background-color : #F3F3F3; - border : 1px solid #F3F3F3; - display : block; - margin : 3px; - padding : 3px; - text-decoration : none; -} - -ul.toolbar li a:hover { - background-color : #FFFFCC; -} - -ul.toolbar li:last-child a:hover { -} - -ul.toolbar ul { - display : none; -} - div.message { border : 1px solid #6699CC; width : 33%; @@ -707,4 +692,49 @@ fieldset.rows fieldset.action { .subfield_not_filled { background-color : #FFFF99; -} \ No newline at end of file +} +.content_hidden { + visibility:hidden; /* you propably don't need to change this one */ + display:none; +} + +/* the property for the displayed tab */ +.content_visible { + visibility:visible; /* you propably don't need to change this one */ + display:block; +} +#addbiblio a { + padding-left : 34px; + background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif"); + background-position : center left; + background-repeat : no-repeat; +} + +#deletebiblio a { + padding-left : 34px; + background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif"); + background-position : center left; + background-repeat : no-repeat; +} + +#printbiblio a { + padding-left : 34px; + background-image: url("/intranet-tmpl/prog/img/toolbar-print.gif"); + background-position : center left; + background-repeat : no-repeat; +} + +#addtoshelf a { + padding-left : 34px; + background-image: url("/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif"); + background-position : center left; + background-repeat : no-repeat; +} + +#placehold a { + padding-left : 34px; + background-image: url("/intranet-tmpl/prog/img/toolbar-hold.gif"); + background-position : center left; + background-repeat : no-repeat; +} + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index e8d4566fb9..d03a5b2564 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -1,17 +1,12 @@
- New - - - )">Delete +
+
  • New
  • +
  • &frameworkcode=&op=">Edit Record
  • +
  • ">Edit Items
  • +
  • &frameworkcode=&op=duplicate">Duplicate Record
  • +
  • )">Delete
  • +
  • ','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf
  • +
  • ">Print
  • +
  • ">Place Hold
  • + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl index dc8af3f80b..f82c0e3fb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl @@ -8,11 +8,11 @@ -
    +
    -

    System Administration

    +

    System Administration

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl index 6c0fea5413..dc08731917 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl @@ -1,5 +1,5 @@ -Koha › Administration › <!-- TMPL_IF NAME="add_form" --> Biblio Framework › <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Biblio Framework › Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --> +Koha › Administration › <!-- TMPL_IF NAME="add_form" --> MARC Frameworks › <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> MARC Frameworks › Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->MARC Frameworks<!-- /TMPL_IF --> - + @@ -160,10 +150,11 @@ function confirm_deletion(count) { - - - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif b/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif deleted file mode 100644 index 6aa552dfccea5dc3af90932cf192568b07cf34cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 979 zcmV;^11$VUNk%w1VH5yZ0-^-~0002Y%*-@ys{jB0|NqSY|Nj6000000A^8LW000F5 zEC2ui02BaN0ssU5Si0Q)Fv>}*y*TTgh5te&5F{Cj<%ycus9LV}UNdLkc&_h!@BhG{ zaHs$ojSkmf$y^EoHD#0eNfHE8>eY(P4q^>y7R(S&$&1nTsE(H2aQB+M4V#PsXuW&~ z<xzN8+w9>2fAo4usOAHut`nwZd*kJHrE*4NlQ9tEIDA!=|eVc(oV z-`wcu5d;P7?(Gui^5{3)-Q(QhDc;=WI`;ky<$@}-8M zJ6{Tx$v8*9$h4``r%(m9@VH_rgf=2R2%1QcYDt1tTaK(cRbxD_6i7y0%eJlCw@xKW zd;k*Q8m@izUFCTv9=N^}irx+Ucktetfa#_X9F}E2!*tcog-f}z<;!~y;nf#5j$SKo zj#~UnT5TGkizo9Ev<=)P{yLU&buJ#^a);P*hM_Qu_Z79TMt{i68A3tp2R zd*<5z-vuZjWt05}Oo0ZCXIdKJDFzl-)I|s(O@QzbAy8LQh@oN^R(M*6<>donXCqG7 zp@|eu#N2=^w#X17X;~K-3FLj2VU0F&*ivx=$+#JfAvTwoU$eEaU{*XvmLxweHtA%O zFwQuilpF<_4|(>TWrUTh@yHXFF}{XmlrS8bmYIYtiO-X4w&|ueGoTsB9#}b8N0utx znd6*#vX>>E*PQ@po`UY#T%qs{q(Ys0t@-Aokm^QehCV_Vp=Lt*muXiouoMYZu08l+ zU8FMFqja50XJe?G8L~^Hu*Qm;oGPjr1|-@AWfY||d6*O(OZ7UWuBIwEDU%L4B#B>` zj>_t6thO>3t*0<-DD4r}ZYrUjLUr~UWOe}iW2ND486vCaj+7szt!9XAx}qAp?6dUN z3*L&G8XCyENaYz$u_BraFuDV)+v|1zPG|5^R%S843?&p-z)G;Rq106P<} B+JyiB diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif new file mode 100644 index 0000000000000000000000000000000000000000..8023d1ede1742c6d30841b8f38811935f05e95fe GIT binary patch literal 130 zcmZ?wbhEHblw*)!n8?gvlDFzV2%G_8#h)yU3=GT+It)Mnl4oEFp3}eb^jrSLa|9zC zq&Xhm>Zu58Z){fOP+l-gdiA2*XG`C__5C1Myd;miD{bn6R~jrz`74uG?r^c1YI7sx eP_bEl$V0PlS5jtfo8#Q#H~ZR~ZL?z;7_0#{-#5Jg literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-delete.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-delete.gif new file mode 100644 index 0000000000000000000000000000000000000000..ffe21b69522d6340071cdacbf582d2303c13e43d GIT binary patch literal 107 zcmZ?wbhEHblw*)!n8?InlDF#r|1^<~to=UR0$qtlt@-7@0&9GGUhsKDu$ilbrwJI-FO K@U;bto=%Opo*8psQ_`w!dcTf-n%TI>^3|t!{m#1U0SpY*0FI_E+yDRo literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-hold.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-hold.gif new file mode 100644 index 0000000000000000000000000000000000000000..af137e7d506c0c477251fa6ee2f3b7abfc50bb8f GIT binary patch literal 106 zcmZ?wbhEHblw*)!n8?InlDF#r|1F zZn*cSiJ?v50qdN!r1=t)p8ni
    System Preferences