Mercurial > hg > bts-webui

changeset 85:3c3d59cdefdb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: reformat templates for readability
author diegoe-guest
date Wed, 03 Jun 2009 19:09:10 +0000
parents 6c6292b6c25f
children ffb1ff6749ce
files bts_webui/amancay/templates/base.html bts_webui/amancay/templates/bug.html bts_webui/amancay/templates/bug_actions.html bts_webui/amancay/templates/bug_forms.html bts_webui/amancay/templates/index.html bts_webui/amancay/templates/old-index.html bts_webui/amancay/templates/package.html bts_webui/amancay/templates/search.html bts_webui/amancay/templates/search_form.html bts_webui/amancay/templates/table.html bts_webui/amancay/templates/toolbox.html
diffstat 11 files changed, 374 insertions(+), 376 deletions(-) [+]
line wrap: on
line diff
--- a/bts_webui/amancay/templates/base.html
+++ b/bts_webui/amancay/templates/base.html
@@ -3,69 +3,69 @@
 <html lang="en">
 <head>
     <title>{% block title %}{% endblock %}</title>
-	<script type="text/javascript" src="/static/MochiKit.js"></script> 
-	<script type="text/javascript" src="/static/amancay_interface.js"></script> 
-	<link rel="stylesheet" href="/static/amancay.css" type="text/css" />
+    <script type="text/javascript" src="/static/MochiKit.js"></script> 
+    <script type="text/javascript" src="/static/amancay_interface.js"></script> 
+    <link rel="stylesheet" href="/static/amancay.css" type="text/css" />
 </head>
 <body>
     <div class="header">
-	{% block content_header %}
-	<div class="topnav">
-		{% if current_user.is_authenticated %}
-		<ul>
-			<li>Logged in as {{ current_user }}</li>
-			<li style="list-style: none">|</li>
-			<li><a id="home_link" href="/index">Home</a></li>
-			<li style="list-style: none">|</li>
-			<li><a id="settings_link"href="/accounts/settings">Settings</a></li>
-			<li style="list-style: none">|</li>
-			<li><a id="help_link" href="/help">Help</a></li>
-			<li style="list-style: none">|</li>
-			<li><a id="logout_link" href="/accounts/logout">Logout</a></li>
-		</ul>
-		{% else %}
-		<ul>
-			<li>Not logged in</li>
-			<li style="list-style: none">|</li>
-			<li><a id="home_link" href="/index">Home</a></li> 
-			<li style="list-style: none">|</li>
-			<li><a id="login_link" href="/accounts/login">Login</a></li>
-			<li style="list-style: none">|</li>
-			<li><a id="help_link" href="/help">Help</a></li>
-		</ul>
-		{% endif %}
-	</div>
-	{% endblock %}
-	</div>
-	<div class="appname">Amancay</div>
+    {% block content_header %}
+    <div class="topnav">
+        {% if current_user.is_authenticated %}
+        <ul>
+            <li>Logged in as {{ current_user }}</li>
+            <li style="list-style: none">|</li>
+            <li><a id="home_link" href="/index">Home</a></li>
+            <li style="list-style: none">|</li>
+            <li><a id="settings_link"href="/accounts/settings">Settings</a></li>
+            <li style="list-style: none">|</li>
+            <li><a id="help_link" href="/help">Help</a></li>
+            <li style="list-style: none">|</li>
+            <li><a id="logout_link" href="/accounts/logout">Logout</a></li>
+        </ul>
+        {% else %}
+        <ul>
+            <li>Not logged in</li>
+            <li style="list-style: none">|</li>
+            <li><a id="home_link" href="/index">Home</a></li> 
+            <li style="list-style: none">|</li>
+            <li><a id="login_link" href="/accounts/login">Login</a></li>
+            <li style="list-style: none">|</li>
+            <li><a id="help_link" href="/help">Help</a></li>
+        </ul>
+        {% endif %}
+    </div>
+    {% endblock %}
+    </div>
+    <div class="appname">Amancay</div>
 
