Daniel Holbach has proposed merging lp:~dholbach/loco-directory/624676 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#624676 Show 'action' links even if user is not logged in
https://bugs.launchpad.net/bugs/624676
--
https://code.launchpad.net/~dholbach/loco-directory/624676/+merge/40707
Your team loco-directory-dev is requested to review the proposed merge of
lp:~dholbach/loco-directory/624676 into lp:loco-directory.
=== modified file 'loco_directory/templates/events/event_list.html'
--- loco_directory/templates/events/event_list.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/events/event_list.html 2010-11-12 11:28:53 +0000
@@ -8,9 +8,7 @@
{% if user_is_on_lc %}
<a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a>
{% endif %}
-{% if user.is_authenticated %}
<a class="sub-nav-item" href="{% url team-event-select %}">{% trans "Add Team Event" %}</a>
-{% endif %}
<a class="sub-nav-item" href="{% url event-history-list %}">{% trans "Past Events" %}</a>
{% endblock %}
=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/events/team_event_detail.html 2010-11-12 11:28:53 +0000
@@ -5,14 +5,13 @@
{% block sub_nav_links %}
<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
+<a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
{% if user.is_authenticated %}
-<a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
-{% if user_is_team_member %}
-<a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a>
-<a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Event" %}</a>
-<a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a>
-{% endif %}
-
+ {% if user_is_team_member %}
+ <a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a>
+ <a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Event" %}</a>
+ <a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a>
+ {% endif %}
{% endif %}
<a class="sub-nav-item" href="{% url event-ical team_event_object.id %}">{% trans "iCal Feed" %}</a>
{% endblock %}
=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
--- loco_directory/templates/events/team_event_detail_attendees.inc.html 2010-10-15 03:24:41 +0000
+++ loco_directory/templates/events/team_event_detail_attendees.inc.html 2010-11-12 11:28:53 +0000
@@ -9,6 +9,8 @@
{% else %}
<a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
{% endif %}
+ {% else %}
+ <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
{% endif %}
</td>
</tr>
=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html 2010-08-24 15:24:24 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html 2010-11-12 11:28:53 +0000
@@ -3,9 +3,7 @@
<table id="team-event-comments">
<tr>
<td colspan="2" class="form-item-value">
- {% if user.is_authenticated %}
<a href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
- {% endif %}
</td>
</tr>
{% regroup team_event_object.teameventcomment_set.all by date_created|date:"D d M Y" as comment_list %}
=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html 2010-09-09 19:06:22 +0000
+++ loco_directory/templates/venues/venue_detail.html 2010-11-12 11:28:53 +0000
@@ -12,9 +12,7 @@
{% block sub_nav_links %}
<a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a>
-{% if user.is_authenticated %}
<a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit Venue Details" %}</a>
-{% endif %}
{% endblock %}
{% block search %}
=== modified file 'loco_directory/templates/venues/venue_list.html'
--- loco_directory/templates/venues/venue_list.html 2010-10-21 11:52:29 +0000
+++ loco_directory/templates/venues/venue_list.html 2010-11-12 11:28:53 +0000
@@ -4,9 +4,7 @@
{% block title %}{% trans "Ubuntu LoCo Event Venues" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
{% block sub_nav_links %}
-{% if user.is_authenticated %}
<a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add New Venue" %}</a>
-{% endif %}
{% endblock %}
{% block search_box %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
