Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents 11a0a1f + 2370608 commit 3e984e20ad492e90fb7b0f5fb1c8d6c73ab543ad @oversize committed Nov 3, 2010
View
150 AUTHORS
@@ -1,17 +1,145 @@
-Django CMS
-==========
+In no particular order:
+
* Patrick Lauber
-* Jason Zylks
+* Peter Ciciman
+* Jonas Obrist
* Simon Meers
-* Peter Cicman
+* Stefan Foulis
+* brightwhitefox
+* Behrooz Nobakht
+* Martin Bommeli
+* Jason Zylks
+* philomat
+* Jannis Leidel
+* Oyvind Saltvik
+* Ekrem Seren
+* Chris Adams
+* martinkosir
+* Manolis Stamatogiannakis
+* Ulrich Petri
+* Luke Plant
+* Evandro Miquelito
+* Marco Rimoldi
+* aaloy
+* GaretJax
+* David Jean Louis
+* Pedro Gracia
* limpbrains :P
-
-Django Page CMS
-===============
+* yohanboniface
+* dstufft
+* Samuel Lüscher
+* Philipp Bosch
+* timesong
+* kunitoki
+* fivethreeo
+* Johannes Bornhold
+* Alberto Paro
+* yann.malet@gmail.com
+* wildermesser
+* Thomas Parslow
+* Maik Lustenberger
+* Arne Gellhaus
+* pigletto
+* kochin
+* MW
+* Lars van de Kerkhof
+* Jonathan Stoppani
+* Chanita Siridechkun
+* Benjamin Wohlwend
+* Aaron Renner
+* spookylukey
+* hysia
+* aball
+* Yann Malet
+* Mokys
+* George Marshall
+* Diógenes Augusto Fernandes Hermínio
+* Chris Glass
+* zundoya
+* yedpodtrzitko
+* shed
+* izi
+* behrooz
+* angular_circle
+* Robert Pogorzelski
+* Pigletto
+* Petteri
+* Mark Rogers
+* Jason Jenkins
+* Антон Евжаков
+* Øyvind Saltvik
+* wid
+* wangJunjie
+* Benjamin Wohlwend
+* phuihock
+* pbgc
+* padelt
+* neoprolog
+* mcosta
+* mathijs
+* m000
+* indexofire
+* fcurella
+* f4nt
+* beshrkayali
+* Yosuke Ikeda
+* Steve Steiner
+* Shinya Okano
+* Seyhun Akyurek
+* Peter-Paul van Gemerden
+* Martin Kosír
+* Lucio Asnaghi
+* James Richards
+* Ian Lewis
+* DaNmarner
+* DZ
+* Cheng-Chia Tseng
+* Charpentier Johan
+* Benjamin
+* Adi Sieker
+* A. Bram Neijt
+* tiret
+* ssteinerX
+* sleytr
+* sealibora
+* rtpm
+* mrlundis
+* meers
+* mbouchar
+* jordanjambazov
+* eged
+* daniele
+* Yuri van der Meer
+* Wayne Moore
+* Tanel Külaots
+* Stavros Korokithakis
+* Shatalov Vadim
+* Sean Bleier
+* Rodolfo Carvalho
+* Restless Being
+* Remco Wendt
+* Patrick Toal
+* Orne Brocaar
+* MerLex
+* Maxime Haineault
+* Maxim Bodyansky
+* Lucas Vogelsang
+* Lars Smit
+* John-Scott Atlakson
+* Jason Davies
+* Janusz Harkot
+* Ivan Vershigora
+* Gerard Świderski
+* Filip Kazimierczak
+* Egor V. Nazarkin
+* David Thompson
+* Darryl Woods
+* Chris Hughes
+* Bernd Zeimetz
+* Arthur Debert
+* Artem Skoretskiy
+* Alessandro Ronchi
* Batiste Bieler
-* Jannis Leidel
* Antoni Aloy López
-* Benjamin Wohlwend
* poweredbypenguins
-* homebrew79
-
+* homebrew79
View
@@ -33,5 +33,5 @@
- a lot of bugfixes
- the cms now depends on the cms.middleware.media.PlaceholderMediaMiddleware middleware
- templatetags refactored: see cms/docs/templatetags.txt for new signatures.
-- placeholder has new option: or and a endbpalceholder templatetag
+- placeholder has new option: or and a endpalceholder templatetag
@@ -39,7 +39,12 @@ def render(self, context, instance, placeholder):
if not instance.page.publisher_is_draft and page.publisher_is_draft:
page = page.publisher_public
- plugins = get_cmsplugin_queryset(request).filter(page=page, language=lang, placeholder__iexact=placeholder, parent__isnull=True).order_by('position').select_related()
+ plugins = get_cmsplugin_queryset(request).filter(
+ placeholder__page=page,
+ language=lang,
+ placeholder__slot__iexact=placeholder,
+ parent__isnull=True
+ ).order_by('position').select_related()
plugin_output = []
template_vars['parent_plugins'] = plugins
for plg in plugins:
View
@@ -3,11 +3,11 @@ Configuration
#############
Out of the box django-cms comes not with a lot features. But with some
-settings you can extend it to a enterprise ready solution. All settings
+settings you can extend it to an enterprise ready solution. All settings
described here can be found in cms/settings.py or in the plugins folder if
-they have a settings.py
+they have a settings.py.
-All thoose settings should be placed in your project settings.py
+All these settings should be placed in your project settings.py.
Required Settings
@@ -56,21 +56,21 @@ Example::
'plugins': ('TextPlugin', 'PicturePlugin'),
'text_only_plugins': ('LinkPlugin',)
'extra_context': {"width":640},
- 'name':gettext("Content")
+ 'name':gettext("Content"),
},
'right-column': {
"plugins": ('TeaserPlugin', 'LinkPlugin'),
"extra_context": {"width":280},
- 'name':gettext("Right Column")
+ 'name':gettext("Right Column"),
'limits': {
'global': 2,
'TeaserPlugin': 1,
'LinkPlugin': 1,
},
- },
- 'base.html content': {
- "plugins": {'TextPlugin', 'PicturePlugin', 'TeasePlugin'}
- },
+ },
+ 'base.html content': {
+ "plugins": {'TextPlugin', 'PicturePlugin', 'TeaserPlugin'}
+ },
}
You can combine template names and placeholder names to granually define the
@@ -129,7 +129,7 @@ Default: ``True``
CMS_APPHOOKS
------------
-A touble with python paths to CMSApp Classes.
+A tuple with python paths to CMSApp Classes.
Overwrites the auto-discovered list of CMSApp Classes located in applications
cms_app.py.
@@ -171,7 +171,7 @@ Example::
('en', gettext('English')),
)
-Default is LANGUAGES. Be sure that you don't have more language in here than
+Default is LANGUAGES. Be sure that you don't have more languages in here than
in the LANGUAGES setting.
@@ -202,7 +202,7 @@ Example::
CMS_SITE_LANGUAGES
------------------
-If you have more then one site and CMS_LANGUAGES differs between the site you
+If you have more then one site and CMS_LANGUAGES differs between the sites you
may want to fill this out so if you switch between the sites in the admin you
only get the languages available on this site.
@@ -211,7 +211,7 @@ Example::
CMS_SITE_LANGUAGES = {
1:['en','de'],
2:['en','fr'],
- 3:['en'],
+ 3:['en'],
}
Oops, something went wrong.

0 comments on commit 3e984e2

Please sign in to comment.