Author: ssthkjer
Date: 2007-06-21 09:57:06 +0200 (Thu, 21 Jun 2007)
New Revision: 5371

Modified:
   trunk/war/src/webapp/index.jsp
Log:
https://jira.sesam.no/jira/browse/SEARCH-2767 and removed inline javascript and 
excessive css

Modified: trunk/war/src/webapp/index.jsp
===================================================================
--- trunk/war/src/webapp/index.jsp      2007-06-21 07:47:37 UTC (rev 5370)
+++ trunk/war/src/webapp/index.jsp      2007-06-21 07:57:06 UTC (rev 5371)
@@ -39,12 +39,10 @@
         <img src="images/index/menu_top.png" id="menuTop" width="151" 
height="23" alt="Sesams&#248;k" />
         <form name="sf" action="<search:boomerang url="/search/" 
param="category:front_search"/>" onsubmit='return check();'>
         <div id="searchbar">
-            <div id="menuCol">
-                <div id="menuMiddle">
-                    <img src="images/index/nettsok_30_30.gif" width="30" 
height="30" alt="Netts&#248;k logo" />
-                    Netts&#248;k
-                </div>
-            </div>          
+            <div id="menuMiddle">
+                <img src="images/index/nettsok_30_30.gif" width="30" 
height="30" alt="Netts&#248;k logo" />
+                Netts&#248;k
+            </div>
             <input type="text" name="q" id="searchInput" 
onfocus="this.form.q.select();" />
             <script type="text/javascript"><!--
                 var focusControl = document.forms["sf"].elements["q"];
@@ -53,22 +51,22 @@
                 } // -->
             </script>                
             <input type="image" id="formSubmit" 
src="images/searchbar/nett.png" alt="" />
-            <img src="images/searchbar/dropdown.png" 
onclick="javascript:toggleButton('front_button_layer');" id="dropdownImg" 
width="19" height="24" alt="Pil ned" />
+            <img src="images/searchbar/dropdown.png" id="dropdownImg" 
width="19" height="24" alt="Pil ned" />
             <a id="searchtip" href='<search:boomerang 
url="/search/?q=&amp;page=/pages/82/index" 
param="category:static;subcategory=header"/>'>S&#248;ketips</a>
             <div id="searchRadio">
                 <input type="radio" name="c" value="d" checked="checked" /> 
Norge &nbsp;&nbsp;
                 <input type="radio" name="c" value="g" /> Verden
             </div>
             <div id="front_button_layer">
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("m","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>Nyhetss&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("y","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>Bedriftss&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("w","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>Persons&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("p","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>Bildes&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("b","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>Bloggs&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("t","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>TV-guide</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("wt","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>NettTV-s&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("sw","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>V&#230;rs&#248;k</div>
-                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("map","");'
 onmouseover='this.style.backgroundColor="#DADBDD"' 
onmouseout='this.style.backgroundColor="#FFF"'>Karts&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("m","");'>Nyhetss&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("y","");'>Bedriftss&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("w","");'>Persons&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("p","");'>Bildes&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("b","");'>Bloggs&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("t","");'>TV-guide</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("wt","");'>NettTV-s&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("sw","");'>V&#230;rs&#248;k</div>
+                <div class="navbut" onclick='deleteCookie("sesam_menu", 
"/");document.getElementById("front_button_layer").style.visibility="hidden";menu_submit("map","");'>Karts&#248;k</div>
                 <div id="closeDD" 
onclick='document.getElementById("front_button_layer").style.visibility="hidden";'>
                     <img src="../images/index/skjul_meny.png" width="21" 
height="20" alt="Skjul meny" />
                     <span>Lukk</span>
@@ -90,39 +88,39 @@
         </script>
         <div id="menutable" <%=hide %>>
             <div class="navMain">
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/nyheter.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=m" 
param="category:front_service"/>' onclick="return 
strep(this);">Nyhetss&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/bedrift.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=y" 
param="category:front_service"/>' onclick="return 
strep(this);">Bedriftss&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/person.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=w" 
param="category:front_service"/>' onclick="return 
strep(this);">Persons&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/bilde.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=p" 
param="category:front_service"/>' onclick="return 
strep(this);">Bildes&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/blogg.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=b" 
param="category:front_service"/>' onclick="return 
strep(this);">Bloggs&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/tv.png" width="16" height="16" 
alt="" />
                     <a href='<search:boomerang url="/search/?c=t" 
param="category:front_service"/>' onclick="return strep(this);">TV-guide</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/webtv.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=wt" 
param="category:front_service"/>' onclick="return 
strep(this);">NettTV-s&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/ver.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang url="/search/?c=sw" 
param="category:front_service"/>' onclick="return 
strep(this);">V&#230;rs&#248;k</a>
                 </div>
-                <div class="navRow">
+                <div>
                     <img src="images/menu/icons/kart.png" width="16" 
height="16" alt="" />
                     <a href='<search:boomerang 
url="http://kart.sesam.no/search/?c=map"; param="category:front_service"/>' 
onclick="return strep(this);">Karts&#248;k</a><span 
class="betaNavbar">beta</span>
                 </div>
@@ -148,20 +146,20 @@
         <search:publish page="/pages/footer"/>
     </div>
 
-        <!-- start gallup (<%=locale  %>) -->
-        <% if ( "no".equals(locale) ) { %>
-        <script type='text/javascript' language='JavaScript' 
src='/javascript/tmv11.js'></script>
-        <script type="text/javascript" language="JavaScript"><!--
-            var tmsec = new Array(3);
-            tmsec[0]="tmsec=sesam";
-            tmsec[1]="tmsec=sesamforside";
-            tmsec[2]="tmsec=sesamforside";
-            getTMqs('','', 'sesam_no', 'no', 'iso-8859-15', tmsec);
-            //-->
-        </script>
-        <noscript><img 
src="http://statistik-gallup.net/V11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=sesamforside&amp;tmsec=sesamforside";
 alt="" /></noscript>
-        <% } %>
-        <!-- end gallup -->
+    <!-- start gallup -->
+    <% if ( "no".equals(locale) ) { %>
+    <script type='text/javascript' language='JavaScript' 
src='/javascript/tmv11.js'></script>
+    <script type="text/javascript" language="JavaScript"><!--
+        var tmsec = new Array(3);
+        tmsec[0]="tmsec=sesam";
+        tmsec[1]="tmsec=sesamforside";
+        tmsec[2]="tmsec=sesamforside";
+        getTMqs('','', 'sesam_no', 'no', 'iso-8859-15', tmsec);
+        //-->
+    </script>
+    <noscript><img 
src="http://statistik-gallup.net/V11***sesam_no/no/iso-8859-15/tmsec=sesam&amp;tmsec=sesamforside&amp;tmsec=sesamforside";
 alt="" /></noscript>
+    <% } %>
+    <!-- end gallup -->
 
     </body>
 </html>

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

Reply via email to