Merge commit 'pattrunk/master'

Conflicts:
	cms/plugins/googlemap/templates/cms/plugins/googlemap.html

cms/admin/pageadmin.py

@@ -29,7 +29,7 @@
 from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.forms import Widget, Textarea, CharField
-from django.http import HttpResponseRedirect, HttpResponse, Http404
+from django.http import HttpResponseRedirect, HttpResponse, Http404, QueryDict
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template.context import RequestContext
 from django.template.defaultfilters import title
@@ -503,11 +503,12 @@ def change_view(self, request, object_id, extra_context=None):
 
             user_lang_set = request.GET.get('language',
                                             django_settings.LANGUAGE_CODE)
-            activate(user_lang_set)
+            #activate(user_lang_set)
             extra_context = {
                 'placeholders': get_placeholders(request, template),
                 'language': user_lang_set,
                 'traduction_language': settings.CMS_LANGUAGES,
+                'show_language_tabs': len(settings.CMS_LANGUAGES) > 1,
                 'page': obj,
                 'CMS_PERMISSION': settings.CMS_PERMISSION,
                 'CMS_MODERATOR': settings.CMS_MODERATOR,
@@ -520,19 +521,13 @@ def change_view(self, request, object_id, extra_context=None):
 
                 'moderation_delete_request': moderation_delete_request,
             }
-
-        return super(PageAdmin, self).change_view(request, object_id, extra_context)
-
-    # since we have 2 step wizard now, this is not required anymore
-
-    #def response_add(self, request, obj, post_url_continue='../%s/'):
-    #    """Called always when new object gets created, there may be some new 
-    #    stuff, which should be published after all other objects on page are 
-    #    collected. E.g. title, plugins, etc...
-    #    """
-    #    obj.save(commit=False)
-    #    return super(PageAdmin, self).response_add(request, obj, post_url_continue)
-
+        tab_language = request.GET.get("language", None)
+        response = super(PageAdmin, self).change_view(request, object_id, extra_context)
+        if tab_language and response.status_code == 302:
+            location = response._headers['location']
+            response._headers['location'] = (location[0], "%s?language=%s" % (location[1], tab_language))
+        return response
+
     def response_change(self, request, obj):
         """Called always when page gets changed, call save on page, there may be
         some new stuff, which should be published after all other objects on page 

cms/media/cms/js/lib/jquery.js

@@ -11,7 +11,7 @@
  */
 (function(){
 
-var 
+var
 	// Will speed up references to window, and allows munging its name.
 	window = this,
 	// Will speed up references to undefined, and allows munging its name.
@@ -2877,7 +2877,7 @@ var withinElement = function(event) {
 	}
 };
 
-jQuery.each({ 
+jQuery.each({
 	mouseover: 'mouseenter', 
 	mouseout: 'mouseleave'
 }, function( orig, fix ){
@@ -3108,7 +3108,7 @@ jQuery( window ).bind( 'unload', function(){
 		// Skip the window
 		if ( id != 1 && jQuery.cache[ id ].handle )
 			jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-}); 
+});
 (function(){
 
 	jQuery.support = {};
@@ -4179,7 +4179,7 @@ if ( document.documentElement["getBoundingClientRect"] )
 			left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
 		return { top: top, left: left };
 	};
-else 
+else
 	jQuery.fn.offset = function() {
 		if ( !this[0] ) return { top: 0, left: 0 };
 		if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );

cms/media/cms/js/wymeditor/skins/django/skin.css

@@ -27,7 +27,7 @@
         .wym_skin_django .wym_area_right         { display: block; }
 
 
-/*TYPO*/    
+/*TYPO*/
         .wym_skin_django                { font-size: 62,5%; font-family: "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Verdana, Arial, sans-serif }
         .wym_skin_django h2             { font-size: 110%; /* = 11px */}
         .wym_skin_django h3             { font-size: 100%; /* = 10px */}

cms/media/cms/wymeditor/skins/compact/skin.css

@@ -27,7 +27,7 @@
         .wym_skin_compact .wym_area_right         { display: none; }
 
 
-/*TYPO*/    
+/*TYPO*/
         .wym_skin_compact                { font-size: 10px; font-family: Verdana, Arial, sans-serif; }
         .wym_skin_compact h2             { font-size: 110%; /* = 11px */}
         .wym_skin_compact h3             { font-size: 100%; /* = 10px */}

cms/media/cms/wymeditor/skins/default/skin.css

@@ -26,7 +26,7 @@
         .wym_skin_default .wym_area_right         { display: block; }
 
 
-/*TYPO*/    
+/*TYPO*/
         .wym_skin_default                { font-size: 62.5%; font-family: Verdana, Arial, sans-serif; }
         .wym_skin_default h2             { font-size: 110%; /* = 11px */}
         .wym_skin_default h3             { font-size: 100%; /* = 10px */}

cms/media/cms/wymeditor/skins/silver/skin.css

@@ -27,7 +27,7 @@
         .wym_skin_silver .wym_area_right         { display: block; }
 
 
-/*TYPO*/    
+/*TYPO*/
         .wym_skin_silver                { font-size: 62.5%; font-family: Verdana, Arial, sans-serif; }
         .wym_skin_silver h2             { font-size: 110%; /* = 11px */}
         .wym_skin_silver h3             { font-size: 100%; /* = 10px */}

cms/media/cms/wymeditor/skins/twopanels/skin.css

@@ -27,7 +27,7 @@
         .wym_skin_twopanels .wym_area_right         { display: block; }
 
 
-/*TYPO*/    
+/*TYPO*/
         .wym_skin_twopanels                { font-size: 62.5%; font-family: Verdana, Arial, sans-serif; }
         .wym_skin_twopanels h2             { font-size: 110%; /* = 11px */}
         .wym_skin_twopanels h3             { font-size: 100%; /* = 10px */}

cms/models/pagemodel.py

@@ -309,13 +309,10 @@ def get_languages(self):
         get the list of all existing languages for this page
         """
         from cms.models.titlemodels import Title
