Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Siyavula/emas.mobiletheme
Browse files Browse the repository at this point in the history
  • Loading branch information
rochecompaan committed May 14, 2012
2 parents 06d5959 + 09a5254 commit 88c68e8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
7 changes: 4 additions & 3 deletions docs/HISTORY.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,8 +1,8 @@
Changelog Changelog
========= =========


1.2 (unreleased) 1.2
---------------- ---


- Show the offending url and use NotFound so we can suppress it in the error log - Show the offending url and use NotFound so we can suppress it in the error log


Expand All @@ -14,7 +14,8 @@ Changelog


- patched to traverse relative urls from folder if content is not folderish - patched to traverse relative urls from folder if content is not folderish


- patched sniffer.utilities.get_user_agent to log the environment and rather return 'No agent found' then 'None'. - patched sniffer.utilities.get_user_agent to log the environment and
rather return 'No agent found' then None.


1.1 1.1
--- ---
Expand Down
4 changes: 0 additions & 4 deletions emas/mobiletheme/templates/nextprevious.pt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,15 +19,12 @@
title="Go to previous item" title="Go to previous item"
i18n:attributes="title title_previous_item" i18n:attributes="title title_previous_item"
tal:attributes="href previous/url"> tal:attributes="href previous/url">
«
<span i18n:translate="label_previous_item" <span i18n:translate="label_previous_item"
tal:omit-tag=""> tal:omit-tag="">
Previous Previous
</span> </span>
</a> </a>
</tal:previous> </tal:previous>


<a class="next" href="" <a class="next" href=""
title="Go to next item" title="Go to next item"
i18n:attributes="title title_next_item" i18n:attributes="title title_next_item"
Expand All @@ -37,7 +34,6 @@
tal:omit-tag=""> tal:omit-tag="">
Next Next
</span> </span>
»
</a> </a>


&nbsp; &nbsp;
Expand Down

0 comments on commit 88c68e8

Please sign in to comment.