Changeset 3191b1b


Ignore:
Timestamp:
Mar 27, 2012 5:45:14 PM (3 years 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@…> (27/03/2012 17:45:14)
git-committer:
yomguy <yomguy@…> (27/03/2012 17:45:14)
Message:

Merge branch 'master' into social

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/templates/telemeta/mediaitem_edit.html

    rea5ec32 rc02171b  
    4545    <a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a> 
    4646    {% endif %} 
    47     <a href="#" class="component_icon button icon_save"  
    48 onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function({d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a> 
     47    <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> 
    4948    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{% url telemeta-images  "wait.gif" %}" /> 
    5049    </div> 
  • example/sandbox_sqlite/settings.py

    rb732ea0 rda3dd5d  
    8585    'django.contrib.messages.middleware.MessageMiddleware', 
    8686    'django.middleware.locale.LocaleMiddleware', 
     87    'pagination.middleware.PaginationMiddleware', 
     88    'django.contrib.auth.backends.ModelBackend', 
     89    'socialregistration.contrib.facebook.auth.FacebookAuth', 
    8790) 
    8891 
     
    107110    'jsonrpc', 
    108111    'south', 
     112    'postman', 
     113    'pagination', 
     114    'socialregistration', 
     115    'socialregistration.contrib.facebook', 
    109116    'sorl.thumbnail', 
    110117) 
     
    132139EMAIL_HOST = 'localhost' 
    133140DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
     141 
     142POSTMAN_AUTO_MODERATE_AS=True 
     143 
     144FACEBOOK_APP_ID = '348560078520326' 
     145FACEBOOK_SECRET_KEY = 'f6204a5468be878bfce8f0007455c022' 
     146FACEBOOK_REQUEST_PERMISSIONS = '' 
  • telemeta/templates/telemeta/base.html

    rfabced9 r1f3e307  
    6464<img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a> 
    6565{% else %} 
     66<div style="float: left;"> 
    6667<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
    6768<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a> 
     69</div> 
     70<div style="float: right;;"> 
     71{% load facebook %} 
     72{% facebook_button %} 
     73</div> 
    6874{% endif %} 
    6975</div> 
Note: See TracChangeset for help on using the changeset viewer.