Merge lp:~cjohnston/summit/remove-propose-meeting-link into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 425
Merged at revision: 427
Proposed branch: lp:~cjohnston/summit/remove-propose-meeting-link
Merge into: lp:summit
Diff against target: 20 lines (+1/-2)
1 file modified
summit/schedule/templates/schedule/actions.html (+1/-2)
To merge this branch: bzr merge lp:~cjohnston/summit/remove-propose-meeting-link
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+118770@code.launchpad.net

Commit message

Allows for the propose a meeting link to be removed for events that do not want meetings proposed in Summit

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
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/actions.html'
2--- summit/schedule/templates/schedule/actions.html 2012-04-30 14:54:44 +0000
3+++ summit/schedule/templates/schedule/actions.html 2012-08-08 15:13:20 +0000
4@@ -1,7 +1,6 @@
5 {% load schedule_perms %}
6
7 {% ifnotequal summit.state "public" %}
8-
9 <div class="action-links">
10 <p style="font-size: 16px; font-weight: bold;">Actions</p>
11 <ul>
12@@ -37,7 +36,7 @@
13 <li><a href="/{{ summit.name }}/create_meeting" title="Create Private Meeting">Create a meeting</a></li>
14 <li><a href="/{{ summit.name }}/review" title="Review Proposed Meetings">Review proposed meetings</a></li>
15 {% else %}
16- <li><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>
17+ <li class="propose"><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>
18 {% endif %}
19 {% if attendee %}
20 <li><a href="{% url summit.schedule.views.created_meetings summit.name attendee.user.username %}">My proposed meetings</a></li>

Subscribers

People subscribed via source and target branches