[bknr-cvs] hans changed trunk/projects/bos/

[BKNR Commits]

Revision: 4003
Author: hans
URL: http://bknr.net/trac/changeset/4003

Fix Impressum/Spenden in POI-Microsite.

U   trunk/projects/bos/payment-website/static/bos.js
U   trunk/projects/bos/payment-website/static/poi.xsl
U   trunk/projects/bos/web/poi-handlers.lisp

Modified: trunk/projects/bos/payment-website/static/bos.js
===================================================================
--- trunk/projects/bos/payment-website/static/bos.js	2008-10-16 18:46:08 UTC (rev 4002)
+++ trunk/projects/bos/payment-website/static/bos.js	2008-10-16 19:34:31 UTC (rev 4003)
@@ -1,9 +1,11 @@
 // -*- Java -*- Script
 
 // ***  extrafenster fuer impressum, kontakt etc. *** //
-function window_extra(target) { 
+function window_extra(target) {
     mywin=open(target,"detailwin","width=482,height=600,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes,left=100,top=100");
     mywin.focus();
+
+    return false;
 };
 
 		
@@ -11,6 +13,8 @@
 function window_ringdetail() { 
     mywin=open("ring-detail","ringdetail","width=492,height=450,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no,left=100,top=100");
     mywin.focus();
+
+    return false;
 };
 
 		
@@ -18,6 +22,8 @@
 function window_news(target) { 
     mywin=open(target,"newswin","width=480,height=400,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes,left=100,top=100");
     mywin.focus();
+
+    return false;
 };
 
 // ***  extrafenster fuer satellitenkarte *** //
@@ -260,4 +266,4 @@
     } else {
         return false;
     }
-}
\ No newline at end of file
+}

Modified: trunk/projects/bos/payment-website/static/poi.xsl
===================================================================
--- trunk/projects/bos/payment-website/static/poi.xsl	2008-10-16 18:46:08 UTC (rev 4002)
+++ trunk/projects/bos/payment-website/static/poi.xsl	2008-10-16 19:34:31 UTC (rev 4003)
@@ -14,6 +14,7 @@
         <link href="http://createrainforest.org/rss/news" rel="alternate" title="RSS Feed"
               type="application/rss+xml">
         </link>
+        <script type="text/javascript" src="/static/bos.js"></script>
         <script type="text/javascript" src="/static/poi/prototype.js"></script>
         <script type="text/javascript" src="/static/poi/effects.js"></script>
         <script type="text/javascript" src="/static/poi/accordion.js"></script>
@@ -101,7 +102,8 @@
   <xsl:template match="entry">
     <xsl:variable name="title"><xsl:value-of select="@title"/></xsl:variable>
     <xsl:variable name="href"><xsl:value-of select="@href"/></xsl:variable>
-    <div class="menue"><a class="menuelink" href="{$href}" shape="rect" target="_blank" >
+    <xsl:variable name="onclick"><xsl:value-of select="@onclick"/></xsl:variable>
+    <div class="menue"><a class="menuelink" href="#" shape="rect" onclick="{$onclick}">
         <xsl:value-of select="$title"/></a></div>
     <div class="menue">|</div>
   </xsl:template>

Modified: trunk/projects/bos/web/poi-handlers.lisp
===================================================================
--- trunk/projects/bos/web/poi-handlers.lisp	2008-10-16 18:46:08 UTC (rev 4002)
+++ trunk/projects/bos/web/poi-handlers.lisp	2008-10-16 19:34:31 UTC (rev 4003)
@@ -444,9 +444,10 @@
           (attribute "subtitle" (poi-string 'subtitle))
           (with-element "menu"
             (with-element "entry" (attribute "title" "Impressum")
-                          (attribute "href" (format nil "/~A/impressum" language)))
+                          (attribute "onclick" (format nil "window_extra('/~A/impressum')" language)))
             (with-element "entry" (attribute "title" "Spenden")
-                          (attribute "href" (format nil "/~A/bestellung" language))))
+                          (attribute "onclick" (format nil "window.location.href = '/~A/bestellung'; return false;"
+                                                       language))))
           (with-element "description" (text (poi-string 'description)))
           (with-media ("image_gallery" "Bildergalerie")
             (mapc #'format-image images))