diff options
| author | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
|---|---|---|
| committer | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
| commit | 29bb2a36f0b5d1781ab05f1976aa0c5017351807 (patch) | |
| tree | 52b2dd87f4d36f6a9c518cc14f96e523b1dea045 /pyaggr3g470r/templates/admin | |
| parent | misc update (diff) | |
| parent | Minor changes to the CSS. (diff) | |
| download | newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.gz newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.bz2 newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
pyaggr3g470r/controllers/feed.py
pyaggr3g470r/templates/home.html
Diffstat (limited to 'pyaggr3g470r/templates/admin')
| -rw-r--r-- | pyaggr3g470r/templates/admin/create_user.html | 2 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/admin/user.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pyaggr3g470r/templates/admin/create_user.html b/pyaggr3g470r/templates/admin/create_user.html index 833ae601..1d6d6c11 100644 --- a/pyaggr3g470r/templates/admin/create_user.html +++ b/pyaggr3g470r/templates/admin/create_user.html @@ -4,7 +4,7 @@ {% endblock %} {% block content %} <div class="container"> - <div class="jumbotron"> + <div class="well"> <h2>{{ message | safe }}</h2> <form action="" method="post" name="saveprofileform" id="profileform"> {{ form.hidden_tag() }} diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html index 046093e1..f20d53dd 100644 --- a/pyaggr3g470r/templates/admin/user.html +++ b/pyaggr3g470r/templates/admin/user.html @@ -4,7 +4,7 @@ {% endblock %} {% block content %} <div class="container"> - <div class="jumbotron"> + <div class="well"> <a href="/admin/edit_user/{{ user.id }}" class="btn btn-default">{{ _('Edit this user') }}</a> <h2>{{ _('Membership') }}</h2> <div class="row"> @@ -14,7 +14,7 @@ </div> </div> </div> - <div class="jumbotron"> + <div class="well"> {% if user.feeds.all()|count == 0 %} <h1>{{ _('This user is not subscribed to any feed.') }}</h1> {% else %} |