Refining navigation in MARC Framework pages; Fixing unfinished YUI-based toolbar...

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index ae3d94b..c40f5f0 100755 (executable)
--- 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 =>
-"<input type=\"hidden\" name=\"tagfield\" value=\"$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 bd7b23f..f80f84b 100644 (file)
--- 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 e8d4566..d03a5b2 100644 (file)
--- 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 @@
 <div id="toolbar">
-                               <a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a>
-                       <input type="submit" id="editbutton" name="editbutton_button" value="Edit">
-            <select id="editbuttonselect" name="editbuttonselect">
-                <option value="0">Bibliographic Record</option>
-                <option value="1">Items</option>
-                <option value="2">As New Record (Duplicate)</option>                
-            </select>
-                       <a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a>
+<ul class="toolbar">
 
-                       <a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a>
-                       <a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a>
-                       
-                       <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- /TMPL_IF -->
-       
-
-    <br clear="all" /></div>
+       <li><a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>
+       <li id="editmenucontainer"><a id="editbiblio" class="menubutton" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
+       <li><a id="edititems" class="menubutton" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
+       <li><a id="duplicatebiblio" class="menubutton" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
+       <li><a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a></li>
+       <li><a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a></li>
+       <li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
+       <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_IF -->
+</ul></div>

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 dc8af3f..f82c0e3 100644 (file)
--- 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 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Administration</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><h1>System Administration</h1>
+       <div class="yui-g"><h1>System Administration</h1>
 
 <table>
 <caption>System Preferences</caption>

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 6c0fea5..dc08731 100644 (file)
--- 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 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --> Biblio Framework &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Biblio Framework &rsaquo; Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --> MARC Frameworks &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> MARC Frameworks &rsaquo; Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->MARC Frameworks<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -61,7 +61,7 @@ function Check(f) {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a> &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a> &rsaquo; Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->MARC Frameworks<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -96,7 +96,7 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-<h1>Biblio framework</h1>
+<h1>MARC Frameworks</h1>
 <p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
 <table>
     <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 9d9eba9..fe8c3c2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -51,29 +51,29 @@ function displayMoreConstraint(numlayer){
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; Edit MARC subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; Subfield Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->MARC Subfield Structure<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><!-- TMPL_VAR NAME="frameworkcode" --> Framework Structure</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; Edit subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; Subfield Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b">
+       <div class="yui-g">
 
 <!-- TMPL_IF NAME="add_form" -->
     <h1>
         <!-- TMPL_IF NAME="use-heading-flags-p" -->
-            <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Constraints<!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_VAR NAME="action" -->
         <!-- /TMPL_IF -->
     </h1>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
     <input type="hidden" name="op" value="add_validate" />
+       <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
     <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
     <input type="submit" value="Save Changes" />
     
-    <h2>Tag <!-- TMPL_VAR NAME="tagfield" --></h2>
     <div id="tabs">
      <p>Edit subfield
         <!-- TMPL_LOOP NAME="loop" -->
@@ -93,34 +93,39 @@ function displayMoreConstraint(numlayer){
         <!-- TMPL_LOOP NAME="loop" --> 
         <div id="content_sub<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden">
         
-        <h3>Basic constaints</h3>
-                <!-- TMPL_IF name="subfieldcode" -->
-                    <p>Subfield code: <!-- TMPL_VAR NAME="subfieldcode" --> <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></p>
-                <!-- TMPL_ELSE -->
-                    <p>Subfield code: <input type="text" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></p>
-            <!-- /TMPL_IF -->
-            <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian</label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></p>
-            <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC</label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></p>
-            <p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
-            <p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
-            <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab</label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
-            
+               <fieldset class="rows"><legend>Basic constraints</legend>
+                       <ol>
+                               <!-- TMPL_IF name="subfieldcode" -->
+                               <li><span class="label">Subfield code:</span> <!-- TMPL_VAR NAME="subfieldcode" --> <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></li>
+                               <!-- TMPL_ELSE -->
+                               <li><span class="label">Subfield code:</span> <input type="text" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></li>
+                               <!-- /TMPL_IF -->
+                               <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
+                               <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
+                               <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --></li>
+                               <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --></li>
+                               <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</li>
+                       </ol>
+            </fieldset>
             <a href="javascript:displayMoreConstraint('more<!-- TMPL_VAR NAME="subfieldcode" -->')">display more constraints</a>
             <div id="more<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden">
-                <h3>Advanced constraint</h3>
-                <p>
-                    <label for="defaultvalue">default value</label>
-                    <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" />
-                </p>
-                <p><label for="hidden">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</p>
-                <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</p>
-                <p><label>Link</label><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</p>
-                <p><label>Others Options:</label> (choose one)</p>
-                    <p><label>Authorized Value</label><!-- TMPL_VAR NAME="authorised_value" --></p>
-                    <p><label>Thesaurus</label><!-- TMPL_VAR NAME="authtypes" --></p>
-                    <p><label>Plugin</label><!-- TMPL_VAR NAME="value_builder" --></p>
-                </p>
-                <p><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link</label><!-- TMPL_VAR NAME="kohafield" --></p>
+             <fieldset class="rows" id="advanced-constraints">
+                               <legend>Advanced constraints</legend>
+                <ol><li><label for="defaultvalue">Default value</label>
+                    <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
+                <li><label for="hidden">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</li>
+                <li><label>Link</label><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
+                <li><span class="label">Others Options:</span> (choose one)
+                       <ol>
+                               <li><label for="">Authorized Value</label><!-- TMPL_VAR NAME="authorised_value" --></li>
+                               <li><label for="">Thesaurus</label><!-- TMPL_VAR NAME="authtypes" --></li>
+                               <li><label for="">Plugin</label><!-- TMPL_VAR NAME="value_builder" --></li>
+                       </ol>
+                </li>
+                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link</label><!-- TMPL_VAR NAME="kohafield" --></li>
+                               </ol>
+                               </fieldset>
             </div>
         </div>
         <!-- /TMPL_LOOP -->
@@ -228,8 +233,5 @@ function displayMoreConstraint(numlayer){
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index 1827246..b919b69 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF name="add_form" -->MARC Tag Structure &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->MARC Tag Structure &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->MARC Tag Structure &rsaquo;  Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC Tag Structure<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="add_form" -->MARC Frameworks &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->MARC Frameworks &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->MARC Frameworks &rsaquo;  Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC Frameworks<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -62,10 +62,10 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Tag Structure</a> &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Tag Structure</a> &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Tag Structure</a> &rsaquo; Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Frameworks</a> &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Frameworks</a> &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Frameworks</a> &rsaquo; Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; <!-- TMPL_VAR NAME="frameworkcode" --> Framework<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -73,7 +73,7 @@
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<h1>MARC Framework for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
 
 
 <!-- TMPL_IF NAME="add_form" -->
@@ -90,7 +90,7 @@
     <p><label for="authorised_value">Authorized value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
         <p>
             <input type="submit" value="Save Changes" onclick="Check(this.form)" />
-            <input type="submit" value="Cancel and Return to MARC Tag Structure" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" />
+            <input type="submit" value="Cancel and Return to MARC Frameworks" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" />
         </p>
     </form>
 <!-- /TMPL_IF -->
@@ -113,7 +113,7 @@
 
     <div class="details"><h3>Tag Deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-    <input type="submit" value="Return to MARC Tag Structure" />
+    <input type="submit" value="Return to MARC Frameworks" />
     </form>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="framework_create" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index a6be6b7..54dd8a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -18,16 +18,17 @@
 <script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/button/button-beta-min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
+function _(s) { return s } // dummy function for gettext
 function Dopop(link) {
     newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
 function confirm_deletion(count) {
         var is_confirmed;
        if (count>0){
-                   is_confirmed= alert(_('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio'));
+                   is_confirmed= alert(_('There are [ '+ count +' ] item(s) attached to this record \n You must delete all items before deleting this record.'));
                    }
         else{
-                   is_confirmed= confirm(_('Are you sure you want to delete this biblio? '));
+                   is_confirmed= confirm(_('Are you sure you want to delete this record? '));
        }
 
     
@@ -41,60 +42,49 @@ function confirm_deletion(count) {
                
     }
 }
-      // "contentready" event handler for the "toolbar" <div>
+
+// prepare DOM for YUI Toolbar
+
+ $(document).ready(function() {
+       $("#edititems").parent().remove();
+       $("#duplicatebiblio").parent().remove();
+       $("#editmenucontainer").empty();
+ });
+
+// YUI Toolbar Functions
+
         YAHOO.example.init = function () {
-      YAHOO.util.Event.onContentReady("toolbar", function () {
+            YAHOO.util.Event.onContentReady("toolbar", function () {
                        var oAddbiblio = new YAHOO.widget.Button("addbiblio");
+                       var oEditbiblio = new YAHOO.widget.Button("editbiblio");
+                       var oEdititems = new YAHOO.widget.Button("edititems");
+                       var oDuplicatebiblio = new YAHOO.widget.Button("duplicatebiblio");
             var oDeletebiblio = new YAHOO.widget.Button("deletebiblio");
                        var oAddtoshelf = new YAHOO.widget.Button("addtoshelf");
                        var oPrintbiblio = new YAHOO.widget.Button("printbiblio");
                        var oPlacehold = new YAHOO.widget.Button("placehold");
-                       var oEditButton = new YAHOO.widget.Button("editbutton", { type: "menu", menu: "editbuttonselect" });
                         });
+                        
+       var editmenu = [
+            { text: "Edit Record", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=" },
+            { text: "Edit Items", url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
+            { text: "Edit as New (Duplicate)", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate" }
+        ];
+        
+        var oEditMenu = new YAHOO.widget.Button({
+                               type: "menu",
+                               label: "Edit",
+                               name: "editmenubutton",
+                               menu: editmenu,
+                               container: "editmenucontainer"
+                });   
+                
     } ();
        
 //]]>
 </script>
-<style type="text/css">
-#toolbar {
-}
-
-#addbiblio a {
-       padding-left : 2.1em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -155px;
-       background-repeat : no-repeat;
-}
-
-#deletebiblio a {
-       padding-left : 2.1em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -188px;
-       background-repeat : no-repeat;
-}
-
-#printbiblio a {
-       padding-left : 2.1em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -243px;
-       background-repeat : no-repeat;
-}
-
-#addtoshelf a {
-       padding-left : 2.2em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -124px;
-       background-repeat : no-repeat;
-}
-
-#placehold a {
-       padding-left : 2.2em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -215px;
-       background-repeat : no-repeat;
-}
-</style>
 </head>
+
 <body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -160,10 +150,11 @@ function confirm_deletion(count) {
                </ul>
                </div>
                
-<!-- TMPL_IF NAME="AmazonContent" -->
-               <!-- TMPL_IF NAME="AmazonISBN" --><div class="yui-u"><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a>
-</div><!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
+<div class="yui-u"><!-- TMPL_IF NAME="AmazonContent" -->
+               <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a>
+<!-- TMPL_ELSE -->
+       <img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" border="0">
+<!-- /TMPL_IF --></div>
                
                <div class="yui-u">
                <ul>

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 (file)
index 6aa552d..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif and /dev/null differ

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 (file)
index 0000000..8023d1e
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif differ

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 (file)
index 0000000..ffe21b6
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-delete.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif
new file mode 100644 (file)
index 0000000..8438975
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif differ

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 (file)
index 0000000..af137e7
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-hold.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-new.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-new.gif
new file mode 100644 (file)
index 0000000..19434d6
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-new.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-print.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-print.gif
new file mode 100644 (file)
index 0000000..599e35b
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-print.gif differ