[Pkg-debile-commits] [debile-web] 04/04: Consistently put most page content inside a <div class='block'>
Jon Severinsson
jonno-guest at moszumanska.debian.org
Tue Mar 25 17:08:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
jonno-guest pushed a commit to branch master
in repository debile-web.
commit d3b0ca1c91d5ad52d4d214e11306fc42f02fce95
Author: Jon Severinsson <jon at severinsson.net>
Date: Tue Mar 25 17:57:03 2014 +0100
Consistently put most page content inside a <div class='block'>
This reindents a lot of template markup, use git show --ignore-all-space for a better view of the changes.
---
templates/builder.html | 15 ++++++++------
templates/group.html | 15 ++++++++------
templates/job.html | 46 ++++++++++++++++++++---------------------
templates/jobs.html | 14 +++++++------
templates/source-not-found.html | 6 ++++--
templates/sources.html | 15 ++++++++------
templates/user.html | 19 +++++++++++------
7 files changed, 75 insertions(+), 55 deletions(-)
diff --git a/templates/builder.html b/templates/builder.html
index 74cd87b..c3d86ed 100644
--- a/templates/builder.html
+++ b/templates/builder.html
@@ -3,8 +3,9 @@
{% block title %}{{builder.name}}{% endblock %}
{% block content %}
- <h1>{{builder.name}}</h1>
+
<div class='block'>
+ <h1>{{builder.name}}</h1>
<div class='desc_line'>
<div class='desc_key'>Name</div>
<div class='desc_value'>{{builder.name}}</div>
@@ -27,10 +28,12 @@
</div>
</div>
- <h3>Jobs Assigned to {{builder.name}}</h3>
- {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
- {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
- <div class = 'clear' ></div>
- {% include "job_list_fragment.html" %}
+ <div class='block'>
+ <h3>Jobs Assigned to {{builder.name}}</h3>
+ {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
+ {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
+ <div class = 'clear' ></div>
+ {% include "job_list_fragment.html" %}
+ </div>
{% endblock %}
diff --git a/templates/group.html b/templates/group.html
index 534af39..eba24f3 100644
--- a/templates/group.html
+++ b/templates/group.html
@@ -3,8 +3,9 @@
{% block title %}Package Group {{group.name}}{% endblock %}
{% block content %}
- <h1>Package Group {{group.name}}</h1>
+
<div class='block'>
+ <h1>Package Group {{group.name}}</h1>
<div class='desc_line'>
<div class='desc_key'>Maintainer</div>
<div class='desc_value'><a href='{{info.maintainer_link}}'>{{group.maintainer.name}}</a></div>
@@ -49,10 +50,12 @@
{% endfor %}
</div>
- <h3>Sources in Package Group {{grop.name}}</h3>
- {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
- {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
- <div class = 'clear' ></div>
- {% include "source_list_fragment.html" %}
+ <div class='block'>
+ <h3>Sources in Package Group {{grop.name}}</h3>
+ {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
+ {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
+ <div class = 'clear' ></div>
+ {% include "source_list_fragment.html" %}
+ </div>
{% endblock %}
diff --git a/templates/job.html b/templates/job.html
index 6a0ba8c..ff2c133 100644
--- a/templates/job.html
+++ b/templates/job.html
@@ -73,31 +73,31 @@
</div>
{% if job.finished_at %}
- <div class='block'>
- <h3>Downloads</h3>
- <div class='desc_line'>
- <div class='desc_key'>Uploaded dud</div>
- <div class='desc_value'><a href='{{info.dud_link}}'>{{info.dud_name}}</a></div>
- </div>
- <div class='desc_line'>
- <div class='desc_key'>Job Log</div>
- <div class='desc_value'><a href='{{info.log_link}}'>{{info.log_name}}</a></div>
- </div>
+ <div class='block'>
+ <h3>Downloads</h3>
+ <div class='desc_line'>
+ <div class='desc_key'>Uploaded dud</div>
+ <div class='desc_value'><a href='{{info.dud_link}}'>{{info.dud_name}}</a></div>
+ </div>
+ <div class='desc_line'>
+ <div class='desc_key'>Job Log</div>
+ <div class='desc_value'><a href='{{info.log_link}}'>{{info.log_name}}</a></div>
+ </div>
+ <div class='desc_line'>
+ <div class='desc_key'>Firehose Report</div>
+ <div class='desc_value'><a href='{{info.firehose_link}}'>{{info.firehose_name}}</a></div>
+ </div>
+ {% if info.files %}
<div class='desc_line'>
- <div class='desc_key'>Firehose Report</div>
- <div class='desc_value'><a href='{{info.firehose_link}}'>{{info.firehose_name}}</a></div>
- </div>
- {% if info.files %}
- <div class='desc_line'>
- <div class='desc_key'>Additional Files</div>
- <div class='desc_value'>
- {% for file in info.files %}
- <a href='{{job.files_url}}/{{file}}'>{{file}}</a><br />
- {% endfor %}
- </div>
+ <div class='desc_key'>Additional Files</div>
+ <div class='desc_value'>
+ {% for file in info.files %}
+ <a href='{{job.files_url}}/{{file}}'>{{file}}</a><br />
+ {% endfor %}
</div>
- {% endif %}
- </div>
+ </div>
+ {% endif %}
+ </div>
{% endif %}
{% endblock %}
diff --git a/templates/jobs.html b/templates/jobs.html
index 5835593..e461ec9 100644
--- a/templates/jobs.html
+++ b/templates/jobs.html
@@ -3,12 +3,14 @@
{% block title %}Job List{% endblock %}
{% block content %}
- <h1>Job list</h1>
- {% if info.desc %}{{info.desc}}{% endif %}
+ <div class='block'>
+ <h1>Job list</h1>
+ {% if info.desc %}{{info.desc}}{% endif %}
- {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
- {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
- <div class = 'clear' ></div>
- {% include "job_list_fragment.html" %}
+ {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
+ {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
+ <div class = 'clear' ></div>
+ {% include "job_list_fragment.html" %}
+ </div>
{% endblock %}
diff --git a/templates/source-not-found.html b/templates/source-not-found.html
index 0c78c7c..8668c42 100644
--- a/templates/source-not-found.html
+++ b/templates/source-not-found.html
@@ -4,7 +4,9 @@
{% block content %}
-Package <i>{{package_name}}/{{version_or_suite}}</i> not found in group <i>{{group_name}}</i><br />
-You can try to search for packages named <a href="/source/{{package_name}}">{{package_name}}</a> instead.<br />
+ <div class='block'>
+ Package <i>{{package_name}}/{{version_or_suite}}</i> not found in group <i>{{group_name}}</i><br />
+ You can try to search for packages named <a href="/source/{{package_name}}">{{package_name}}</a> instead.<br />
+ </div>
{% endblock %}
diff --git a/templates/sources.html b/templates/sources.html
index 2e654f2..04998fc 100644
--- a/templates/sources.html
+++ b/templates/sources.html
@@ -3,12 +3,15 @@
{% block title %}Package List{% endblock %}
{% block content %}
- <h1>Package list</h1>
- {% if info.desc %}{{info.desc}}{% endif %}
- {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
- {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
- <div class = 'clear' ></div>
- {% include "source_list_fragment.html" %}
+ <div class='block'>
+ <h1>Package list</h1>
+ {% if info.desc %}{{info.desc}}{% endif %}
+
+ {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
+ {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
+ <div class = 'clear' ></div>
+ {% include "source_list_fragment.html" %}
+ </div>
{% endblock %}
diff --git a/templates/user.html b/templates/user.html
index e0e8e3c..2344174 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -3,8 +3,9 @@
{% block title %}{{user.name}}{% endblock %}
{% block content %}
- <h1>{{user.name}}</h1>
+
<div class='block'>
+ <h1>{{user.name}}</h1>
<div class='desc_line'>
<div class='desc_key'>Name</div>
<div class='desc_value'>{{user.name}}</div>
@@ -24,19 +25,25 @@
</div>
{% if groups_info %}
+ <div class='block'>
<h3>Groups Maintained by {{user.name}}</h3>
{% include "group_list_fragment.html" %}
+ </div>
{% endif %}
{% if builders_info %}
+ <div class='block'>
<h3>Builders Maintained by {{user.name}}</h3>
{% include "builder_list_fragment.html" %}
+ </div>
{% endif %}
- <h3>Sources Uploaded by {{user.name}}</h3>
- {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
- {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
- <div class = 'clear' ></div>
- {% include "source_list_fragment.html" %}
+ <div class='block'>
+ <h3>Sources Uploaded by {{user.name}}</h3>
+ {% if info.prev_link %}<a class='left' href='{{info.prev_link}}'>previous page</a>{% endif %}
+ {% if info.next_link %}<a class='right' href='{{info.next_link}}'>next page</a>{% endif %}
+ <div class = 'clear' ></div>
+ {% include "source_list_fragment.html" %}
+ </div>
{% endblock %}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git
More information about the Pkg-debile-commits
mailing list