]> git.0d.be Git - mandayejs.git/commitdiff
projects / mandayejs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e305a3e)
move templates and static files to app
authorFrédéric Péters <fpeters@entrouvert.com>
Sun, 22 Mar 2015 18:26:42 +0000 (19:26 +0100)
committerFrédéric Péters <fpeters@entrouvert.com>
Sun, 22 Mar 2015 18:26:42 +0000 (19:26 +0100)
13 files changed:
mandayejs/mandaye/static/mandaye.css [new file with mode: 0644] patch | blob
mandayejs/mandaye/static/mandaye.js [new file with mode: 0644] patch | blob
mandayejs/mandaye/static/mandaye.post.js [new file with mode: 0644] patch | blob
mandayejs/mandaye/templates/mandaye/panel.html [new file with mode: 0644] patch | blob
mandayejs/mandaye/templates/mandaye/post-login.html [new file with mode: 0644] patch | blob
mandayejs/mandaye/templates/registration/login.html [new file with mode: 0644] patch | blob
mandayejs/settings.py patch | blob | history
mandayejs/static/mandaye.css [deleted file] patch | blob | history
mandayejs/static/mandaye.js [deleted file] patch | blob | history
mandayejs/static/mandaye.post.js [deleted file] patch | blob | history
mandayejs/templates/mandaye/panel.html [deleted file] patch | blob | history
mandayejs/templates/mandaye/post-login.html [deleted file] patch | blob | history
mandayejs/templates/registration/login.html [deleted file] patch | blob | history

diff --git a/mandayejs/mandaye/static/mandaye.css b/mandayejs/mandaye/static/mandaye.css
new file mode 100644 (file)
index 0000000..8afe252
--- /dev/null
+++ b/mandayejs/mandaye/static/mandaye.css
@@ -0,0 +1,9 @@
+#mandaye-js {
+  background: black;
+  color: white;
+  padding: 5px 0;
+}
+
+#mandaye-js a {
+  color: white;
+}
diff --git a/mandayejs/mandaye/static/mandaye.js b/mandayejs/mandaye/static/mandaye.js
new file mode 100644 (file)
index 0000000..6ceb0f1
--- /dev/null
+++ b/mandayejs/mandaye/static/mandaye.js
@@ -0,0 +1,5 @@
+$(function() {
+  $('head').append('<link rel="stylesheet" href="/_mandaye/static/mandaye.css" type="text/css" />');
+  $('body').prepend('<div id="mandaye-js">Chargement en cours...</div>');
+  $('#mandaye-js').load('/_mandaye/panel');
+});
diff --git a/mandayejs/mandaye/static/mandaye.post.js b/mandayejs/mandaye/static/mandaye.post.js
new file mode 100644 (file)
index 0000000..479e4c7
--- /dev/null
+++ b/mandayejs/mandaye/static/mandaye.post.js
@@ -0,0 +1,5 @@
+$(function() {
+  $('#post-login-frame').on('load', function() {
+    window.location = '/';
+  });
+});
diff --git a/mandayejs/mandaye/templates/mandaye/panel.html b/mandayejs/mandaye/templates/mandaye/panel.html
new file mode 100644 (file)
index 0000000..03636ef
--- /dev/null
+++ b/mandayejs/mandaye/templates/mandaye/panel.html
@@ -0,0 +1,7 @@
+<div>
+{% if user.is_authenticated %}
+  {{ user.username }} <a href="{% url 'auth_logout' %}">Logout</a>
+{% else %}
+  <a href="{% url 'auth_login' %}">Log in</a>
+{% endif %}
+</div>
diff --git a/mandayejs/mandaye/templates/mandaye/post-login.html b/mandayejs/mandaye/templates/mandaye/post-login.html
new file mode 100644 (file)
index 0000000..65f72c5
--- /dev/null
+++ b/mandayejs/mandaye/templates/mandaye/post-login.html
@@ -0,0 +1,13 @@
+{% load gadjo staticfiles %}
+<html>
+<head>
+  <script src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>
+  <script src="{% static 'mandaye.post.js' %}"></script>
+</head>
+<body>
+       Please wait...
+ <br/>
+ <iframe id="post-login-frame" src="{% url 'post-login-do' %}" style="display: none;">
+ </iframe>
+</body>
+</html>
diff --git a/mandayejs/mandaye/templates/registration/login.html b/mandayejs/mandaye/templates/registration/login.html
new file mode 100644 (file)
index 0000000..ea78c5d
--- /dev/null
+++ b/mandayejs/mandaye/templates/registration/login.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<form method="post">
+{% csrf_token %}
+{{ form.as_p }}
+<input type="submit" value="Log in" />
+</form>
+</body>
+</html>
diff --git a/mandayejs/settings.py b/mandayejs/settings.py
index 0e1bb732864fcc44cb8983ea449f8f3c13fc6887..1c4c8ef827f1c4e312bf42d332e915d0dc15b5ca 100644 (file)
--- a/mandayejs/settings.py
+++ b/mandayejs/settings.py
@@ -106,14 +106,6 @@ STATIC_URL = '/_mandaye/static/'
 STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + \
             ('gadjo.finders.XStaticFinder',)
 
-STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'mandayejs', 'static'),
-)
-
-TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, 'mandayejs', 'templates'),
-)
-
 LOGIN_URL = 'auth_login'
 LOGIN_REDIRECT_URL = 'post-login'
 
diff --git a/mandayejs/static/mandaye.css b/mandayejs/static/mandaye.css
deleted file mode 100644 (file)
index 8afe252..0000000
--- a/mandayejs/static/mandaye.css
+++ /dev/null
@@ -1,9 +0,0 @@
-#mandaye-js {
-  background: black;
-  color: white;
-  padding: 5px 0;
-}
-
-#mandaye-js a {
-  color: white;
-}
diff --git a/mandayejs/static/mandaye.js b/mandayejs/static/mandaye.js
deleted file mode 100644 (file)
index 6ceb0f1..0000000
--- a/mandayejs/static/mandaye.js
+++ /dev/null
@@ -1,5 +0,0 @@
-$(function() {
-  $('head').append('<link rel="stylesheet" href="/_mandaye/static/mandaye.css" type="text/css" />');
-  $('body').prepend('<div id="mandaye-js">Chargement en cours...</div>');
-  $('#mandaye-js').load('/_mandaye/panel');
-});
diff --git a/mandayejs/static/mandaye.post.js b/mandayejs/static/mandaye.post.js
deleted file mode 100644 (file)
index 479e4c7..0000000
--- a/mandayejs/static/mandaye.post.js
+++ /dev/null
@@ -1,5 +0,0 @@
-$(function() {
-  $('#post-login-frame').on('load', function() {
-    window.location = '/';
-  });
-});
diff --git a/mandayejs/templates/mandaye/panel.html b/mandayejs/templates/mandaye/panel.html
deleted file mode 100644 (file)
index 03636ef..0000000
--- a/mandayejs/templates/mandaye/panel.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-{% if user.is_authenticated %}
-  {{ user.username }} <a href="{% url 'auth_logout' %}">Logout</a>
-{% else %}
-  <a href="{% url 'auth_login' %}">Log in</a>
-{% endif %}
-</div>
diff --git a/mandayejs/templates/mandaye/post-login.html b/mandayejs/templates/mandaye/post-login.html
deleted file mode 100644 (file)
index 65f72c5..0000000
--- a/mandayejs/templates/mandaye/post-login.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load gadjo staticfiles %}
-<html>
-<head>
-  <script src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>
-  <script src="{% static 'mandaye.post.js' %}"></script>
-</head>
-<body>
-       Please wait...
- <br/>
- <iframe id="post-login-frame" src="{% url 'post-login-do' %}" style="display: none;">
- </iframe>
-</body>
-</html>
diff --git a/mandayejs/templates/registration/login.html b/mandayejs/templates/registration/login.html
deleted file mode 100644 (file)
index ea78c5d..0000000
--- a/mandayejs/templates/registration/login.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-<form method="post">
-{% csrf_token %}
-{{ form.as_p }}
-<input type="submit" value="Log in" />
-</form>
-</body>
-</html>
saml reverse proxy (initial proof of concept)