Merge of NRB's template work

CHANGELOG.txt

@@ -2,6 +2,7 @@
 ==============
 
 * Add unique constraint to slug field
+* Relocated partial templates to 'includes' directories.
 * Search box on every page
 * Sorting
 

CONTRIBUTORS.txt

@@ -8,5 +8,8 @@ Contributors
 Andrii Kurinny
 James Punteney
 Jonas Obrist
-Taavi Taijala
+Nolan Bruabker
 Preston Holmes
+Taavi Taijala
+
+

templates/account/login.html

@@ -41,11 +41,11 @@ <h1>{% trans "Log In" %}</h1>
         </fieldset>
     </form>
 
-    {% include "account/_trouble_ticket.html" %}
+    {% include "account/includes/_trouble_ticket.html" %}
 {% endblock %}
 
 {% block extra_body %}
 <script>
     $("#id_username").focus();
 </script>
-{% endblock %}
+{% endblock %}

templates/account/password_reset.html

@@ -25,11 +25,11 @@ <h1>{% trans "Password Reset" %}</h1>
         </fieldset>
     </form>
 
-    {% include "account/_trouble_ticket.html" %}
+    {% include "account/includes/_trouble_ticket.html" %}
 {% endblock %}
 
 {% block extra_body %}
     <script>
         $("#id_email").focus();
     </script>
-{% endblock %}
+{% endblock %}

templates/account/signup.html

@@ -30,7 +30,7 @@ <h1>{% trans "Sign Up" %}</h1>
         {% 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 @@ <h1>{% trans "Sign Up" %}</h1>
         });
     </script>
 {% endblock %}
-{% endcomment %}
+{% endcomment %}

templates/package/ajax_package_list.html

@@ -4,7 +4,7 @@ <h2>{% if packages.count %}Packages{% else %}No packages found{% endif %}</h2>
         <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 @@ <h2>{% if packages.count %}Packages{% else %}No packages found{% endif %}</h2>
         {% endfor %}
 
     </script>    
-</div>
+</div>

templates/package/package.html

@@ -108,14 +108,14 @@ <h2>Comparison Grids</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 %}
 

templates/package/package_archive.html

@@ -12,7 +12,7 @@ <h1>Latest 15 packages added</h1>
 
     <div id="packages">
         {% for package in latest %}
-            {% include "package/_package.html"%}
+            {% include "package/includes/_package.html"%}
         {% endfor %}
     </div>
 

templates/package/package_form.html

@@ -30,7 +30,7 @@ <h1><a href="{% url home %}">home</a> / <a href="{% url packages %}">packages</a
 <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>
 

templates/searchv1/search.html

@@ -36,7 +36,7 @@ <h2>{% if packages.count %}Packages{% else %}No packages found{% endif %}</h2>
                 <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>