jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of github.com:kylewm/woodwind

Browse source
This commit is contained in:
Kyle Mahan 2016-06-22 05:29:28 +00:00
commit fa9ec84e35
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
woodwind/templates/_entry.jinja2
View file

@ -10,7 +10,7 @@
{{ context.permalink | domain_for_url }} {{ context.permalink | domain_for_url }}
</header> </header>
{% if context.title %} {% if context.title %}
<h1>{{ context.title }}</h1> <h1>{{ context.title|e }}</h1>
{% endif %} {% endif %}
{% if context.content %} {% if context.content %}
<div class="content"> <div class="content">
@ -28,7 +28,7 @@
{% endfor %} {% endfor %}
<article> <article>
<header> <details><summary><header>
{% if entry.author_photo %} {% if entry.author_photo %}
<img src="{{entry.author_photo|proxy_image}}"/> <img src="{{entry.author_photo|proxy_image}}"/>
{% endif %} {% endif %}
@ -43,9 +43,9 @@
{% endif %} {% endif %}
</header> </header>
{% if entry.title %} {% if entry.title %}
<h1>{{ entry.title }}</h1> <h1>{{ entry.title|e }}</h1>
{% endif %} {% endif %}
</summary>
{% if entry.get_property('event') %} {% if entry.get_property('event') %}
<p> <p>
{% if entry.get_property('start') %} {% if entry.get_property('start') %}
@ -71,7 +71,7 @@
</div> </div>
{% endif %} {% endif %}
</details>
<footer> <footer>
{% set location = entry.get_property('location') %} {% set location = entry.get_property('location') %}
{% if location and 'name' in location %} {% if location and 'name' in location %}

8
woodwind/templates/subscriptions.jinja2
View file

@ -30,7 +30,8 @@
<i class="fa fa-warning"></i> Last {{ s.feed.failure_count }} Attempt(s) Failed <i class="fa fa-warning"></i> Last {{ s.feed.failure_count }} Attempt(s) Failed
</div> </div>
{% endif %} {% endif %}
<form class="edit-subscription" action="{{ url_for('.edit_subscription') }}" method="POST"> <details><summary><b>{{ s.name }}</b> checked {{s.feed.last_checked | relative_time}}</summary>
<form class="edit-subscription" action="{{ url_for('.edit_subscription') }}" method="POST">
<input type="hidden" name="id" value="{{ s.id }}"/> <input type="hidden" name="id" value="{{ s.id }}"/>
<label>Name</label> <label>Name</label>
<input type="text" name="name" value="{{ s.name }}"/> <input type="text" name="name" value="{{ s.name }}"/>
@ -55,7 +56,7 @@
</div> </div>
<div class="feed-details" id="details-{{loop.index}}"> <div class="feed-details" id="details-{{loop.index}}">
<strong>Details</strong> <details><summary><strong>Details</strong></summary>
<ul> <ul>
<li>Last checked: {{s.feed.last_checked | relative_time}}</li> <li>Last checked: {{s.feed.last_checked | relative_time}}</li>
<li>Last updated: {{s.feed.last_updated | relative_time}}</li> <li>Last updated: {{s.feed.last_updated | relative_time}}</li>
@ -66,9 +67,10 @@
<li>PuSH last ping: {{s.feed.last_pinged | relative_time}}</li> <li>PuSH last ping: {{s.feed.last_pinged | relative_time}}</li>
<li>PuSH expiry: {{s.feed.push_expiry | relative_time}}</li> <li>PuSH expiry: {{s.feed.push_expiry | relative_time}}</li>
</ul> </ul>
</details>
</div> </div>
</details>
<form class="poll-now" action="{{ url_for('.update_feed') }}" method="POST" style="display:inline"> <form class="poll-now" action="{{ url_for('.update_feed') }}" method="POST" style="display:inline">
<input type="hidden" name="id" value="{{ s.feed.id }}"/> <input type="hidden" name="id" value="{{ s.feed.id }}"/>
<button type="submit">Poll Now</button> <span class="poll-status"></span> <button type="submit">Poll Now</button> <span class="poll-status"></span>