-	<div class="body">
-		<div class="sidebar">
-		{% block sidebar %}
-		<h3 class="sidebar_title">Bugs</h3>
-		<ul>
-			<li><a id="search_link" href="/search">Search</a></li>
-			<li><a id="selected_bugs_link" href="/selected_bugs">Selected</a></li>
-			<li><a id="tagged_bugs_link" href="/tagged_bugs">Tagged</a></li>
-			<li><a id="submitted_bugs_link" href="/submitted_bugs">Latest Submitted</a></li>
-			<li><a id="received_bugs_link" href="/received_bugs">Latest Received</a></li>
-			<li><a id="package_bugs_link" href="/package_bugs">Selected Packages</a></li>
-		</ul>
-		{% endblock %}
-		</div>
+    <div class="body">
+        <div class="sidebar">
+        {% block sidebar %}
+        <h3 class="sidebar_title">Bugs</h3>
+        <ul>
+            <li><a id="search_link" href="/search">Search</a></li>
+            <li><a id="selected_bugs_link" href="/selected_bugs">Selected</a></li>
+            <li><a id="tagged_bugs_link" href="/tagged_bugs">Tagged</a></li>
+            <li><a id="submitted_bugs_link" href="/submitted_bugs">Latest Submitted</a></li>
+            <li><a id="received_bugs_link" href="/received_bugs">Latest Received</a></li>
+            <li><a id="package_bugs_link" href="/package_bugs">Selected Packages</a></li>
+        </ul>
+        {% endblock %}
+        </div>
 
-		<div id="toolbox" class="toolbox">
-		{% block toolbox %}{% endblock %}
-		</div>
+        <div id="toolbox" class="toolbox">
+        {% block toolbox %}{% endblock %}
+        </div>
 
-	    <div class="main">
-			{% if info_to_user %}
-			<div class="info_to_user">{{ info_to_user }}</div>
-			{% endif %}
-			{% block main_content %}{% endblock %}
-		</div>
+        <div class="main">
+            {% if info_to_user %}
+            <div class="info_to_user">{{ info_to_user }}</div>
+            {% endif %}
+            {% block main_content %}{% endblock %}
+        </div>
 
-		<div class="loading" id="loading"></div>
-	</div>
+        <div class="loading" id="loading"></div>
+    </div>
 </body>
 </html>
--- a/bts_webui/amancay/templates/bug.html
+++ b/bts_webui/amancay/templates/bug.html
@@ -7,51 +7,50 @@
 <script type="text/javascript" src="/static/buglog.js"></script> 
 <div class="bug_log" id="main_content">
 <div class="bug_log_title">
-<div class="report_information">
-Bug <span class="bug_number">{{ bug_number }}</span> -
-Severity <span class="severity">{{ bug_status.severity }}</span> -
-Last modified on 
-<span class="modified">{{ bug_status.log_modified|tstodate }}</span>
-<!-- reported by <span class="bug_submitter"><a 
-href="mailto:{{ bug_originator.1 }}">{{ bug_originator.0 }}</a></span>
-<span class="bug_date">on {{ bug_status.date|tstodate }}</span> -->
-</div>
-<div class="bug_title">{{ bug_status.subject|escape }}</div>
-<div class="extra_information">
-<ul>
-<li>Package: <a 
-href="/package/{{ bug_status.package }}">{{ bug_status.package }}</a></li>
-{% if bug_status.tags %}
-<li>Tags: {{ bug_status.tags }}</li>
-{% endif %}
-{% if bug_status.found_versions|length %}
-<li>Found in: {{ bug_status.found_versions|join:", " }}</li>
-{% endif %}
-
-</ul>
-</div>
+    <div class="report_information">
+        Bug <span class="bug_number">{{ bug_number }}</span> -
+        Severity <span class="severity">{{ bug_status.severity }}</span> -
+        Last modified on 
+        <span class="modified">{{ bug_status.log_modified|tstodate }}</span>
+        <!-- reported by <span class="bug_submitter"><a 
+        href="mailto:{{ bug_originator.1 }}">{{ bug_originator.0 }}</a></span>
+        <span class="bug_date">on {{ bug_status.date|tstodate }}</span> -->
+    </div>
+    <div class="bug_title">{{ bug_status.subject|escape }}</div>
+    <div class="extra_information">
+        <ul>
+            <li>Package: <a 
+            href="/package/{{ bug_status.package }}">{{ bug_status.package }}</a></li>
+            {% if bug_status.tags %}
+            <li>Tags: {{ bug_status.tags }}</li>
+            {% endif %}
+            {% if bug_status.found_versions|length %}
+            <li>Found in: {{ bug_status.found_versions|join:", " }}</li>
+            {% endif %}
+        </ul>
+    </div>
 </div>
 
 
 {% if bug_messages %}
