From 81cd75591e2bb96790912306d9c3930d6a917d5f Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 27 Aug 2012 11:43:57 +0200 Subject: new mobile template --- module/web/static/js/mobile.js | 38 +++++---- module/web/templates/mobile/base.html | 143 +++++++++++++++------------------ module/web/templates/mobile/login.html | 48 +---------- 3 files changed, 88 insertions(+), 141 deletions(-) diff --git a/module/web/static/js/mobile.js b/module/web/static/js/mobile.js index 21d1be26c..58ccf5800 100644 --- a/module/web/static/js/mobile.js +++ b/module/web/static/js/mobile.js @@ -1,18 +1,22 @@ // Sets the require.js configuration for your application. require.config({ - - // 3rd party script alias names (Easier to type "jquery" than "libs/jquery-1.7.2.min") - paths: { - // Core Libraries - jquery: "libs/jquery-1.8.0", - underscore: "libs/lodash-0.4.2", - backbone: "libs/backbone-0.9.2", + paths:{ + + jquery:"libs/jquery-1.8.0", + jqueryui:"libs/jqueryui", + flot:"libs/jquery.flot.min", + transit:"libs/jquery.transit-0.1.3", + fastClick:"libs/jquery.fastClick-0.2", + omniwindow: "libs/jquery.omniwindow", - // Require.js Plugins - text: "plugins/text-2.0.0" + underscore:"libs/lodash-0.5.2", + backbone:"libs/backbone-0.9.2", - }, + // Require.js Plugins + text:"plugins/text-2.0.3" + + }, // Sets the configuration for your third party scripts that are not AMD compatible shim: { @@ -20,15 +24,19 @@ require.config({ "backbone": { deps: ["underscore", "jquery"], exports: "Backbone" //attaches "Backbone" to the window object - } + }, + transit: ["jquery"], + fastClick: ["jquery"] } // end Shim Configuration }); -// Include Desktop Specific JavaScript files here (or inside of your Desktop router) -require(['jquery','backbone','routers/mobileRouter'], function($, Backbone, Mobile) { +define('mobile', ['routers/mobileRouter', 'transit', 'fastClick'], function(Mobile) { + + var init = function(){ + var router = new Mobile(); + }; - // Instantiates a new Router - this.router = new Mobile(); + return {"init":init}; }); \ No newline at end of file diff --git a/module/web/templates/mobile/base.html b/module/web/templates/mobile/base.html index 342a7eb63..1b717ff7b 100644 --- a/module/web/templates/mobile/base.html +++ b/module/web/templates/mobile/base.html @@ -1,84 +1,67 @@ - - - - {% block title %}pyLoad {{ _("Webinterface") }}{% endblock %} - - - - - - {% block head %} - {% endblock %} - - - -{% block content %} - -
-
-
- -
-
-
-

- Package1 -

-
-
-

- Package2 -

-
-
-

- Package3 -

- -
-
+ + + {% block title %}pyLoad {{ _("Webinterface") }}{% endblock %} + + + + + + + + + + + {% block head %} + {% endblock %} + + + +
+ +
+
+
+

dfgfdg

+ {% block content %} + {% endblock content %}
-{% endblock content %} - - - \ No newline at end of file +
+
+ + + diff --git a/module/web/templates/mobile/login.html b/module/web/templates/mobile/login.html index 37698cc5c..5a1625f43 100644 --- a/module/web/templates/mobile/login.html +++ b/module/web/templates/mobile/login.html @@ -1,49 +1,5 @@ -{% extends 'default_mobile/base.html' %} +{% extends 'mobile/base.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 %} - -
-
+

Test test sd

{% endblock %} \ No newline at end of file -- cgit v1.2.3