Drop the superfluous id=None query args

[bluechips.git] / bluechips / templates / base.mako
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako

index 97f0b9b7805ca15542bd5d316860feacb33eb983..0fa65cf7c75abc4cd275cc6ca74a437bfaef4241 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -4,8 +4,11 @@
    <head>
      <meta http-equiv="content-type" content="text/html; charset=utf-8" />
      <title>${self.title()}</title>
-    ${h.stylesheet_link('/css/main.css')}
-    ${h.stylesheet_link('/js/jquery.date_input.css')}
+    ${h.stylesheet_link('%s/css/main.css' % request.script_name)}
+    ${h.stylesheet_link('//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/flick/jquery-ui.css')}
+    ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js')}
+    ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js')}
+    ${h.javascript_link('%s/js/admin.js' % request.script_name)}
    </head>
    <body>
      % if c.mobile_client:
@@ -26,32 +29,32 @@
              </h1>
            </td>
            <td>
-            <a href="${h.url_for(controller='status', action='index', id=None)}">
-              <img src="/icons/status.png" alt="">
+            <a href="${h.url_for(controller='status', action='index')}">
+              <img src="${request.script_name}/icons/status.png" alt="">
                <span>Dashboard</span>
              </a>
            </td>
            <td>
-            <a href="${h.url_for(controller='spend', action='index', id=None)}">
-              <img src="/icons/spend.png" alt="">
+            <a href="${h.url_for(controller='spend', action='index')}">
+              <img src="${request.script_name}/icons/spend.png" alt="">
                <span>Expense</span>
              </a>
            </td>
            <td>
-            <a href="${h.url_for(controller='transfer', action='index', id=None)}">
-              <img src="/icons/transfer.png" alt="">
+            <a href="${h.url_for(controller='transfer', action='index')}">
+              <img src="${request.script_name}/icons/transfer.png" alt="">
                <span>Transfer</span>
              </a>
            </td>
            <td>
-            <a href="${h.url_for(controller='history', action='index', id=None)}">
-              <img src="/icons/history.png" alt="">
+            <a href="${h.url_for(controller='history', action='index')}">
+              <img src="${request.script_name}/icons/history.png" alt="">
                <span>History</span>
              </a>
            </td>
            <td>
-            <a href="${h.url_for(controller='user', action='index', id=None)}">
-              <img src="/icons/user.png" alt="">
+            <a href="${h.url_for(controller='user', action='index')}">
+              <img src="${request.script_name}/icons/user.png" alt="">
                <span>User</span>
              </a>
            </td>
@@ -59,14 +62,11 @@
        </table>
      </div>
      % for message in h.flash.pop_messages():
-      <div class="flash">${message | n}</div>
+      <div class="flash">${str(message) | n}</div>
      % endfor
      <div id="content">
        ${next.body()}
      </div>
-    ${h.javascript_link('/js/jquery-1.3.2.js')}
-    ${h.javascript_link('/js/jquery.date_input.js')}
-    ${h.javascript_link('/js/admin.js')}
    </body>
  </html>