Permalink
Browse files

Merge branch 'develop' into toolbar_anchor_fix

  • Loading branch information...
2 parents 95ddd77 + 2b95e08 commit 01e3a4fa2be8594ee7455d4781f38c9dbcc32869 @neoascetic committed Oct 12, 2012
Showing with 14,043 additions and 10,452 deletions.
  1. +364 −105 cms/migrations/0001_initial.py
  2. +333 −74 cms/migrations/0002_auto_start.py
  3. +346 −18 cms/migrations/0003_remove_placeholder.py
  4. +333 −80 cms/migrations/0004_textobjects.py
  5. +333 −90 cms/migrations/0005_mptt_added_to_plugins.py
  6. +333 −130 cms/migrations/0006_apphook.py
  7. +333 −76 cms/migrations/0007_apphook_longer.py
  8. +334 −81 cms/migrations/0008_redirects.py
  9. +334 −85 cms/migrations/0009_added_meta_fields.py
  10. +333 −87 cms/migrations/0010_5char_language.py
  11. +332 −86 cms/migrations/0011_title_overwrites.py
  12. +325 −441 cms/migrations/0012_publisher.py
  13. +326 −202 cms/migrations/0013_site_copy.py
  14. +326 −203 cms/migrations/0014_sites_removed.py
  15. +325 −228 cms/migrations/0015_modified_by_added.py
  16. +326 −206 cms/migrations/0016_author_copy.py
  17. +326 −207 cms/migrations/0017_author_removed.py
  18. +326 −208 cms/migrations/0018_site_permissions.py
  19. +326 −214 cms/migrations/0019_public_table_renames.py
  20. +326 −259 cms/migrations/0020_advanced_permissions.py
  21. +314 −384 cms/migrations/0021_publisher2.py
  22. +315 −150 cms/migrations/0022_login_required_added.py
  23. +312 −137 cms/migrations/0023_plugin_table_naming_function_changed.py
  24. +294 −161 cms/migrations/0024_added_placeholder_model.py
  25. +299 −186 cms/migrations/0025_placeholder_migration.py
  26. +296 −152 cms/migrations/0026_finish_placeholder_migration.py
  27. +298 −143 cms/migrations/0027_added_width_to_placeholder.py
  28. +292 −138 cms/migrations/0028_limit_visibility_in_menu_step1of3.py
  29. +296 −146 cms/migrations/0029_limit_visibility_in_menu_step2of3_data.py
  30. +294 −137 cms/migrations/0030_limit_visibility_in_menu_step3of3.py
  31. +293 −142 cms/migrations/0031_improved_language_code_support.py
  32. +293 −145 cms/migrations/0032_auto__del_field_cmsplugin_publisher_public__del_field_cmsplugin_publis.py
  33. +293 −154 cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.py
  34. +292 −150 cms/migrations/0034_auto__chg_field_title_language__chg_field_cmsplugin_language__add_fiel.py
  35. +292 −139 cms/migrations/0035_auto__add_field_globalpagepermission_can_view__add_field_pagepermissio.py
  36. +293 −136 cms/migrations/0036_auto__add_field_cmsplugin_changed_date.py
  37. +8 −5 cms/plugin_base.py
  38. +40 −28 cms/plugins/file/migrations/0001_initial.py
  39. +29 −17 cms/plugins/file/migrations/0002_freeze.py
  40. +27 −152 cms/plugins/file/migrations/0003_publisher.py
  41. +29 −153 cms/plugins/file/migrations/0004_table_rename.py
  42. +25 −119 cms/plugins/file/migrations/0005_publisher2.py
  43. +42 −29 cms/plugins/flash/migrations/0001_initial.py
  44. +28 −15 cms/plugins/flash/migrations/0002_freeze.py
  45. +28 −58 cms/plugins/flash/migrations/0003_publisher.py
  46. +30 −123 cms/plugins/flash/migrations/0004_table_rename.py
  47. +27 −124 cms/plugins/flash/migrations/0005_publisher2.py
  48. +58 −82 cms/plugins/googlemap/migrations/0001_initial.py
  49. +40 −133 cms/plugins/googlemap/migrations/0002_table_rename.py
  50. +40 −143 cms/plugins/googlemap/migrations/0003_address_unified.py
  51. +39 −126 cms/plugins/googlemap/migrations/0004_copy_address.py
  52. +40 −141 cms/plugins/googlemap/migrations/0005_delete_street.py
  53. +40 −138 cms/plugins/googlemap/migrations/0006_publisher2.py
  54. +23 −98 cms/plugins/googlemap/migrations/0007_latlng.py
  55. +23 −56 cms/plugins/googlemap/migrations/0008_routeplaner.py
  56. +22 −56 cms/plugins/googlemap/migrations/0009_routeplaner_title.py
  57. +9 −12 cms/plugins/googlemap/migrations/0010_auto__chg_field_googlemap_content.py
  58. +9 −17 cms/plugins/googlemap/migrations/0011_remove_zoom_null_values.py
  59. +5 −25 ...oglemap/migrations/0012_auto__add_field_googlemap_width__add_field_googlemap_height__chg_field.py
  60. +37 −32 cms/plugins/inherit/migrations/0001_initial.py
  61. +20 −60 cms/plugins/inherit/migrations/0002_fieldchanges.py
  62. +80 −28 cms/plugins/link/migrations/0001_initial.py
  63. +74 −5 cms/plugins/link/migrations/0002_link_rename.py
  64. +67 −18 cms/plugins/link/migrations/0003_page_link.py
  65. +66 −21 cms/plugins/link/migrations/0004_larger_link_names.py
  66. +65 −57 cms/plugins/link/migrations/0005_publisher.py
  67. +66 −123 cms/plugins/link/migrations/0006_table_rename.py
  68. +63 −122 cms/plugins/link/migrations/0007_publisher2.py
  69. +65 −59 cms/plugins/link/migrations/0008_mailto.py
  70. +20 −26 cms/plugins/link/migrations/0009_add_target.py
  71. +82 −28 cms/plugins/picture/migrations/0001_initial.py
  72. +75 −6 cms/plugins/picture/migrations/0002_link_rename.py
  73. +67 −17 cms/plugins/picture/migrations/0003_freeze.py
  74. +68 −62 cms/plugins/picture/migrations/0004_publisher.py
  75. +66 −116 cms/plugins/picture/migrations/0005_table_rename.py
  76. +66 −136 cms/plugins/picture/migrations/0006_float_added.py
  77. +65 −131 cms/plugins/picture/migrations/0007_publisher2.py
  78. +65 −111 cms/plugins/picture/migrations/0008_longdesc_added.py
  79. +49 −40 cms/plugins/snippet/migrations/0001_initial.py
  80. +35 −59 cms/plugins/snippet/migrations/0002_publisher.py
  81. +37 −127 cms/plugins/snippet/migrations/0003_table_rename.py
  82. +34 −124 cms/plugins/snippet/migrations/0004_publisher2.py
  83. +34 −106 cms/plugins/snippet/migrations/0005_template_added.py
  84. +70 −133 cms/plugins/teaser/migrations/0001_initial.py
  85. +64 −129 cms/plugins/teaser/migrations/0002_publisher2.py
  86. +40 −29 cms/plugins/text/migrations/0001_initial.py
  87. +24 −10 cms/plugins/text/migrations/0002_freeze.py
  88. +25 −51 cms/plugins/text/migrations/0003_publisher.py
  89. +29 −117 cms/plugins/text/migrations/0004_table_rename.py
  90. +25 −117 cms/plugins/text/migrations/0005_publisher2.py
  91. +13 −21 cms/plugins/text/migrations/0006_2_1_4_upgrade.py
  92. +44 −59 cms/plugins/twitter/migrations/0001_initial.py
  93. +10 −22 cms/plugins/twitter/migrations/0002_auto__add_twittersearch.py
  94. +66 −94 cms/plugins/video/migrations/0001_initial.py
  95. +32 −85 cms/plugins/video/migrations/0002_color_mute_controller.py
  96. +22 −185 cms/plugins/video/migrations/0003_newplayer_step1.py
  97. +22 −63 cms/plugins/video/migrations/0004_newplayer_step2.py
  98. +23 −62 cms/plugins/video/migrations/0005_newplayer_step3.py
  99. +22 −56 cms/plugins/video/migrations/0006_newplayer_step4.py
  100. +21 −65 cms/plugins/video/migrations/0007_newplayer_step5.py
  101. +17 −0 cms/tests/plugins.py
  102. +1 −1 docs/extending_cms/api_references.rst
  103. +10 −6 docs/extending_cms/custom_plugins.rst
  104. +8 −0 docs/index.rst
  105. +22 −3 docs/upgrade/2.4.rst
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
+import re
from cms.exceptions import SubClassNeededError, Deprecated
from cms.models import CMSPlugin
from django import forms
from django.conf import settings
from django.contrib import admin
from django.core.exceptions import ImproperlyConfigured
-from django.db.models.options import get_verbose_name
from django.forms.models import ModelForm
from django.utils.encoding import smart_str
from django.utils.translation import ugettext_lazy as _
@@ -71,7 +71,7 @@ def __new__(cls, name, bases, attrs):
]
# Set default name
if not new_plugin.name:
- new_plugin.name = get_verbose_name(new_plugin.__name__)
+ new_plugin.name = re.sub("([a-z])([A-Z])","\g<1> \g<2>", name)
return new_plugin
@@ -83,7 +83,7 @@ class CMSPluginBase(admin.ModelAdmin):
form = None
change_form_template = "admin/cms/page/plugin_change_form.html"
# Should the plugin be rendered in the admin?
- admin_preview = True
+ admin_preview = False
render_template = None
# Should the plugin be rendered at all, or doesn't it have any output?
@@ -106,8 +106,11 @@ def __init__(self, model=None, admin_site=None):
self.placeholder = None
self.page = None
+
def render(self, context, instance, placeholder):
- raise NotImplementedError("render needs to be implemented")
+ context['instance'] = instance
+ context['placeholder'] = placeholder
+ return context
@property
def parent(self):
@@ -223,4 +226,4 @@ def pluginmedia(self):
def get_plugin_media(self, request, context, plugin):
raise Deprecated(
"CMSPluginBase.get_plugin_media is deprecated in favor of django-sekizai"
- )
+ )
@@ -1,43 +1,55 @@
-
+# -*- coding: utf-8 -*-
+import datetime
from south.db import db
+from south.v2 import SchemaMigration
from django.db import models
-from cms.plugins.file.models import *
-class Migration:
-
- depends_on = (
- ("cms", "0001_initial"),
- )
+
+class Migration(SchemaMigration):
def forwards(self, orm):
-
# Adding model 'File'
- db.create_table('file_file', (
- ('cmsplugin_ptr', models.OneToOneField(orm['cms.CMSPlugin'])),
- ('file', models.FileField(_("file"), upload_to=CMSPlugin.get_media_path)),
- ('title', models.CharField(_("title"), max_length=255, null=True, blank=True)),
+ db.create_table('cmsplugin_file', (
+ ('cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
+ ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
))
db.send_create_signal('file', ['File'])
-
-
-
+
+
def backwards(self, orm):
-
# Deleting model 'File'
- db.delete_table('file_file')
-
-
-
+ db.delete_table('cmsplugin_file')
+
+
models = {
'cms.cmsplugin': {
- '_stub': True,
- 'id': ('models.AutoField', [], {'primary_key': 'True'})
+ 'Meta': {'object_name': 'CMSPlugin'},
+ 'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
+ 'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
+ 'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+ 'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
},
- 'cms.page': {
- 'Meta': {'ordering': "('tree_id','lft')"},
- '_stub': True,
- 'id': ('models.AutoField', [], {'primary_key': 'True'})
+ 'cms.placeholder': {
+ 'Meta': {'object_name': 'Placeholder'},
+ 'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+ },
+ 'file.file': {
+ 'Meta': {'object_name': 'File', 'db_table': "'cmsplugin_file'", '_ormbases': ['cms.CMSPlugin']},
+ 'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
+ 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
}
}
-
-
+
+ complete_apps = ['file']
@@ -1,32 +1,44 @@
-
+# -*- coding: utf-8 -*-
from south.db import db
from django.db import models
from cms.plugins.file.models import *
class Migration:
-
def forwards(self, orm):
"Write your forwards migration here"
-
-
+
+
def backwards(self, orm):
"Write your backwards migration here"
-
-
+
models = {
- 'file.file': {
- 'cmsplugin_ptr': ('models.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
- 'file': ('models.FileField', [], {'max_length': '100'}),
- 'title': ('models.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
- },
'cms.cmsplugin': {
- '_stub': True,
- 'id': ('models.AutoField', [], {'primary_key': 'True', 'blank': 'True'})
+ 'Meta': {'object_name': 'CMSPlugin'},
+ 'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
+ 'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
+ 'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+ 'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
+ },
+ 'cms.placeholder': {
+ 'Meta': {'object_name': 'Placeholder'},
+ 'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
},
- 'cms.page': {
- '_stub': True,
- 'id': ('models.AutoField', [], {'primary_key': 'True', 'blank': 'True'})
+ 'file.file': {
+ 'Meta': {'object_name': 'File', 'db_table': "'cmsplugin_file'", '_ormbases': ['cms.CMSPlugin']},
+ 'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
+ 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
}
}
-
+
complete_apps = ['file']
Oops, something went wrong.

0 comments on commit 01e3a4f

Please sign in to comment.