Changeset 27150 for main

Timestamp:

2013-03-28T17:46:57+13:00 (11 years ago)

Author:

ak19

Message:

Shifting position of RSS link in GS2 to header area. Smaller icon. Changes to demo collection's extra.dm macro file, as the RSS link will appear on all pages in the header now the user specifies that it should appear. Moved the actual rsslink macro and javascript into nav_css which defines the header, rather than in base and style.dm where the rsslink macro and associated javacsript function were before'

Location:

main/trunk/greenstone2

Files:

• collect/demo/macros/extra.dm (modified) (1 diff)
• macros/base.dm (modified) (1 diff)
• macros/nav_css.dm (modified) (2 diffs)
• macros/style.dm (modified) (1 diff)
• web/images/rssicon.png (modified) ( previous)
• web/images/rssicon_large.png (added)
• web/images/rssicon_small.png (added)

main/trunk/greenstone2/collect/demo/macros/extra.dm

@@ -1 @@
-package about
-
-_pagescriptextra_ {
- _rssscript_
-}
-_pagefooterextra_ {
+package Global
+_optrsslink_ {
 _rsslink_
 }
-

main/trunk/greenstone2/macros/base.dm

@@ -423 +423 @@
 
 
-# RSS link and default RSS icon for embedding in the link
-# RSS icon from http://webneel.com/post/freedownload/web-design/icon-design/25-web-rss-icons
-
-_rssicon_ {<img class="icon" src="_httpimages_/rssicon.png" alt="_collectionname_ RSS feed" title="_collectionname_ RSS feed" onLoad="addDomainToRSSAnchor(this)">}
-
-_rsslink_ {<a id="rss" href="_gwcgi_?site=localhost&amp;a=rss&amp;c=_cgiargc_&amp;l=_cgiargl_&amp;w=_cgiargw_">_rssicon_</a>}
-# e.g. rss link: http://localhost:8283/greenstone/cgi-bin/library.cgi?site=localhost&a=rss&c=demo&l=en&w=utf-8&hostname=localhost:8283
-
 ###########################################################################
 # Metadata formatting stuff

main/trunk/greenstone2/macros/nav_css.dm

@@ -14 +14 @@
 #######################################################################
 
-_globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink__optloginlink_}
+_globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink__optloginlink_ _optrsslink_}
 _homelink_  {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
 _helplink_  {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
@@ -36 +36 @@
       </script>
     )
+}
+
+
+# if a collection should have an rss link,
+# set _optrsslink_ for that collection's global package to contain _rsslink_ 
+_optrsslink_ {}
+
+# RSS link and default RSS icon for embedding in the link
+# RSS icon from http://webneel.com/post/freedownload/web-design/icon-design/25-web-rss-icons
+# e.g. rss link: http://localhost:8283/greenstone/cgi-bin/library.cgi?site=localhost&a=rss&c=demo&l=en&w=utf-8&hostname=localhost:8283
+# And the javascript that's used for appending "&hostname=host:port" to the link to the RSS feed
+# The script is activated on loading the rss icon <img>, since onLoad doesn't work on <a>
+# The rsslink that embeds rssicon are two macros defined in base.dm
+# To use this script, define pagescriptextra macro to contain the domainscript macro
+# Can do so at collectionlevel in a collection's extra.dm (try to add it to package about)
+
+_rssicon_ {<img class="icon" src="_httpimages_/rssicon.png" alt="_collectionname_ RSS feed" title="_collectionname_ RSS feed" onLoad="addDomainToRSSAnchor(this)">}
+
+_rsslink_ {<a id="rss" href="_gwcgi_?site=localhost&amp;a=rss&amp;c=_cgiargc_&amp;l=_cgiargl_&amp;w=_cgiargw_">_rssicon_</a>
+<script type="text/javascript">
+function addDomainToRSSAnchor (imgtag) 
+  \{
+     parent = imgtag.parentNode;
+     if (parent && parent.href) 
+     \{
+        parent.href += "&hostname="+location.hostname;
+    if(location.port) \{
+           parent.href += ":"+location.port;
+        \}
+     \}
+  \} 
+</script>
 }
 

main/trunk/greenstone2/macros/style.dm

@@ -229 +229 @@
 }
 
-# Javascript that's used for appending "&hostname=host:port" to the link to the RSS feed
-# The script is activated on loading the rss icon <img>, since onLoad doesn't work on <a>
-# The rsslink that embeds rssicon are two macros defined in base.dm
-# To use this script, define pagescriptextra macro to contain the domainscript macro
-# Can do so at collectionlevel in a collection's extra.dm (try to add it to package about)
-
-_rssscript_ {
-  function addDomainToRSSAnchor (imgtag) 
-  \{
-     parent = imgtag.parentNode;
-     if (parent && parent.href) 
-     \{
-        parent.href += "&hostname="+location.hostname;
-    if(location.port) \{
-           parent.href += ":"+location.port;    
-        \}
-     \}
-  \} 
-}
 
 # imagescript only used in nav_ns4.dm