Skip to content
Browse files

Merge commit 'b39c1ecd45899266283558e3b4e9087572a161b4' into development

  • Loading branch information...
2 parents d317d02 + b39c1ec commit 3f6cecb8a019289e9648061d1dfcefe32c04ae1f @amol- amol- committed May 23, 2012
View
4 devtools/commands/quickstart_jinja/master.html
@@ -25,13 +25,13 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="${tg.url('/images/turbogears_logo.png')}" alt="TurboGears 2"/> ${getattr(tmpl_context, 'project_name', 'turbogears2')}</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="${('', 'active')[defined('page') and page=='index']}"><a href="${tg.url('/')}">Welcome</a></li>
<li class="${('', 'active')[defined('page') and page=='about']}"><a href="${tg.url('/about')}">About</a></li>
<li class="${('', 'active')[defined('page') and page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>
<li class="${('', 'active')[defined('page') and page=='environ']}"><a href="${tg.url('/environ')}">WSGI Environment</a></li>
</ul>
- <ul class="nav pull-right" py:if="tg.auth_stack_enabled">
+ <ul class="nav nav-pills pull-right" py:if="tg.auth_stack_enabled">
<li py:if="not request.identity"><a href="${tg.url('/login')}">Login</a></li>
<li py:if="request.identity"><a href="${tg.url('/logout_handler')}">Logout</a></li>
<li py:if="request.identity"><a href="${tg.url('/admin')}">Admin</a></li>
View
4 devtools/commands/quickstart_jinja/master.jinja
@@ -19,15 +19,15 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="{{tg.url('/images/turbogears_logo.png')}}" alt="TurboGears 2"/>turbogears2</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="{% if page == 'index' %}active{% endif %}"><a href="{{ tg.url('/') }}">Welcome</a></li>
<li><a href="{{ tg.url('/about') }}" class="{% if page == 'about' %}active{% endif %}">About</a></li>
<li><a href="{{ tg.url('/data') }}" class="{% if page == 'data' %}active{% endif %}">Serving Data</a></li>
<li><a href="{{ tg.url('/environ') }}" class="{% if page == 'environ' %}active{% endif %}">WSGI Environment</a></li>
</ul>
{% if tg.auth_stack_enabled %}
- <ul class="nav pull-right">
+ <ul class="nav nav-pills pull-right">
{% if request.identity %}
<li><a href="{{tg.url('/logout_handler')}}">Logout</a></li>
<li><a href="{{tg.url('/admin')}}">Admin</a></li>
View
4 devtools/commands/quickstart_kajiki/master.html
@@ -20,13 +20,13 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="${tg.url('/images/turbogears_logo.png')}" alt="TurboGears 2"/> ${getattr(tmpl_context, 'project_name', 'turbogears2')}</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="${('', 'active')[defined('page') and page=='index']}"><a href="${tg.url('/')}">Welcome</a></li>
<li class="${('', 'active')[defined('page') and page=='about']}"><a href="${tg.url('/about')}">About</a></li>
<li class="${('', 'active')[defined('page') and page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>
<li class="${('', 'active')[defined('page') and page=='environ']}"><a href="${tg.url('/environ')}">WSGI Environment</a></li>
</ul>
- <ul class="nav pull-right" py:if="tg.auth_stack_enabled">
+ <ul class="nav nav-pills pull-right" py:if="tg.auth_stack_enabled">
<li py:if="not request.identity"><a href="${tg.url('/login')}">Login</a></li>
<li py:if="request.identity"><a href="${tg.url('/logout_handler')}">Logout</a></li>
<li py:if="request.identity"><a href="${tg.url('/admin')}">Admin</a></li>
View
4 devtools/commands/quickstart_kajiki/master.xml
@@ -20,13 +20,13 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="${tg.url('/images/turbogears_logo.png')}" alt="TurboGears 2"/> ${getattr(tmpl_context, 'project_name', 'turbogears2')}</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="${('', 'active')[self.defined('page') and page=='index']}"><a href="${tg.url('/')}">Welcome</a></li>
<li class="${('', 'active')[self.defined('page') and page=='about']}"><a href="${tg.url('/about')}">About</a></li>
<li class="${('', 'active')[self.defined('page') and page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>
<li class="${('', 'active')[self.defined('page') and page=='environ']}"><a href="${tg.url('/environ')}">WSGI Environment</a></li>
</ul>
- <ul class="nav pull-right" py:if="tg.auth_stack_enabled">
+ <ul class="nav nav-pills pull-right" py:if="tg.auth_stack_enabled">
<li py:if="not request.identity"><a href="${tg.url('/login')}">Login</a></li>
<li py:if="request.identity"><a href="${tg.url('/logout_handler')}">Logout</a></li>
<li py:if="request.identity"><a href="${tg.url('/admin')}">Admin</a></li>
View
4 devtools/commands/quickstart_mako/master.html
@@ -25,13 +25,13 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="${tg.url('/images/turbogears_logo.png')}" alt="TurboGears 2"/> ${getattr(tmpl_context, 'project_name', 'turbogears2')}</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="${('', 'active')[defined('page') and page=='index']}"><a href="${tg.url('/')}">Welcome</a></li>
<li class="${('', 'active')[defined('page') and page=='about']}"><a href="${tg.url('/about')}">About</a></li>
<li class="${('', 'active')[defined('page') and page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>
<li class="${('', 'active')[defined('page') and page=='environ']}"><a href="${tg.url('/environ')}">WSGI Environment</a></li>
</ul>
- <ul class="nav pull-right" py:if="tg.auth_stack_enabled">
+ <ul class="nav nav-pills pull-right" py:if="tg.auth_stack_enabled">
<li py:if="not request.identity"><a href="${tg.url('/login')}">Login</a></li>
<li py:if="request.identity"><a href="${tg.url('/logout_handler')}">Logout</a></li>
<li py:if="request.identity"><a href="${tg.url('/admin')}">Admin</a></li>
View
6 devtools/commands/quickstart_mako/master.mak
@@ -29,7 +29,7 @@
<%def name="body_class()"></%def>
<%def name="meta()">
- <meta charset="utf-8" />
+ <meta charset="${response.charset}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</%def>
@@ -47,15 +47,15 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="${tg.url('/images/turbogears_logo.png')}" alt="TurboGears 2"/> ${getattr(tmpl_context, 'project_name', 'turbogears2')}</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="${('', 'active')[page=='index']}"><a href="${tg.url('/')}">Welcome</a></li>
<li class="${('', 'active')[page=='about']}"><a href="${tg.url('/about')}">About</a></li>
<li class="${('', 'active')[page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>
<li class="${('', 'active')[page=='environ']}"><a href="${tg.url('/environ')}">WSGI Environment</a></li>
</ul>
% if tg.auth_stack_enabled:
- <ul class="nav pull-right">
+ <ul class="nav nav-pills pull-right">
% if not request.identity:
<li><a href="${tg.url('/login')}">Login</a></li>
% else:
View
2 devtools/templates/turbogears/+package+/templates/master.html
@@ -20,7 +20,7 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><img src="${tg.url('/images/turbogears_logo.png')}" alt="TurboGears 2"/> ${getattr(tmpl_context, 'project_name', 'turbogears2')}</a>
- <ul class="nav">
+ <ul class="nav nav-pills">
<li class="${('', 'active')[defined('page') and page=='index']}"><a href="${tg.url('/')}">Welcome</a></li>
<li class="${('', 'active')[defined('page') and page=='about']}"><a href="${tg.url('/about')}">About</a></li>
<li class="${('', 'active')[defined('page') and page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>

0 comments on commit 3f6cecb

Please sign in to comment.
Something went wrong with that request. Please try again.