Changeset 3191b1b

Timestamp:

03/27/12 17:45:14 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

social

Children:

513697b

Parents:

da3dd5d (diff), c02171b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (03/27/12 17:45:14)

git-committer:

yomguy <yomguy@…> (03/27/12 17:45:14)

Message:

Merge branch 'master' into social

Files:

• telemeta/migrations/0009_auto__chg_field_mediaitem_language_iso__del_field_userprofile_departem.py (added)
• telemeta/templates/telemeta/mediaitem_edit.html (modified) (1 diff)
• example/sandbox_sqlite/settings.py (modified) (3 diffs)
• telemeta/templates/telemeta/base.html (modified) (1 diff)

telemeta/templates/telemeta/mediaitem_edit.html

@@ -45 +45 @@
     <a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a>
     {% endif %}
-    <a href="#" class="component_icon button icon_save" 
-onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function({d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
+    <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
     <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{% url telemeta-images  "wait.gif" %}" />
     </div>

example/sandbox_sqlite/settings.py

@@ -85 +85 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
+    'pagination.middleware.PaginationMiddleware',
+    'django.contrib.auth.backends.ModelBackend',
+    'socialregistration.contrib.facebook.auth.FacebookAuth',
 )
 
@@ -107 +110 @@
     'jsonrpc',
     'south',
+    'postman',
+    'pagination',
+    'socialregistration',
+    'socialregistration.contrib.facebook',
     'sorl.thumbnail',
 )
@@ -132 +139 @@
 EMAIL_HOST = 'localhost'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
+
+POSTMAN_AUTO_MODERATE_AS=True
+
+FACEBOOK_APP_ID = '348560078520326'
+FACEBOOK_SECRET_KEY = 'f6204a5468be878bfce8f0007455c022'
+FACEBOOK_REQUEST_PERMISSIONS = ''

telemeta/templates/telemeta/base.html

@@ -64 +64 @@
 <img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a>
 {% else %}
+<div style="float: left;">
 <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
+</div>
+<div style="float: right;;">
+{% load facebook %}
+{% facebook_button %}
+</div>
 {% endif %}
 </div>