removed logo feature, fixed a bad import in tasks.py

jpyuda · Nov 16, 2011 · 3f43829 · 3f43829
1 parent a9987ef
commit 3f43829
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 48 deletions.
diff --git a/app.yaml b/app.yaml
@@ -26,4 +26,5 @@ handlers:
   script: main.application
 
 builtins:
-- datastore_admin: on
+- datastore_admin: on
+- remote_api: on
diff --git a/appengine_config.py b/appengine_config.py
@@ -1,17 +1,21 @@
 import sys
-import os
+import os, os.path
+from logging import error
 
 
 
-sys.path= [os.path.join(os.path.dirname(__file__), 'shared'), os.path.join(os.path.dirname(__file__), '.')]+sys.path
 
 
 
 
 
 def namespace_manager_default_namespace_for_request():
     import os
+    if os.environ.get('PATH_INFO', '').startswith('/_ah') and not os.environ.get('PATH_INFO', '').startswith('/_ah/login_required') or os.environ.get('PATH_INFO', '').startswith('/_ah/upload'): return ''
     if os.environ.get('HTTP_HOST'):
         return os.environ.get('HTTP_HOST').split(':')[0]
     else:
-        return ''
+        return ''
+
+remoteapi_CUSTOM_ENVIRONMENT_AUTHENTICATION = (
+    'HTTP_X_APPENGINE_INBOUND_APPID', ['techevents'])
diff --git a/appengine_console.py b/appengine_console.py
diff --git a/sources/tasks.py b/sources/tasks.py
@@ -48,6 +48,7 @@ def process_gdata(source):
 
 
 def fetch_icals(request):
+    from models import ICalendarSource
     try:
         if request.method == 'POST':
             cursor=request.POST.get('cursor')

diff --git a/templates/admin-base.html b/templates/admin-base.html
@@ -54,11 +54,9 @@
 	</div>
     <div class="row"><h1>
 		<a href="{% url front-page %}">
-			{% if site.logo_asset_href %}
-			<img src="{% versioned site.logo_asset_href site.original_logo_version %}" alt="{{ site.name }}">
-			{% else %}
+
 			{{ site.name }}
-			{% endif %}
+
 			</a>
 	</h1></div>
 
@@ -76,7 +74,7 @@
 {% endblock %}
 <div class="row" id="footer">
 	<div class="row">
-	<p> {{ site.name }} is made with <a href="http://eventgrinder.com/">EVENTGRINDER</a>.</p>
+	<p> {{ site.name }} is made with:<a href="https://github.com/rosskarchner/eventgrinder">eventgrinder</a></p>
 	</div>
 </div>
    </BODY>

diff --git a/templates/base.html b/templates/base.html
@@ -120,11 +120,9 @@
 	<div class="cell position-0 width-10">
 	<h1 id="title">
 		<a href="{% url front-page %}">
-			{% if site.logo_asset_href %}
-			<img src="{{site.logo_asset_href }}" alt="{{ site.name }}">
-			{% else %}
+
 			{{ site.name }}
-			{% endif %}
+
 			</a> </h1>
 			{% if site.twitter %} 
 			<div>Get events as soon as we do, follow @{{site.twitter}}!</div> {% endif %}
@@ -153,7 +151,7 @@ <h1 id="title">
 <div class="row">
 
 	<div id="footer" class="cell position-0 width-4">
-		<p> {{ site.name }} is made with: <br/><a href="http://eventgrinder.com/"><img src="{% versioned "/static/eventgrinder.png" %}" alt="EVENTGRINDER"/></a></p>
+		<p> {{ site.name }} is made with:<a href="https://github.com/rosskarchner/eventgrinder">eventgrinder</a></p>
 	</div>
 </div>
 {% block endcode %}

diff --git a/templates/eventsite/newsletter.html b/templates/eventsite/newsletter.html
@@ -30,15 +30,7 @@
 
 </head>
 <body>
-
-
-			{% if site.logo_asset_href %}
-			<img src="{{site.logo_asset_href }}" alt="{{ site.name }}">
-			{% else %}
-			{{ site.name }}
-			{% endif %}
-
-
+
 <h1> <a href="http://{{site.host}}{% url front-page %}">{{ site.name }} for the week of {{ start|date:"F j, Y"}}</a></h1>