-{% for message in bug_messages %}
-<div class="bug_log_item">
-	<div class="bug_log_header">
-	{% if message.from.0 %}
-	<span class="bug_log_from"><a 
-	href="mailto:{{ message.from.1 }}">{{ message.from.0 }}</a></span>
-	<span class="bug_log_date">said 
-	{% endif %} on {{ message.date|tstodate }}:<br/></span>
-	<span class="bug_log_subject">{{ message.subject|escape }}</span>
-	</div>
+    {% for message in bug_messages %}
+    <div class="bug_log_item">
+        <div class="bug_log_header">
+            {% if message.from.0 %}
+            <span class="bug_log_from"><a 
+            href="mailto:{{ message.from.1 }}">{{ message.from.0 }}</a></span>
+            <span class="bug_log_date">said 
+            {% endif %} on {{ message.date|tstodate }}:<br/></span>
+            <span class="bug_log_subject">{{ message.subject|escape }}</span>
+        </div>
 
-	<div class="bug_log_body">
-	<pre>{{ message.body|escape }}</pre>
-	</div>
-</div>
-	{% endfor %}
-{% include "bug_actions.html" %}
-{% include "bug_forms.html" %}
+        <div class="bug_log_body">
+            <pre>{{ message.body|escape }}</pre>
+        </div>
+    </div>
+    {% endfor %}
+    {% include "bug_actions.html" %}
+    {% include "bug_forms.html" %}
 {% endif %}
 </div>
 {% endblock %}
--- a/bts_webui/amancay/templates/bug_actions.html
+++ b/bts_webui/amancay/templates/bug_actions.html
@@ -1,13 +1,13 @@
 <div class="bug_actions">
-<form name="show_add_comment" method="POST">
-<input id="add_comment_button" type="button" value="Add Comment" />
-<input id="report_spam_button" type="button" value="Report Spam" />
-<select id="more_actions">
-<option selected>More Actions</option>
-<option value="reassign">Reassign</option>
-<option value="severity">Change Severity</option>
-<option value="close">Close</option>
-<option value="retitle">Retitle</option>
-</select>
-</form>
+    <form name="show_add_comment" method="POST">
+        <input id="add_comment_button" type="button" value="Add Comment" />
+        <input id="report_spam_button" type="button" value="Report Spam" />
+        <select id="more_actions">
+            <option selected>More Actions</option>
+            <option value="reassign">Reassign</option>
+            <option value="severity">Change Severity</option>
+            <option value="close">Close</option>
+            <option value="retitle">Retitle</option>
+        </select>
+    </form>
 </div>
--- a/bts_webui/amancay/templates/bug_forms.html
+++ b/bts_webui/amancay/templates/bug_forms.html
@@ -1,123 +1,122 @@
 <!-- hidden forms: add comment -->
 <div class="action_form" id="add_comment_form">
-<form name="add_comment" method="POST" action="./">
-<fieldset class="action_form">
-<legend class="action_form">Add Comment</legend>
-<ul>
-{% if current_user.is_authenticated %}
-<li>The message will be sent from <b>{{ current_user.email }}</b></li>
-{% else %}
-<li><label for="from_email">Your Email:</label>
-<input size="80" name="from_email" maxlength="255" /></li>
-{% endif %}
-<li><label for="subject">Subject:</label>
-<input size="80" name="subject" maxlength="255"/></li>
-<li><label for="comment">Comment:</label>
-<textarea cols="80" rows="10" name="comment" />
-</textarea></li>
-<li><input type="submit" class="submit" value="Submit" /></li>
-</ul>
-</fieldset>
-</form>
+    <form name="add_comment" method="POST" action="./">
+        <fieldset class="action_form">
+        <legend class="action_form">Add Comment</legend>
+        <ul>
+            {% if current_user.is_authenticated %}
+            <li>The message will be sent from <b>{{ current_user.email }}</b></li>
+            {% else %}
+            <li><label for="from_email">Your Email:</label>
+            <input size="80" name="from_email" maxlength="255" /></li>
+            {% endif %}
+            <li><label for="subject">Subject:</label>
+            <input size="80" name="subject" maxlength="255"/></li>
+            <li><label for="comment">Comment:</label>
+            <textarea cols="80" rows="10" name="comment" />
+            </textarea></li>
+            <li><input type="submit" class="submit" value="Submit" /></li>
+        </ul>
+        </fieldset>
+    </form>
 </div>
 <!-- reassign -->
 <div class="action_form" id="reassign_form">
