diff options
author | 2012-11-05 15:15:17 +0100 | |
---|---|---|
committer | 2012-11-05 15:15:17 +0100 | |
commit | 83d8d203685cac3f5aed3872897463c7afa50810 (patch) | |
tree | d1218cb219303b77f6c8fd6209a52b5025d56dee /module/web/templates | |
parent | improved header layout (diff) | |
download | pyload-83d8d203685cac3f5aed3872897463c7afa50810.tar.xz |
new Setup system, JQuery Web-If
Diffstat (limited to 'module/web/templates')
-rw-r--r-- | module/web/templates/default/base.html | 12 | ||||
-rw-r--r-- | module/web/templates/mobile/base.html | 119 | ||||
-rw-r--r-- | module/web/templates/mobile/login.html | 30 |
3 files changed, 115 insertions, 46 deletions
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index d54075110..dfb7a93bf 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -9,14 +9,14 @@ <!-- TODO Include this font -->
<link href="http://fonts.googleapis.com/css?family=Abel" rel="stylesheet" type="text/css"/>
- <link href="static/css/bootstrap.css" rel="stylesheet" type="text/css"/>
- <link href="static/css/font.css" rel="stylesheet" type="text/css"/>
- <link href="static/css/default/style.less" rel="stylesheet/less" type="text/css" media="screen"/>
+ <link href="/static/css/bootstrap.css" rel="stylesheet" type="text/css"/>
+ <link href="/static/css/font.css" rel="stylesheet" type="text/css"/>
+ <link href="/static/css/default/style.less" rel="stylesheet/less" type="text/css" media="screen"/>
{% block css %}
{% endblock %}
- <script src="static/js/libs/less-1.3.0.min.js" type="text/javascript"></script>
- <script type="text/javascript" data-main="static/js/default" src="static/js/libs/require-2.0.6.js"></script>
+ <script src="/static/js/libs/less-1.3.0.min.js" type="text/javascript"></script>
+ <script type="text/javascript" data-main="static/js/default" src="/static/js/libs/require-2.0.6.js"></script>
<script>
require(['default'], function(App) {
App.init();
@@ -99,7 +99,7 @@ <div class="logo"></div>
<div class="block copyright">
© 2008-2012<br>
- The pyLoad Team<br>
+ <a href="http://pyload.org/" target="_blank">The pyLoad Team</a><br>
</div>
<div class="block">
diff --git a/module/web/templates/mobile/base.html b/module/web/templates/mobile/base.html index 95d824730..ef2f06ffe 100644 --- a/module/web/templates/mobile/base.html +++ b/module/web/templates/mobile/base.html @@ -1,41 +1,84 @@ <!DOCTYPE html> <html> -<head> - <meta charset="utf-8"> - <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title> - <meta name="description" content=""> - <meta name="HandheldFriendly" content="True"> - <meta name="MobileOptimized" content="320"> - <meta name="viewport" content="width=device-width"> - <meta http-equiv="cleartype" content="on"> - - <link rel="shortcut icon" href="img/touch/apple-touch-icon.png"> - <link href="static/css/font.css" rel="stylesheet" type="text/css"/> - {# TODO: Needs cleanup #} - <link rel="stylesheet" href="/static/css/mobile/style.css"> - - <script type="text/javascript" data-main="static/js/mobile" src="static/js/libs/require-2.0.6.js"></script> - {% block head %} - {% endblock %} -</head> -<body class="viewport"> -<div id="wrap"> -<header> - <div class="logo"></div> - <span class="title">pyLoad</span> -</header> -<div id="content"> - <h2>Tech Demo</h2> - <h3>In Development</h3> -</div> -</div> -<footer> - Tab Bar -</footer> -<script> - require(['mobile'], function (App) { - App.init(); - }); -</script> -</body> + <head> + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title> + <meta name="HandheldFriendly" content="True"> + <meta http-equiv="cleartype" content="on"> + + <link rel="stylesheet" href="/static/css/mobile/jquery.mobile-1.1.1.min.css" /> + <link rel="stylesheet" href="/static/css/mobile/my.css" type="text/css" /> + <link rel="stylesheet" href="/static/css/font.css"/> + + + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> + <script src="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.1.1/jquery.mobile-1.1.1.min.js"></script> + <script src="my.js"></script> + + + <script type="text/javascript" data-main="static/js/default" src="/static/js/libs/require-2.0.6.js"></script> + <script> + require(['mobile'], function(App) { + App.init(); + {% block require %}{% endblock %} + }); + </script> + + + {% block head %}{% endblock %} + </head> + <body> + <!-- Home --> + <div data-role="page" id="page1"> + <div data-theme="a" data-role="header"> + {% block header %}{% endblock %} + {% if user %} + <!-- Navbar --> + <div data-role="navbar" data-iconpos="bottom"> + <ul> + <li> + <a href="#page1" data-theme="" data-icon="back"> + Back + </a> + </li> + <li> + <a href="#page1" data-theme="" data-icon="home" class="ui-btn-active ui-state-persist"> + Home + </a> + </li> + <li> + <a href="#page1" data-theme="" data-icon="plus"> + Add + </a> + </li> + <li> + <a href="#page1" data-theme="" data-icon="gear"> + Settings + </a> + </li> + {% block navbar %}{% endblock %} + </ul> + </div> + {% endif %} + + </div> + <div data-role="content"> + {% block content %}{% endblock %} + </div> + <div data-theme="a" data-role="footer" data-position="fixed"> + {% block footer %}{% endblock %} + <div> + <a data-role="button" data-transition="none" href="/toggle_mobile" class="ui-btn-left"> + {{ _("Desktop Version") }} + </a> + <a data-role="button" data-transition="none" href="http://pyload.org/" class="ui-btn-right"> + {{ _("Pyload") }} + </a> + </div> + + </div> + </div> + {% block pages %}{% endblock %} + </body> </html> diff --git a/module/web/templates/mobile/login.html b/module/web/templates/mobile/login.html index 5a1625f43..5821cc0c8 100644 --- a/module/web/templates/mobile/login.html +++ b/module/web/templates/mobile/login.html @@ -1,5 +1,31 @@ {% extends 'mobile/base.html' %} {% block title %}{{_("Login")}} - {{super()}} {% endblock %} + +{% block header %} + <h2> + PyLoad Login + </h2> +{% endblock %} + {% block content %} -<h1>Test test sd</h1> -{% endblock %}
\ No newline at end of file + <form action="/login" method="POST" data-ajax="false"> + <div data-role="fieldcontain"> + <fieldset data-role="controlgroup"> + <label for="username"> + Username + </label> + <input name="username" id="username" placeholder="username" value="" type="text" /> + </fieldset> + </div> + <div data-role="fieldcontain"> + <fieldset data-role="controlgroup"> + <label for="password"> + Password + </label> + <input name="password" id="password" placeholder="password" value="" type="password" /> + </fieldset> + </div> + <input id="submit" type="submit" data-theme="a" data-icon="forward" data-iconpos="left" value="Login" /> + </form> +{% endblock %} + |