Merge pull request #264 from NinaKos/master

fixing css bug on: replacing css edit-toolbar on view event page

Author: ialja

web/templates/pages/view_event.html

@@ -31,9 +31,9 @@
 
 	<div class="container">
 		<div id="fb-root"></div>
-		{% if user.profile.is_ambassador %}
-		{% if user.profile.country == event.country or user.is_staff %}
 			<div class="edit-toolbar">
+			{% if user.profile.is_ambassador %}
+			{% if user.profile.country == event.country or user.is_staff %}
 				<div id="change_status">
 					{% if event.status == 'PENDING' %}
 						<div class="alert alert-warning">
@@ -58,7 +58,6 @@
 								<a class="btn btn-sm btn-primary" href="{% url 'web.view_event' next_event.pk next_event.slug %}">Next pending event</a> 
 							</div>
 							{% endif %}
-
 						</div>
 					{% elif event.status == 'APPROVED' %}
 						<div class="alert alert-info">
@@ -91,21 +90,19 @@
 							{% endif %}
 						</div>
 					{% endif %}
+				</div>
 			{% endif %}
 			{% endif %}
 			{% if event.creator.id == request.user.id %}
 				<a href="{% url 'web.edit_event' event.id %}" class="btn pull-right edit-event-btn">
-						<i class="fa fa-pencil-square-o"></i>Edit event</a>
+				<i class="fa fa-pencil-square-o"></i>Edit event</a>
 				{% if event.status == 'PENDING' %}
 							<div class="alert alert-warning">
 								<strong>NOTE:</strong> This event is stil being reviewed by <a href="{% url 'web.ambassadors' %}">moderators</a>.
 							</div>
 				{% endif %}
-				</div>
 			</div>	
-		{% endif %}
-
-
+			{% endif %}
 
 		<div class="about-event clearfix">
 			<div class="col-md-8 event-description first">