-<form name="reassign" method="POST" action="./">
-<fieldset class="action_form">
-<legend class="action_form">Reassign report to</legend>
-<ul>
-{% if current_user.is_authenticated %}
-<li>The message will be sent from <b>{{ current_user.email }}</b></li>
-{% else %}
-<li><label for="from_email">Your Email:</label>
-<input size="80" name="from_email" maxlength="255" /></li>
-{% endif %}
-<li><label for="reassign_to">Reassign to:</label>
-<input size="80" name="reassign_to" maxlength="255"/></li>
-<li><label for="reassign_version">Version:</label>
-<input size="80" name="reassign_version" maxlength="255"/></li>
-<li><label for="reassign_comment">Comment:</label>
-<textarea cols="80" rows="5" name="reassign_comment" />
-</textarea></li>
-<li><input type="submit" class="submit" value="Submit" /></li>
-</ul>
-</fieldset>
-</form>
+    <form name="reassign" method="POST" action="./">
+        <fieldset class="action_form">
+        <legend class="action_form">Reassign report to</legend>
+        <ul>
+            {% if current_user.is_authenticated %}
+            <li>The message will be sent from <b>{{ current_user.email }}</b></li>
+            {% else %}
+            <li><label for="from_email">Your Email:</label>
+            <input size="80" name="from_email" maxlength="255" /></li>
+            {% endif %}
+            <li><label for="reassign_to">Reassign to:</label>
+            <input size="80" name="reassign_to" maxlength="255"/></li>
+            <li><label for="reassign_version">Version:</label>
+            <input size="80" name="reassign_version" maxlength="255"/></li>
+            <li><label for="reassign_comment">Comment:</label>
+            <textarea cols="80" rows="5" name="reassign_comment" />
+            </textarea></li>
+            <li><input type="submit" class="submit" value="Submit" /></li>
+        </ul>
+        </fieldset>
+    </form>
 </div>
 
 <!-- retitle -->
 <div class="action_form" id="retitle_form">
-<form name="retitle" method="POST" action="./">
-<fieldset class="action_form">
-<legend class="action_form">Retitle bug report</legend>
-<ul>
-{% if current_user.is_authenticated %}
-<li>The message will be sent from <b>{{ current_user.email }}</b></li>
-{% else %}
-<li><label for="from_email">Your Email:</label>
-<input size="80" name="from_email" maxlength="255" /></li>
-{% endif %}
-<li><label for="retitle_to">Retitle to:</label>
-<input size="80" name="retitle_to" maxlength="255"/></li>
-<li><label for="retitle_comment">Comment:</label>
-<textarea cols="80" rows="5" name="retitle_comment" />
-</textarea></li>
-<li><input type="submit" class="submit" value="Submit" /></li>
-</ul>
-</fieldset>
-</form>
+    <form name="retitle" method="POST" action="./">
+        <fieldset class="action_form">
+        <legend class="action_form">Retitle bug report</legend>
+        <ul>
+        {% if current_user.is_authenticated %}
+        <li>The message will be sent from <b>{{ current_user.email }}</b></li>
+        {% else %}
+        <li><label for="from_email">Your Email:</label>
+        <input size="80" name="from_email" maxlength="255" /></li>
+        {% endif %}
+        <li><label for="retitle_to">Retitle to:</label>
+        <input size="80" name="retitle_to" maxlength="255"/></li>
+        <li><label for="retitle_comment">Comment:</label>
+        <textarea cols="80" rows="5" name="retitle_comment" />
+        </textarea></li>
+        <li><input type="submit" class="submit" value="Submit" /></li>
+        </ul>
+        </fieldset>
+    </form>
 </div>
 <!-- close -->
 <div class="action_form" id="close_form">
-<form name="close" method="POST" action="./">
-<fieldset class="action_form">
-<legend class="action_form">Close bug report</legend>
-<ul>
-{% if current_user.is_authenticated %}
-<li>The message will be sent from <b>{{ current_user.email }}</b></li>
-{% else %}
-<li><label for="from_email">Your Email:</label>
-<input size="80" name="from_email" maxlength="255" /></li>
-{% endif %}
-<li><label for="close_version">Fixed Version:</label>
-<input size="80" name="close_version" maxlength="255"/></li>
-<li><label for="close_comment">Comment:</label>
-<textarea cols="80" rows="5" name="close_comment" />
-</textarea></li>
-<li><input type="submit" class="submit" value="Submit" /></li>
-</ul>
-</fieldset>
-</form>
+    <form name="close" method="POST" action="./">
+        <fieldset class="action_form">
+        <legend class="action_form">Close bug report</legend>
+        <ul>
+            {% if current_user.is_authenticated %}
+            <li>The message will be sent from <b>{{ current_user.email }}</b></li>
+            {% else %}
+            <li><label for="from_email">Your Email:</label>
+            <input size="80" name="from_email" maxlength="255" /></li>
+            {% endif %}
+            <li><label for="close_version">Fixed Version:</label>
+            <input size="80" name="close_version" maxlength="255"/></li>
+            <li><label for="close_comment">Comment:</label>
+            <textarea cols="80" rows="5" name="close_comment" />
+            </textarea></li>
+            <li><input type="submit" class="submit" value="Submit" /></li>
+        </ul>
+        </fieldset>
+    </form>
 </div>
 
 <!-- severity -->
 <div class="action_form" id="severity_form">
