More refactoring for #66

PaulKinlan · Nov 20, 2011 · cad21a3 · cad21a3
1 parent b3d862b
commit cad21a3
Show file tree

Hide file tree

Showing 44 changed files with 64 additions and 109 deletions.
diff --git a/server/.idea/.name b/server/.idea/.name
diff --git a/server/.idea/encodings.xml b/server/.idea/encodings.xml
diff --git a/server/.idea/misc.xml b/server/.idea/misc.xml
diff --git a/server/.idea/modules.xml b/server/.idea/modules.xml
diff --git a/server/.idea/server.iml b/server/.idea/server.iml
diff --git a/server/.idea/vcs.xml b/server/.idea/vcs.xml
diff --git a/server/.idea/workspace.xml b/server/.idea/workspace.xml
diff --git a/server/demos/imagestudio/pages/index.html b/server/demos/imagestudio/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/application.html" %}
+{% extends "demos/imagestudio/layouts/application.html" %}
 {% block title %}Image Studio{% endblock %}
 {% block scripts %}
   <script src="//webintents.org/webintents.min.js"></script>

diff --git a/server/demos/imgur/pages/index.html b/server/demos/imgur/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/application.html" %}
+{% extends "demos/imgur/layouts/application.html" %}
 {% block title %}Demo: Imgur{% endblock%}
 {% block head %}Demo: Imgur{% endblock%}
 {% block scripts %}

diff --git a/server/demos/instapaper/pages/index.html b/server/demos/instapaper/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/application.html" %}
+{% extends "demos/instapaper/layouts/application.html" %}
 {% block title %}Demo: Instapaper{% endblock%}
 {% block head %}Demo: Instapaper{% endblock%}
 {% block scripts %}

diff --git a/server/demos/mememator/pages/index.html b/server/demos/mememator/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/application.html" %}
+{% extends "demos/mememator/layouts/application.html" %}
 {% block scripts %}
     <script src="//webintents.org/webintents.min.js"></script>
   <link rel=icon href="favicon.ico" />

diff --git a/server/demos/pages/twitter/index.html b/server/demos/pages/twitter/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "demos/layouts/base.html" %}
 {% block title %}Web Intents: Twitter Demo{% endblock %}
 {% block headline %}Web Intents: Twitter Demos{% endblock %}
 {% block scripts %}

diff --git a/server/demos/shortener/pages/index.html b/server/demos/shortener/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/application.html" %}
+{% extends "demos/shortener/layouts/application.html" %}
 {% block title %}Demo: Goo.gl URL Shortener{% endblock%}
 {% block head %}Demo: Goo.gl URL Shortener{% endblock%}
 {% block scripts %}

diff --git a/server/demos/twitpic/pages/index.html b/server/demos/twitpic/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/application.html" %}
+{% extends "demos/twitpic/layouts/application.html" %}
 {% block scripts %}
   <link rel=icon href="favicon.ico" />
   <intent action="http://webintents.org/save" 

diff --git a/server/examples/pages/index.html b/server/examples/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Examples{% endblock %}
 {% block headline %}Examples{% endblock %}
 {% block head %}

diff --git a/server/examples/pages/intents/discover/discover.html b/server/examples/pages/intents/discover/discover.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Intent: Discover{% endblock %}
 {% block headline %}Discover Intent Example{% endblock %}
 {% block head %}

diff --git a/server/examples/pages/intents/discover/discover_action.html b/server/examples/pages/intents/discover/discover_action.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Intent: Discover{% endblock %}
 {% block scripts %}
   <script src="//webintents.org/webintents.min.js"></script>

diff --git a/server/examples/pages/intents/discover/discover_discover.html b/server/examples/pages/intents/discover/discover_discover.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Discovery{% endblock %}
 {% block scripts %}
   <script src="//webintents.org/webintents.min.js"></script>

diff --git a/server/examples/pages/intents/pick/pick.html b/server/examples/pages/intents/pick/pick.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block headline %}Pick intent example{% endblock %}
 {% block title %}Intent: Pick{% endblock %}
 {% block scripts %}

diff --git a/server/examples/pages/intents/pick/pick_action.html b/server/examples/pages/intents/pick/pick_action.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Intent: Pick{% endblock %}
 {% block scripts %}
   <script src="//webintents.org/webintents.min.js"></script>

diff --git a/server/examples/pages/intents/pick/pick_pick.html b/server/examples/pages/intents/pick/pick_pick.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Pick an Image{% endblock %}
 {% block scripts %}
   <script src="//webintents.org/webintents.min.js"></script>

