From d856372c0b9f515bc214b268e028e0493a77d092 Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Tue, 2 Dec 2008 04:46:15 +0000
Subject: [PATCH] random template manipulations

git-svn-id: http://yolanda.mister-muffin.de/svn@396 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/yolanda/templates/xhtml/base.mako   | 34 +++++++++++++++++------
 trunk/yolanda/templates/xhtml/upload.mako | 10 +++----
 2 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako
index 6f18531..f4ecdd2 100644
--- a/trunk/yolanda/templates/xhtml/base.mako
+++ b/trunk/yolanda/templates/xhtml/base.mako
@@ -3,16 +3,17 @@
 <!-- XHTML 5, baby ! -->
 
 <%def name="search()">
+
     <div id="search">
 
         <h1>Search</h1>
 
-        ${h.form(h.url_for('search_results'), method='get')}
+        <form action="(h.url_for('search_results'))}" method="get">
 
-            ${h.text_field('query')}
-            ${h.submit('Search Videos')}
+            <input id="query" name="query" type="text"/>
+            <input type="submit" value="Search"/>
 
-        ${h.end_form()}
+        </form>
 
         <ul id="queries">
 
@@ -44,12 +45,13 @@
 
         <h1>Login</h1>
 
-        ${h.form(h.url_for('account/login'), method='post')}
+        <form action="${h.url_for('account/login')}" 
+method="post">
 
-            ${h.text_field('username')}
-            ${h.submit('Login (OpenID)')}
+            <input id="username" name="username" type="url"/>
+            <input type="submit" value="Login (OpenID)"/>
 
-        ${h.end_form()}
+        </form>
 
     </div>
 </%def>
@@ -105,6 +107,17 @@
     </div>
 </%def>
 
+<%def name="upload()">
+
+    <div id="upload">
+
+        <h1>Upload</h1>
+        <a href="${h.url_for('upload')}">Upload</a>
+
+    </div>
+
+</%def>
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
@@ -133,7 +146,12 @@
         Skip menu.
     </a>
 
+<%doc>
+    login will be implemented later on
     ${self.login()}
+</%doc>
+
+    ${self.upload()}
 
     ${self.search()}
 
diff --git a/trunk/yolanda/templates/xhtml/upload.mako b/trunk/yolanda/templates/xhtml/upload.mako
index 077c51d..18299cb 100644
--- a/trunk/yolanda/templates/xhtml/upload.mako
+++ b/trunk/yolanda/templates/xhtml/upload.mako
@@ -49,8 +49,8 @@
         <li id="language">
             <label for="language">language</label>
             <select name="language">
-                <option value="de">German</option>
-                <option value="en">English</option>
+                <option value="deu">German</option>
+                <option value="eng">English</option>
             </select>
         </li>
 
@@ -60,11 +60,11 @@
         </li>
 
         <li>
-            <div id="contributor" repeat="template">
-                <label for="contributor">Contributor</label>
+            <span id="contributor" repeat="template">
+                <label for="contributor.[contributor]">Contributor</label>
                 <input name="contributor.[contributor]" type="text"/>
                 <button type="remove">Remove</button>
-            </div>
+            </span>
             <button type="add" template="contributor">Add contributor</button>
         </li>
 
