Removed static file finding utilities in theme inheritance, since this doesn't work on prod.

Author: Arachnid

main.py

@@ -39,7 +39,6 @@
 # Import custom django libraries
 webapp.template.register_template_library('utils.django_libs.gravatar')
 webapp.template.register_template_library('utils.django_libs.description')
-webapp.template.register_template_library('utils.django_libs.find_static')
 
 # Log a message each time this module get loaded.
 logging.info('Loading %s, app version = %s',

utils/django_libs/find_static.py

@@ -101,7 +101,6 @@ class below because Django requires you to load the template with a method
     directory, file_name = os.path.split(abspath)
     if directory:
       template_dirs = [directory] + template_dirs
-    logging.warn(template_dirs, file_name)
     new_settings = {
         'TEMPLATE_DIRS': template_dirs,
         'TEMPLATE_DEBUG': debug,

utils/template.py

@@ -52,7 +52,6 @@ def build_tree(base):
         do_build_tree(basedir, theme, tree)
     return tree
 templates = build_tree('views')
-staticfiles = build_tree('static')
 
 def find_file(tree, path):
     cur = tree

view.py

@@ -4,7 +4,7 @@
         <meta http-equiv="Content-Type" content="{{ blog.html_type }}; charset={{ blog.charset }}" />
         <title> {{ title }}</title>
         <meta name="generator" content="Bloog {{ bloog_version }}" />
-        <link rel="stylesheet" href="{{"style.css"|find_static_file}}" type="text/css" media="screen" />
+        <link rel="stylesheet" href="/static/default/style.css" type="text/css" media="screen" />
         <link rel="alternate" type="application/rss+xml" title="{{ blog.title }} RSS Feed" 
               href="{{ blog.root_url }}{{ blog.master_atom_url }}" />
         <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/assets/skins/sam/skin.css" />
@@ -18,7 +18,7 @@
             <div id="masthead" class="fix">
                 <h1><a href="/">{{ blog.title }}</a></h1>
                 <div id="authorBlurb">
-                    <img src="{{"images/avatar.png"|find_static_file}}" alt="Avatar" />
+                    <img src="/static/default/images/avatar.png" alt="Avatar" />
                     <p id="authorIntro">
                         {{ blog.description }}
                     </p>
@@ -89,7 +89,7 @@ <h1><a href="/">{{ blog.title }}</a></h1>
                     <div id="searchWrap">
                         <form method="get" id="searchForm" action="/search">
                             <input type="text" value="{{ searchterm }}" name="s" id="s" />
-                            <input id="searchsubmit" type="image" src="{{"images/btn_search.gif"|find_static_file}}" alt="Search" />
+                            <input id="searchsubmit" type="image" src="/static/default/images/btn_search.gif" alt="Search" />
                         </form>
                     </div>
                     {% endblock %}
@@ -254,7 +254,7 @@ <h3>Subscribe</h3>
         </div>
 
         <script type="text/javascript" src="http://yui.yahooapis.com/2.5.2/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-        <script type="text/javascript" src="{{"js/bloog_base.js"|find_static_file}}"></script>
+        <script type="text/javascript" src="/static/default/js/bloog_base.js"></script>
 
         {% if user_is_admin %}
         {% include "form_editor.html" %}

views/default/bloog/base.html

@@ -37,8 +37,8 @@
 {% if not user_is_admin %}
 <!-- Load scripts if not already loaded due to admin interface -->
 <script type="text/javascript" src="http://yui.yahooapis.com/combo?2.5.2/build/yahoo-dom-event/yahoo-dom-event.js&2.5.2/build/animation/animation-min.js&2.5.2/build/connection/connection-min.js&2.5.2/build/container/container-min.js&2.5.2/build/menu/menu-min.js&2.5.2/build/element/element-beta-min.js&2.5.2/build/button/button-min.js&2.5.2/build/editor/editor-beta-min.js&2.5.2/build/selector/selector-beta-min.js"></script>
-<script type="text/javascript" src="{{"js/ojay/js-class.js"|find_static_file}}"></script>
-<script type="text/javascript" src="{{"js/ojay/core.js"|find_static_file}}"></script>
+<script type="text/javascript" src="/static/default/js/ojay/js-class.js"></script>
+<script type="text/javascript" src="/static/default/js/ojay/core.js"></script>
 {% endif %}
-<script type="text/javascript" src="{{"js/bloog_comments.js"|find_static_file}}"></script>
+<script type="text/javascript" src="/static/default/js/bloog_comments.js"></script>
 

views/default/bloog/blog/form_comment.html

@@ -21,7 +21,7 @@ <h2>Contact Me</h2>
             <p><input type="text" id="subject" name="subject" size="22" tabindex="3" />
                 <label for="subject"><small>Subject</small></label></p>
             <p><textarea id="message" name="message" cols="60" rows="10" tabindex="4">Please enter a message.</textarea></p>
-            <p><input name="submit" type="image" src="{{"images/btn_submit.gif"|find_static_file}}" alt="Submit" id="submit" tabindex="5" value="Submit" /></p>
+            <p><input name="submit" type="image" src="/static/default/images/btn_submit.gif" alt="Submit" id="submit" tabindex="5" value="Submit" /></p>
             <input type="hidden" name="token" value="{{ token }}" />
             <input type="hidden" name="curtime" value="{{ curtime|floatformat }}" />
         </form>

views/default/bloog/contact/contact.get.html

@@ -1,7 +1,7 @@
 {% if user_is_admin %}
 
 {% block head %}
-<link rel="stylesheet" type="text/css" href="{{"editor.css"|find_static_file}}" />
+<link rel="stylesheet" type="text/css" href="/static/default/editor.css" />
 {% endblock %}
 
 <div id="postDialog" class="popupDialog">
@@ -27,9 +27,9 @@
 </div>
 
 <script type="text/javascript" src="http://yui.yahooapis.com/combo?2.5.2/build/yahoo-dom-event/yahoo-dom-event.js&2.5.2/build/animation/animation-min.js&2.5.2/build/connection/connection-min.js&2.5.2/build/container/container-min.js&2.5.2/build/menu/menu-min.js&2.5.2/build/element/element-beta-min.js&2.5.2/build/button/button-min.js&2.5.2/build/editor/editor-beta-min.js&2.5.2/build/selector/selector-beta-min.js"></script>
-<script type="text/javascript" src="{{"js/ojay/js-class.js"|find_static_file}}"></script>
-<script type="text/javascript" src="{{"js/ojay/core.js"|find_static_file}}""></script>
-<script type="text/javascript" src="{{"js/bloog_admin.js"|find_static_file}}"></script>
+<script type="text/javascript" src="/static/default/js/ojay/js-class.js"></script>
+<script type="text/javascript" src="/static/default/js/ojay/core.js"></script>
+<script type="text/javascript" src="/static/default/js/bloog_admin.js"></script>
 
 {% endif %}