-<form name="severity" method="POST" action="./">
-<fieldset class="action_form">
-<legend class="action_form">Change bug severity</legend>
-<ul>
-{% if current_user.is_authenticated %}
-<li>The message will be sent from <b>{{ current_user.email }}</b></li>
-{% else %}
-<li><label for="from_email">Your Email:</label>
-<input size="80" name="from_email" maxlength="255" /></li>
-{% endif %}
-<li><label for="severity">New severity:</label>
-<select name="severity">
-<option value="critical">Critical</option>
-<option value="grave">Grave</option>
-<option value="serious">Serious</option>
-<option value="important">Important</option>
-<option value="normal">Normal</option>
-<option value="minor">Minor</option>
-<option value="wishlist">Wishlist</option>
-</select></li>
-<li><label for="severity_comment">Comment:</label>
-<textarea cols="80" rows="5" name="severity_comment" />
-</textarea></li>
-<li><input type="submit" class="submit" value="Submit" /></li>
-</ul>
-</fieldset>
-</form>
+    <form name="severity" method="POST" action="./">
+        <fieldset class="action_form">
+        <legend class="action_form">Change bug severity</legend>
+        <ul>
+            {% if current_user.is_authenticated %}
+            <li>The message will be sent from <b>{{ current_user.email }}</b></li>
+            {% else %}
+            <li><label for="from_email">Your Email:</label>
+            <input size="80" name="from_email" maxlength="255" /></li>
+            {% endif %}
+            <li><label for="severity">New severity:</label>
+            <select name="severity">
+                <option value="critical">Critical</option>
+                <option value="grave">Grave</option>
+                <option value="serious">Serious</option>
+                <option value="important">Important</option>
+                <option value="normal">Normal</option>
+                <option value="minor">Minor</option>
+                <option value="wishlist">Wishlist</option>
+            </select></li>
+            <li><label for="severity_comment">Comment:</label>
+            <textarea cols="80" rows="5" name="severity_comment" />
+            </textarea></li>
+            <li><input type="submit" class="submit" value="Submit" /></li>
+        </ul>
+        </fieldset>
+    </form>
 </div>
-
--- a/bts_webui/amancay/templates/index.html
+++ b/bts_webui/amancay/templates/index.html
@@ -9,9 +9,9 @@
 
 {% block main_content %}
 <div id="main_content" class="bug_list">
-{% block bug_list %}
-{% include "table.html" %}
-{% endblock %}
+    {% block bug_list %}
+    {% include "table.html" %}
+    {% endblock %}
 </div>
 {% endblock %}
 
--- a/bts_webui/amancay/templates/old-index.html
+++ b/bts_webui/amancay/templates/old-index.html
@@ -9,19 +9,19 @@
 <div class="submitted">
 <span class="table_title">Latest submitted bugs</span>
 <table class="bugs">
-	<tr>
-		<th>Package</th>
-		<th>Title</th>
-		<th>Status</th>
-	</tr>
-	{% for bug in submitted_list %}
-	<tr class="{{ bug.severity }}">
-		<td>{{ bug.package }}</td>
-		<td>{{ bug.subject|slice:":50" }}
-		{% if bug.subject|slice:":50"|length_is:50 %}...{% endif %} </td>
-		<td>{{ bug.status }}</td>
-	</tr>
-	{% endfor %}
+    <tr>
+        <th>Package</th>
+        <th>Title</th>
+        <th>Status</th>
+    </tr>
+    {% for bug in submitted_list %}
+    <tr class="{{ bug.severity }}">
+        <td>{{ bug.package }}</td>
+        <td>{{ bug.subject|slice:":50" }}
+        {% if bug.subject|slice:":50"|length_is:50 %}...{% endif %} </td>
+        <td>{{ bug.status }}</td>
+    </tr>
+    {% endfor %}
 </table>
 </div>
 {% endif %}
@@ -30,19 +30,19 @@
 <div class="received">
 <span class="table_title">Latest received bugs</span>
 <table class="bugs">
