Skip to content

Commit

Permalink
Merge pull request #10 from LongYC/master
Browse files Browse the repository at this point in the history 
Minor HTML clean up which includes standardize indentations, adding titl...
  • Loading branch information
@klrkdekira
klrkdekira committed Oct 10, 2014
2 parents 8be5ed7 + b52f15d commit f248593
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 58 deletions.
4 changes: 2 additions & 2 deletions billwatcher/templates/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="col-sm-9">
<div class="container">
<h1>Who We Are</h1>
<img src="{{request.static_url('billwatcher:static/img/sinar.png')}}" />
<img src="{{request.static_url('billwatcher:static/img/sinar.png')}}" alt="Sinar Project" />
<p>We are a group of concerned Citizen that hope to see more transparency in govt.</p>

<hr />
Expand All @@ -25,7 +25,7 @@ <h2>Contacts</h2>
<hr />

<h2>This is an open source project</h2>
<p>Our Code is in github you can help us by fork and contribute code, or report bug to us.</p>
<p>Our source code is on GitHub, you can help us by forking and contributing codes or reporting bugs to us.</p>
</div>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions billwatcher/templates/bill/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
</div>
<div class="panel-body">
<dl>
<dt>Code:</dt><dd>{{bill['name']}}</dd>
<dt>Name:</dt><dd>{{bill['description']}}</dd>
<dt>Year:</dt><dd>{{bill['year'] or ''}}</dd>
<dt>Status:</dt><dd>{{bill['status'].capitalize() if bill['status']}}</dd>
<dt>Code:</dt><dd>{{bill['name']}}</dd>
<dt>Name:</dt><dd>{{bill['description']}}</dd>
<dt>Year:</dt><dd>{{bill['year'] or ''}}</dd>
<dt>Status:</dt><dd>{{bill['status'].capitalize() if bill['status']}}</dd>
<dt>Presented by:</dt><dd>{{bill['presented_by']}}</dd>
</dl>
</div>
Expand All @@ -37,9 +37,9 @@
</div>
<div class="panel-body">
<dl>
<dt>First Reading:</dt><dd>{{bill['history']['first_reading']}}</dd>
<dt>Second Reading:</dt><dd>{{bill['history']['second_reading']}}</dd>
<dt>Passed At:</dt><dd>{{bill['history']['passed_at']}}</dd>
<dt>First Reading:</dt><dd>{{bill['history']['first_reading']}}</dd>
<dt>Second Reading:</dt><dd>{{bill['history']['second_reading']}}</dd>
<dt>Passed At:</dt><dd>{{bill['history']['passed_at']}}</dd>
</dl>
</div>
</div>
Expand Down
40 changes: 20 additions & 20 deletions billwatcher/templates/bill/list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,28 @@ <h4 class="pull-left">Parliament Bills</h4>
{{data.pager(format='$link_first $link_previous ~2~ $link_next $link_last')}}
</div>
<table id="bill-list" class="table table-striped table-responsive">
<thead>
<tr>
<thead>
<tr>
<th>Code</th>
<th>Bill</th>
<th>Status</th>
<th>Year</th>
</tr>
</thead>
<tbody>
{% for bill in data.items %}
<tr>
<th>Bill</th>
<th>Status</th>
<th>Year</th>
</tr>
</thead>
<tbody>
{% for bill in data.items %}
<tr>
<td>{{bill.name}}</td>
<td>
<a href="{{request.route_url('bill.detail', bill_id=bill._id)}}">
{{bill.description}}
</a>
</td>
<td>{{bill.status.capitalize() if bill.status}}</td>
<td>{{bill.year or ''}}</td>
</tr>
{% endfor %}
</tbody>
<td>
<a href="{{request.route_url('bill.detail', bill_id=bill._id)}}">
{{bill.description}}
</a>
</td>
<td>{{bill.status.capitalize() if bill.status}}</td>
<td>{{bill.year or ''}}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
Expand Down
7 changes: 3 additions & 4 deletions billwatcher/templates/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ <h1 class="textcenter">Malaysian BillWatcher</h1>
</div>
<div class="row">
<div class="col-lg-8 col-lg-offset-2">

<form id="bigsearch" method="GET" action="{{request.route_url('search')}}">
<form id="bigsearch" method="GET" action="{{request.route_url('search')}}">
<div class="input-group">
<input type="text" name="search" class="form-control" placeholder="Search for Bill here" value="{{request.params.get('search', '')}}">
<input type="text" name="search" class="form-control" placeholder="Search for Bill here" value="{{request.params.get('search', '')}}">
<span class="input-group-btn">
<button type="submit" class="btn btn-default">Go</button>
</span>
</div>
</form>
</form>
</div>
</div>
</div>
Expand Down
42 changes: 21 additions & 21 deletions billwatcher/templates/search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@
<div class="col-lg-12">
<h4 class="pull-left">Search results for <strong>{{request.params.get('search')}}</strong></h4>
<table class="table table-striped table-responsive">
<thead>
<tr>
<thead>
<tr>
<th>Code</th>
<th>Bill</th>
<th style="width: 200px">Status</th>
<th style="width: 100px">Year</th>
</tr>
</thead>
<tbody>
{% for bill in bills %}
<tr>
<th>Bill</th>
<th style="width: 200px">Status</th>
<th style="width: 100px">Year</th>
</tr>
</thead>
<tbody>
{% for bill in bills %}
<tr>
<td>
{{bill['_source'].name}}
</td>
<td>
<a href="{{request.route_url('bill.detail', bill_id=bill._id)}}">
{{bill['_source'].description}}
</a>
</td>
<td>{{bill['_source'].status.capitalize() if bill['_source'].status}}</td>
<td>{{bill['_source'].year or ''}}</td>
</tr>
{% endfor %}
</tbody>
<td>
<a href="{{request.route_url('bill.detail', bill_id=bill._id)}}">
{{bill['_source'].description}}
</a>
</td>
<td>{{bill['_source'].status.capitalize() if bill['_source'].status}}</td>
<td>{{bill['_source'].year or ''}}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% endblock %}
Expand Down
8 changes: 4 additions & 4 deletions billwatcher/templates/template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<dl>
<dt>Funded by</dt>
<dd>
<a href="http://isif.asia/">
<img src="{{request.static_url('billwatcher:static/img/isif.png')}}"/>
<a href="http://isif.asia/" title="isif asia">
<img src="{{request.static_url('billwatcher:static/img/isif.png')}}" alt="isif asia" />
</a>
</dd>
</dl>
Expand All @@ -83,7 +83,7 @@
<dl>
<dt>Who we are</dt>
<dd>
<img id="sinar-logo" src="{{request.static_url('billwatcher:static/img/sinar.png')}}" />
<img id="sinar-logo" src="{{request.static_url('billwatcher:static/img/sinar.png')}}" alt="Sinar Project" />
<br />
We are a group of concerned Citizen that hope to see more transparency in government.
</dd>
Expand All @@ -100,7 +100,7 @@
</dl>
<dl>
<dt>This is an open source project</dt>
<dd>Our Code is in github you can help us by fork and contribute code, or report bug to us.</dd>
<dd>Our source code is on GitHub, you can help us by forking and contributing codes or reporting bugs to us.</dd>
<dd>
<ul id="github-links" class="pull-left list-inline">
<li>
Expand Down

0 comments on commit f248593

Please sign in to comment.