From 3ceb90c09196ed80785ef05d483ca9ecaaa6905a Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 24 May 2017 14:03:46 -0400
Subject: [PATCH] PINES Customization: NoveList Added Content Attempt 2

Taking a different approach to displaying the NoveList
content upon loading.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 .../src/templates/opac/parts/record/extras.tt2     | 43 ++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index fa063f74af..c2ca17efa1 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -72,35 +72,40 @@
         <div class="rdetail_extras">
             <div class="rdetail_extras_hr"></div>
             <div class="rdetail_extras_link">
-                [%  
-                    IF tab_is_active(name);
-                        href = mkurl('', {}, ['expand', 'ac']);
-                        arrow = arrow_down;			    
-					ELSIF !ctx.is_staff AND name == 'awards' AND !CGI.request_uri.match('expand');
+                [%  IF !CGI.request_uri.match('expand') AND !ctx.is_staff AND name == 'awards';
                         href = mkurl('', {}, ['expand', 'ac']);
-                        arrow = arrow_down;						    
-					ELSE;
-                        IF name == 'addedcontent' AND default_ac;
-                            href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; 
+                        arrow = arrow_down;
+                    ELSE;
+                        IF tab_is_active(name);
+                            href = mkurl('', {}, ['expand', 'ac']);
+                            arrow = arrow_down;
                         ELSE;
-                            href = mkurl('', {expand => name}) _ '#' _ name; 
+                            IF name == 'addedcontent' AND default_ac;
+                                href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; 
+                            ELSIF name == 'awards';
+                                href = mkurl('', {}, ['expand', 'ac']);
+                            ELSE;
+                                href = mkurl('', {expand => name}) _ '#' _ name;
+                            END;
+                            arrow = arrow_right;
                         END;
-                        arrow = arrow_right;
                     END;
                 %]
                 <a name='[% name %]' href='[% href %]' class="rdetail_extras_lbl" rel="nofollow" vocab="">[% arrow %] [% extra.label | html %]</a>
             </div>
         </div>
         <div class='rdetail_extras_div'>
-            [%  IF tab_is_active(name);
-                    IF name == 'marchtml';
-                        ctx.marchtml;
-                    ELSE;
-                        # Load the template for the selected extra
-                        INCLUDE "opac/parts/record/${name}.tt2";
-                    END;
-                ELSIF !ctx.is_staff AND name == 'awards' AND !CGI.request_uri.match('expand');
+            [%  IF !ctx.is_staff AND name == 'awards' AND !CGI.request_uri.match('expand');
                     INCLUDE "opac/parts/record/awards.tt2";
+                ELSE;
+                    IF tab_is_active(name);
+                        IF name == 'marchtml';
+                            ctx.marchtml;
+                        ELSE;
+                            # Load the template for the selected extra
+                            INCLUDE "opac/parts/record/${name}.tt2";
+                        END;
+                    END;
                 END; 
             %]
         </div>
-- 
2.11.0