[llvm-commits] [zorg] r146500 - in /zorg/trunk/llvmlab/llvmlab/ui: ci/views.py frontend/views.py templates/index.html templates/layout.html

Tue Dec 13 11:00:47 PST 2011

Author: ddunbar
Date: Tue Dec 13 13:00:47 2011
New Revision: 146500

URL: http://llvm.org/viewvc/llvm-project?rev=146500&view=rev
Log:
llvmlab.ui: Compatibility update for Flask 0.7+ change to blueprint model.

Modified:
    zorg/trunk/llvmlab/llvmlab/ui/ci/views.py
    zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py
    zorg/trunk/llvmlab/llvmlab/ui/templates/index.html
    zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html

Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=146500&r1=146499&r2=146500&view=diff
==============================================================================

--- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Tue Dec 13 13:00:47 2011
@@ -7,7 +7,7 @@
 from flask import session
 from flask import url_for
 from flask import current_app
-ci = flask.Module(__name__, url_prefix='/ci')
+ci = flask.Module(__name__, url_prefix='/ci', name='ci')
 
 from llvmlab import util
 

Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?rev=146500&r1=146499&r2=146500&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Tue Dec 13 13:00:47 2011
@@ -13,7 +13,7 @@
 ###
 # Top-level Information
 
-frontend = flask.Module(__name__)
+frontend = flask.Module(__name__, name="frontend")
 
 @frontend.route('/')
 def index():

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/index.html?rev=146500&r1=146499&r2=146500&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/index.html (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Tue Dec 13 13:00:47 2011
@@ -9,7 +9,7 @@
 <li><a href="{{ url_for('logout') }}">logout</a></li>
 <li><a href="{{ url_for('machines') }}">machines</a></li>
 <li><a href="{{ url_for('users') }}">users</a></li>
-<li><a href="{{ url_for('dashboard') }}">dashboard</a></li>
+<li><a href="{{ url_for('ci.dashboard') }}">dashboard</a></li>
 {% if session.logged_in %}
 <li><a href="{{ url_for('user', username=session.active_user) }}">my info</a></li>
 <li><a href="{{ url_for('admin') }}">admin</a></li>

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=146500&r1=146499&r2=146500&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Tue Dec 13 13:00:47 2011
@@ -13,7 +13,7 @@
 </head>
 <body>
   <div class="header">
-    <a href="{{ url_for('index') }}">{#
+    <a href="{{ url_for('frontend.index') }}">{#
       #}lab.llvm.org</a> | {{ self.title() }}
     {% if session.logged_in %}
          
@@ -27,7 +27,7 @@
   </div>
   <div class="body">{% block body %}{% endblock %}</div>
   <div class="footer">
-    <a href="{{ url_for('index') }}">{#
+    <a href="{{ url_for('frontend.index') }}">{#
       #}lab.llvm.org</a><br>
     <i>Administered by <a href="mailto:{{
                                         config['ADMIN_EMAIL'] }}">{{



