TPAC added content improvements

* Style the sub-tabs to indicate which is selected
* If the template knows there is no content, hide the main tab
* cleanup

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index b29a0bc..ff2cb29 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -77,8 +77,9 @@
 </script>
 [% END; # use_autosuggest %]
 
+
+[% IF ctx.page == 'record' %]
 <script type="text/javascript">
-    [% ac_types = ['toc',  'anotes', 'excerpt', 'summary', 'reviews'] %]
 
     /* Checks to see if a given type of added content has data to show.
      * The first arg to callback() is boolean indicating the presence of data.
@@ -92,27 +93,24 @@
             load : function(result) { callback(true, ident, type); }
         });
     }
-
-    [% 
-        IF ctx.page == 'record';
-            # XXX revisit when ident=ctx.bre_id
-            ident = ctx.record_attrs.isbn_clean || ctx.record_attrs.upc; 
-            IF ident; 
-                FOR type IN ac_types;
-                    IF ctx.added_content.$type.status == '3' # status unknown %]
-                        dojo.addOnLoad(function() {
-                            var ident = '[% ident %]';
-                            var type = '[% type %]';
-                            acIsAvailable(ident, type, function(avail, ident, type) { 
-                                // if the content is available, un-hide the tab
-                                if (avail) dojo.removeClass(dojo.byId('ac:' + type), 'hidden');
-                            });
+    [%-  # XXX revisit when ident=ctx.bre_id
+        ident = ctx.record_attrs.isbn_clean || ctx.record_attrs.upc; 
+        IF ident; 
+            FOR type IN ctx.added_content.keys;
+                IF ctx.added_content.$type.status == '3' # status unknown %]
+                    dojo.addOnLoad(function() {
+                        var ident = '[% ident %]';
+                        var type = '[% type %]';
+                        acIsAvailable(ident, type, function(avail, ident, type) { 
+                            // if the content is available, un-hide the tab
+                            if (avail) dojo.removeClass(dojo.byId('ac:' + type), 'hidden');
                         });
-                    [% END; # IF status unknown
-                END; 
-            END; # IF ident
-        END;
+                    });
+                [% END; # IF status unknown
+            END; 
+        END; # IF ident
     %]
 </script>
+[% END; # page=record -%]
 
 [%- END; # want_dojo -%]

diff --git a/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2 b/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2
index 21e81ef..477d278 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2
@@ -18,9 +18,13 @@
 %]
 
     <div id='ac_tab_wrapper'>
-        [% FOR type IN ac_types.keys;
+    [% 
+        all_hidden = 1;
+        FOR type IN ac_types.keys;
             tab_class = 'ac_tab';
+            SET tab_class = tab_class _ ' ac_tab_selected' IF type == selected_type; 
             IF ctx.added_content.$type.status != '2'; # no content
+                all_hidden = 0;
                 IF ctx.added_content.$type.status == '3' AND want_dojo; # status unknown
                     tab_class = tab_class _ ' hidden';
                 END %]
@@ -28,7 +32,8 @@
                 <a href="[% mkurl('', {ac => type}) _ '#addedcontent' %]">[% ac_types.$type %]</a>
             </div>
             [% END;
-        END %]
+        END;
+    %]
     </div>
 
     <div id='ac_content'>
@@ -41,6 +46,8 @@
                 ELSE;
                     l('No Content Available');
                 END;
+            ELSIF all_hidden;
+                l('No Content Available');
             END;
         %]
     </div>

diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index 63f82ee..d02efb0 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -3,6 +3,11 @@
 
         [%  # Hidden extras are not yet implemented.  Some may require JS
 
+        MACRO tab_is_active(tab) BLOCK;
+            exp_name = 'expand_' _ tab;
+            IF ctx.$exp_name OR ctx.expand_all; 1; END;
+        END;
+
         # Let's see if we should hide the content cafe / simple summary content
         hide_summary = 1;
         IF attrs.summary.0; hide_summary = 0; ELSE;
@@ -14,6 +19,15 @@
             END;
         END;
 
+        # if no added content is available, hide the main tab
+        IF !tab_is_active('addedcontent');
+            hide_ac = 1;
+            FOR type IN ctx.added_content.keys;
+                SET hide_ac = 0 IF 
+                    ctx.added_content.$type.status != '2'; # not available
+            END;
+        END;
+
         extras = [
             {name => 'summaryplus',  label => l('Summaries & More'), hide => hide_summary}, 
             {name => 'contents',  label => l('Contents'), hide => !attrs.contents},
@@ -22,16 +36,11 @@
             {name => 'excerpt',  label => l('Excerpt'), hide => 1},
             {name => 'issues',   label => l('Issues Held'), hide => !(ctx.have_holdings_to_show || ctx.have_mfhd_to_show)},
             {name => 'preview',  label => l('Preview'), hide => 1}, 
-            {name => 'addedcontent',  label => l('Additional Content')},  # hide if all content is known to not exist
+            {name => 'addedcontent',  label => l('Additional Content'), hide => hide_ac},  # hide if all content is known to not exist
             {name => 'cnbrowse', label => l('Shelf Browser')},
             {name => 'marchtml', label => l('MARC Record')}
         ];
 
-        MACRO tab_is_active(tab) BLOCK;
-            exp_name = 'expand_' _ tab;
-            IF ctx.$exp_name OR ctx.expand_all; 1; END;
-        END;
-
         FOREACH extra IN extras;
             IF extra.hide; NEXT; END; 
             name = extra.name;

diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index de20865..6e69772 100644 (file)
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -1433,5 +1433,7 @@ a.preflib_change {
 }
 
 #ac_tab_wrapper { width : 100%; }
-.ac_tab { float: left; padding-right: 10px; font-size: 110%;  }
+.ac_tab { float: left; padding-right: 10px; font-size: 110%; padding: 5px; border: 1px solid #417860; }
+.ac_tab_selected { background-color: #417860; }
+.ac_tab_selected a { color: #FFF; }
 #ac_content { clear: both; width: 100%; margin-top: 10px; }