TPAC: Refactor bookbag list actions into a common template

The "add to bookbag" actions in both the search results and record
details pages contained a large amount of duplicated code; consolidate
those into a single template that can be included into each page.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2 b/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
new file mode 100644 (file)
index 0000000..1ba888e
--- /dev/null
+++ b/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
@@ -0,0 +1,83 @@
+[%
+    dsetting = "opac.default_list";
+    tclass = "temporary divider";
+
+    IF rec.id;
+        # Results table context
+        ctx.bre_id = rec.id;
+        stop_parms = 1;
+        rec_anchor = 'record_' _ ctx.bre_id;
+    ELSE;
+        # Record details context
+        rec_anchor => ctx.bre_id;
+    END;
+
+    IF ctx.user_setting_map.defined(dsetting);
+        default_list = ctx.user_setting_map.$dsetting;
+    END;
+
+    IF (!default_list) && ctx.bookbags.size;
+        tclass = "temporary";
+    END;
+
+    href = mkurl(ctx.opac_root _ '/mylist/add', {
+        record => ctx.bre_id, anchor => rec_anchor
+    }, stop_parms);
+%]
+<ul class="popmenu">
+    <li><a href="#" class="no-dec">
+          <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
+          [% l("Add to my list") %]
+        </a>
+    <ul>
+    <li class="[% tclass %]">
+    <a href="[% href %]">[% l('Temporary List') %]</a>
+    </li>
+    [% IF default_list;
+       label = (ctx.default_bookbag) ? ctx.default_bookbag : l('Default List');
+       class = (ctx.bookbags.size) ? "default divider" : "default";
+       href = mkurl(ctx.opac_root _ '/myopac/list/update', {
+            action => 'add_rec', list => default_list,
+            record => ctx.bre_id, anchor => rec_anchor
+        }, stop_parms);
+    %]
+    <li class="[% class %]"><a href="[% href %]">[% label %]</a></li>
+    [% END %]
+    [% IF ctx.bookbags.size;
+       i = 0;
+       FOREACH bag IN ctx.bookbags;
+           href = mkurl(ctx.opac_root _ '/myopac/list/update', {
+                action => 'add_rec', list => bag.id, record => ctx.bre_id,
+                anchor => rec_anchor
+           }, stop_parms);
+           i = i + 1;
+           IF i == ctx.bookbags.size;
+    %]
+    <li class="divider">
+        [%- ELSE -%]
+    <li>
+        [%- END -%]
+    <a href="[% href %]">[% bag.name %]</a>
+    </li>
+    [%
+       END;
+       END
+    %]
+    <li>
+        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {
+            limit => ctx.bookbag_count, add_rec => ctx.bre_id,
+            anchor => rec_anchor
+        }) %]">
+        [% l('See All') %]
+        </a>
+    </li>
+    <li class="new">
+    <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {
+        add_rec => ctx.bre_id, anchor => rec_anchor
+    }, stop_parms) %]">
+    [% l('Add to new list') %]
+    </a>
+    </li>
+    </ul>
+    </li>
+</ul>

diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 16e55cf..9f83fc6 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -31,64 +31,8 @@
         </div>
         <div class="rdetail_aux_utils toggle_list">
         [%  IF ctx.user;
-            dsetting = "opac.default_list";
-            tclass = (ctx.user_setting_map.$dsetting) ? "temporary" :
-                         (ctx.bookbags.size) ? "temporary divider" : "temporary";
-            href = mkurl(ctx.opac_root _ '/mylist/add',
-                         {record => ctx.bre_id, anchor => ctx.bre_id}, stop_parms);
+            INCLUDE "opac/parts/bookbag_actions.tt2";
         %]
