Skip to content

Commit 3b3e7b8

Browse files
JelteFJelteF
committed
Autoindent django templates (#48)
1 parent 5b41e1b commit 3b3e7b8

File tree

10 files changed

+652
-652
lines changed

10 files changed

+652
-652
lines changed

‎pgcommitfest/commitfest/templates/404.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%extends "base.html" %}
22
{%block title%}Not found{%endblock%}
33
{%block contents%}
4-
<h1>Not found</h1>
5-
<p>The specified URL was not found.</p>
4+
<h1>Not found</h1>
5+
<p>The specified URL was not found.</p>
66
{%endblock%}
77

‎pgcommitfest/commitfest/templates/activity.html

+20-20
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
{%load commitfest %}
33
{%block contents%}
44

5-
<table class="table table-striped table-bordered table-hover table-condensed">
6-
<thead>
7-
<tr>
8-
<th>Time</th>
9-
<th>User</th>
10-
<th>Patch</th>
11-
<th>Activity</th>
12-
</tr>
13-
</thead>
14-
<tbody>
15-
{%for a in activity %}
16-
<tr>
17-
<td style="white-space: nowrap;">{{a.date}}</td>
18-
<td>{{a.by}}</td>
19-
<td><a href="/{%if commitfest%}{{commitfest.id}}{%else%}{{a.cfid}}{%endif%}/{{a.patchid}}/">{{a.name}}</a></td>
20-
<td>{{a.what}}</td>
21-
</tr>
22-
{%endfor%}
23-
</tbody>
24-
</table>
5+
<table class="table table-striped table-bordered table-hover table-condensed">
6+
<thead>
7+
<tr>
8+
<th>Time</th>
9+
<th>User</th>
10+
<th>Patch</th>
11+
<th>Activity</th>
12+
</tr>
13+
</thead>
14+
<tbody>
15+
{%for a in activity %}
16+
<tr>
17+
<td style="white-space: nowrap;">{{a.date}}</td>
18+
<td>{{a.by}}</td>
19+
<td><a href="/{%if commitfest%}{{commitfest.id}}{%else%}{{a.cfid}}{%endif%}/{{a.patchid}}/">{{a.name}}</a></td>
20+
<td>{{a.what}}</td>
21+
</tr>
22+
{%endfor%}
23+
</tbody>
24+
</table>
2525

2626
{%endblock%}

‎pgcommitfest/commitfest/templates/base.html

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
{%load commitfest%}
22
<!DOCTYPE html>
33
<html>
4-
<head>
4+
<head>
55
<title>{{title}}</title>
66
<link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
77
<link rel="stylesheet" href="/media/commitfest/css/bootstrap.css" />
88
<link rel="stylesheet" href="/media/commitfest/css/bootstrap-theme.min.css" />
99
<link rel="stylesheet" href="/media/commitfest/css/commitfest.css?{% static_file_param %}" />
1010
<link rel="shortcut icon" href="/media/commitfest/favicon.ico" />
11-
{%block extrahead%}{%endblock%}
12-
{%if rss_alternate%} <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
13-
</head>
14-
<body>
15-
<div class="container-fluid">
16-
<ul class="breadcrumb">
17-
<li><a href="/">Home</a></li>
18-
{%for c in breadcrumbs%}
19-
<li><a href="{{c.href}}">{{c.title}}</a></li>
20-
{%endfor%}
21-
<li class="active">{{title}}</li>
22-
<li class="pull-right active">
23-
{%if user.is_authenticated%}
24-
Logged in as {{user}} (<a href="/account/profile/">edit profile</a> | <a href="/account/logout/">log out</a>{%if user.is_staff%} | <a href="/admin/">administration</a>{%endif%})
25-
{%else%}
26-
<a href="/account/login/?next={{request.path}}">Log in</a>
27-
{%endif%}
28-
</li>
29-
{%if header_activity%} <li class="pull-right active"><a href="{{header_activity_link}}">{{header_activity}}</a></li>{%endif%}
30-
</ul>
11+
{%block extrahead%}{%endblock%}
12+
{%if rss_alternate%} <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
13+
</head>
14+
<body>
15+
<div class="container-fluid">
16+
<ul class="breadcrumb">
17+
<li><a href="/">Home</a></li>
18+
{%for c in breadcrumbs%}
19+
<li><a href="{{c.href}}">{{c.title}}</a></li>
20+
{%endfor%}
21+
<li class="active">{{title}}</li>
22+
<li class="pull-right active">
23+
{%if user.is_authenticated%}
24+
Logged in as {{user}} (<a href="/account/profile/">edit profile</a> | <a href="/account/logout/">log out</a>{%if user.is_staff%} | <a href="/admin/">administration</a>{%endif%})
25+
{%else%}
26+
<a href="/account/login/?next={{request.path}}">Log in</a>
27+
{%endif%}
28+
</li>
29+
{%if header_activity%} <li class="pull-right active"><a href="{{header_activity_link}}">{{header_activity}}</a></li>{%endif%}
30+
</ul>
3131

