Author: rgardler
Date: Tue Jul 28 03:23:38 2015
New Revision: 1692982
URL: http://svn.apache.org/r1692982
Log:
move the import meetups commadn into the navbar
Modified:
comdev/tools/events_list/templates/events/index.html
comdev/tools/events_list/templates/groups/index.html
comdev/tools/events_list/templates/include/navbar.html
Modified: comdev/tools/events_list/templates/events/index.html
URL:
http://svn.apache.org/viewvc/comdev/tools/events_list/templates/events/index.html?rev=1692982&r1=1692981&r2=1692982&view=diff
==============================================================================
--- comdev/tools/events_list/templates/events/index.html (original)
+++ comdev/tools/events_list/templates/events/index.html Tue Jul 28 03:23:38
2015
@@ -15,10 +15,6 @@
<h1>Events</h1>
-{% if can_import %}
- <a href="/events/importMeetups">Import Meetups</a>
-{% endif %}
-
{% if upcoming_events_list %}
<table id="eventList" class="table table-striped">
<thead>
Modified: comdev/tools/events_list/templates/groups/index.html
URL:
http://svn.apache.org/viewvc/comdev/tools/events_list/templates/groups/index.html?rev=1692982&r1=1692981&r2=1692982&view=diff
==============================================================================
--- comdev/tools/events_list/templates/groups/index.html (original)
+++ comdev/tools/events_list/templates/groups/index.html Tue Jul 28 03:23:38
2015
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Community Development: Events</title>
+ <title>Community Development: Groups</title>
<script src="http://code.jquery.com/jquery-1.11.1.min.js";></script>
<script type="text/javascript"
src="http://cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js";></script>
@@ -14,9 +14,6 @@
{% include "include/navbar.html" %}
<h1>Groups</h1>
- {% if can_import %}
- <a href="/events/importMeetups">Import Meetups</a>
- {% endif %}
{% if groups_list %}
<table id="groupList" class="table table-striped">
@@ -26,6 +23,7 @@
<th>City</th>
<th>State</th>
<th>Country</th>
+ <th>Actions</th>
</tr>
</thead>
<tbody>
@@ -35,6 +33,9 @@
<td>{{ group.city }}</td>
<td>{{ group.state }}</td>
<td>{{ group.country }}</td>
+ {% if can_import %}
+ <td><a href="">Import Members</a></td>
+ {% endif %}
</tr>
{% endfor %}
</tbody>
Modified: comdev/tools/events_list/templates/include/navbar.html
URL:
http://svn.apache.org/viewvc/comdev/tools/events_list/templates/include/navbar.html?rev=1692982&r1=1692981&r2=1692982&view=diff
==============================================================================
--- comdev/tools/events_list/templates/include/navbar.html (original)
+++ comdev/tools/events_list/templates/include/navbar.html Tue Jul 28 03:23:38
2015
@@ -19,6 +19,16 @@
<li><a class="{% is_active_page request 'eventIndex' %}" href="{% url
'eventIndex' %}">Events</a></li>
<li><a class="{% is_active_page request 'groupIndex' %}" href="{% url
'groupIndex' %}">Groups</a></li>
</ul>
+
+ <ul class="nav navbar-nav navbar-right">
+ {% if can_import %}
+ <li><a href="{% url 'importMeetups' %}">Import Meetups</a></li>
+ {% endif %}
+ </ul>
+
+
+
+
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
