# HG changeset patch
# User cavaliet
# Date 1411480295 -7200
# Node ID 51225e5220070fa8a7a489eedc3b99503e5af37c
# Parent  8b34dc2c2f416cd28778b78bfdf0f1077d4a9965
little changes and auth templates in hdalab base

diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/settings.py
--- a/src/hdalab/settings.py	Mon Sep 22 16:57:17 2014 +0200
+++ b/src/hdalab/settings.py	Tue Sep 23 15:51:35 2014 +0200
@@ -123,8 +123,8 @@
 )
 
 INSTALLED_APPS = (
-    'hdabo',
     'south',
+    'hdalab',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -136,7 +136,7 @@
     'registration',
     'haystack',
     'easy_thumbnails',
-    'hdalab',
+    'hdabo',
     'renkanmanager',
 )
 
@@ -166,7 +166,7 @@
 from hdalab.config import * #@UnusedWildImport
 
 if 'LOGIN_REDIRECT_URL' not in locals():
-    LOGIN_REDIRECT_URL = BASE_URL + "hdabo"
+    LOGIN_REDIRECT_URL = BASE_URL
 if 'LOGIN_URL' not in locals():
     LOGIN_URL = BASE_URL + "hdalab/hdabo/accounts/login"
 
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/static/hdalab/css/profile.css
--- a/src/hdalab/static/hdalab/css/profile.css	Mon Sep 22 16:57:17 2014 +0200
+++ b/src/hdalab/static/hdalab/css/profile.css	Tue Sep 23 15:51:35 2014 +0200
@@ -54,4 +54,7 @@
 }
 td.list{
     padding-left: 18px !important;
+}
+li.edito{
+    margin-top: 10px;
 }
\ No newline at end of file
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/editorial/edito_home.html
--- a/src/hdalab/templates/editorial/edito_home.html	Mon Sep 22 16:57:17 2014 +0200
+++ b/src/hdalab/templates/editorial/edito_home.html	Tue Sep 23 15:51:35 2014 +0200
@@ -9,6 +9,9 @@
 {% endblock %}
 
 {% block main_content %}
-<p><a href="{% url 'manage_renkans' %}">Management des Renkans : acceptation ou rejet des publications</a></p>
-<p><a href="{% url 'hdalab_folders' %}">Dossiers d'éditorialisation</a></p>
+<h1>Éditorialisation</h1>
+<ul>
+  <li class="edito"><p><a href="{% url 'manage_renkans' %}">Management des Renkans : acceptation ou rejet des publications</a></p></li>
+  <li class="edito"><p><a href="{% url 'hdalab_folders' %}">Dossiers d'éditorialisation</a></p></li>
+</ul>
 {% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/editorial/folders.html
--- a/src/hdalab/templates/editorial/folders.html	Mon Sep 22 16:57:17 2014 +0200
+++ b/src/hdalab/templates/editorial/folders.html	Tue Sep 23 15:51:35 2014 +0200
@@ -18,6 +18,7 @@
 	    <th>Liste</th>
 	    <th>Éditer</th>
 	    <th>Effacer</th>
+	    <th>Renkan</th>
     </tr>
     {% for f in folders %}
     <tr class="border_bottom">
@@ -27,6 +28,7 @@
         <td class="list"><ul>{% for d in f.datasheets.all %}<li>{{ d.title }}</li>{% endfor %}</ul></td>
         <td class="text_centered"><a href="{% url 'hdalab_add_or_update_folder' folder_pk=f.pk %}"><img src="{% static 'hdabo/img/pen.png' %}"/></a></td>
         <td class="text_centered"><a class="" href="{% url 'hdalab_delete_folder' folder_pk=f.pk %}" onclick="return confirm('Êtes-vous sûr(e) ? Cette action est définitive.')"><img src="{% static 'hdabo/img/tag_remove.png' %}"/></a></td>
+        <td class="text_centered"><a href="{% url 'renkan_edit' %}?folder={{ f.pk }}" target="_blank"><img src="{% static 'hdalab/img/mind_map_icon.png' %}"/></a></td>
     </tr>
     {% endfor %}
 </table>
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/activate.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/activate.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+	{% if account %}
+	<p>{% trans "Account successfully activated" %}</p>
+	<p><a href="{% url 'auth_login' %}">{% trans "Log in" %}</a></p>
+	{% else %}
+	<p>{% trans "Account activation failed" %}</p>
+	{% endif %}
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/activation_complete.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/activation_complete.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+    <p>{% trans "Your account is now activated." %}</p>
+    <p>&nbsp;</p>
+    <p><a href="{% url 'login' %}">{% trans "Log in" %}</a></p>
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/activation_email.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/activation_email.txt	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% trans "Activate account at" %} {{ site.name }}:
+
+http://{{ site.domain }}{% url 'registration_activate' activation_key %}
+
+{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/activation_email_subject.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/activation_email_subject.txt	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,1 @@
+{% load i18n %}{% trans "Account activation on" %} {{ site.name }}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/login.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/login.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% load static %}
+{% load i18n %}
+
+{% block title %}{% trans "Login" %}{% endblock %}
+
+{% block main_content %}
+    <div class="register">
+        {% if form.errors %}
+        <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
+        {% endif %}
+        <form action="" method='post' id="login-form">
+            {% csrf_token %}
+            <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}{% url 'home' %}{% endif %}" />
+            {{form.as_p}}
+            <button class="button" type="submit" value="login">{% trans "login" %}</button>
+        </form>
+        <p>&nbsp;</p>
+        <p><a href="{% url 'registration_register' %}">{% trans "Still not a user ? Create an account" %}</a>
+        <p><a href="{% url 'auth_password_reset' %}">{% trans "Forgot password ?" %}</a>
+    </div>
+{% endblock %}
+
+
+
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_change_done.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_change_done.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+    <p>{% trans "Password changed" %}</p>
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_change_form.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_change_form.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+	<form method="post" action=".">
+	  {% csrf_token %} 
+	  {{ form.as_p }}
+	  <input type="submit" value="{% trans 'Submit' %}" />
+	</form>
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_reset_complete.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_reset_complete.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+	<p>{% trans "Password reset successfully" %}</p>
+	<p><a href="{% url 'auth_login' %}">{% trans "Log in" %}</a></p>
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_reset_confirm.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_reset_confirm.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+	{% if validlink %}
+	<form method="post" action=".">
+	  {% csrf_token %} 
+	  {{ form.as_p }}
+	  <input type="submit" value="{% trans 'Submit' %}" />
+	</form>
+	{% else %}
+	<p>{% trans "Password reset failed" %}</p>
+	{% endif %}
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_reset_done.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_reset_done.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+    <p>{% trans "Email with password reset instructions has been sent." %}</p>
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_reset_email.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_reset_email.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %}
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/password_reset_form.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/password_reset_form.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+	<form method="post" action=".">
+	  {% csrf_token %} 
+	  {{ form.as_p }}
+	  <input type="submit" value="{% trans 'Submit' %}" />
+	</form>
+</div>
+{% endblock %}
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/registration_complete.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/registration_complete.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+    <p>{% trans "You are now registered. Activation email sent." %}</p>
+</div>
+{% endblock %}
\ No newline at end of file
diff -r 8b34dc2c2f41 -r 51225e522007 src/hdalab/templates/registration/registration_form.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/registration/registration_form.html	Tue Sep 23 15:51:35 2014 +0200
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="register">
+	<form method="post" action=".">
+	  {% csrf_token %}
+	  {{ form.as_p }}
+	  <input type="submit" value="{% trans 'Submit' %}" />
+	</form>
+</div>
+{% endblock %}