diff --git a/server/examples/pages/intents/share/share.html b/server/examples/pages/intents/share/share.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Intent: Share{% endblock %}
 {% block headline %}Share intent examples{% endblock %}
 {% block scripts %}

diff --git a/server/examples/pages/intents/share/share_action.html b/server/examples/pages/intents/share/share_action.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% content scripts %}
   <script src="//webintents.org/webintents.min.js"></script>
   <script src="/javascripts/events.js"></script>

diff --git a/server/examples/pages/intents/share/share_image.html b/server/examples/pages/intents/share/share_image.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Share Image{% endblock %}
 {% block headline %}Image Sharing app{% endblock %}
 

diff --git a/server/examples/pages/intents/share/share_link.html b/server/examples/pages/intents/share/share_link.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Share Link{% endblock %}
 {% block headline %}Link Sharing app{% endblock %}
 {% block head %}

diff --git a/server/examples/pages/intents/shorten/shorten.html b/server/examples/pages/intents/shorten/shorten.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Intent: Shorten{% endblock %}
 {% block headline %}Shorten Intent Example{% endblock %}
 {% block head %}

diff --git a/server/examples/pages/intents/shorten/shorten_action.html b/server/examples/pages/intents/shorten/shorten_action.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Kinlan's Link Shortener{% endblock %}
 {% block headline %}Kinlan's Link Shortener{% endblock %}
 {% block scripts %}

diff --git a/...ages/usage/declarativeRegister/index.html → .../usage/declarativeRegistration/index.html b/...ages/usage/declarativeRegister/index.html → .../usage/declarativeRegistration/index.html
diff --git a/server/examples/pages/usage/startActivity/index.html b/server/examples/pages/usage/startActivity/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "examples/layouts/base.html" %}
 {% block title %}Example: startActivity{% endblock %}
 {% block headline %}Example: startActivity{% endblock %}
 {% block scripts %}

diff --git a/server/handlers_base.py b/server/handlers_base.py
@@ -25,7 +25,6 @@ class PageHandler(webapp2.RequestHandler):
   def render_file(self, file, domain):
     import logging
     self.response.headers['X-Content-Security-Policy'] = "allow 'self'; img-src *; script-src www.google-analytics.com apis.google.com;"
-    request_path = os.path.dirname(self.request.path[1:]) # Slice off the leading slash
 
     if file is None or file == "":
       file = "index.html"
@@ -41,15 +40,17 @@ def render_file(self, file, domain):
     self.response.headers['Content-Type'] = content_type
 
     # test if the file exists in the static
-    path = os.path.join(domain,  request_path , "static", file)
+    path = os.path.join(os.path.dirname(__file__), domain, "static", file)
     if os.path.exists(path):
       f = open(path, "r")
       self.response.out.write(f.read())
       return
-
-    path = os.path.join(domain, request_path,  "pages", file)
+
+    template_path = os.path.join(domain, "pages", file)
+    logging.info(template_path)
+    path = os.path.join(os.path.dirname(__file__), template_path) 
     if os.path.exists(path):
-      template = jinja_environment.get_template(path)
+      template = jinja_environment.get_template(template_path)
       self.response.out.write(template.render())
     else:
       self.error(404)

diff --git a/server/registry/pages/index.html b/server/registry/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "registry/layouts/base.html" %}
 {% block title %}Web Intents: Index{% endblock %}
 {% block headline %}Web Intents: Index{% endblock %}
 {% block head %}

