Merge lp:~cjohnston/summit/remove-twitter-if-no-tag into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 529
Merged at revision: 529
Proposed branch: lp:~cjohnston/summit/remove-twitter-if-no-tag
Merge into: lp:summit
Diff against target: 24 lines (+4/-3)
1 file modified
summit/schedule/templates/schedule/summit.html (+4/-3)
To merge this branch: bzr merge lp:~cjohnston/summit/remove-twitter-if-no-tag
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+157856@code.launchpad.net

Commit message

Removes the box-feature if there is no twitter hash tag

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/summit.html'
2--- summit/schedule/templates/schedule/summit.html 2013-04-08 21:06:14 +0000
3+++ summit/schedule/templates/schedule/summit.html 2013-04-09 12:24:28 +0000
4@@ -117,8 +117,7 @@
5 {% endif %}
6 </ul>
7 </div>
8- <div class="three-col last-col box box-padded-feature">
9- {% if summit.hashtag %}
10+ <div class="three-col last-co {% if summit.hashtag %} box box-padded-feature">
11 <h3>Latest from Twitter</h3>
12 <div id="tweets">
13 <ul id="twitter_update_list">
14@@ -127,7 +126,9 @@
15 <a href="http://twitter.com/{{ summit.hashtag }}">@{{ summit.hashtag }}</a>
16 </div>
17 <script type="text/javascript" src="https://search.twitter.com/search.json?q={{ summit.hashtag|urlencode }}&callback=twitterCallback2&count=5"></script>
18- {% endif %}
19+ {% else %}
20+ ">
21+ {% endif %}
22 </div>
23 </div>
24 {% endblock %}

Subscribers

People subscribed via source and target branches