summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2016-01-10 23:15:48 +0100
committerAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2016-01-10 23:15:48 +0100
commitdc13ffa2d9268b952ddd307ea515dc82d218222e (patch)
treee651abb364e0adabb93dad1fb488967587258c61
parent326e9e0ae16343cb31defd4710ff6b76c079bfdf (diff)
downloadpadlite-teams-dc13ffa2d9268b952ddd307ea515dc82d218222e.tar.gz
padlite-teams-dc13ffa2d9268b952ddd307ea515dc82d218222e.tar.bz2
padlite-teams-dc13ffa2d9268b952ddd307ea515dc82d218222e.zip
templates: Code style
-rw-r--r--templates/group.html30
-rw-r--r--templates/group_change.html4
-rw-r--r--templates/group_delete.html4
-rw-r--r--templates/index.html10
-rw-r--r--templates/login.html4
-rw-r--r--templates/pad_change.html24
-rw-r--r--templates/pad_delete.html9
7 files changed, 55 insertions, 30 deletions
diff --git a/templates/group.html b/templates/group.html
index c70cc77..cd815c0 100644
--- a/templates/group.html
+++ b/templates/group.html
@@ -35,7 +35,9 @@
<tr>
<td class="col-sm-10 nopadding">
- <a href="{{ url_for('pad', group_name=group.name, pad_name=pad.name) }}" class="block">{{pad}}</a>
+ <a href="{{ url_for('pad', group_name=group.name, pad_name=pad.name) }}" class="block">
+ {{pad}}
+ </a>
</td>
<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">
@@ -70,7 +72,9 @@
<ul class="list-group">
{% for member in members|selectattr("active") %}
- <li class="list-group-item">{{member.user}}{% if member.admin %} (is admin){% endif %}</li>
+ <li class="list-group-item">
+ {{member.user}} {% if member.admin %}(is admin){% endif %}
+ </li>
{% endfor %}
</ul>
</div>
@@ -129,7 +133,7 @@
$('#collapseOperations').collapse('hide');
</script>
{% endif %}
-{% else %}{# if public_view #}
+{% else %}{# if not membership.active #}
<div class="panel panel-default">
<div class="panel-heading">
@@ -138,17 +142,19 @@
<div class="panel-body">
{% if membership %}
- <div class="text-center">
- Membership request pending.
- </div>
+ <div class="text-center">
+ Membership request pending.
+ </div>
{% else %}
- <form class="form-horizontal" role="form" method="POST">
- <div class="form-group">
- <div class="col-lg-offset-2 col-lg-8">
- <button type="submit" class="btn btn-block btn-default">Request membership</button>
+ <form class="form-horizontal" role="form" method="POST">
+ <div class="form-group">
+ <div class="col-lg-offset-2 col-lg-8">
+ <button type="submit" class="btn btn-block btn-default">
+ Request membership
+ </button>
+ </div>
</div>
- </div>
- </form>
+ </form>
{% endif %}
</div>
</div>
diff --git a/templates/group_change.html b/templates/group_change.html
index 24cefa4..0c62f70 100644
--- a/templates/group_change.html
+++ b/templates/group_change.html
@@ -14,7 +14,9 @@
{% endfor %}
<div class="form-group">
<div class="col-lg-10 col-lg-offset-2">
- <button type="submit" class="btn btn-primary">Save group</button>
+ <button type="submit" class="btn btn-primary">
+ Save group
+ </button>
</div>
</div>
</form>
diff --git a/templates/group_delete.html b/templates/group_delete.html
index c0ec22d..238a993 100644
--- a/templates/group_delete.html
+++ b/templates/group_delete.html
@@ -27,7 +27,9 @@
{% endfor %}
<div class="form-group">
<div class="col-lg-offset-2 col-lg-8">
- <button type="submit" class="btn btn-danger btn-lg btn-block">Delete group {{group}}</button>
+ <button type="submit" class="btn btn-danger btn-lg btn-block">
+ Delete group {{group}}
+ </button>
</div>
</div>
</form>
diff --git a/templates/index.html b/templates/index.html
index 3dd6cb8..74098fe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -9,7 +9,9 @@
<div class="list-group">
{% for group in groups %}
- <a class="list-group-item" href="{{ url_for('group', group_name=group.name) }}">{{group}}</a>
+ <a class="list-group-item" href="{{ url_for('group', group_name=group.name) }}">
+ {{group}}
+ </a>
{% endfor %}
</div>
@@ -26,6 +28,7 @@
</a>
</h3>
</div>
+
<div id="collapseCreate" class="panel-collapse collapse in">
<div class="panel-body">
<form class="form-horizontal" role="form" method="POST">
@@ -34,13 +37,16 @@
{% endfor %}
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
- <button type="submit" class="btn btn-default">Create group</button>
+ <button type="submit" class="btn btn-default">
+ Create group
+ </button>
</div>
</div>
</form>
</div>
</div>
</div>
+
{% if not create_form.errors %}
<script type="text/javascript">
$('#collapseCreate').collapse('hide');
diff --git a/templates/login.html b/templates/login.html
index d6e4574..cd0fb57 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -8,7 +8,9 @@
{% endfor %}
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
- <button type="submit" class="btn btn-default">Sign in</button>
+ <button type="submit" class="btn btn-default">
+ Sign in
+ </button>
</div>
</div>
</form>
diff --git a/templates/pad_change.html b/templates/pad_change.html
index be72486..e4635e5 100644
--- a/templates/pad_change.html
+++ b/templates/pad_change.html
@@ -4,11 +4,13 @@
{% block content %}
<div class="panel panel-default">
<div class="panel-heading">
- {% if pad %}
- <h3 class="panel-title">Edit pad: {{pad.name}}</h3>
- {% else %}
- <h3 class="panel-title">Create a pad</h3>
- {% endif %}
+ <h3 class="panel-title">
+ {% if pad %}
+ Edit pad: {{pad.name}}
+ {% else %}
+ Create a pad
+ {% endif %}
+ </h3>
</div>
<div class="panel-body">
@@ -18,11 +20,13 @@
{% endfor %}
<div class="form-group">
<div class="col-lg-10 col-lg-offset-2">
- {% if pad %}
- <button type="submit" class="btn btn-primary">Save pad</button>
- {% else %}
- <button type="submit" class="btn btn-primary">Create pad</button>
- {% endif %}
+ <button type="submit" class="btn btn-primary">
+ {% if pad %}
+ Save pad
+ {% else %}
+ Create pad
+ {% endif %}
+ </button>
</div>
</div>
</form>
diff --git a/templates/pad_delete.html b/templates/pad_delete.html
index 14ef48c..c1925d7 100644
--- a/templates/pad_delete.html
+++ b/templates/pad_delete.html
@@ -12,9 +12,10 @@
<div class="form-group">
<div class="col-lg-offset-2 col-lg-8">
<p class="form-control-static text-center lead">
- Are you sure you want to delete the pad {{pad}} in the group {{group}}?
+ Are you sure you want to delete the pad {{pad}} in the
+ group {{group}}?
</p>
-
+
<p class="form-control-static text-center">
This will permanently delete all versions and the complete
history of the pad.
@@ -27,7 +28,9 @@
{% endfor %}
<div class="form-group">
<div class="col-lg-offset-2 col-lg-8">
- <button type="submit" class="btn btn-danger btn-lg btn-block">Delete pad {{pad}}</button>
+ <button type="submit" class="btn btn-danger btn-lg btn-block">
+ Delete pad {{pad}}
+ </button>
</div>
</div>
</form>