--- a/.settings/org.eclipse.core.resources.prefs	Tue Jun 17 11:24:27 2014 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Tue Jun 17 16:07:40 2014 +0200
@@ -11,6 +11,7 @@
 encoding//src/hdabo/migrations/0002_backport_hdabo_sf.py=utf-8
 encoding//src/hdabo/migrations/0003_update_redirection.py=utf-8
 encoding//src/hdabo/migrations/0005_auto__chg_field_datasheet_organisation.py=utf-8
+encoding//src/hdabo/migrations/0007_auto__add_folder.py=utf-8
 encoding//src/hdabo/models.py=utf-8
 encoding//src/hdabo/search/french_whoosh_backend.py=utf-8
 encoding//src/hdabo/tests/models.py=utf-8

--- a/src/hdabo/config.py.tmpl	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/config.py.tmpl	Tue Jun 17 16:07:40 2014 +0200
@@ -17,7 +17,7 @@
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/site/")
+STATIC_ROOT = os.path.abspath(BASE_DIR + "../../web/static/site/")
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/migrations/0007_auto__add_folder.py	Tue Jun 17 16:07:40 2014 +0200
@@ -0,0 +1,233 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Folder'
+        db.create_table(u'hdabo_folder', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=2048)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=2048, null=True, blank=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+        ))
+        db.send_create_signal(u'hdabo', ['Folder'])
+
+        # Adding M2M table for field datasheets on 'Folder'
+        m2m_table_name = db.shorten_name(u'hdabo_folder_datasheets')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('folder', models.ForeignKey(orm[u'hdabo.folder'], null=False)),
+            ('datasheet', models.ForeignKey(orm[u'hdabo.datasheet'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['folder_id', 'datasheet_id'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Folder'
+        db.delete_table(u'hdabo_folder')
+
+        # Removing M2M table for field datasheets on 'Folder'
+        db.delete_table(db.shorten_name(u'hdabo_folder_datasheets'))
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'hdabo.author': {
+            'Meta': {'object_name': 'Author'},
+            'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        u'hdabo.datasheet': {
+            'Meta': {'object_name': 'Datasheet'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}),
+            'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}),
+            'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}),
+            'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}),
+            'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+            'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}),
+            'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}),
+            'original_creation_date': ('django.db.models.fields.DateField', [], {}),
+            'original_modification_date': ('django.db.models.fields.DateField', [], {}),
+            'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}),
+            'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}),
+            'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'hdabo.datasheet_college_periods': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {}),
+            'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"})
+        },
+        u'hdabo.datasheet_college_themes': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'hdabo.datasheet_domains': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'hdabo.datasheet_highschool_periods': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {}),
+            'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"})
+        },
+        u'hdabo.datasheet_highschool_themes': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'hdabo.datasheet_primary_periods': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {}),
+            'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"})
+        },
+        u'hdabo.datasheet_primary_themes': {
+            'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'},
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sort_value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'hdabo.documentformat': {
+            'Meta': {'object_name': 'DocumentFormat'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'})
+        },
+        u'hdabo.domain': {
+            'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'school_period': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'hdabo.folder': {
+            'Meta': {'object_name': 'Folder'},
+            'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'})
+        },
+        u'hdabo.location': {
+            'Meta': {'object_name': 'Location'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        u'hdabo.organisation': {
+            'Meta': {'object_name': 'Organisation'},
+            'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+        },
+        u'hdabo.tag': {
+            'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+            'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+            'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'})
+        },
+        u'hdabo.tagcategory': {
+            'Meta': {'object_name': 'TagCategory'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'})
+        },
+        u'hdabo.taggedsheet': {
+            'Meta': {'object_name': 'TaggedSheet'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}),
+            'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'hdabo.timeperiod': {
+            'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'school_period': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'hdabo.user': {
+            'Meta': {'object_name': 'User', 'db_table': "'auth_user'"},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        }
+    }
+
+    complete_apps = ['hdabo']
\ No newline at end of file

--- a/src/hdabo/models.py	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/models.py	Tue Jun 17 16:07:40 2014 +0200
@@ -403,4 +403,14 @@
 
 class Datasheet_primary_themes(SortedDatasheetLink):
     domain = models.ForeignKey(Domain, db_index=True, null=False, blank=False)
