From 6924c6dc8f0057d561113e83973146559b3bf80b Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 17 Feb 2015 16:25:30 -0500
Subject: [PATCH] LP#1402797 clean up action rows and styling

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 | 19 +++++++------------
 .../web/js/ui/default/staff/cat/services/marcedit.js  | 13 +++++++------
 2 files changed, 14 insertions(+), 18 deletions(-)

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 1d4dbba728..958e823214 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -1,17 +1,12 @@
 <div>
-  <div ng-if="bre">
-    <div class="row col-md-12 pad-vert marcfastitemadd">
-        <input id="mfiacn" type="text" placeholder="[% l('Call Number:') %]" ng-model="fast_item_callnumber"/>
-        <input id="mfiabc" type="text" placeholder="[% l('Barcode') %]" ng-model="fast_item_barcode"/>
-        <button class="btn btn-default" ng-click="saveFastItem()">Add Item</button>
-      </div>
-    </div>
+  <div ng-if="bre" class="row col-md-12 pad-vert marcfastitemadd">
+    <input id="mfiacn" type="text" placeholder="[% l('Call Number:') %]" ng-model="fast_item_callnumber"/>
+    <input id="mfiabc" type="text" placeholder="[% l('Barcode') %]" ng-model="fast_item_barcode"/>
+    <button class="btn btn-default" ng-click="saveFastItem()">Add Item</button>
   </div>
-  <div class="marcffeditor">
-    <div class="row col-md-12 pad-vert marctypesource">
-      <div class="col-md-2"><label>Record Type:</label> {{calculated_record_type}}</div>
-      <div ng-if="bre" class="col-md-2"><eg-marc-edit-bibsource/></div>
-    </div>
+  <div class="marcffeditor pad-vert row col-md-12 marctypesource">
+    <div class="col-md-2"><label>Record Type:</label> {{calculated_record_type}}</div>
+    <div ng-if="bre" class="col-md-2"><eg-marc-edit-bibsource/></div>
   </div>
   <div class="marcrecord pad-vert">
     <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 f6f2e05304..46a658b2ab 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
@@ -161,7 +161,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     '/></span>'+
                   '</span>',
         scope: { field: "=", subfield: "=", onKeydown: '=' },
-        replace: false
+        replace: true
     }
 })
 
@@ -179,7 +179,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                       'id="r{{field.record.subfield(\'901\',\'c\')[1]}}f{{field.position}}i{{indNumber}}"'+
                       '/></span>',
         scope: { ind : '=', field: '=', onKeydown: '=', indNumber: '@' },
-        replace: false,
+        replace: true
     }
 })
 
@@ -197,7 +197,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                       'id="r{{field.record.subfield(\'901\',\'c\')[1]}}f{{field.position}}tag"'+
                       '/></span>',
         scope: { tag : '=', field: '=', onKeydown: '=' },
-        replace: false
+        replace: true
     }
 })
 
@@ -211,7 +211,8 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     '<span><eg-marc-edit-ind field="field" ind="field.ind2" on-keydown="onKeydown" ind-number="2"/></span>'+
                     '<span><eg-marc-edit-subfield ng-repeat="subfield in field.subfields" subfield="subfield" field="field" on-keydown="onKeydown"/></span>'+
                   '</div>',
-        scope: { field: "=", onKeydown: '=' }
+        scope: { field: "=", onKeydown: '=' },
+        replace: true
     }
 })
 
@@ -269,7 +270,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
     return {
         templateUrl : './cat/share/t_marcedit',
         restrict: 'E',
-        replace: false,
+        replace: true,
         scope: { recordId : '=', recordType : '@', maxUndo : '@' },
         link: function (scope, element, attrs) {
 
@@ -786,7 +787,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
 .directive("egMarcEditBibsource", ['$timeout',function ($timeout) {
     return {
         restrict: 'E',
-        replace: false,
+        replace: true,
         template: '<span class="nullable">'+
                     '<select class="form-control" ng-model="bib_source" ng-options="s.id() as s.source() for s in bib_sources">'+
                       '<option value="">Select a Source</option>'+
-- 
2.11.0