From e7605940aee5cde5bc8a55ae403834525601fa2f Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 18 Aug 2009 15:51:03 +0200
Subject: new webinterface functions

---
 module/web/templates/default.tpl | 42 ++++++++++++++++++++++++++++++----------
 module/web/templates/footer.tpl  |  4 ++++
 2 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'module/web/templates')

diff --git a/module/web/templates/default.tpl b/module/web/templates/default.tpl
index 70671028e..0940dc046 100644
--- a/module/web/templates/default.tpl
+++ b/module/web/templates/default.tpl
@@ -1,29 +1,52 @@
 %header =  'pyLoad Webinterface'
-%include header title=header, use_js=['mootools-1.2.3-core.js'], use_css= ['default.css']
+%js = ['mootools-1.2.3-core.js','mootools-1.2.3.1-more.js']
 
-<a class="anchor" name="dokuwiki__top" id="dokuwiki__top"></a>
+%if page== "home": js.append('default/home.js')
+%end
 
-<div id="head-panel">
+%include header title=header, use_js=js, use_css= ['default.css']
 
-	<div id="head-search-and-login">
+<a class="anchor" name="top" id="top"></a>
 
+<div id="head-panel">
 
 
-				<img src="static/default/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">User</span>
+	<div id="head-search-and-login">
 
+%if page != "login":
+				<img src="static/default/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user}}</span>
 					<ul id="user-actions">
-				<li><a href="/start?do=logout&amp;sectok=ff40bdf226c283991652e062d187c43a"  class="action logout" rel="nofollow">Logout</a></li>
+				<li><a href="/logout"  class="action logout" rel="nofollow">Logout</a></li>
 				<li></li>
 				<li></li>
 			</ul>
+%else:
+    <span style="padding-right: 2px;">Please Login!</span>
+	
 
+%end
 	</div>
 
 	<a href="/"><img id="head-logo" src="/static/default/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
 
 	<div id="head-menu">
 		<ul>
-			<li class=" selected"><a href="/" title=""><img src="static/default/head-menu-home.png" alt="" /> Home</a></li><li class=""><a href="/news" title=""><img src="static/default/head-menu-news.png" alt="" /> News</a></li><li class=""><a href="/wiki" title=""><img src="static/default/head-menu-wiki.png" alt="" /> Wiki</a></li><li class=""><a href="/download" title=""><img src="static/default/head-menu-download.png" alt="" /> Download</a></li><li class=""><a href="/development" title=""><img src="static/default/head-menu-development.png" alt="" /> Development</a></li><li class="right"><a href="/start?do=index"  class="action index" accesskey="x" rel="nofollow"><img src="static/default/head-menu-index.png" alt="" />Logs</a></li>		</ul>
+	<li class="
+        %if page == "home" or page == "login":
+        selected
+        %endif
+        "><a href="/" title=""><img src="static/default/head-menu-home.png" alt="" /> Home</a></li>
+        <li class=" 
+        %if page == "queue":
+        selected
+        %endif
+        "><a href="/queue" title=""><img src="static/default/head-menu-download.png" alt="" /> Queue</a></li>
+        <li class="
+        %if page == "downloads":
+        selected
+        %endif
+        "><a href="/downloads" title=""><img src="static/default/head-menu-development.png" alt="" /> Downloads</a></li>
+        <li class="right"><a href="/logs"  class="action index" accesskey="x" rel="nofollow"><img src="static/default/head-menu-index.png" alt="" />Logs</a></li>		</ul>
 	</div>
 
 	<div style="clear:both;"></div>
@@ -50,7 +73,6 @@
 <input type="hidden" name="do" value="login" /><fieldset ><legend>Login</legend>
 <label class="block" for="focus__this"><span>Username</span> <input type="text" id="focus__this" name="u" class="edit" /></label><br />
 <label class="block"><span>Password</span> <input type="password" name="p" class="edit" /></label><br />
-<label class="simple" for="remember__me"><input type="checkbox" id="remember__me" name="r" value="1" /> <span>Remember me</span></label>
 <input type="submit" value="Login" class="button" />
 </fieldset>
 </div></form>
@@ -73,7 +95,7 @@
 
 <div id="foot">© 2008-2009 the pyLoad Team
 
-	<a href="#dokuwiki__top" class="action top" accesskey="x"><span>Back to top</span></a><br />
+	<a href="#top" class="action top" accesskey="x"><span>Back to top</span></a><br />
 	<!--<div class="breadcrumbs"></div>-->
 
 
@@ -81,4 +103,4 @@
 
 </div>
 
-%include footer
\ No newline at end of file
+%include footer use_js=[]
\ No newline at end of file
diff --git a/module/web/templates/footer.tpl b/module/web/templates/footer.tpl
index 308b1d01b..a59b414bf 100644
--- a/module/web/templates/footer.tpl
+++ b/module/web/templates/footer.tpl
@@ -1,2 +1,6 @@
+%for item in use_js:
+<script type="text/javascript" src="static/{{item}}"></script>
+%end
+
 </body>
 </html>
-- 
cgit v1.2.3