Bugfix. Corregir un par de MultipleJoin y herencia incorrecta.

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

index 7a8e03c737cfdcabf37a00057a72353a1b366a5c..48ae3143f4ed1185c34ff65eff59b80489fc4949 100644 (file)
--- a/sercom/templates/master.kid
+++ b/sercom/templates/master.kid
@@ -1,5 +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 ?>
  <!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 
+       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()">
  <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()">
@@ -20,8 +25,9 @@
  </head>
  
  <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
  </head>
  
  <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
-    <div py:if="tg.config('identity.on',False) and not 'logging_in' in locals()"
-        id="pageLogin">
+               <div id="header"><span style="position:relative; top: 90%;">Administrador y Corrector Automático de Trabajos Prácticos</span></div>
+    <div id="main_content">
+    <div py:if="tg.config('identity.on',False) and not 'logging_in' in locals()" id="pageLogin">
          <span py:if="tg.identity.anonymous">
              <a href="/login">Login</a>
          </span>
          <span py:if="tg.identity.anonymous">
              <a href="/login">Login</a>
          </span>
@@ -30,19 +36,20 @@
              <a href="/logout">Logout</a>
          </span>
      </div>
              <a href="/logout">Logout</a>
          </span>
      </div>
-    <div id="header">&nbsp;</div>
-    <div id="main_content">
      <div py:if="tg_flash" class="flash" py:content="tg_flash"></div>
  
      <div py:if="tg_flash" class="flash" py:content="tg_flash"></div>
  
+    ${XML(str(menu))}
+        
      <div py:replace="[item.text]+item[:]"/>
  
         <!-- End of main_content -->
         </div>
      <div py:replace="[item.text]+item[:]"/>
  
         <!-- End of main_content -->
         </div>
-<div id="footer"> <img src="/static/images/under_the_hood_blue.png" alt="TurboGears under the hood" />
-  <p>TurboGears is a open source front-to-back web development
-    framework written in Python</p>
-  <p>Copyright &copy; 2006 Kevin Dangoor</p>
-</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>
+               <br />
+               <br />
+       <p>Copyleft &copy; 2007 Dimov, Lucarella, Markiewicz</p>
+       </div>
  </body>
  
  </html>
  </body>
  
  </html>