-    
+
+
+# Evolution pour Hda 2 : folders of datasheets
+class Folder(models.Model):
+    url = models.URLField(max_length=2048, unique=True, blank=False, null=False)
+    title = models.CharField(max_length=2048, blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
+    datasheets = models.ManyToManyField(Datasheet)
+
+
+

--- a/src/hdabo/settings.py	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/settings.py	Tue Jun 17 16:07:40 2014 +0200
@@ -138,6 +138,9 @@
 SEARCH_STAR_CHARACTER = "*"
 PAGINATION_DEFAULT_NB_BY_PAGE = 50
 
+# User class after migration to django > 1.6.5
+AUTH_USER_MODEL = 'hdabo.User'
+
 from hdabo.config import * #@UnusedWildImport
 
 if 'LOGIN_REDIRECT_URL' not in locals():

--- a/src/hdabo/static/hdabo/css/style.css	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/static/hdabo/css/style.css	Tue Jun 17 16:07:40 2014 +0200
@@ -416,4 +416,11 @@
 
 #page_number {
 	text-align: right;
+}
+
+.folder-input{
+	width: 500px;
+}
+textarea.folder-input{
+    height: 120px;
 }
\ No newline at end of file

Binary file src/hdabo/static/hdabo/img/pen.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/templates/add_or_update_folder.html	Tue Jun 17 16:07:40 2014 +0200
@@ -0,0 +1,14 @@
+{% extends "hdabo_base.html" %}
+{% block title %}HDA - BO : Créer ou modifier un dossier{% endblock %}
+    
+{% block content %}
+{{block.super}}
+<form method="POST" action="{% url 'add_or_update_folder' %}">
+{% csrf_token %}
+<input type="hidden" name="pk" value="{% if folder %}{{folder.pk}}{% endif %}" />
+<p>Url (adresse de la page sur le portail Histoire de Arts)&nbsp;:<br/><input class="folder-input" type="text" name="url" value="{% if folder %}{{folder.url}}{% endif %}"/></p>
+<p>Titre&nbsp;:<br/><input class="folder-input" type="text" name="title" value="{% if folder %}{{folder.title}}{% endif %}"/></p>
+<p>Description&nbsp;:<br/><textarea class="folder-input" name="description">{% if folder %}{{folder.description}}{% endif %}</textarea></p>
+<button type="submit">Envoyer</button>
+</form>
+{% endblock %}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/templates/folders.html	Tue Jun 17 16:07:40 2014 +0200
@@ -0,0 +1,34 @@
+{% extends "hdabo_base.html" %}
+{% load hdabo_tags %}
+{% block title %}HDA - BO : Tous les dossiers{% endblock %}
+    
+{% block content %}
+{{block.super}}
+<p><a href="{% url 'add_or_update_folder' %}">Nouveau dossier</a></p>
+<table>
+    <tr>
+	    <th>Url</th>
+	    <th>Titre</th>
+	    <th>Description</th>
+	    <th>Liste</th>
+	    <th>Éditer</th>
+	    <th>Effacer</th>
+    </tr>
+    {% for f in folders %}
+    <tr class="imageline {% cycle 'hdabooddline' 'hdaboevenline' %}">
+        <td><a href="{{f.url}}" title="{{f.url}}" target="_blank">{{f.url|short_url}}</a></td>
+        <td>{{f.title}}</td>
+        <td>{{f.description}}</td>
+        <td>
+            <ul>
+            {% for d in f.datasheets.all %}
+                <li></li>
+            {% endfor %}
+            </ul>
+        </td>
+        <td class="text_centered"><a href="{% url 'add_or_update_folder' folder_pk=f.pk %}"><img src="{{STATIC_URL}}hdabo/img/pen.png"/></a></td>
+        <td class="text_centered"><a href="#"><img src="{{STATIC_URL}}hdabo/img/tag_remove.png"/></a></td>
+    </tr>
+    {% endfor %}
+</table>
+{% endblock %}

--- a/src/hdabo/templates/hdabo_base.html	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/templates/hdabo_base.html	Tue Jun 17 16:07:40 2014 +0200
@@ -48,7 +48,7 @@
 <div id="header">      
     {% block header %}
     <div id="header_left">
-    	<p><a href="{% url 'hdabo.views.home' %}">HDA<span class="hda_blue">BO</span></a></p>
+    	<p><a href="{% url 'home' %}">HDA<span class="hda_blue">BO</span></a></p>
     </div>
     {% endblock %}
 </div>
@@ -56,7 +56,9 @@
     <div id="toolbar">
     {% block toolbar %}
     {% if user.is_authenticated %}
