entrouvert
/
dauphine-logement
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

mise à jour de fiber en 0.10.2, intégration de django-modeltranslation et django-fiber-modeltranslation 

refs #2666
This commit is contained in:
Benjamin Dauvergne 2013-04-05 11:49:26 +02:00
parent 92f6ae9ed1
commit cf81755f7f
11 changed files with 430 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
appli_project/appli_socle/static/css/base.css
View File

@ -27,6 +27,7 @@ body {
/* Header */
div#header {
position: relative;
margin-bottom: 10px;
}
@ -843,3 +844,11 @@ p.framed {
#df-sidebar-content-section {
display: none;
}
#set-language {
position: absolute;
right: 20px;
top: 5px;
}
#set-language form {
display: inline;
}

BIN
appli_project/appli_socle/static/images/en.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 B

BIN
appli_project/appli_socle/static/images/fr.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 545 B

0
appli_project/migrations/__init__.py Normal file
View File

161
appli_project/migrations/fiber/0001_initial.py Normal file
View File

@ -0,0 +1,161 @@
# -*- coding: utf-8 -*-
import 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 'ContentItem'
db.create_table(u'fiber_contentitem', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
('content_markup', self.gf('fiber.utils.fields.FiberMarkupField')()),
('content_html', self.gf('fiber.utils.fields.FiberHTMLField')()),
('protected', self.gf('django.db.models.fields.BooleanField')(default=False)),
('metadata', self.gf('fiber.utils.json.JSONField')(null=True, blank=True)),
('template_name', self.gf('django.db.models.fields.CharField')(max_length=70, blank=True)),
('used_on_pages_data', self.gf('fiber.utils.json.JSONField')(null=True, blank=True)),
))
db.send_create_signal(u'fiber', ['ContentItem'])
# Adding model 'Page'
db.create_table(u'fiber_page', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='subpages', null=True, to=orm['fiber.Page'])),
('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
('url', self.gf('fiber.utils.fields.FiberURLField')(max_length=255, blank=True)),
('redirect_page', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='redirected_pages', null=True, on_delete=models.SET_NULL, to=orm['fiber.Page'])),
('mark_current_regexes', self.gf('django.db.models.fields.TextField')(blank=True)),
('template_name', self.gf('django.db.models.fields.CharField')(max_length=70, blank=True)),
('show_in_menu', self.gf('django.db.models.fields.BooleanField')(default=True)),
('is_public', self.gf('django.db.models.fields.BooleanField')(default=True)),
('protected', self.gf('django.db.models.fields.BooleanField')(default=False)),
('metadata', self.gf('fiber.utils.json.JSONField')(null=True, blank=True)),
('lft', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
('rght', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
('tree_id', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
('level', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
))
db.send_create_signal(u'fiber', ['Page'])
# Adding model 'PageContentItem'
db.create_table(u'fiber_pagecontentitem', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('content_item', self.gf('django.db.models.fields.related.ForeignKey')(related_name='page_content_items', to=orm['fiber.ContentItem'])),
('page', self.gf('django.db.models.fields.related.ForeignKey')(related_name='page_content_items', to=orm['fiber.Page'])),
('block_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('sort', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
))
db.send_create_signal(u'fiber', ['PageContentItem'])
# Adding model 'Image'
db.create_table(u'fiber_image', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
('image', self.gf('django.db.models.fields.files.ImageField')(max_length=255)),
('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
('width', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
('height', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
))
db.send_create_signal(u'fiber', ['Image'])
# Adding model 'File'
db.create_table(u'fiber_file', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
('file', self.gf('django.db.models.fields.files.FileField')(max_length=255)),
('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
))
db.send_create_signal(u'fiber', ['File'])
def backwards(self, orm):
# Deleting model 'ContentItem'
db.delete_table(u'fiber_contentitem')
# Deleting model 'Page'
db.delete_table(u'fiber_page')
# Deleting model 'PageContentItem'
db.delete_table(u'fiber_pagecontentitem')
# Deleting model 'Image'
db.delete_table(u'fiber_image')
# Deleting model 'File'
db.delete_table(u'fiber_file')
models = {
u'fiber.contentitem': {
'Meta': {'object_name': 'ContentItem'},
'content_html': ('fiber.utils.fields.FiberHTMLField', [], {}),
'content_markup': ('fiber.utils.fields.FiberMarkupField', [], {}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'used_on_pages_data': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'})
},
u'fiber.file': {
'Meta': {'ordering': "('file',)", 'object_name': 'File'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
},
u'fiber.image': {
'Meta': {'ordering': "('image',)", 'object_name': 'Image'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
},
u'fiber.page': {
'Meta': {'ordering': "('tree_id', 'lft')", 'object_name': 'Page'},
'content_items': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['fiber.ContentItem']", 'through': u"orm['fiber.PageContentItem']", 'symmetrical': 'False'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'mark_current_regexes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'subpages'", 'null': 'True', 'to': u"orm['fiber.Page']"}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'redirect_page': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirected_pages'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['fiber.Page']"}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'show_in_menu': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'url': ('fiber.utils.fields.FiberURLField', [], {'max_length': '255', 'blank': 'True'})
},
u'fiber.pagecontentitem': {
'Meta': {'object_name': 'PageContentItem'},
'block_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'content_item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': u"orm['fiber.ContentItem']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': u"orm['fiber.Page']"}),
'sort': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
}
}
complete_apps = ['fiber']

86
appli_project/migrations/fiber/0002_auto__add_field_page_meta_description.py Normal file
View File

@ -0,0 +1,86 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Page.meta_description'
db.add_column(u'fiber_page', 'meta_description',
self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'Page.meta_description'
db.delete_column(u'fiber_page', 'meta_description')
models = {
u'fiber.contentitem': {
'Meta': {'object_name': 'ContentItem'},
'content_html': ('fiber.utils.fields.FiberHTMLField', [], {}),
'content_markup': ('fiber.utils.fields.FiberMarkupField', [], {}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'used_on_pages_data': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'})
},
u'fiber.file': {
'Meta': {'ordering': "('file',)", 'object_name': 'File'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
},
u'fiber.image': {
'Meta': {'ordering': "('image',)", 'object_name': 'Image'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
},
u'fiber.page': {
'Meta': {'ordering': "('tree_id', 'lft')", 'object_name': 'Page'},
'content_items': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['fiber.ContentItem']", 'through': u"orm['fiber.PageContentItem']", 'symmetrical': 'False'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'mark_current_regexes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'meta_description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'subpages'", 'null': 'True', 'to': u"orm['fiber.Page']"}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'redirect_page': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirected_pages'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['fiber.Page']"}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'show_in_menu': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'url': ('fiber.utils.fields.FiberURLField', [], {'max_length': '255', 'blank': 'True'})
},
u'fiber.pagecontentitem': {
'Meta': {'object_name': 'PageContentItem'},
'block_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'content_item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': u"orm['fiber.ContentItem']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': u"orm['fiber.Page']"}),
'sort': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
}
}
complete_apps = ['fiber']

150
appli_project/migrations/fiber/0003_auto__add_field_contentitem_name_fr__add_field_contentitem_name_en__ad.py Normal file
View File

@ -0,0 +1,150 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'ContentItem.name_fr'
db.add_column(u'fiber_contentitem', 'name_fr',
self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
keep_default=False)
# Adding field 'ContentItem.name_en'
db.add_column(u'fiber_contentitem', 'name_en',
self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
keep_default=False)
# Adding field 'ContentItem.content_markup_fr'
db.add_column(u'fiber_contentitem', 'content_markup_fr',
self.gf('fiber.utils.fields.FiberMarkupField')(null=True, blank=True),
keep_default=False)
# Adding field 'ContentItem.content_markup_en'
db.add_column(u'fiber_contentitem', 'content_markup_en',
self.gf('fiber.utils.fields.FiberMarkupField')(null=True, blank=True),
keep_default=False)
# Adding field 'ContentItem.content_html_fr'
db.add_column(u'fiber_contentitem', 'content_html_fr',
self.gf('fiber.utils.fields.FiberHTMLField')(null=True, blank=True),
keep_default=False)
# Adding field 'ContentItem.content_html_en'
db.add_column(u'fiber_contentitem', 'content_html_en',
self.gf('fiber.utils.fields.FiberHTMLField')(null=True, blank=True),
keep_default=False)
# Adding field 'Page.title_fr'
db.add_column(u'fiber_page', 'title_fr',
self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
keep_default=False)
# Adding field 'Page.title_en'
db.add_column(u'fiber_page', 'title_en',
self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'ContentItem.name_fr'
db.delete_column(u'fiber_contentitem', 'name_fr')
# Deleting field 'ContentItem.name_en'
db.delete_column(u'fiber_contentitem', 'name_en')
# Deleting field 'ContentItem.content_markup_fr'
db.delete_column(u'fiber_contentitem', 'content_markup_fr')
# Deleting field 'ContentItem.content_markup_en'
db.delete_column(u'fiber_contentitem', 'content_markup_en')
# Deleting field 'ContentItem.content_html_fr'
db.delete_column(u'fiber_contentitem', 'content_html_fr')
# Deleting field 'ContentItem.content_html_en'
db.delete_column(u'fiber_contentitem', 'content_html_en')
# Deleting field 'Page.title_fr'
db.delete_column(u'fiber_page', 'title_fr')
# Deleting field 'Page.title_en'
db.delete_column(u'fiber_page', 'title_en')
models = {
u'fiber.contentitem': {
'Meta': {'object_name': 'ContentItem'},
'content_html': ('fiber.utils.fields.FiberHTMLField', [], {}),
'content_html_en': ('fiber.utils.fields.FiberHTMLField', [], {'null': 'True', 'blank': 'True'}),
'content_html_fr': ('fiber.utils.fields.FiberHTMLField', [], {'null': 'True', 'blank': 'True'}),
'content_markup': ('fiber.utils.fields.FiberMarkupField', [], {}),
'content_markup_en': ('fiber.utils.fields.FiberMarkupField', [], {'null': 'True', 'blank': 'True'}),
'content_markup_fr': ('fiber.utils.fields.FiberMarkupField', [], {'null': 'True', 'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
'name_fr': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'used_on_pages_data': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'})
},
u'fiber.file': {
'Meta': {'ordering': "('file',)", 'object_name': 'File'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
},
u'fiber.image': {
'Meta': {'ordering': "('image',)", 'object_name': 'Image'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
},
u'fiber.page': {
'Meta': {'ordering': "('tree_id', 'lft')", 'object_name': 'Page'},
'content_items': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['fiber.ContentItem']", 'through': u"orm['fiber.PageContentItem']", 'symmetrical': 'False'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'mark_current_regexes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'meta_description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'subpages'", 'null': 'True', 'to': u"orm['fiber.Page']"}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'redirect_page': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirected_pages'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['fiber.Page']"}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'show_in_menu': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
'title_fr': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'url': ('fiber.utils.fields.FiberURLField', [], {'max_length': '255', 'blank': 'True'})
},
u'fiber.pagecontentitem': {
'Meta': {'object_name': 'PageContentItem'},
'block_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'content_item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': u"orm['fiber.ContentItem']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': u"orm['fiber.Page']"}),
'sort': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
}
}
complete_apps = ['fiber']

0
appli_project/migrations/fiber/__init__.py Normal file
View File

23
appli_project/settings/commun.py
View File

@ -30,7 +30,6 @@ INSTALLED_APPS = (
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'django.contrib.gis',
#'modeltranslation',
# crispy
'crispy_forms',
# pagination
@ -42,10 +41,11 @@ INSTALLED_APPS = (
'appli_project.appli_offre',
'appli_project.appli_recherche',
# fiber apps:
'piston',
'mptt',
'compressor',
'fiber',
'modeltranslation',
'fiber_modeltranslation',
)
# Local time zone for this installation. Choices can be found here:
@ -71,11 +71,11 @@ USE_I18N = True
# calendars according to the current locale
USE_L10N = True
#ugettext = lambda s: s
#LANGUAGES = (
# ('fr', ugettext('French')),
# ('en', ugettext('English')),
#)
ugettext = lambda s: s
LANGUAGES = (
('fr', ugettext('French')),
('en', ugettext('English')),
)
# django-modeltranslation
#MODELTRANSLATION_TRANSLATION_REGISTRY = 'pages.translation'
@ -136,9 +136,9 @@ MIDDLEWARE_CLASSES = (
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
#'django.middleware.locale.LocaleMiddleware',
# fiber
# 'fiber.middleware.ObfuscateEmailAddressMiddleware',
'django.middleware.locale.LocaleMiddleware',
'fiber.middleware.ObfuscateEmailAddressMiddleware',
'fiber.middleware.AdminPageMiddleware',
'appli_project.appli_socle.middleware.AdminPageMiddlewareOverloaded',
'pagination.middleware.PaginationMiddleware',
'appli_project.appli_socle.middleware.LoggerMiddleware',
@ -205,6 +205,9 @@ FIBER_TEMPLATE_CHOICES = (
FIBER_EXCLUDE_URLS = [ 'admin/', 'superadmin/' ]
FIBER_IMAGES_DIR = 'uploads/images'
FIBER_FILES_DIR = 'uploads/files'
SOUTH_MIGRATION_MODULES = { 'fiber': 'appli_project.migrations.fiber', }
# Inscription
PROFIL_OFFRE_NON_CONFIRME_TIMEOUT = 2 # en jours

10
appli_project/templates/base.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
{% load fiber_tags %}
{% load fiber_tags i18n %}
<html lang="en">
<head>
<meta charset="utf-8" />
@ -21,6 +21,14 @@ function clean_submenu() {
<body class="{% block body-class %}{{ fiber_page.title|slugify }}{% endblock %}" onload="clean_submenu(); {% block onload %}{% endblock %}">
<div id="wpr-page">
<div id="header">
<div id="set-language">
{% for lang in LANGUAGES %}
<form action="/i18n/setlang/" method="post">
{% csrf_token %}
<input type="image" src="{{ STATIC_URL }}images/{{ lang.0 }}.png" name="language" value="{{ lang.0 }}" title="{{ lang.1 }}"/>
</form>
{% endfor %}
</div>
<img src="/static/dauphine/titre2.jpg" width="950" height="165" border="0" usemap="#Map2" />
<map name="Map2" id="Map2">
<area shape="rect" coords="0,0,780,148" href="/" alt="accueil"/>

4
appli_project/urls.py
View File

@ -16,10 +16,10 @@ urlpatterns = patterns('',
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT,}),
# i18n switcher
#(r'^i18n/', include('django.conf.urls.i18n')),
(r'^i18n/', include('django.conf.urls.i18n')),
# fiber
url(r'^api/v1/', include('fiber.api.urls')),
url(r'^api/v2/', include('fiber.rest_api.urls')),
url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('fiber',),}),
url(r'^admin/fiber/', include('fiber.admin_urls')),
# admin