diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-05 23:59:03 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-05 23:59:03 -0600 |
| commit | d4731a373ca665d4547eb0e89cdf270d41c44243 (patch) | |
| tree | 41dbfb57e5f6745ad6ac3acd5de8c4d9788c950c /templates | |
| parent | c8d979b8a48805d162ab46cdc4e493da0aa1595c (diff) | |
| parent | 803ba89841468bcf088ea79ea981a849ca159682 (diff) | |
Merge branch 'archweb' into archweb-generic
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 14 | ||||
| -rw-r--r-- | templates/todolists/view.html | 23 |
2 files changed, 27 insertions, 10 deletions
diff --git a/templates/base.html b/templates/base.html index 5702c8e0..c981f02c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -69,7 +69,7 @@ </div> {% endblock %} <div id="footer"> - <p>Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" + <p>Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" title="Contact Aaron Griffin">Aaron Griffin</a>.</p> @@ -81,6 +81,18 @@ the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.</p> </div> </div> + <script type="application/ld+json"> + { + "@context": "http://schema.org", + "@type": "WebSite", + "url": "{{ domain }}/", + "potentialAction": { + "@type": "SearchAction", + "target": "{{ domain }}/packages/?q={search_term}", + "query-input": "required name=search_term" + } + } + </script> {% block script_block %}{% endblock %} </body> </html> diff --git a/templates/todolists/view.html b/templates/todolists/view.html index c3ee57f8..4ae25fb0 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -22,16 +22,18 @@ {% endif %} </ul> - <p class="todo-info">{{ list.created|date }} - {{ list.creator.get_full_name }}</p> + <div class="todo-info">{{ list.created|date }} - {{ list.creator.get_full_name }}</div> - <div>{{list.description|urlize|linebreaks}}</div> - - <p>Link to lists of pkgbase values:</p> - <ul>{% for svn_root in svn_roots %} - <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li> - {% endfor %}</ul> + <div class="todo-description"> + {{list.stripped_description|default:'(no description)'|urlize|linebreaks}} + </div> - <p>{{ list.packages|length }} total todo list package{{ list.packages|pluralize }} found.</p> + <div class="todo-pkgbases"> + <p>Link to lists of pkgbase values:</p> + <ul>{% for svn_root in svn_roots %} + <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li> + {% endfor %}</ul> + </div> <div class="box filter-criteria"> <h3>Filter Todo List Packages</h3> @@ -54,7 +56,10 @@ <input type="checkbox" name="incomplete" id="id_incomplete" value="incomplete"/></div> <div ><label> </label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div> <div class="clear"></div> - <div id="filter-info"><span id="filter-count">{{ list.packages|length }}</span> todo list packages displayed.</div> + <div id="filter-info"> + <span id="filter-count">{{ list.packages|length }}</span> packages displayed out of + {{ list.packages|length }} total package{{ list.packages|pluralize }}. + </div> </fieldset> </form> </div> |