-	<tr>
-		<th>Package</th>
-		<th>Title</th>
-		<th>Status</th>
-	</tr>
-	{% for bug in received_list %}
-	<tr class="{{ bug.severity }}">
-		<td>{{ bug.package }}</td>
-		<td>{{ bug.subject|slice:":50" }}
-		{% if bug.subject|slice:":50"|length_is:50 %}...{% endif %} </td>
-		<td>{{ bug.status }}</td>
-	</tr>
-	{% endfor %}
+    <tr>
+        <th>Package</th>
+        <th>Title</th>
+        <th>Status</th>
+    </tr>
+    {% for bug in received_list %}
+    <tr class="{{ bug.severity }}">
+        <td>{{ bug.package }}</td>
+        <td>{{ bug.subject|slice:":50" }}
+        {% if bug.subject|slice:":50"|length_is:50 %}...{% endif %} </td>
+        <td>{{ bug.status }}</td>
+    </tr>
+    {% endfor %}
 </table>
 </div>
 {% endif %}
@@ -53,9 +53,9 @@
 <div class="packages">
 Selected packages:
 <form name="add_package" id="add_package" action="/index/" method="POST" >
-	<input type="text" name="package_name" id="package_name"
-	value="" />
-	<input type="submit" value="Add" />
+    <input type="text" name="package_name" id="package_name"
+    value="" />
+    <input type="submit" value="Add" />
 </form>
 {% if package_list %}
 <form name="package_selection" id="package_selection" action="/index/"
@@ -63,12 +63,12 @@
 <table name="package_list" id="package_list">
     {% for package in package_list %}
         <tr>
-			<td class="package_select">
-				<input type="checkbox" name="package_select"
-				       id="package_select" value="{{ package }}" />
-			</td>
-			<td class="package_name">{{ package }}</td>
-		</tr>
+            <td class="package_select">
+                <input type="checkbox" name="package_select"
+                       id="package_select" value="{{ package }}" />
+            </td>
+            <td class="package_name">{{ package }}</td>
+        </tr>
     {% endfor %}
 </table>
 <input type="submit" value="Remove" />
@@ -81,8 +81,8 @@
 <div class="bugs">
 Selected bugs:
 <form name="add_bug" id="add_bug" action="/index/" method="POST" >
-	<input type="text" name="bug_number" id="bug_number" value="" />
-	<input type="submit" value="Add" />
+    <input type="text" name="bug_number" id="bug_number" value="" />
+    <input type="submit" value="Add" />
 </form>
 {% if bug_list %}
 <form name="bug_selection" id="bug_selection" action="/index/"
@@ -90,12 +90,12 @@
 <table name="bug_list" id="bug_list">
     {% for bug in bug_list %}
         <tr>
-			<td class="bug_select">
-				<input type="checkbox" name="bug_select"
-				       id="bug_select" value="{{ bug }}" />
-			</td>
-			<td class="bug_number">{{ bug }}</td>
-		</tr>
+            <td class="bug_select">
+                <input type="checkbox" name="bug_select"
+                       id="bug_select" value="{{ bug }}" />
+            </td>
+            <td class="bug_number">{{ bug }}</td>
+        </tr>
     {% endfor %}
 </table>
 <input type="submit" value="Remove" />
--- a/bts_webui/amancay/templates/package.html
+++ b/bts_webui/amancay/templates/package.html
@@ -9,30 +9,30 @@
 <div class="package_bugs">
 <span class="table_title">Package {{ package }} bugs</span>
 <table class="bugs">
-	<tr>
-		<th colspan=2>Summary</th>
-		<th>Status</th>
-		<th>Modified</th>
-	</tr>
-	{% for bug in bug_list %}
-	<tr >
-		<td class="bug_number">{{ bug.id }}</td>
-		<td class="subject"><a href="/bug/{{ bug.id }}">{{ bug.subject|escape }}
-		<span class="hidden">
-		<b>Severity</b>: {{ bug.severity }}<br/>
-		<b>Submitted by</b>: {{ bug.originator }}<br/>
-		{% if bug.keywords %}
-		<b>Tags</b>: {{ bug.keywords }}<br/>
-		{% endif%}
-		</span></a>
-		
-		</td>
-		<td class="{{ bug.severity }}">
-			<span class="{{ bug.pending }}">{{ bug.pending }}</span>
-		</td>
-		<td class="date">{{ bug.log_modified|tstodate }}</td>
-	</tr>
-	{% endfor %}
+    <tr>
+        <th colspan=2>Summary</th>
+        <th>Status</th>
+        <th>Modified</th>
+    </tr>
+    {% for bug in bug_list %}
+    <tr >
+        <td class="bug_number">{{ bug.id }}</td>
+        <td class="subject"><a href="/bug/{{ bug.id }}">{{ bug.subject|escape }}
+        <span class="hidden">
+        <b>Severity</b>: {{ bug.severity }}<br/>
+        <b>Submitted by</b>: {{ bug.originator }}<br/>
+        {% if bug.keywords %}
+        <b>Tags</b>: {{ bug.keywords }}<br/>
+        {% endif%}
+        </span></a>
+        
+        </td>
+        <td class="{{ bug.severity }}">
+            <span class="{{ bug.pending }}">{{ bug.pending }}</span>
+        </td>
+        <td class="date">{{ bug.log_modified|tstodate }}</td>
+    </tr>
+    {% endfor %}
 </table>
 </div>
 {% endif %}