32-
<h1>{{title}}</h1>
32+
<h1>{{title}}</h1>
3333

34-
{%if messages%}
35-
{%for m in messages%}
36-
<div class="alert {{m.tags|alertmap}}">{{m}}</div>
37-
{%endfor%}
38-
{%endif%}
34+
{%if messages%}
35+
{%for m in messages%}
36+
<div class="alert {{m.tags|alertmap}}">{{m}}</div>
37+
{%endfor%}
38+
{%endif%}
3939

40-
{%block contents%}
41-
{%endblock%}
42-
</div>
43-
<script src="/media/commitfest/js/jquery.js"></script>
44-
<script src="/media/commitfest/js/jquery-ui.js"></script>
45-
<script src="/media/commitfest/js/bootstrap.js"></script>
46-
<script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
47-
{%block morescript%}{%endblock%}
48-
</html>
40+
{%block contents%}
41+
{%endblock%}
42+
</div>
43+
<script src="/media/commitfest/js/jquery.js"></script>
44+
<script src="/media/commitfest/js/jquery-ui.js"></script>
45+
<script src="/media/commitfest/js/bootstrap.js"></script>
46+
<script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
47+
{%block morescript%}{%endblock%}
48+
</html>

‎pgcommitfest/commitfest/templates/base_form.html

+90-90
Original file line numberDiff line numberDiff line change
@@ -2,113 +2,113 @@
22
{%load commitfest%}
33

