Skip to content

Commit

Permalink
Fixed bug displaying the time between posts in feed where time was be…
Browse files Browse the repository at this point in the history
…ing incorrectly converted into hours
  • Loading branch information
malnoxon committed Aug 22, 2016
1 parent f6e46cc commit ad6a7af
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions rsstory/index.pt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

<ul id="header_bar">
<li class="menu"><a class="active" href="/">Home</a></li>
<li class="menu"><a href="/about">About</a></li>
<li class="menu"><a href="/archive-fails">Report Error</a></li>
<li class="menu"><a href="https://github.com/malnoxon/rsstory">Github</a></li>
<li class="menu" tal:condition="not: logged_in" style="float:right"><a href="login">Login</a></li>
<li class="menu" tal:condition="logged_in" style="float:right"><a href="${request.application_url}/logout">Logout</a></li>
<li class="menu" tal:condition="user_email" style="float:right"><a href="${request.application_url}/my-feeds">${user_email}</a></li>
<li class="menu" tal:condition="logged_in" style="float:right"><a href="my-feeds">My Feeds</a></li>
</ul>
<ul id="header_bar">
<li class="menu"><a class="active" href="/">Home</a></li>
<li class="menu"><a href="/about">About</a></li>
<li class="menu"><a href="/archive-fails">Report Error</a></li>
<li class="menu"><a href="https://github.com/malnoxon/rsstory">Github</a></li>
<li class="menu" tal:condition="not: logged_in" style="float:right"><a href="login">Login</a></li>
<li class="menu" tal:condition="logged_in" style="float:right"><a href="${request.application_url}/logout">Logout</a></li>
<li class="menu" tal:condition="user_email" style="float:right"><a href="${request.application_url}/my-feeds">${user_email}</a></li>
<li class="menu" tal:condition="logged_in" style="float:right"><a href="my-feeds">My Feeds</a></li>
</ul>

<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
Expand Down Expand Up @@ -75,8 +75,8 @@
</td>
</tr>
</table>
<div class="g-recaptcha" data-sitekey="6LcnlgsTAAAAAGmVA_COh_S6FDDtnEUJY9aL8Ulf"></div>
<div tal:condition="not: logged_in">WARNING: If you create a feed while not logged in you will NOT be able to manage it later!</div>
<div class="g-recaptcha" data-sitekey="6LcnlgsTAAAAAGmVA_COh_S6FDDtnEUJY9aL8Ulf"></div>
<div tal:condition="not: logged_in">WARNING: If you create a feed while not logged in you will NOT be able to manage it later!</div>
<button type="button" id="submit">
Submit
</button>
Expand Down
2 changes: 1 addition & 1 deletion rsstory/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def my_feeds(request):
titles.append(f.name)
archive_urls.append(f.archive_url)
time_created.append(datetime.datetime.fromtimestamp(f.time_created).strftime("%Y-%m-%d %H:%M:%S"))
time_between_posts.append(f.time_between_posts // (60 * 24)) # display in hours
time_between_posts.append(f.time_between_posts // (60 * 60)) # display in hours
urls.append("/static/feeds/" + f.id + ".xml")
preview_feeds.append("/static/previews/preview" + f.id + ".txt")
ids.append(f.id)
Expand Down

0 comments on commit ad6a7af

Please sign in to comment.