--- a/bts_webui/amancay/templates/search.html
+++ b/bts_webui/amancay/templates/search.html
@@ -8,16 +8,16 @@
 
 {% block main_content %}
 <div id="main_content">
-{% block search_form %}
-{% include "search_form.html" %}
-{% endblock %}
-<div id="search_results">
-{% if bug_list %}
-	{% block bug_list %}
-	{% include "table.html" %}
-	{% endblock %}
-{% endif %}
-</div>
+    {% block search_form %}
+    {% include "search_form.html" %}
+    {% endblock %}
+    <div id="search_results">
+        {% if bug_list %}
+            {% block bug_list %}
+            {% include "table.html" %}
+            {% endblock %}
+        {% endif %}
+    </div>
 </div>
 {% endblock %}
 
--- a/bts_webui/amancay/templates/search_form.html
+++ b/bts_webui/amancay/templates/search_form.html
@@ -1,24 +1,24 @@
 <div class="search_form" id="search_form">
-<form method="GET" action="/search/" class="search_form">
-<fieldset class="search_form">
-<legend class="search_title">Search Bugs</legend>
-<ol class="search_form">
-<li><label for="package_search">Enter a package name:</label></li>
-<li><input class="search_field" type="text" id="package_search" 
-name="package_search" value="" /></li>
-<li><input class="submit_search" type="submit" value="Search" /></li>
-</ol>
-<!--
-<ol class="search_form">
-<li><label for="package_search">Package:</label><input type="text"
-id="package_search" name="package_search" value="" /></li>
-<li><label for="maintainer_search">Maintainer Email:</label><input type="text"
-id="maintainer_search" name="maintainer_search" value="" /></li>
-<li><label for="submitter_search">Submitter Email:</label><input type="text"
-id="submitter_search" name="submitter_search" value="" /></li>
-<li><label for="bug_">Bug number:</label><input type="text"
-id="package_search" name="package_search" value="" /></li>
-</ol>-->
-</fieldset>
-</form>
+    <form method="GET" action="/search/" class="search_form">
+        <fieldset class="search_form">
+        <legend class="search_title">Search Bugs</legend>
+        <ol class="search_form">
+            <li><label for="package_search">Enter a package name:</label></li>
+            <li><input class="search_field" type="text" id="package_search" 
+            name="package_search" value="" /></li>
+            <li><input class="submit_search" type="submit" value="Search" /></li>
+        </ol>
+        <!--
+        <ol class="search_form">
+        <li><label for="package_search">Package:</label><input type="text"
+        id="package_search" name="package_search" value="" /></li>
+        <li><label for="maintainer_search">Maintainer Email:</label><input type="text"
+        id="maintainer_search" name="maintainer_search" value="" /></li>
+        <li><label for="submitter_search">Submitter Email:</label><input type="text"
+        id="submitter_search" name="submitter_search" value="" /></li>
+        <li><label for="bug_">Bug number:</label><input type="text"
+        id="package_search" name="package_search" value="" /></li>
+        </ol>-->
+        </fieldset>
+    </form>
 </div>
--- a/bts_webui/amancay/templates/table.html
+++ b/bts_webui/amancay/templates/table.html
@@ -3,53 +3,53 @@
 {% if bug_list %}
 <span class="table_title">{{ table_title }}</span>
 <div class="pager">
-{% if pages %}
-<span class="page_numbers">Pages:
-<ul class="page_numbers" id="pager">
-{% for number in pages %}
-	{% ifequal number current_page %}
-		<li class="current">{{ number }}</li>
-	{% else %}
-		<li class="normal"><a href="{{ url }}&page={{number}}">{{ number }}</a></li>
-	{% endifequal %}
-{% endfor %}
-</ul>
-</span>
-{% endif %}
-{% if total_bugs %}
-<span class="total_bugs">Found {{ total_bugs }} 
-{% ifequal total_bugs 1 %}bug{% else %}bugs{%endifequal%}</span>
-{% endif %}
+    {% if pages %}
+    <span class="page_numbers">Pages:
+        <ul class="page_numbers" id="pager">
+            {% for number in pages %}
+            {% ifequal number current_page %}
+                <li class="current">{{ number }}</li>
+            {% else %}
+                <li class="normal"><a href="{{ url }}&page={{number}}">{{ number }}</a></li>
+            {% endifequal %}
+            {% endfor %}
+        </ul>
+    </span>
+    {% endif %}
+    {% if total_bugs %}
+    <span class="total_bugs">Found {{ total_bugs }} 
+    {% ifequal total_bugs 1 %}bug{% else %}bugs{%endifequal%}</span>
+    {% endif %}
 </div>
 <table class="bugs">
