Changeset eb1356d

Timestamp:

05/02/12 16:33:41 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

social

Parents:

4afba25 (diff), 57305a5 (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@…> (05/02/12 16:33:41)

git-committer:

yomguy <yomguy@…> (05/02/12 16:33:41)

Message:

Merge branch 'master' into social

Files:

• telemeta/models/format.py (modified) (1 diff)
• telemeta/views/base.py (modified) (1 diff)
• example/sandbox_sqlite/settings.py (modified) (3 diffs)
• telemeta/templates/telemeta/base.html (modified) (1 diff)

telemeta/models/format.py

@@ -83 +83 @@
 
     def __unicode__(self):
-        return self.original_code
+        return self.original_format
 
     @property

telemeta/views/base.py

@@ -660 +660 @@
             last_revision = None
 
-        physical_format = item.original_format.original_format
+        physical_format = item.original_format
 
         return render(request, template,

example/sandbox_sqlite/settings.py

@@ -104 +104 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
+    'pagination.middleware.PaginationMiddleware',
+    'django.contrib.auth.backends.ModelBackend',
+    'socialregistration.contrib.facebook.auth.FacebookAuth',
 )
 
@@ -127 +130 @@
     'jsonrpc',
     'south',
+    'postman',
+    'pagination',
+    'socialregistration',
+    'socialregistration.contrib.facebook',
     'sorl.thumbnail',
 )
@@ -158 +165 @@
 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 %}">{% trans "Sign in" %}</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>