-            <ul class="popmenu">
-            <li><a href="#" class="no-dec">
-                    <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
-                    [% l("Add to my list") %]
-                </a>
-            <ul>
-            <li class="[% tclass %]">
-                <a href="[% href %]">[% l('Temporary List') %]</a>
-            </li>
-            [% IF ctx.user_setting_map.$dsetting;
-               label = (ctx.default_bookbag) ? ctx.default_bookbag : l('Default List');
-               class = (ctx.bookbags.size) ? "default divider" : "default";
-               href = mkurl(ctx.opac_root _ '/myopac/list/update',
-                            {action => 'add_rec', list => ctx.user_setting_map.$dsetting,
-                             record => ctx.bre_id, anchor => ctx.bre_id}, stop_parms);
-            %]
-            <li class="[% class %]">
-                <a href="[% href %]">[% label %]</a>
-            </li>
-            [% END %]
-            [% IF ctx.bookbags.size;
-               i = 0;
-               FOREACH bag IN ctx.bookbags;
-                   href = mkurl(ctx.opac_root _ '/myopac/list/update',
-                                {action => 'add_rec', list => bag.id, record => ctx.bre_id,
-                                 anchor => ctx.bre_id}, stop_parms);
-                   i = i + 1;
-                   IF i == ctx.bookbags.size;
-            %]
-            <li class="divider">
-                [% ELSE %]
-            <li>
-                [% END %]
-               <a href="[% href %]">[% bag.name %]</a>
-            </li>
-            [%
-               END;
-               END
-            %]
-            <li>
-                <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {limit => ctx.bookbag_count, add_rec => ctx.bre_id}) %]">
-                [% l('See All') %]
-                </a>
-            </li>
-            <li class="new">
-                <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {add_rec => ctx.bre_id}, stop_parms) %]">
-                [% l('Add to new list') %]
-                </a>
-            </li>
-            </ul>
-            </li>
-            </ul>
         [%  ELSE;
             operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
             label = (operation == "add") ? l("Add to my list") : l("Remove from my list"); 

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index e16852b..662041e 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -225,67 +225,8 @@
                                                         </div>
                                                         <div class="results_aux_utils result_util">
                                                             [%  IF ctx.user;
-                                                                dsetting = "opac.default_list";
-                                                                tclass = (ctx.user_setting_map.$dsetting) ? "temporary" :
-                                                                           (ctx.bookbags.size) ? "temporary divider" : "temporary";
-                                                                 href = mkurl(ctx.opac_root _ '/mylist/add',
-                                                                              {record => rec.id, anchor => 'record_' _ rec.id}, 1);
+                                                                INCLUDE "opac/parts/bookbag_actions.tt2";
                                                             %]
-                                                                <ul class="popmenu">
-                                                                    <li><a href="#" class="no-dec">
-                                                                          <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
-                                                                          [% l("Add to my list") %]
-                                                                        </a>
-                                                                    <ul>
-                                                                    <li class="[% tclass %]">
-                                                                    <a href="[% href %]">[% l('Temporary List') %]</a>
-                                                                    </li>
-                                                                    [% IF ctx.user_setting_map.$dsetting;
-                                                                       class = (ctx.bookbags.size) ? "default divider" : "default";
-                                                                       label = (ctx.default_bookbag) ? ctx.default_bookbag : l('Default List');
-                                                                       href = mkurl(ctx.opac_root _ '/myopac/list/update',
-                                                                                {action => 'add_rec', list => ctx.user_setting_map.$dsetting,
-                                                                                 record => rec.id, anchor => 'record_' _ rec.id}, 1);
-                                                                    %]
-                                                                    <li class="[% class %]">
-                                                                    <a href="[% href %]">[% label %]</a>
-                                                                    </li>
-                                                                    [% END %]
-                                                                    [% IF ctx.bookbags.size;
-                                                                       i = 0;
-                                                                       FOREACH bag IN ctx.bookbags;
-                                                                           href = mkurl(ctx.opac_root _ '/myopac/list/update',
-                                                                                    {action => 'add_rec', list => bag.id, record => rec.id,
-                                                                                     anchor => 'record_' _ rec.id}, 1);
-                                                                           i = i + 1;
-                                                                           IF i == ctx.bookbags.size;
-                                                                    %]
-                                                                    <li class="divider">
-                                                                        [% ELSE %]
-                                                                    <li>
-                                                                        [% END %]
-                                                                    <a href="[% href %]">[% bag.name %]</a>
-                                                                    </li>
-                                                                    [%
-                                                                       END;
-                                                                       END
-                                                                    %]
-                                                                    <li>
-                                                                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists',
-                                                                                          {limit => ctx.bookbag_count, add_rec => rec.id,
-                                                                                           anchor => 'record_' _ rec.id}) %]">
-                                                                        [% l('See All') %]
-                                                                        </a>
-                                                                    </li>
-                                                                    <li class="new">
-                                                                    <a href="[% mkurl(ctx.opac_root _ '/myopac/lists',
-                                                                                      {add_rec => rec.id, anchor => 'record_' _ rec.id}, 0) %]">
-                                                                    [% l('Add to new list') %]
-                                                                    </a>
-                                                                    </li>
-                                                                    </ul>
-                                                                    </li>
-                                                                </ul>
                                                             [%  ELSE;
                                                                 operation = ctx.mylist.grep(rec.id).size ? "delete" : "add";
                                                                 label = (operation == "add") ? l("Add to my list") : l("Remove from my list");