Allura/allura/templates/jinja_master/footer.html
File was removed.
Allura/allura/templates/jinja_master/main_menu.html to Allura/allura/templates/jinja_master/theme_macros.html
--- a/Allura/allura/templates/jinja_master/main_menu.html +++ b/Allura/allura/templates/jinja_master/theme_macros.html @@ -1,15 +1,25 @@ +{%- macro header(u, login_url) %} <div class="nav"> - <div id="mainmenu" class="row"> - <div class="column grid_2"><a href="/" class="logo"> </a></div> - <div class="column grid_10 tright"> - {% if c.user and c.user._id %} + <div id="mainmenu"> + <div class="grid-2"><a href="/" class="logo"> </a></div> + <div class="grid-10 tright"> + {% if u and u._id %} <a href="/account/">Account</a> - <a href="/users/{{c.user.username}}">{{c.user.display_name}}</a> + <a href="/users/{{u.username}}">{{u.display_name}}</a> <a href="/auth/logout">Log Out</a> {% else %} <a href="/auth/create_account">Register</a> - <a href="{{g.login_url}}">Log In</a> + <a href="{{login_url}}">Log In</a> {% endif %} </div> </div> -</div>+</div> +{%- endmacro %} + +{%- macro footer() %} +<footer> + <div class="grid-6"> + This project is powered by <a href="http://sourceforge.net/p/allura/home/">Allura</a>. + </div> +</footer> +{%- endmacro %}