[Kernel-commits] r3893 - trunk/war/src/webapp/WEB-INF/jsp/decorators

[ssthkjer]

Author: ssthkjer
Date: 2006-10-31 12:36:01 +0100 (Tue, 31 Oct 2006)
New Revision: 3893

Modified:
   trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
template cleaning - moved gallup code in maindecorator.jsp to 
/fragments/gallup.vm

Modified: trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp       
2006-10-30 16:34:04 UTC (rev 3892)
+++ trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp       
2006-10-31 11:36:01 UTC (rev 3893)
@@ -357,83 +357,7 @@
 
 <decorator:getProperty property="page.map-script"/>
 
-<!-- start Gallup: <%=locale  %> -->
-<% if ( !"sv".equals(locale) ) { %>
-<script type='text/javascript' language='JavaScript' 
src='../javascript/tmv11.js'></script>
-<script type="text/javascript" language="JavaScript">
-<!--
-var tmsec = new Array(2);
-tmsec[0]="tmsec=sesam";
-<% if (currentC.equals("g")) { %> tmsec[1]="tmsec=sesamsok_verden";
-<% } else if (currentC.equals("d")) { %> tmsec[1]="tmsec=sesamsok";
-<% } else if (currentC.equals("m") && "Norge".equals(newscountry)) { %> 
tmsec[1]="tmsec=nyhetssok_norske";
-<% } else if (currentC.equals("m") && "Internasjonale 
nyheter".equals(contentsource)) { %> tmsec[1]="tmsec=nyhetssok_internasjonale";
-<% } else if (currentC.equals("m") && "Norden-no".equals(newscountry)) { %> 
tmsec[1]="tmsec=nyhetssok_nordiske";
-<% } else if (currentC.equals("m") && "Mediearkivet".equals(contentsource)) { 
%> tmsec[1]="tmsec=nyhetssok_papir";
-<% } else if (currentC.equals("m")) { %> tmsec[1]="tmsec=nyhetssok";
-<% } else if (currentC.equals("l")) { %> tmsec[1]="tmsec=nyhetssok";
-<% } else if (currentC.equals("y")) { %> tmsec[1]="tmsec=bedriftssok";
-<% } else if (currentC.equals("yip")) { %> tmsec[1]="tmsec=bedriftssok_info";
-<% } else if (currentC.equals("w")) { %> tmsec[1]="tmsec=personsok";
-<% } else if (currentC.equals("wip")) { %> tmsec[1]="tmsec=personsok_info";
-<% } else if (currentC.equals("sw")) { %> tmsec[1]="tmsec=weathersok";
-<% } else if (currentC.equals("swip")) { %> tmsec[1]="tmsec=weathersok_info";
-<% } else if (currentC.equals("p")) { %> tmsec[1]="tmsec=bildesok";
-<% } else if (currentC.equals("b")) { %> tmsec[1]="tmsec=bloggsok";
-<% } else if (currentC.equals("t")) { %> tmsec[1]="tmsec=tvsok";
-<% } else if (currentC.equals("wt")) { %> tmsec[1]="tmsec=tvsok_web";
-<% } else if (currentC.equals("ads")) { %> tmsec[1]="tmsec=sponsede_lenker";
-<% } else if (currentC.equals("n")) { %> tmsec[1]="tmsec=<search:velocity 
template="/pages/tns"/>";
-<% } else { %> tmsec[1]="tmsec=xxx";
-<% } %>
-getTMqs('','', 'sesam_no', 'no', 'iso-8859-15', tmsec);
-//-->
-</script>
-<% if (currentC.equals("g") ) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=sesamsok_verden";
 alt="" /></noscript>
-<% } else if (currentC.equals("d")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=sesamsok";
 alt="" /></noscript>
-<% } else if (currentC.equals("m") && "Norge".equals(newscountry)) { %> 
<noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=nyhetssok_norske";
 alt="" /></noscript>
-<% } else if (currentC.equals("m") && "Internasjonale 
nyheter".equals(contentsource)) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=nyhetssok_internasjonale";
 alt="" /></noscript>
-<% } else if (currentC.equals("m") && "Norden-no".equals(newscountry)) { %> 
<noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=nyhetssok_nordiske";
 alt="" /></noscript>
-<% } else if (currentC.equals("m") && "Mediearkivet".equals(contentsource)) { 
%> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=nyhetssok_papir";
 alt="" /></noscript>
-<% } else if (currentC.equals("m")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=nyhetssok";
 alt="" /></noscript>
-<% } else if (currentC.equals("l")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=nyhetssok";
 alt="" /></noscript>
-<% } else if (currentC.equals("y")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=bedriftssok";
 alt="" /></noscript>
-<% } else if (currentC.equals("yip")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=bedriftssok_info";
 alt="" /></noscript>
-<% } else if (currentC.equals("w")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=personsok";
 alt="" /></noscript>
-<% } else if (currentC.equals("wip")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=personsok_info";
 alt="" /></noscript>
-<% } else if (currentC.equals("p")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=bildesok";
 alt="" /></noscript>
-<% } else if (currentC.equals("b")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=bloggesok";
 alt="" /></noscript>
-<% } else if (currentC.equals("t")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=tvsok";
 alt="" /></noscript>
-<% } else if (currentC.equals("wt")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=tvsok_web";
 alt="" /></noscript>
-<% } else if (currentC.equals("ads")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=sponsede_lenker";
 alt="" /></noscript>
-<% } else if (currentC.equals("n")) { %> <noscript><img 
src="http://statistik-gallup.net/v11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=<search:velocity
 template="/pages/tns"/>" alt="" /></noscript>
-<% } %>
+<search:velocity template="fragments/gallup" />
 
-<% } else { %>
-
-<!-- BEGIN Open Insight XE TAGGING -->
-<script type="text/javascript" language="JavaScript">
-<!--
-var if_Site_ID = "sesam";
-var if_sid = "217";
-var if_tag = "<" + "script type='text/javascript' language='JavaScript' " + 
"DEFER SRC=http" + "://" + if_Site_ID + ".research-int.se/scripts/" + 
if_Site_ID + "_if.js" + "></" + "scr" + "ipt>";
-
-<% if (currentC.equals("g")) { %> var mep1 = "&Site=sesam&Section=world";
-<% } else if (currentC.equals("d")) { %> var mep1 = 
"&Site=sesam&Section=netsearch";
-<% } else if (currentC.equals("m")) { %> var mep1 = "&Site=sesam&Section=news";
-<% } else if (currentC.equals("p")) { %> var mep1 = "&Site=sesam&Section=pics";
-<% } %>
-
-document.write(if_tag);
-//-->
-</script>
-<noscript>
-<img 
src="http://sesam.research-int.se/data?JSFLAG=no&tax0_SiteID=217&Site=sesam&Section=nyheter&Subsection1=sverige&Subsection2=aktuellt&Page=index&Groups1=Paket";
 alt="" />
-</noscript>
-<!-- END Insight XE -->
-
-<% } %>
-<!-- end gallup. -->
-
 </body>
 </html>

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits