Changeset ddaaf4c

Timestamp:

03/29/12 14:31:30 (14 months 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:

• telemeta/htdocs/css/telemeta.css (modified) (2 diffs)
• telemeta/htdocs/images/bg_yt.png (added)
• telemeta/htdocs/images/grid_bg_2.png (added)
• telemeta/htdocs/images/logo_mini_wh.png (added)
• telemeta/templates/telemeta/base.html (modified) (5 diffs)
• telemeta/urls.py (modified) (1 diff)
• example/sandbox_sqlite/settings.py (modified) (3 diffs)

telemeta/htdocs/css/telemeta.css

@@ -103 +103 @@
 
 #header {
-    padding: 0.2em 0;
+    padding: 0em;
 /*     background: url("../images/waves.png") 100% 0% no-repeat; */
 }
@@ -471 +471 @@
 #menu .red { border-bottom-color:  #DD0000; }
 #menu .violet { border-bottom-color:  #A00020; }
+#menu .origin { border-bottom-color: #6a0307; }
 
 * html #menu :link, * html #menu :visited { background-position: 1px 0 }

telemeta/templates/telemeta/base.html

@@ -90 +90 @@
 <ul id="nav">
  {% if user.is_authenticated %}
-  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span>
+  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a>
    <ul>
     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
@@ -101 +101 @@
  {% endif %}
 
- {% block archives %}
  <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
   <ul>
@@ -109 +108 @@
     <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
   </ul>
-  <div class="clear"></div>
  </li>
- {% endblock archives %}
- 
- {% block geonav %}
+
  <li><a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
- {% endblock geonav %}
 
  <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
@@ -128 +123 @@
  <li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li>
  </ul>
- <div class="clear"></div>
  </li>
 {% endif %}
 </ul>
-<div class="clear"></div>
 
-{% endblock %}
+{% endblock menu %}
 </div>
 </div>
@@ -161 +154 @@
   <tr>
    <td>
-    <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}" height="30" width="93"
+    <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}"
    alt="Telemeta Powered"/></a>
     <p class="left">

telemeta/urls.py

@@ -293 +293 @@
     url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
         name="telemeta-login"),
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
+        name="telemeta-login"),
     #url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'},
     #    name="telemeta-login"),

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 = ''