Changeset ddaaf4c


Ignore:
Timestamp:
03/29/12 14:31:30 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
social
Children:
74a669d
Parents:
513697b (diff), c1e3f39 (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/29/12 14:31:30)
git-committer:
yomguy <yomguy@…> (03/29/12 14:31:30)
Message:

Merge branch 'master' into social

Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • telemeta/htdocs/css/telemeta.css

    rf95ca3b r8a5b1b5  
    103103 
    104104#header { 
    105     padding: 0.2em 0; 
     105    padding: 0em; 
    106106/*     background: url("../images/waves.png") 100% 0% no-repeat; */ 
    107107} 
     
    471471#menu .red { border-bottom-color:  #DD0000; } 
    472472#menu .violet { border-bottom-color:  #A00020; } 
     473#menu .origin { border-bottom-color: #6a0307; } 
    473474 
    474475* html #menu :link, * html #menu :visited { background-position: 1px 0 } 
  • telemeta/templates/telemeta/base.html

    r1f3e307 rddaaf4c  
    9090<ul id="nav"> 
    9191 {% if user.is_authenticated %} 
    92   <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span> 
     92  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a> 
    9393   <ul> 
    9494    <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li> 
     
    101101 {% endif %} 
    102102 
    103  {% block archives %} 
    104103 <li><a href="#archives#" class="green">{% trans "Archives" %}</a> 
    105104  <ul> 
     
    109108    <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li> 
    110109  </ul> 
    111   <div class="clear"></div> 
    112110 </li> 
    113  {% endblock archives %} 
    114   
    115  {% block geonav %} 
     111 
    116112 <li><a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a></li> 
    117  {% endblock geonav %} 
    118113 
    119114 <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li> 
     
    128123 <li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li> 
    129124 </ul> 
    130  <div class="clear"></div> 
    131125 </li> 
    132126{% endif %} 
    133127</ul> 
    134 <div class="clear"></div> 
    135128 
    136 {% endblock %} 
     129{% endblock menu %} 
    137130</div> 
    138131</div> 
     
    161154  <tr> 
    162155   <td> 
    163     <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}" height="30" width="93" 
     156    <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}" 
    164157   alt="Telemeta Powered"/></a> 
    165158    <p class="left"> 
  • telemeta/urls.py

    rb6c6871 r8a5b1b5  
    293293    url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'}, 
    294294        name="telemeta-login"), 
     295    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'}, 
     296        name="telemeta-login"), 
    295297    #url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'}, 
    296298    #    name="telemeta-login"), 
  • 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 = '' 
Note: See TracChangeset for help on using the changeset viewer.