-    <ul><li><a href="{% url 'hdabo.views.home' %}">Home</a></li>
+    <ul><li><a href="{% url 'home' %}">Home</a></li>
+    <li><a href="{% url 'folders' %}">Dossiers</a></li>
+    <li><a href="{% url 'orga_list' %}">Organisations</a></li>
     <li><a href="{% url 'hdabo.views.all_tags' %}">Tous les tags</a></li>
     <li><a href="{% url 'haystack_search' %}">Recherche</a></li>
     <li><span style="float:right;">{{user.username}}&nbsp;|&nbsp;<a href="{% url 'django.contrib.auth.views.logout_then_login' %}" >Se déconnecter</a>{% if user.is_staff %}&nbsp;|&nbsp;<a href="{% url 'admin:index' %}" >admin</a>{% endif %}</span></li>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/templates/home.html	Tue Jun 17 16:07:40 2014 +0200
@@ -0,0 +1,11 @@
+{% extends "hdabo_base.html" %}
+{% block title %}HdaBo - Home{% endblock %}
+    
+{% block content %}
+<ul>
+  <li><a href="{% url 'folders' %}">Dossiers</a></li>
+  <li><a href="{% url 'orga_list' %}">Organisations</a></li>
+  <li><a href="{% url 'hdabo.views.all_tags' %}">Tous les tags</a></li>
+  <li><a href="{% url 'haystack_search' %}">Recherche</a></li>
+</ul>
+{% endblock %}

--- a/src/hdabo/templates/list_for_orga.html	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/templates/list_for_orga.html	Tue Jun 17 16:07:40 2014 +0200
@@ -60,11 +60,11 @@
     pour l'organisation <b>{{ orga_name }}</b> : {{nb_sheets}} fiche(s)</p>
     {% if valid != "2" %}
     <div id="count_nav_top">
-        <p><a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=0 %}">&lt;&lt;</a>&nbsp;&nbsp;
-           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=prev_index %}">&lt;</a>&nbsp;&nbsp;
+        <p><a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=0 %}">&lt;&lt;</a>&nbsp;&nbsp;
+           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=prev_index %}">&lt;</a>&nbsp;&nbsp;
            {{displayed_index}}/{{nb_sheets}}&nbsp;&nbsp;
-           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=next_index %}">&gt;</a>&nbsp;&nbsp;
-           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=last_index %}">&gt;&gt;</a></p>
+           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=next_index %}">&gt;</a>&nbsp;&nbsp;
+           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=last_index %}">&gt;&gt;</a></p>
     </div>
     {% endif %}
     <table>
@@ -76,11 +76,11 @@
     </table>
     {% if valid != "2" %}
     <div id="count_nav_bottom">
-        <p><a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=0 %}">&lt;&lt;</a>&nbsp;&nbsp;
-           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=prev_index %}">&lt;</a>&nbsp;&nbsp;
+        <p><a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=0 %}">&lt;&lt;</a>&nbsp;&nbsp;
+           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=prev_index %}">&lt;</a>&nbsp;&nbsp;
            {{displayed_index}}/{{nb_sheets}}&nbsp;&nbsp;
-           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=next_index %}">&gt;</a>&nbsp;&nbsp;
-           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id, valid=valid, start_index=last_index %}">&gt;&gt;</a></p>
+           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=next_index %}">&gt;</a>&nbsp;&nbsp;
+           <a href="{% url hdabo.views.list_for_orga orga_id=orga_id valid=valid start_index=last_index %}">&gt;&gt;</a></p>
     </div>
     {% endif %}
     {% endblock %}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/templatetags/__init__.py	Tue Jun 17 16:07:40 2014 +0200
@@ -0,0 +1,1 @@
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/templatetags/hdabo_tags.py	Tue Jun 17 16:07:40 2014 +0200
@@ -0,0 +1,26 @@
+from django.template import Library, TemplateSyntaxError
+
+register = Library()
+
+import logging
+logger = logging.getLogger(__name__)
+
+@register.filter
+def short_url(value):
+    """ Takes a full url http://www.anything.com/anything/anything/end and return anything.com[...]end """
+    # Error management
+    if value is None :
+        return ""
+    if not isinstance(value, (str,unicode)) :
+        raise TemplateSyntaxError('urlify value error : string is required')
+    if value[:7]=="http://":
+        value = value[7:]
+    if value[:4]=="www.":
+        value = value[4:]
+    if len(value)>35:
+        value = value[:15] + "[...]" + value[-15:]
+             
+    return value
+short_url.is_safe = True
+
+

