Put events in the sidebar and fix buttons for roles.

digitalnatives · Oct 26, 2017 · bc65c61 · bc65c61
1 parent 33b38ca
commit bc65c61
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/lib/course_planner_web/templates/event/index.html.eex b/lib/course_planner_web/templates/event/index.html.eex
@@ -3,9 +3,11 @@
     <div class="col-xs-6 col-sm-9 col-md-10 page-title">
       Events
     </div>
-    <div class="col-xs-6 col-sm-3 col-md-2">
-      <%= link "New event", to: event_path(@conn, :new), class: "mdl-button mdl-js-button mdl-button--raised" %>
-    </div>
+    <%= if @conn.assigns.current_user.role == "Coordinator" do %>
+      <div class="col-xs-6 col-sm-3 col-md-2">
+        <%= link "New event", to: event_path(@conn, :new), class: "mdl-button mdl-js-button mdl-button--raised" %>
+      </div>
+    <% end %>
   </div>
 
   <table class="mdl-data-table mdl-js-data-table mdl-shadow--2dp page">

diff --git a/lib/course_planner_web/templates/layout/coordinator_app_navbar.html.eex b/lib/course_planner_web/templates/layout/coordinator_app_navbar.html.eex
@@ -15,6 +15,7 @@
   <%= CoursePlannerWeb.SharedView.navbar_item "Classes", @conn, class_path(@conn, :index) %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Attendances", @conn, attendance_path(@conn, :index) %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Tasks", @conn, task_path(@conn, :index) %>
+  <%= CoursePlannerWeb.SharedView.navbar_item "Events", @conn, event_path(@conn, :index) %>
   <%= CoursePlannerWeb.SharedView.navbar_separator %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Settings", @conn, setting_path(@conn, :show) %>
   <%= if show_program_about?(), do: CoursePlannerWeb.SharedView.navbar_item "About #{get_program_name()}", @conn, about_path(@conn, :show) %>

diff --git a/lib/course_planner_web/templates/layout/student_app_navbar.html.eex b/lib/course_planner_web/templates/layout/student_app_navbar.html.eex
@@ -4,6 +4,7 @@
   <%= CoursePlannerWeb.SharedView.navbar_separator %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Courses", @conn, offered_course_path(@conn, :index) %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Attendances", @conn, attendance_path(@conn, :index) %>
+  <%= CoursePlannerWeb.SharedView.navbar_item "Events", @conn, event_path(@conn, :index) %>
   <%= if show_program_about?() do %>
     <%= CoursePlannerWeb.SharedView.navbar_separator %>
     <%= CoursePlannerWeb.SharedView.navbar_item "About #{get_program_name()}", @conn, about_path(@conn, :show) %>

diff --git a/lib/course_planner_web/templates/layout/teacher_app_navbar.html.eex b/lib/course_planner_web/templates/layout/teacher_app_navbar.html.eex
@@ -4,6 +4,7 @@
   <%= CoursePlannerWeb.SharedView.navbar_separator %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Courses", @conn, offered_course_path(@conn, :index) %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Attendances", @conn, attendance_path(@conn, :index) %>
+  <%= CoursePlannerWeb.SharedView.navbar_item "Events", @conn, event_path(@conn, :index) %>
   <%= if show_program_about?() do %>
     <%= CoursePlannerWeb.SharedView.navbar_separator %>
     <%= CoursePlannerWeb.SharedView.navbar_item "About #{get_program_name()}", @conn, about_path(@conn, :show) %>

diff --git a/lib/course_planner_web/templates/layout/volunteer_app_navbar.html.eex b/lib/course_planner_web/templates/layout/volunteer_app_navbar.html.eex
@@ -3,6 +3,7 @@
   <%= CoursePlannerWeb.SharedView.navbar_item "Calendar", @conn, schedule_path(@conn, :show) %>
   <%= CoursePlannerWeb.SharedView.navbar_separator %>
   <%= CoursePlannerWeb.SharedView.navbar_item "Tasks", @conn, task_path(@conn, :index) %>
+  <%= CoursePlannerWeb.SharedView.navbar_item "Events", @conn, event_path(@conn, :index) %>
   <%= CoursePlannerWeb.SharedView.navbar_separator %>
   <%= if show_program_about?() do %>
     <%= CoursePlannerWeb.SharedView.navbar_separator %>