[open-ils-commits] [GIT] Evergreen ILS branch master updated. c0c6bce0de95a47a1eb6937b28e86d671af98214

Evergreen Git git at git.evergreen-ils.org
Tue May 1 14:33:44 EDT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c0c6bce0de95a47a1eb6937b28e86d671af98214 (commit)
       via  fb2efae80ebaf7a3427cb3586bc42b3d823bf199 (commit)
      from  cd3a6cdc37ffb4fbbd101cf6f41c04610027d460 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0c6bce0de95a47a1eb6937b28e86d671af98214
Author: Ben Shum <ben at evergreener.net>
Date:   Tue May 1 13:11:39 2018 -0500

    LP#1759350: followup
    
    Small tweak to fix some html syntax in the changes.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
index 7ec1ee1..dc6b11d 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -59,92 +59,92 @@
     <div class="row pad-vert">
       <div class="marcffeditor">
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Type" fixed-field-label="[% l('Type') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="ELvl" fixed-field-label="[% l('ELvl') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Source" fixed-field-label="[% l('Source') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Audn" fixed-field-label="[% l('Audn') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Ctrl" fixed-field-label="[% l('Ctrl') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Lang" fixed-field-label="[% l('Lang') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Type" fixed-field-label="[% l('Type') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="ELvl" fixed-field-label="[% l('ELvl') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Source" fixed-field-label="[% l('Source') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Audn" fixed-field-label="[% l('Audn') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Ctrl" fixed-field-label="[% l('Ctrl') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Lang" fixed-field-label="[% l('Lang') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="BLvl" fixed-field-label="[% l('BLvl') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Form" fixed-field-label="[% l('Form') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Conf" fixed-field-label="[% l('Conf') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Biog" fixed-field-label="[% l('Biog') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="MRec" fixed-field-label="[% l('MRec') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="BLvl" fixed-field-label="[% l('BLvl') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Form" fixed-field-label="[% l('Form') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Conf" fixed-field-label="[% l('Conf') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Biog" fixed-field-label="[% l('Biog') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="MRec" fixed-field-label="[% l('MRec') | html %]" record="record"></eg-marc-edit-fixed-field>
             <eg-marc-edit-fixed-field fixed-field="Ctry" fixed-field-label="[% l('Ctry') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="s_l" fixed-field-label="[% l('s_l') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Cont" fixed-field-label="[% l('Cont') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="s_l" fixed-field-label="[% l('s_l') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Cont" fixed-field-label="[% l('Cont') | html %]" record="record"></eg-marc-edit-fixed-field>
             <eg-marc-edit-fixed-field fixed-field="GPub" fixed-field-label="[% l('GPub') | html %]" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="LitF" fixed-field-label="[% l('LitF') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Indx" fixed-field-label="[% l('Indx') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Alph" fixed-field-label="[% l('Alph') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="LitF" fixed-field-label="[% l('LitF') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Indx" fixed-field-label="[% l('Indx') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Alph" fixed-field-label="[% l('Alph') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Desc" fixed-field-label="[% l('Desc') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Ills" fixed-field-label="[% l('Ills') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Fest" fixed-field-label="[% l('Fest') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="DtSt" fixed-field-label="[% l('DtSt') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Date1" fixed-field-label="[% l('Date1') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Date2" fixed-field-label="[% l('Date2') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Desc" fixed-field-label="[% l('Desc') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Ills" fixed-field-label="[% l('Ills') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Fest" fixed-field-label="[% l('Fest') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="DtSt" fixed-field-label="[% l('DtSt') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Date1" fixed-field-label="[% l('Date1') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Date2" fixed-field-label="[% l('Date2') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="SrTp" fixed-field-label="[% l('SrTp') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Regl" fixed-field-label="[% l('Regl') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Orig" fixed-field-label="[% l('Orig') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Freq" fixed-field-label="[% l('Freq') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="EntW" fixed-field-label="[% l('EntW') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SrTp" fixed-field-label="[% l('SrTp') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Regl" fixed-field-label="[% l('Regl') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Orig" fixed-field-label="[% l('Orig') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Freq" fixed-field-label="[% l('Freq') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="EntW" fixed-field-label="[% l('EntW') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="TrAr" fixed-field-label="[% l('TrAr') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Part" fixed-field-label="[% l('Part') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="LTxt" fixed-field-label="[% l('LTxt') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="FMus" fixed-field-label="[% l('FMus') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="AccM" fixed-field-label="[% l('AccM') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Comp" fixed-field-label="[% l('Comp') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="TrAr" fixed-field-label="[% l('TrAr') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Part" fixed-field-label="[% l('Part') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="LTxt" fixed-field-label="[% l('LTxt') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="FMus" fixed-field-label="[% l('FMus') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="AccM" fixed-field-label="[% l('AccM') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Comp" fixed-field-label="[% l('Comp') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="SpFm" fixed-field-label="[% l('SpFm') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Relf" fixed-field-label="[% l('Relf') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Proj" fixed-field-label="[% l('Proj') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="CrTp" fixed-field-label="[% l('CrTp') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SpFm" fixed-field-label="[% l('SpFm') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Relf" fixed-field-label="[% l('Relf') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Proj" fixed-field-label="[% l('Proj') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="CrTp" fixed-field-label="[% l('CrTp') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="TMat" fixed-field-label="[% l('TMat') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Time" fixed-field-label="[% l('Time') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Tech" fixed-field-label="[% l('Tech') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="File" fixed-field-label="[% l('File') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="TMat" fixed-field-label="[% l('TMat') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Time" fixed-field-label="[% l('Time') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Tech" fixed-field-label="[% l('Tech') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="File" fixed-field-label="[% l('File') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Type_tbmfhd" fixed-field-label="[% l('Type_tbmfhd') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="ELvl_tbmfhd" fixed-field-label="[% l('ELvl_tbmfhd') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Item_tbmfhd" fixed-field-label="[% l('Item_tbmfhd') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="GeoDiv" fixed-field-label="[% l('GeoDiv') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Roman" fixed-field-label="[% l('Roman') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="CatLang" fixed-field-label="[% l('CatLang') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Type_tbmfhd" fixed-field-label="[% l('Type_tbmfhd') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="ELvl_tbmfhd" fixed-field-label="[% l('ELvl_tbmfhd') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Item_tbmfhd" fixed-field-label="[% l('Item_tbmfhd') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="GeoDiv" fixed-field-label="[% l('GeoDiv') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Roman" fixed-field-label="[% l('Roman') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="CatLang" fixed-field-label="[% l('CatLang') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Kind" fixed-field-label="[% l('Kind') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Rules" fixed-field-label="[% l('Rules') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Subj" fixed-field-label="[% l('Subj') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Series" fixed-field-label="[% l('Series') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="SerNum" fixed-field-label="[% l('SerNum') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="NameUse" fixed-field-label="[% l('NameUse') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Kind" fixed-field-label="[% l('Kind') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Rules" fixed-field-label="[% l('Rules') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Subj" fixed-field-label="[% l('Subj') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Series" fixed-field-label="[% l('Series') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SerNum" fixed-field-label="[% l('SerNum') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="NameUse" fixed-field-label="[% l('NameUse') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="SubjUse" fixed-field-label="[% l('SubjUse') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="SerUse" fixed-field-label="[% l('SerUse') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="TypeSubd" fixed-field-label="[% l('TypeSubd') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="GovtAgn" fixed-field-label="[% l('GovtAgn') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="RefStatus" fixed-field-label="[% l('RefStatus') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="UpdStatus" fixed-field-label="[% l('UpdStatus') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SubjUse" fixed-field-label="[% l('SubjUse') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SerUse" fixed-field-label="[% l('SerUse') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="TypeSubd" fixed-field-label="[% l('TypeSubd') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="GovtAgn" fixed-field-label="[% l('GovtAgn') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="RefStatus" fixed-field-label="[% l('RefStatus') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="UpdStatus" fixed-field-label="[% l('UpdStatus') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Name" fixed-field-label="[% l('Name') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Status" fixed-field-label="[% l('Status') | html %] record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="ModRec" fixed-field-label="[% l('ModRec') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Name" fixed-field-label="[% l('Name') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Status" fixed-field-label="[% l('Status') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="ModRec" fixed-field-label="[% l('ModRec') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
       </div>
     </div>

commit fb2efae80ebaf7a3427cb3586bc42b3d823bf199
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Mar 26 14:52:27 2018 -0400

    LP#1759350: Allow translation of fixed field mnemonics
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
index c9dfdbc..7ec1ee1 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -59,92 +59,92 @@
     <div class="row pad-vert">
       <div class="marcffeditor">
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Type" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="ELvl" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Source" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Audn" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Ctrl" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Lang" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Type" fixed-field-label="[% l('Type') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="ELvl" fixed-field-label="[% l('ELvl') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Source" fixed-field-label="[% l('Source') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Audn" fixed-field-label="[% l('Audn') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Ctrl" fixed-field-label="[% l('Ctrl') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Lang" fixed-field-label="[% l('Lang') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="BLvl" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Form" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Conf" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Biog" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="MRec" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Ctry" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="BLvl" fixed-field-label="[% l('BLvl') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Form" fixed-field-label="[% l('Form') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Conf" fixed-field-label="[% l('Conf') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Biog" fixed-field-label="[% l('Biog') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="MRec" fixed-field-label="[% l('MRec') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Ctry" fixed-field-label="[% l('Ctry') | html %]" record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="s_l" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Cont" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="GPub" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="LitF" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Indx" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Alph" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="s_l" fixed-field-label="[% l('s_l') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Cont" fixed-field-label="[% l('Cont') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="GPub" fixed-field-label="[% l('GPub') | html %]" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="LitF" fixed-field-label="[% l('LitF') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Indx" fixed-field-label="[% l('Indx') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Alph" fixed-field-label="[% l('Alph') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Desc" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Ills" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Fest" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="DtSt" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Date1" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Date2" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Desc" fixed-field-label="[% l('Desc') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Ills" fixed-field-label="[% l('Ills') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Fest" fixed-field-label="[% l('Fest') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="DtSt" fixed-field-label="[% l('DtSt') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Date1" fixed-field-label="[% l('Date1') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Date2" fixed-field-label="[% l('Date2') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="SrTp" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Regl" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Orig" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Freq" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="EntW" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SrTp" fixed-field-label="[% l('SrTp') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Regl" fixed-field-label="[% l('Regl') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Orig" fixed-field-label="[% l('Orig') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Freq" fixed-field-label="[% l('Freq') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="EntW" fixed-field-label="[% l('EntW') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="TrAr" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Part" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="LTxt" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="FMus" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="AccM" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Comp" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="TrAr" fixed-field-label="[% l('TrAr') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Part" fixed-field-label="[% l('Part') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="LTxt" fixed-field-label="[% l('LTxt') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="FMus" fixed-field-label="[% l('FMus') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="AccM" fixed-field-label="[% l('AccM') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Comp" fixed-field-label="[% l('Comp') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="SpFm" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Relf" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Proj" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="CrTp" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SpFm" fixed-field-label="[% l('SpFm') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Relf" fixed-field-label="[% l('Relf') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Proj" fixed-field-label="[% l('Proj') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="CrTp" fixed-field-label="[% l('CrTp') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="TMat" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Time" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Tech" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="File" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="TMat" fixed-field-label="[% l('TMat') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Time" fixed-field-label="[% l('Time') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Tech" fixed-field-label="[% l('Tech') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="File" fixed-field-label="[% l('File') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Type_tbmfhd" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="ELvl_tbmfhd" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Item_tbmfhd" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="GeoDiv" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Roman" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="CatLang" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Type_tbmfhd" fixed-field-label="[% l('Type_tbmfhd') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="ELvl_tbmfhd" fixed-field-label="[% l('ELvl_tbmfhd') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Item_tbmfhd" fixed-field-label="[% l('Item_tbmfhd') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="GeoDiv" fixed-field-label="[% l('GeoDiv') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Roman" fixed-field-label="[% l('Roman') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="CatLang" fixed-field-label="[% l('CatLang') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Kind" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Rules" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Subj" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Series" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="SerNum" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="NameUse" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Kind" fixed-field-label="[% l('Kind') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Rules" fixed-field-label="[% l('Rules') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Subj" fixed-field-label="[% l('Subj') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Series" fixed-field-label="[% l('Series') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SerNum" fixed-field-label="[% l('SerNum') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="NameUse" fixed-field-label="[% l('NameUse') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="SubjUse" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="SerUse" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="TypeSubd" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="GovtAgn" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="RefStatus" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="UpdStatus" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SubjUse" fixed-field-label="[% l('SubjUse') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="SerUse" fixed-field-label="[% l('SerUse') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="TypeSubd" fixed-field-label="[% l('TypeSubd') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="GovtAgn" fixed-field-label="[% l('GovtAgn') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="RefStatus" fixed-field-label="[% l('RefStatus') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="UpdStatus" fixed-field-label="[% l('UpdStatus') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
         <div class="row col-md-12">
-            <eg-marc-edit-fixed-field fixed-field="Name" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="Status" record="record"></eg-marc-edit-fixed-field>
-            <eg-marc-edit-fixed-field fixed-field="ModRec" record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Name" fixed-field-label="[% l('Name') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="Status" fixed-field-label="[% l('Status') | html %] record="record"></eg-marc-edit-fixed-field>
+            <eg-marc-edit-fixed-field fixed-field="ModRec" fixed-field-label="[% l('ModRec') | html %] record="record"></eg-marc-edit-fixed-field>
         </div>
       </div>
     </div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
index c4708ea..1085e63 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
@@ -222,15 +222,16 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
         transclude: true,
         restrict: 'E',
         template: '<div class="col-md-2">'+
-                    '<div class="col-md-1"><label name="{{fixedField}}" for="{{fixedField}}_ff_input">{{fixedField}}</label></div>'+
+                    '<div class="col-md-1"><label name="{{fixedField}}" for="{{fixedField}}_ff_input">{{fixedFieldLabel}}</label></div>'+
                     '<div class="col-md-1"><input type="text" style="padding-left: 5px; margin-left: 1em" size="4" id="{{fixedField}}_ff_input"/></div>'+
                   '</div>',
-        scope: { record: "=", fixedField: "@" },
+        scope: { record: "=", fixedField: "@", fixedFieldLabel: "@" },
         replace: true,
         controller : ['$scope', '$element', 'egTagTable',
             function ( $scope ,  $element ,  egTagTable) {
                 $($element).removeClass('fixed-field-box');
                 $($element).children().css({ display : 'none' });
+                $scope.fixedFieldLabel = $scope.fixedFieldLabel || $scope.fixedField;
                 $scope.me = null;
                 $scope.content = null; // this is where context menus dump their values
                 $scope.item_container = [];

-----------------------------------------------------------------------

Summary of changes:
 .../src/templates/staff/cat/share/t_marcedit.tt2   |  128 ++++++++++----------
 .../js/ui/default/staff/cat/services/marcedit.js   |    5 +-
 2 files changed, 67 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
Evergreen ILS




More information about the open-ils-commits mailing list