From d8119f648e63a4728433e67e79d2a99296a8c2c1 Mon Sep 17 00:00:00 2001 From: godofdream Date: Thu, 16 Aug 2012 17:48:39 +0200 Subject: Added Mobile WebIf, some Layouting --- module/web/templates/default/app.html | 19 +++++++++++ module/web/templates/default/app_login.html | 49 +++++++++++++++++++++++++++ module/web/templates/default/base.html | 4 +-- module/web/templates/default/login.html | 4 --- module/web/templates/default/queue.html | 51 +++++++++++++++++++++++++---- 5 files changed, 115 insertions(+), 12 deletions(-) create mode 100644 module/web/templates/default/app.html create mode 100644 module/web/templates/default/app_login.html (limited to 'module/web/templates') diff --git a/module/web/templates/default/app.html b/module/web/templates/default/app.html new file mode 100644 index 000000000..306f4b8bf --- /dev/null +++ b/module/web/templates/default/app.html @@ -0,0 +1,19 @@ + + + + + + {% block title %}pyLoad {{ _("Webinterface") }}{% endblock %} + + + + + + {% block head %} + {% endblock %} + + + {% block content %} + {% endblock content %} + + \ No newline at end of file diff --git a/module/web/templates/default/app_login.html b/module/web/templates/default/app_login.html new file mode 100644 index 000000000..ecc41ee92 --- /dev/null +++ b/module/web/templates/default/app_login.html @@ -0,0 +1,49 @@ +{% extends 'default/app.html' %} +{% block title %}{{_("Login")}} - {{super()}} {% endblock %} +{% block content %} + +
+
+

+ pyLoad {{_("Login")}} +

+
+
+ {% if logout %} +
+ {{_("You were successfully logged out.")}} +
+ {% endif %} +
+
+
+ + +
+
+
+
+ + +
+
+ +
+ {% if errors %} +
+

{{_("Your username and password didn't match. Please try again.")}}

+ {{ _("To reset your login data or add an user run:") }} python pyLoadCore.py -u +
+ {% endif %} +
+ + {{_("Desktop Version")}} + +
+
+
+{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 5e1b2089a..d075fe792 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -49,7 +49,7 @@ {{ user.name }}
- {{ _("Logout") }} + {{ _("Logout") }}
@@ -92,7 +92,7 @@

pyLoad

- asd
+ {{_("Mobile Version")}}
dsfdsf
sdf dsg
diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html index 95c62a992..035853a26 100644 --- a/module/web/templates/default/login.html +++ b/module/web/templates/default/login.html @@ -1,7 +1,5 @@ {% extends 'default/base.html' %} - {% block title %}{{_("Login")}} - {{super()}} {% endblock %} - {% block content %}
@@ -30,6 +28,4 @@ {{ _("To reset your login data or add an user run:") }} python pyLoadCore.py -u {% endif %}
- - {% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index d13cca776..455916763 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -46,16 +46,55 @@ document.addEvent("domready", function(){
-
-
-
-
-
- {{_("Folder:")}} TestPackage/ | {{_("Password:")}} trololo +
-- cgit v1.2.3