Commit 377b3cf62378dc0b1bdd57cdbbc9c6d73c3560d6
Committed by
Sergio Oliveira
Sergio Oliveira
1 parent
3e96a0a5
Exists in
master
and in
39 other branches
Updated and fixed browserid logins
Conflicts: requirements.txt src/templates/base.html
Showing
2 changed files
with
2 additions
and
1 deletions
Show diff stats
requirements.txt
| @@ -18,7 +18,6 @@ django-hitcounter==0.1.1 | @@ -18,7 +18,6 @@ django-hitcounter==0.1.1 | ||
| 18 | Pillow==2.5.1 | 18 | Pillow==2.5.1 |
| 19 | django-i18n-model==0.0.7 | 19 | django-i18n-model==0.0.7 |
| 20 | django-tastypie==0.11.0 | 20 | django-tastypie==0.11.0 |
| 21 | - | ||
| 22 | gunicorn==19.1.0 | 21 | gunicorn==19.1.0 |
| 23 | eventlet==0.15.0 | 22 | eventlet==0.15.0 |
| 24 | 23 |
src/templates/base.html
| @@ -44,6 +44,7 @@ | @@ -44,6 +44,7 @@ | ||
| 44 | <body class="container"> | 44 | <body class="container"> |
| 45 | {% browserid_info %} | 45 | {% browserid_info %} |
| 46 | 46 | ||
| 47 | + | ||
| 47 | {% block navbar %} | 48 | {% block navbar %} |
| 48 | <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> | 49 | <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> |
| 49 | <div class="container"> | 50 | <div class="container"> |
| @@ -139,6 +140,7 @@ | @@ -139,6 +140,7 @@ | ||
| 139 | </div> | 140 | </div> |
| 140 | </div> | 141 | </div> |
| 141 | </nav> | 142 | </nav> |
| 143 | + | ||
| 142 | {% endblock %} | 144 | {% endblock %} |
| 143 | 145 | ||
| 144 | {% block messages %} | 146 | {% block messages %} |