44
{%block contents%}
5-
<form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
6-
{%if form.errors%}
7-
<div class="alert">Please correct the errors below, and re-submit the form.</div>
8-
{%endif%}
9-
{%if form.non_field_errors%}
10-
<div class="alert alert-danger">{{form.non_field_errors}}</div>
11-
{%endif%}
12-
{%if note%}
13-
<div class="alert alert-info">{{note|safe}}</div>
14-
{%endif%}
15-
{%for field in form%}
16-
{%if not field.is_hidden%}
17-
<div class="form-group">
18-
{{field|label_class:"control-label col-lg-1"}}
19-
<div class="col-lg-11 controls">
20-
{%if field.errors %}
21-
{%for e in field.errors%}
22-
<div class="alert alert-danger">{{e}}</div>
23-
{%endfor%}
5+
<form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
6+
{%if form.errors%}
7+
<div class="alert">Please correct the errors below, and re-submit the form.</div>
248
{%endif%}
25-
{%if not field.name in form.selectize_multiple_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
26-
{%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
27-
</div>
28-
{%else%}
29-
{{field}}
30-
{%endif%}
31-
{%endfor%}
32-
<div class="form-group">
33-
<div class="col-lg-12">
34-
<div class="control"><input type="submit" class="btn btn-default" value="{{savebutton|default:"Save"}}"></div>
9+
{%if form.non_field_errors%}
10+
<div class="alert alert-danger">{{form.non_field_errors}}</div>
11+
{%endif%}
12+
{%if note%}
13+
<div class="alert alert-info">{{note|safe}}</div>
14+
{%endif%}
15+
{%for field in form%}
16+
{%if not field.is_hidden%}
17+
<div class="form-group">
18+
{{field|label_class:"control-label col-lg-1"}}
19+
<div class="col-lg-11 controls">
20+
{%if field.errors %}
21+
{%for e in field.errors%}
22+
<div class="alert alert-danger">{{e}}</div>
23+
{%endfor%}
24+
{%endif%}
25+
{%if not field.name in form.selectize_multiple_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
26+
{%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
27+
</div>
28+
{%else%}
29+
{{field}}
30+
{%endif%}
31+
{%endfor%}
32+
<div class="form-group">
33+
<div class="col-lg-12">
34+
<div class="control"><input type="submit" class="btn btn-default" value="{{savebutton|default:"Save"}}"></div>
35+
</div>
3536
</div>
36-
</div>
37-
</form>
37+
</form>
3838

39-
{%if threadbrowse %}
40-
{%include "thread_attach.inc" %}
41-
{%endif%}
39+
{%if threadbrowse %}
40+
{%include "thread_attach.inc" %}
41+
{%endif%}
4242

43-
{%if user.is_staff%}
44-
<div class="modal fade" id="searchUserModal" role="dialog">
45-
<div class="modal-dialog modal-lg">
43+
{%if user.is_staff%}
44+
<div class="modal fade" id="searchUserModal" role="dialog">
45+
<div class="modal-dialog modal-lg">
4646
<div class="modal-content">
47-
<div class="modal-header">
48-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
49-
<h3>Search user</h3>
50-
</div>
51-
<div class="modal-body">
52-
<form class="form-inline" style="margin-bottom: 5px;">
53-
<div class="input-append">
54-
<input id="searchUserSearchField" type="text" class="span2 search-query" autocomplete="off">
55-
<button id="searchUserSearchButton" onclick="return findUsers()" class="btn btn-default">Search</button>
56-
</div>
57-
</form>
58-
<div>Search for users above and then pick one in the list below:</div>
59-
<div id="searchUserListWrap">
60-
<select id="searchUserList" size="6" style="width:100%;" onchange="searchUserListChanged()"></select>
61-
</div>
62-
</div>
63-
<div class="modal-footer">
64-
<a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
65-
<a href="#" id="doSelectUserButton" class="btn btn-default btn-primary disabled">Add user to system</a>
47+
<div class="modal-header">
48+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
49+
<h3>Search user</h3>
50+
</div>
51+
<div class="modal-body">
52+
<form class="form-inline" style="margin-bottom: 5px;">
53+
<div class="input-append">
54+
<input id="searchUserSearchField" type="text" class="span2 search-query" autocomplete="off">
55+
<button id="searchUserSearchButton" onclick="return findUsers()" class="btn btn-default">Search</button>
56+
</div>
57+
</form>
58+
<div>Search for users above and then pick one in the list below:</div>
59+
<div id="searchUserListWrap">
60+
<select id="searchUserList" size="6" style="width:100%;" onchange="searchUserListChanged()"></select>
6661
</div>
62+
</div>
63+
<div class="modal-footer">
64+
<a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
65+
<a href="#" id="doSelectUserButton" class="btn btn-default btn-primary disabled">Add user to system</a>
66+
</div>
6767
</div>
68+
</div>
6869
</div>
69-
</div>
70-
{%endif%}
70+
{%endif%}
7171
{%endblock%}
7272

7373
{%block extrahead%}
74-
<link rel="stylesheet" href="/media/commitfest/css/selectize.css" />
75-
<link rel="stylesheet" href="/media/commitfest/css/selectize.default.css" />
74+
<link rel="stylesheet" href="/media/commitfest/css/selectize.css" />
75+
<link rel="stylesheet" href="/media/commitfest/css/selectize.default.css" />
7676
{%endblock%}
7777
{%block morescript%}
78-
<script src="/media/commitfest/js/selectize.min.js"></script>
79-
<script>
78+
<script src="/media/commitfest/js/selectize.min.js"></script>
79+
<script>
8080
/* Set up selectize fields */
81-
{% for f, url in selectize_multiple_fields %}
81+
{% for f, url in selectize_multiple_fields %}
8282
$('#id_{{f}}').selectize({
83-
plugins: ['remove_button'],
84-
valueField: 'id',
85-
labelField: 'value',
86-
searchField: 'value',
87-
load: function(query, callback) {
88-
if (!query.length) return callback();
89-
$.ajax({
90-
'url': '{{url}}',
91-
'type': 'GET',
92-
'dataType': 'json',
93-
'data': {
94-
'query': query,
95-
},
96-
'error': function() { callback();},
97-
'success': function(res) { callback(res.values);},
98-
});
99-
}
83+
plugins: ['remove_button'],
84+
valueField: 'id',
85+
labelField: 'value',
86+
searchField: 'value',
87+
load: function(query, callback) {
88+
if (!query.length) return callback();
89+
$.ajax({
90+
'url': '{{url}}',
91+
'type': 'GET',
92+
'dataType': 'json',
93+
'data': {
94+
'query': query,
95+
},
96+
'error': function() { callback();},
97+
'success': function(res) { callback(res.values);},
98+
});
99+
}
100100
});
101-
{%endfor%}
102-
{%if user.is_staff%}
101+
{%endfor%}
102+
{%if user.is_staff%}
103103
$('.selectize-control').after(
104-
$('<a href="#" class="btn btn-default btn-sm">Import user not listed</a>').click(function () {
105-
search_and_store_user();
106-
})
104+
$('<a href="#" class="btn btn-default btn-sm">Import user not listed</a>').click(function () {
105+
search_and_store_user();
106+
})
107107
);
108108

109-
$('#searchUserModal').on('shown.bs.modal', function() {
110-
$('#searchUserSearchField').focus();
111-
});
112-
{%endif%}
113-
</script>
109+
$('#searchUserModal').on('shown.bs.modal', function() {
110+
$('#searchUserSearchField').focus();
111+
});
112+
{%endif%}
113+
</script>
114114
{%endblock%}

0 commit comments

Comments
 (0)