diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/_pagination.html | 6 | ||||
| -rw-r--r-- | templates/group.html | 12 | ||||
| -rw-r--r-- | templates/index.html | 2 | ||||
| -rw-r--r-- | templates/layout.html | 12 | ||||
| -rw-r--r-- | templates/login.html (renamed from templates/auth/login.html) | 0 |
5 files changed, 18 insertions, 14 deletions
diff --git a/templates/_pagination.html b/templates/_pagination.html index f53df57..a8d1114 100644 --- a/templates/_pagination.html +++ b/templates/_pagination.html @@ -1,7 +1,7 @@ {% macro render_pagination(pagination) %} <ul class="pagination" style="margin-top: 5px; margin-bottom: 0; padding: 0"> {% if pagination.has_prev %} - <li><a href="{{ url_for_other_page(pagination.page - 1) }}">«</a></li> + <li><a href="{{ url_for_other_page(pagination.prev_num) }}">«</a></li> {% else %} <li class="disabled"><a href="#">«</a></li> {% endif %} @@ -13,13 +13,13 @@ {% else %} <li class="active"><a href="#">{{ page }}</a></li> {% endif %} - {% else %} + {% else %} <li class="disabled"><a href="#">…</a></li> {% endif %} {%- endfor %} {% if pagination.has_next %} - <li><a href="{{ url_for_other_page(pagination.page + 1) }}">»</a></li> + <li><a href="{{ url_for_other_page(pagination.next_num) }}">»</a></li> {% else %} <li class="disabled"><a href="#">»</a></li> {% endif %} diff --git a/templates/group.html b/templates/group.html index 6a5236c..38e078f 100644 --- a/templates/group.html +++ b/templates/group.html @@ -16,6 +16,12 @@ No description {% endif %} </div> + + {% if not public_view and group.public %} + <div class="panel-footer text-center"> + This group is public viewable. + </div> + {% endif %} </div> {% if not public_view %} @@ -30,10 +36,10 @@ {% endif %} <tr> - <td class="col-sm-11 nopadding"> + <td class="col-sm-10 nopadding"> <a href="{{ url_for('pad', group_name=group.name, pad_name=pad.name) }}" class="block">{{pad}}</a> </td> - <td class="col-sm-1 text-right"> + <td class="col-sm-2 text-right"> <a href="{{ url_for('pad_change', group_name=group.name, pad_name=pad.name) }}" class="btn btn-xs btn-info"> <span class="glyphicon glyphicon-cog" /> </a> @@ -87,7 +93,7 @@ </tr> {% endif %} <tr> - <td>{{member.user.username}}</td> + <td>{{member.user.name}}</td> <td class="text-center">{{member.user.email}}</td> <td class="text-right"> <a href="{{ url_for('group_join', group_name=group.name, member_id=member.id, accept='yes') }}" class="btn btn-xs btn-success">Accept</a> diff --git a/templates/index.html b/templates/index.html index 1c4e612..f79fb68 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% from "_formhelpers.html" import render_field %} -{% block head %}Hello {{user.username}}!{% endblock %} +{% block head %}Hello {{current_user.name}}!{% endblock %} {% block content %} <div class="panel panel-default"> diff --git a/templates/layout.html b/templates/layout.html index 4019773..4ba5c4a 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -54,21 +54,19 @@ <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> - {% if user %} - {% if user.admin %} + {% if current_user.is_authenticated %} + {% if current_user.admin %} <li><a href="{{ url_for('admin.index') }}"><span class="glyphicon glyphicon-dashboard" /> Admin</a></li> {% endif %} - <li><a href="{{ url_for('auth.logout') }}"><span class="glyphicon glyphicon-log-out" /> Logout</a></li> + <li><a href="{{ url_for('logout') }}"><span class="glyphicon glyphicon-log-out" /> Logout</a></li> {% else %} - <li><a href="{{ url_for('auth.login') }}"><span class="glyphicon glyphicon-log-in" /> Login</a></li> + <li><a href="{{ url_for('login') }}"><span class="glyphicon glyphicon-log-in" /> Login</a></li> {% endif %} </ul> </div><!-- /.navbar-collapse --> </nav> - - {% for categorie, message in get_flashed_messages(with_categories=true) %} {% if categorie == 'message' %} <div class="alert alert-danger">{{ message }}</div> @@ -76,7 +74,7 @@ <div class="alert alert-{{categorie}}">{{ message }}</div> {% endif %} {% endfor %} - + {% block content %}{% endblock %} </div> </body> diff --git a/templates/auth/login.html b/templates/login.html index 3ba4e2e..3ba4e2e 100644 --- a/templates/auth/login.html +++ b/templates/login.html |