--- a/src/hdabo/urls.py	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/urls.py	Tue Jun 17 16:07:40 2014 +0200
@@ -1,6 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.contrib.auth import urls as auth_url
+from .views import AddOrUpdateFolder, Folders
 
 
 # Uncomment the next two lines to enable the admin:
@@ -20,6 +21,7 @@
     url(r'^admin/', include(admin.site.urls)),
     url(r'^search/', include('haystack.urls')),
     url(r'^$', 'hdabo.views.home', name='home'),
+    url(r'^list/$', 'hdabo.views.orga_list', name='orga_list'),
     url(r'^list/(?P<orga_id>[\w-]+)$', 'hdabo.views.list_for_orga', name='list_for_orga'),
     url(r'^list/(?P<orga_id>[\w-]+)/(?P<valid>[\w-]+)/$', 'hdabo.views.list_for_orga', name='list_for_orga'),
     url(r'^list/(?P<orga_id>[\w-]+)/(?P<valid>[\w-]+)/(?P<start_index>[\w-]+)/$', 'hdabo.views.list_for_orga', name='list_for_orga'),
@@ -44,4 +46,7 @@
     url(r'^updatetagalias$', 'hdabo.views.update_tag_alias'),
     url(r'^updatetagcategory$', 'hdabo.views.update_tag_category'),
     url(r'^ordertagsdatasheet$', 'hdabo.views.reorder_tag_datasheet'),
+    url(r'^folders/$', Folders.as_view(), name='folders'),
+    url(r'^folder/$', AddOrUpdateFolder.as_view(), name='add_or_update_folder'),
+    url(r'^folder/(?P<folder_pk>[\w-]+)$', AddOrUpdateFolder.as_view(), name='add_or_update_folder'),
 )

--- a/src/hdabo/views.py	Tue Jun 17 11:24:27 2014 +0200
+++ b/src/hdabo/views.py	Tue Jun 17 16:07:40 2014 +0200
@@ -6,22 +6,27 @@
 from django.db import connection
 from django.db.models import Max, Count, Min
 from django.http import HttpResponseBadRequest
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render_to_response, redirect, get_object_or_404
 from django.template import RequestContext
 from django.utils.http import urlquote
 from haystack.constants import DJANGO_ID
 from haystack.query import SearchQuerySet
+from hdabo.models import Datasheet, Organisation, Tag, TagCategory, TaggedSheet, Folder
 from hdabo.utils import OrderedDict, remove_accents, normalize
-from hdabo.wp_utils import (normalize_tag, query_wikipedia_title,
-    get_or_create_tag, process_tag, reorder_datasheet_tags)
-from models import Datasheet, Organisation, Tag, TagCategory, TaggedSheet
+from hdabo.wp_utils import (normalize_tag, query_wikipedia_title, get_or_create_tag, process_tag, reorder_datasheet_tags)
 from wikitools import wiki
 import django.utils.simplejson as json
 import re
+from django.views.generic.base import TemplateView, View
 
 
 @login_required
 def home(request):
+    return render_to_response("home.html", context_instance=RequestContext(request))
+
+
+@login_required
+def orga_list(request):
     
     orgas = Organisation.objects.all().order_by('name')
 
@@ -578,3 +583,40 @@
     reorder_datasheet_tags(ds)
     
     return get_tag_table(request=request, ds_id=ds_id, valid=0)
+
+
+class Folders(TemplateView):
+    template_name = "folders.html"
+    def get(self, request):
+        folders = Folder.objects.all().order_by('title')
+        return self.render_to_response({'folders':folders})
+
+
+
+class AddOrUpdateFolder(TemplateView):
+    
+    template_name = "add_or_update_folder.html"
+    
+    def get(self, request, folder_pk=None):
+        folder = None
+        if folder_pk:
+            folder = get_object_or_404(Folder, pk=folder_pk)
+        return self.render_to_response({'folder':folder})
+    
+    def post(self, request):
+        
+        folder = None
+        if "pk" in request.POST and request.POST["pk"]!="":
+            folder = get_object_or_404(Folder, pk=request.POST["pk"])
+        if not folder:
+            folder = Folder.objects.create()
+        folder.url = request.POST["url"]
+        folder.title = request.POST["title"]
+        folder.description = request.POST["description"]
+        folder.save()
+        
+        return redirect('folders')
+
+
+
+