Permalink
Browse files

Merge of NRB's template work

  • Loading branch information...
1 parent fe08d99 commit 101645ebdf0bb16d9510e16f75305c6d341c635e @pydanny pydanny committed Mar 14, 2011
View
@@ -2,6 +2,7 @@
==============
* Add unique constraint to slug field
+* Relocated partial templates to 'includes' directories.
* Search box on every page
* Sorting
View
@@ -8,5 +8,8 @@ Contributors
Andrii Kurinny
James Punteney
Jonas Obrist
-Taavi Taijala
+Nolan Bruabker
Preston Holmes
+Taavi Taijala
+
+
No changes.
@@ -41,11 +41,11 @@
</fieldset>
</form>
- {% include "account/_trouble_ticket.html" %}
+ {% include "account/includes/_trouble_ticket.html" %}
{% endblock %}
{% block extra_body %}
<script>
$("#id_username").focus();
</script>
-{% endblock %}
+{% endblock %}
@@ -25,11 +25,11 @@
</fieldset>
</form>
- {% include "account/_trouble_ticket.html" %}
+ {% include "account/includes/_trouble_ticket.html" %}
{% endblock %}
{% block extra_body %}
<script>
$("#id_email").focus();
</script>
-{% endblock %}
+{% endblock %}
@@ -30,7 +30,7 @@
{% url privacy as privacy_url %}
<p>{% blocktrans %}By clicking "Sign Up", you are indicating that you have read and agree to the <a href="{{ terms_url }}">Terms of Use</a>.{% endblocktrans %}</p>
- {% include "account/_trouble_ticket.html" %}
+ {% include "account/includes/_trouble_ticket.html" %}
{% endif %}
{% endblock %}
@@ -47,4 +47,4 @@
});
</script>
{% endblock %}
-{% endcomment %}
+{% endcomment %}
@@ -1,17 +0,0 @@
-{% load cache %}
-{% load package_tags %}
-<tr id="package-{{ package.id }}">
- <td class="usage-count">{{ package.usage_count }}</td>
- <td class="usage-button">{% if package.pk in used_packages_list %}
- {% usage_button %}
- </td>
- <td>{{ package.pypi_downloads }}</td>
- <td><a href="{% url package package.slug %}">{{ package.title }}</a></td>
- {% cache 500 commitchart package %}
- <td><img id="package-githubcommits" src="http://chart.apis.google.com/chart?cht=bvg&chs=105x20&chd=t:{{package|commits_over_52}}&chco=666666&chbh=1,1,1&chds=0,20" /></td>
- {% endcache %}
- <td>{{ package.pypi_version.number|default:"n/a"|slice:":12" }}</td>
- <td>{{ package.repo_watchers|default:"n/a" }}</td>
- <td>{{ package.repo_forks|default:"n/a" }}</td>
- <td>{{ package.created|timesince }} ago</td>
-</tr>
@@ -4,7 +4,7 @@
<p class="editable-cell">Click a package to add it to the grid.</p>
{% endif %}
{% for package in packages %}
- {% include "package/_package.html" %}
+ {% include "package/includes/_package.html" %}
{% endfor %}
<script type="text/javascript">
@@ -23,4 +23,4 @@
{% endfor %}
</script>
-</div>
+</div>
@@ -108,14 +108,14 @@ <h2 class="rtd" style="display: none;">Read the Docs</h2>
{% if forloop.last %}
<div id="package-gridname">
<a class="awesome forestgreen" id="find-a-grid" href="#">Find another grid to join!</a>
- {% include "package/_attach_grid.html" %}
+ {% include "package/includes/_attach_grid.html" %}
</div>
{% endif %}
{% empty %}
<div id="package-gridname">
<a class="awesome forestgreen" id="find-a-grid" href="#">Find a grid to join!</a>
- {% include "package/_attach_grid.html" %}
+ {% include "package/includes/_attach_grid.html" %}
</div>
{% endfor %}
@@ -12,7 +12,7 @@
<div id="packages">
{% for package in latest %}
- {% include "package/_package.html"%}
+ {% include "package/includes/_package.html"%}
{% endfor %}
</div>
@@ -30,7 +30,7 @@
<script src="{{ STATIC_URL }}js/urlify.js" type="text/javascript"></script>
<script type="text/javascript">
$(function() {
- {% include "package/_package_form.js" %}
+ {% include "package/includes/_package_form.js" %}
});
</script>
@@ -36,7 +36,7 @@
<a href="{% url latest_packages %}">latest</a> <a href="{% url packages %}">all</a>
</p>
{% for package in packages %}
- {% include "package/_package.html"%}
+ {% include "package/includes/_package.html"%}
{% endfor %}
</div>
</div>

0 comments on commit 101645e

Please sign in to comment.