DRY DRY DRY - and some more link style tweaking

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@735 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml b/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
index 82c3392..e8b49ce 100644 (file)
--- a/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
@@ -177,23 +177,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.600;</td>
                         <td type='opac/slot-data' query='datafield[tag^=600]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag600').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag600', item);
                        ]]></script>
                        </td>
                </tr>
@@ -201,23 +185,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.610;</td>
                         <td type='opac/slot-data' query='datafield[tag^=610]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag610').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag610', item);
                        ]]></script>
                        </td>
                </tr>
@@ -225,23 +193,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.611;</td>
                         <td type='opac/slot-data' query='datafield[tag^=611]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag611').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag611', item);
                        ]]></script>
                        </td>
                </tr>
@@ -249,23 +201,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.630;</td>
                         <td type='opac/slot-data' query='datafield[tag^=630]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag630').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag630', item);
                        ]]></script>
                        </td>
                </tr>
@@ -273,23 +209,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.648;</td>
                         <td type='opac/slot-data' query='datafield[tag^=648]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag648').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag648', item);
                        ]]></script>
                        </td>
                </tr>
@@ -297,23 +217,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subjects;</td>
                         <td type='opac/slot-data' query='datafield[tag^=650]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag650').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag650', item);
                        ]]></script>
                        </td>
                </tr>
@@ -321,23 +225,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.651;</td>
                         <td type='opac/slot-data' query='datafield[tag^=651]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag651').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag651', item);
                        ]]></script>
                        </td>
                </tr>
@@ -345,23 +233,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.653;</td>
                         <td type='opac/slot-data' query='datafield[tag^=653]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag653').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag653', item);
                        ]]></script>
                        </td>
                </tr>
@@ -369,23 +241,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.654;</td>
                         <td type='opac/slot-data' query='datafield[tag^=654]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag654').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag654', item);
                        ]]></script>
                        </td>
                </tr>
@@ -393,23 +249,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.655;</td>
                         <td type='opac/slot-data' query='datafield[tag^=655]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag655').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag655', item);
                        ]]></script>
                        </td>
                </tr>
@@ -417,23 +257,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.656;</td>
                         <td type='opac/slot-data' query='datafield[tag^=656]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag656').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag656', item);
                        ]]></script>
                        </td>
                </tr>
@@ -441,23 +265,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.657;</td>
                         <td type='opac/slot-data' query='datafield[tag^=657]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag657').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag657', item);
                        ]]></script>
                        </td>
                </tr>
@@ -465,23 +273,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.658;</td>
                         <td type='opac/slot-data' query='datafield[tag^=658]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag658').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag658', item);
                        ]]></script>
                        </td>
                </tr>
@@ -489,23 +281,7 @@
                         <td nowrap='nowrap' class='rdetail_desc'>&common.subject.662;</td>
                         <td type='opac/slot-data' query='datafield[tag^=662]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag662').removeClass('hide_me');
-                               var cgi = new CGI();
-                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
-                               var total = '';
-                               var output = [];
-                               var list = dojo.query( 'subfield', item );
-                               for (var i =0; i < list.length; i++) {
-                                       total += dojox.data.dom.textContent(list[i]) + ' ';
-                                       var current = '<a href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                                       for (var p in other_params) {
-                                       if (cgi.param(other_params[p]))
-                                               current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                                       }
-                                       current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
-                                       output.push(current);
-                               }
-                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                               return subjectMe('#tag662', item);
                        ]]></script>
                        </td>
                </tr>
@@ -616,8 +392,28 @@
                config.ids.rdetail.image                                = 'rdetail_image';
                config.ids.rdetail.tor_pic                              = 'rdetail_tor_pic';
 
-       /* Only clear the resources box once */
-       var first_issn = true;
+        /* Only clear the resources box once */
+        var first_issn = true;
+
+        function subjectMe(tag, item) {
+           dojo.query(tag).removeClass('hide_me');
+            var cgi = new CGI();
+            var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+            var total = '';
+            var output = [];
+            var list = dojo.query( 'subfield', item );
+            for (var i =0; i < list.length; i++) {
+                total += dojox.data.dom.textContent(list[i]) + ' ';
+                var current = '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total;
+                for (var p in other_params) {
+                if (cgi.param(other_params[p]))
+                    current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
+                }
+                current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                output.push(current);
+            }
+            return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+        }
 
         dojo.addOnLoad( function () {
             var here = findOrgUnit(getLocation());

diff --git a/web/opac/theme/lul/css/colors.css b/web/opac/theme/lul/css/colors.css
index f733212..05ad023 100644 (file)
--- a/web/opac/theme/lul/css/colors.css
+++ b/web/opac/theme/lul/css/colors.css
@@ -1,5 +1,6 @@
 body a                 { color: black; text-decoration: none;}
 body a:visited { color: black; text-decoration: none;}
+body a.search_link:visited { color: #003399; text-decoration: none; font-weight: bold; }
 body a:hover   { color: red; text-decoration: underline;}
 
 
@@ -80,7 +81,7 @@ a:focus { background: #E0E0F0; color: #000000;}
 
 .nav_link_active {font-weight: bold;}
 
-.search_link { text-decoration: none; }
+.search_link { color: #003399; text-decoration: none; font-weight: bold; }
 .result_table_subtable { border-top: 1px solid #E0E0F0; }
 
 .copy_count_cell { border-right: 1px solid #E0E0F0; }