diff --git a/server/server.py b/server/server.py
@@ -18,25 +18,28 @@
 
 exampleRoutes = [ Route('/<:.*>', handlers_base.PageHandler, 'examples')]
 demoRoutes = [
-      Route('/mememator/proxy', demos.mememator.handlers.ProxyHandler, 'demos'),
-      Route('/mememator/<:.*>', handlers_base.PageHandler, 'demos'),
-      Route('/imagestudio/<:.*>', handlers_base.PageHandler, 'demos'),
-      Route('/twitpic/proxy', demos.twitpic.handlers.ProxyHandler, 'demos'),
-      Route('/twitpic/upload', demos.twitpic.handlers.UploadHandler, 'demos'),
-      Route('/twitpic/<:.*>', handlers_base.PageHandler, 'demos'),
-      Route('/shortener/shorten', demos.shortener.handlers.ShortenHandler, 'demos'),
-      Route('/shortener/<:.*>', handlers_base.PageHandler, 'demos'),
-      Route('/instapaper/add', demos.instapaper.handlers.AddHandler, 'demos'),
-      Route('/instapaper/<:.*>', handlers_base.PageHandler, 'demos'),
-      Route('/imgur/save', demos.imgur.handlers.SaveHandler, 'demos'),
-      Route('/imgur/<:.*>', handlers_base.PageHandler, 'demos'),
+      Route('/mememator/proxy', demos.mememator.handlers.ProxyHandler, 'demos/mememator'),
+      Route('/mememator/<:.*>', handlers_base.PageHandler, 'demos/mememator'),
+      Route('/imagestudio/<:.*>', handlers_base.PageHandler, 'demos/imagestudio'),
+      Route('/twitpic/proxy', demos.twitpic.handlers.ProxyHandler, 'demos/twitpic'),
+      Route('/twitpic/upload', demos.twitpic.handlers.UploadHandler, 'demos/twitpic'),
+      Route('/twitpic/<:.*>', handlers_base.PageHandler, 'demos/twitpic'),
+      Route('/shortener/shorten', demos.shortener.handlers.ShortenHandler, 'demos/shortener'),
+      Route('/shortener/<:.*>', handlers_base.PageHandler, 'demos/shortener'),
+      Route('/instapaper/add', demos.instapaper.handlers.AddHandler, 'demos/instapaper'),
+      Route('/instapaper/<:.*>', handlers_base.PageHandler, 'demos/instapaper'),
+      Route('/imgur/save', demos.imgur.handlers.SaveHandler, 'demos/imgur'),
+      Route('/imgur/<:.*>', handlers_base.PageHandler, 'demos/imgur'),
       Route('/<:.*>', handlers_base.PageHandler, 'demos')
 ]
 
 app = webapp2.WSGIApplication([
     routes.DomainRoute('webintents-org.appspot.com', [
       Route('/<:.*>', handlers_base.PageHandler, 'webintents')
     ]),
+    routes.DomainRoute('webintents.org', [
+      Route('/<:.*>', handlers_base.PageHandler, 'webintents')
+    ]),
     routes.DomainRoute('examples.webintents-org.appspot.com', exampleRoutes),
     routes.DomainRoute('examples.webintents.org', exampleRoutes),
     routes.DomainRoute('demos.webintents-org.appspot.com', demoRoutes ),

diff --git a/server/webintents/pages/discover b/server/webintents/pages/discover
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Discover{% endblock %}
 {% block headline %}Discover - http://webintents.org/discover{% endblock %}
 {% block content %}

diff --git a/server/webintents/pages/edit b/server/webintents/pages/edit
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Edit{% endblock %}
 {% block headline %}Edit - http://webintents.org/edit{% endblock %}
 {% block content %}

diff --git a/server/webintents/pages/faq.html b/server/webintents/pages/faq.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Web Intents FAQ{% endblock %}
 {% block headline %}Web Intents FAQ{% endblock %}
 {% block head %}

diff --git a/server/webintents/pages/index.html b/server/webintents/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Web Intents{% endblock %}
 {% block headline %}Web Intents{% endblock %}
 {% block head %}

diff --git a/server/webintents/pages/pick b/server/webintents/pages/pick
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Pick{% endblock %}
 {% block headline %}Pick - http://webintents.org/pick{% endblock %}
 {% block content %}

diff --git a/server/webintents/pages/save b/server/webintents/pages/save
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Save{% endblock %}
 {% block headline %}Save - http://webintents.org/save{% endblock %}
 {% block content %}

diff --git a/server/webintents/pages/share b/server/webintents/pages/share
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Share{% endblock %}
 {% block headline %}Share - http://webintents.org/share{% endblock %}
 {% block content %}

diff --git a/server/webintents/pages/subscribe b/server/webintents/pages/subscribe
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}Subscribe{% endblock %}
 {% block headline %}Subscribe - http://webintents.org/subscribe{% endblock %}
 {% block content %}

diff --git a/server/webintents/pages/view b/server/webintents/pages/view
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "webintents/layouts/base.html" %}
 {% block title %}View{% endblock %}
 {% block headline %}View - http://webintents.org/view{% endblock %}
 {% block content %}

diff --git a/server/widgets/pages/index.html b/server/widgets/pages/index.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "widgets/layouts/base.html" %}
 {% block title %}Widgets{% endblock %}
 {% block headline %}Widgets{% endblock %}
 {% block content %}

diff --git a/server/widgets/pages/save.html b/server/widgets/pages/save.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "widgets/layouts/base.html" %}
 {% block title %}Widgets: Save{% endblock %}
 {% block headline %}Save{% endblock %}
 {% block head %}

diff --git a/server/widgets/pages/share.html b/server/widgets/pages/share.html
@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "widgets/layouts/base.html" %}
 {% block title %}Widgets: Share{% endblock %}
 {% block headline %}Share{% endblock %}
 {% block head %}