Mergear archivos a comparar de prueba y comando.

[software/sercom.git] / sercom / templates / master.kid
diff --git a/sercom/templates/master.kid b/sercom/templates/master.kid

index f8f591abc6b22ec20c558b3c5a428b22e61d8bdd..b23c32195590f066b94f807beb52fa08d6b06c55 100644 (file)
--- a/sercom/templates/master.kid
+++ b/sercom/templates/master.kid
@@ -1,6 +1,10 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <?python import sitetemplate ?>
-<?python from sercom.menu import menu ?>
+<?python
+       from sercom.menu import Menu
+       from sercom.controllers import Root
+       menu = Menu(Root)
+?>
  <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
  
  <head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
@@ -34,23 +38,17 @@
      </div>
      <div py:if="tg_flash" class="flash" py:content="tg_flash"></div>
  
-               <div id="navbar">
-                       Ir a :
-                       <select OnChange="window.location=this.options[this.selectedIndex].value;">
-                               <option value="${tg.url('/')}">Inicio</option>
-                               <option py:for="i in menu" value="${tg.url(i['url'])}">
-                               ${i['name']}
-                               </option>
-                       </select>
-               </div>
+    ${XML(str(menu))}
+        
      <div py:replace="[item.text]+item[:]"/>
  
         <!-- End of main_content -->
         </div>
         <div id="footer">
-               <a href="http://www/turbogears.org/"><img src="/static/images/under_the_hood_blue.png" alt="TurboGears under the hood" /></a>
-       <p>Copyleft &copy; 2007 Dimov, Lucarella, Markiewicz</p>
+               <a href="http://www.turbogears.org/"><img src="/static/images/under_the_hood_blue.png" alt="TurboGears under the hood" /></a>
+               <br />
                 <br />
+       <p>Copyleft &copy; 2007 Dimov, Lucarella, Markiewicz</p>
         </div>
  </body>