-	<tr>
-		<th>Package</th>
-		<th colspan=2>Summary</th>
-		<th>Status</th>
-		<th>Modified</th>
-	</tr>
-	{% for bug in bug_list %}
-	<tr >
-		<td class="package">
-			<a href="/package/{{ bug.package }}">{{ bug.package }}</a>
-		</td>
-		<td class="bug_number">{{ bug.id }}</td>
-		<td class="subject"><a href="/bug/{{ bug.id }}">{{ bug.subject|escape|slice:":60" }}
-		{% if bug.subject|escape|slice:":60"|length_is:60 %}...{% endif %} 
-		<span class="hidden">
-		<b>Severity</b>: {{ bug.severity }}<br/>
-		<b>Submitted by</b>: {{ bug.originator }}<br/>
-		{% if bug.keywords %}
-		<b>Tags</b>: {{ bug.keywords }}<br/>
-		{% endif%}
-		</span></a>
-		
-		</td>
-		<td class="{{ bug.severity }}">
-			<span class="{{ bug.pending }}">{{ bug.pending }}</span>
-		</td>
-		<td class="date">{{ bug.log_modified|tstodate}}</td>
-	</tr>
-	{% endfor %}
+    <tr>
+        <th>Package</th>
+        <th colspan=2>Summary</th>
+        <th>Status</th>
+        <th>Modified</th>
+    </tr>
+    {% for bug in bug_list %}
+    <tr>
+        <td class="package">
+            <a href="/package/{{ bug.package }}">{{ bug.package }}</a>
+        </td>
+        <td class="bug_number">{{ bug.id }}</td>
+        <td class="subject">
+            <a href="/bug/{{ bug.id }}">{{ bug.subject|escape|slice:":60" }}
+            {% if bug.subject|escape|slice:":60"|length_is:60 %}...{% endif %} 
+            <span class="hidden">
+            <b>Severity</b>: {{ bug.severity }}<br/>
+            <b>Submitted by</b>: {{ bug.originator }}<br/>
+            {% if bug.keywords %}
+            <b>Tags</b>: {{ bug.keywords }}<br/>
+            {% endif%}
+            </span></a>
+        </td>
+        <td class="{{ bug.severity }}">
+            <span class="{{ bug.pending }}">{{ bug.pending }}</span>
+        </td>
+        <td class="date">{{ bug.log_modified|tstodate}}</td>
+    </tr>
+    {% endfor %}
 </table>
 {% endif %}
--- a/bts_webui/amancay/templates/toolbox.html
+++ b/bts_webui/amancay/templates/toolbox.html
@@ -5,16 +5,16 @@
 <table id="item_list">
     {% for item in toolbox.item_list %}
         <tr>
-			<td class="item_select">
-				<input type="checkbox" name="{{ toolbox.item_type }}_select"
-				       id="item_select" value="{{ item }}" />
-			</td>
-			<td class="item_name">{{ item }}</td>
-		</tr>
+            <td class="item_select">
+                <input type="checkbox" name="{{ toolbox.item_type }}_select"
+                       id="item_select" value="{{ item }}" />
+            </td>
+            <td class="item_name">{{ item }}</td>
+        </tr>
     {% endfor %}
 </table>
 <div class="toolbox_remove">
-		<input class="toolbox_remove" type="submit" value="Remove" />
+        <input class="toolbox_remove" type="submit" value="Remove" />
 </div>
 {% else %}
     <div class="toolbox_message">No items selected</div>
@@ -23,12 +23,12 @@
 </div>
 <div class="toolbox_add_item">
 <form id="add_item" method="post" action=".">
-	<div class="toolbox_txt">
-		<input class="toolbox_txt" type="text" name="{{ toolbox.item_type }}" 
-	id="item" value="" />
-	</div>
-	<div class="toolbox_add">
-		<input class="toolbox_add" id="toolbox_add" type="submit" value="Add" />
-	</div>
+    <div class="toolbox_txt">
+        <input class="toolbox_txt" type="text" name="{{ toolbox.item_type }}" 
+    id="item" value="" />
+    </div>
+    <div class="toolbox_add">
+        <input class="toolbox_add" id="toolbox_add" type="submit" value="Add" />
+    </div>
 </form>
 </div>