diff options
author | godofdream <soilfiction@gmail.com> | 2012-08-17 01:29:03 +0200 |
---|---|---|
committer | godofdream <soilfiction@gmail.com> | 2012-08-17 01:29:03 +0200 |
commit | 7bc7de7332670f692eda576787e671c2eba0e5bb (patch) | |
tree | 594b70c9b59794d05d01cd7939bef750a8ff51b4 /module/web/templates | |
parent | Merge (diff) | |
download | pyload-7bc7de7332670f692eda576787e671c2eba0e5bb.tar.xz |
added division into default template and mobile template, added Base site
Diffstat (limited to 'module/web/templates')
-rw-r--r-- | module/web/templates/default/app.html | 19 | ||||
-rw-r--r-- | module/web/templates/default/login.html | 8 | ||||
-rw-r--r-- | module/web/templates/default/logout.html | 9 | ||||
-rw-r--r-- | module/web/templates/default_mobile/base.html | 84 | ||||
-rw-r--r-- | module/web/templates/default_mobile/login.html (renamed from module/web/templates/default/app_login.html) | 6 |
5 files changed, 94 insertions, 32 deletions
diff --git a/module/web/templates/default/app.html b/module/web/templates/default/app.html deleted file mode 100644 index 306f4b8bf..000000000 --- a/module/web/templates/default/app.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title> - <link href="static/css/default/my.css" rel="stylesheet" type="text/css"/> - <link href="static/css/jquery.mobile-1.1.1.min.css" rel="stylesheet" type="text/css"/> - <script type="text/javascript" src="static/js/libs/jquery-1.8.0.min.js"></script> - <script type="text/javascript" src="static/js/libs/jquery.mobile-1.1.1.min.js"></script> - <script type="text/javascript" src="static/js/libs/my.js"></script> - {% block head %} - {% endblock %} - </head> - <body> - {% block content %} - {% endblock content %} - </body> -</html>
\ No newline at end of file diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html index 035853a26..9454b709d 100644 --- a/module/web/templates/default/login.html +++ b/module/web/templates/default/login.html @@ -2,11 +2,17 @@ {% block title %}{{_("Login")}} - {{super()}} {% endblock %} {% block content %} <br> +{% if logout %} +<div id="logged_out"> + <b>{{_("You were successfully logged out.")}}</b> +</div> +{% endif %} +<br> <div class="login"> <div class="login_title"> {{_("Login")}} </div> - <form action="" method="post" accept-charset="utf-8" id="login"> + <form action="/login" method="post" accept-charset="utf-8" id="login"> <input type="hidden" name="do" value="login" /> <div class="login_user"> <span>{{_("Username")}}</span> diff --git a/module/web/templates/default/logout.html b/module/web/templates/default/logout.html deleted file mode 100644 index 8444c4b3f..000000000 --- a/module/web/templates/default/logout.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends 'default/base.html' %} - -{% block head %} - <meta http-equiv="refresh" content="3; url=/"> -{% endblock %} - -{% block content %} - <p><b>{{_("You were successfully logged out.")}}</b></p> -{% endblock %} diff --git a/module/web/templates/default_mobile/base.html b/module/web/templates/default_mobile/base.html new file mode 100644 index 000000000..d2fec8f2e --- /dev/null +++ b/module/web/templates/default_mobile/base.html @@ -0,0 +1,84 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title> + <link href="static/css/default_mobile/my.css" rel="stylesheet" type="text/css"/> + <link href="static/css/default_mobile/jquery.mobile-1.1.1.min.css" rel="stylesheet" type="text/css"/> + <script type="text/javascript" src="static/js/libs/jquery-1.8.0.min.js"></script> + <script type="text/javascript" src="static/js/default_mobile/jquery.mobile-1.1.1.min.js"></script> + <script type="text/javascript" src="static/js/default_mobile/my.js"></script> + {% block head %} + {% endblock %} + </head> + <body> + +{% block content %} +<!-- home --> +<div data-role="page" id="page1" style="background: url('/static/img/default_mobile/fancy_deboss.png') repeat"> + <div data-role="content" style="padding: 1%"> + <div data-role="navbar" data-iconpos="bottom"> + <ul> + <li> + <a href="#page1" data-theme="a" data-icon="home" class="ui-btn-active ui-state-persist"> + Home + </a> + </li> + <li> + <a href="#page1" data-theme="a" data-icon="plus"> + Add + </a> + </li> + <li> + <a href="#page1" data-theme="a" data-icon="gear"> + Settings + </a> + </li> + <li> + <a href="/logout" data-ajax="false" data-theme="a" data-icon="arrow-r"> + Logout + </a> + </li> + </ul> + </div> + <div data-role="collapsible-set" data-theme="a" data-content-theme="d"> + <div data-role="collapsible" data-collapsed="true"> + <h3> + Package1 + </h3> + </div> + <div data-role="collapsible" data-collapsed="true"> + <h3> + Package2 + </h3> + </div> + <div data-role="collapsible" data-collapsed="false"> + <h3> + Package3 + </h3> + <ul data-role="listview" data-divider-theme="b" data-inset="true"> + <li data-theme="c"> + <a href="#page1" data-transition="slide"> + File1 + </a> + </li> + <li data-theme="c"> + <a href="#page1" data-transition="slide"> + File2 + </a> + </li> + <li data-theme="c"> + <a href="#page1" data-transition="slide"> + File3 + </a> + </li> + </ul> + </div> + </div> + </div> +</div> +{% endblock content %} + + </body> +</html>
\ No newline at end of file diff --git a/module/web/templates/default/app_login.html b/module/web/templates/default_mobile/login.html index ecc41ee92..b3cf4f691 100644 --- a/module/web/templates/default/app_login.html +++ b/module/web/templates/default_mobile/login.html @@ -1,4 +1,4 @@ -{% extends 'default/app.html' %} +{% extends 'default_mobile/base.html' %} {% block title %}{{_("Login")}} - {{super()}} {% endblock %} {% block content %} <!-- Login --> @@ -14,7 +14,7 @@ <b>{{_("You were successfully logged out.")}}</b> </div> {% endif %} - <form action="" method="POST" data-ajax="false"> + <form action="/login" method="POST" data-ajax="false"> <div data-role="fieldcontain"> <fieldset data-role="controlgroup"> <label for="textinput1"> @@ -40,7 +40,7 @@ </div> {% endif %} <div> - <a href="/toggle_mobile" > + <a href="/toggle_mobile" data-ajax="false"> {{_("Desktop Version")}} </a> </div> |