-        titles = Title.objects.filter(page=self)
+
         if not hasattr(self, "languages_cache"):
-            languages = []
-            for t in titles:
-                if t.language not in languages:
-                    languages.append(t.language)
-            self.languages_cache = languages
+            self.languages_cache = Title.objects.filter(page=self).values_list("language", flat=True).distinct()
+
         return self.languages_cache
 
     def get_absolute_url(self, language=None, fallback=True):

cms/plugins/file/models.py

@@ -2,7 +2,6 @@
 from django.utils.translation import ugettext_lazy as _
 from cms.models import CMSPlugin
 from posixpath import join, basename, splitext, exists
-from django.db.models import Q
 from cms import settings as cms_settings
 from django.conf import settings
 

cms/plugins/link/models.py

@@ -2,7 +2,6 @@
 from django.utils.translation import ugettext_lazy as _
 from cms.models import CMSPlugin, Page
 from django.conf import settings
-from django.db.models import Q
 
 class Link(CMSPlugin):
     """

cms/plugins/snippet/models.py

@@ -3,7 +3,7 @@
 from cms.models import CMSPlugin
 from django.conf import settings
 from cms.utils.helpers import reversion_register
-from django.db.models import Q
+
 
 # Stores the actual data
 class Snippet(models.Model):

cms/plugins/teaser/models.py

@@ -2,7 +2,6 @@
 from django.utils.translation import ugettext_lazy as _
 from cms.models import CMSPlugin, Page
 from os.path import basename
-from django.db.models import Q
 from django.conf import settings
 
 class Teaser(CMSPlugin):

cms/plugins/text/models.py

@@ -6,7 +6,6 @@
 from django.utils.text import truncate_words
 from cms.plugins.text.utils import plugin_admin_html_to_tags,\
     plugin_tags_to_admin_html
-from django.db.models import Q
 
 class Text(CMSPlugin):
     """A block of content, tied to a page, for a particular language"""

cms/templates/admin/cms/page/change_form.html

@@ -65,18 +65,21 @@ <h1>{{ title }}
 
 <input type="hidden" name="language" value="{{language}}" />
 
+{% if show_language_tabs %}
 <div id="page_form_lang_tabs">
     {% for lang_code, lang_name in traduction_language %}
         <input type="button" onclick="trigger_lang_button(this,'./?language={{lang_code}}');"
             class="language_button {% ifequal lang_code language %}selected{% endifequal %}"
             id="debutton" name="{{lang_code}}" value="{{lang_name}}" /> 
     {% endfor %}
 </div>
-
+{% endif %}
 
 
 <div id="lang_tab_content">
+{% if show_language_tabs %}
 <h2 class="header"></h2>
+{% endif %}
 {% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
 {% if save_on_top %}{% submit_row %}{% endif %}
 {% if errors %}

cms/utils/__init__.py

@@ -62,17 +62,25 @@ def get_language_from_request(request, current_page=None):
     """
     Return the most obvious language according the request
     """
-    language = get_language_in_settings(request.REQUEST.get('language', None))
+    language = request.REQUEST.get('language', None)
+
+    if language:
+        language = get_language_in_settings(language)
+
     if language is None:
         language = getattr(request, 'LANGUAGE_CODE', None)
-    if language is None:
+
+    # TODO: This smells like a refactoring oversight - was current_page ever a page object? It appears to be a string now
+    if language is None and isinstance(current_page, Page):
         # in last resort, get the first language available in the page
-        if current_page:
-            languages = current_page.get_languages()
-            if len(languages) > 0:
-                language = languages[0]
+        languages = current_page.get_languages()
+
+        if len(languages) > 0:
+            language = languages[0]
+
     if language is None:
         language = settings.CMS_DEFAULT_LANGUAGE
+
     return language
 
 

setup.py

@@ -1,4 +1,11 @@
 from setuptools import setup, find_packages
+import os
+
+media_files = []
+
+for dirpath, dirnames, filenames in os.walk('cms/media'):
+    media_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
+
 setup(
     name='django-cms',
     version='2.0.0.alpha',
@@ -10,6 +17,7 @@
         'mptt': 'mptt',
         'publisher': 'publisher',
     },
+    data_files = media_files,
     package_data = {
         'cms': [
             'templates/admin/cms/mail/*.html',