new member video page

nadineproject · May 21, 2021 · f9207ff · f9207ff
1 parent 9f6e615
commit f9207ff
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/member/static/css/member.css b/member/static/css/member.css
@@ -274,7 +274,7 @@ table td {
 	width: 100%;
 }
 
-#dropdown1 a, #dropdown2 a, #dropdown3 a {
+#dropdown1 a, #dropdown2 a, #dropdown3 a, #dropdown4 a {
 	color: RGBA(79, 134, 135, 1);
 }
 

diff --git a/member/templates/member/base.html b/member/templates/member/base.html
@@ -95,18 +95,23 @@
               <a class='dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown2' href="{% url 'member:org:list' %}">{% trans "Organizations" %}</a>
               <ul id='dropdown2' class='dropdown-content'>
                 <li><a href="{% url 'member:org:list' %}">{% blocktrans %}Active Organizations{% endblocktrans %}</a></li>
-              <li><a href="{% url 'member:tag:cloud' 'organizations' %}">{% trans "Tags" %}</a></li>
+                <li><a href="{% url 'member:tag:cloud' 'organizations' %}">{% trans "Tags" %}</a></li>
+              </ul>
+            </li>
+            <li>
+              <a class='dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown3' href="{% url 'member:event:calendar' %}">{% trans "Events" %}</a>
+              <ul id='dropdown3' class='dropdown-content'>
+                <li><a href="{% url 'member:event:videos' %}">{% blocktrans %}Videos{% endblocktrans %}</a></li>
               </ul>
             </li>
-            <li><a href="{% url 'member:event:calendar' %}">{% trans "Events" %}</a></li>
             <li><a href="{% url 'member:connect:email_lists' %}">{% trans "Mailing Lists" %}</a></li>
             {% if integrations.slack %}
               <li><a class='slack-a' href="{% url 'member:connect:slack' user.username %}">{% trans "Slack" %}</a></li>
             {% endif %}
             <li><a href="{% url 'member:profile:redirect' %}">{% trans "Profile" %}</a></li>
             <li>
-              <a class='logout-a dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown3' href="{% url 'logout' %}">{% trans "Logout" %}</a>
-              <ul id='dropdown3' class='dropdown-content'>
+              <a class='logout-a dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown4' href="{% url 'logout' %}">{% trans "Logout" %}</a>
+              <ul id='dropdown4' class='dropdown-content'>
                 {% if request.user.is_staff %}
                   <li><a href="{% url 'staff:home' %}">{% trans "Staff" %}</a></li>
                   <li><a href="{% url 'admin:index' %}">{% trans "Admin" %}</a></li>
@@ -123,8 +128,8 @@
             {% endif %}
             <li><a href="{% url 'member:profile:redirect' %}">{% trans "Profile" %}</a></li>
             <li>
-              <a class='logout-a dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown3' href="{% url 'logout' %}">{% trans "Logout" %}</a>
-              <ul id='dropdown3' class='dropdown-content'>
+              <a class='logout-a dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown4' href="{% url 'logout' %}">{% trans "Logout" %}</a>
+              <ul id='dropdown4' class='dropdown-content'>
                 {% if request.user.is_staff %}
                   <li><a href="{% url 'staff:home' %}">Staff</a></li>
                   <li><a href="{% url 'admin:index' %}">Admin</a></li>
@@ -208,7 +213,6 @@
           {% endif %}
         </div>
       {% endblock %}
-      </div>
     </div>
     </footer>
     {% endblock %}

diff --git a/member/templates/member/events/member_videos.html b/member/templates/member/events/member_videos.html
@@ -0,0 +1,22 @@
+{% extends "member/base.html" %}
+{% load static %}
+{% load i18n %}
+
+{% block sub-title %}{% trans "Member Videos" %} | {% endblock %}
+
+{% block style %}
+{% endblock %}
+
+{% block content %}
+<h2>Member Videos</h2>
+<hr/>
+
+<div style="text-align: center;">
+  <h3>Lunch & Learn - 3D Printing with Trevor</h3>
+  <video width='640' controls>
+    <source src="/media/member_videos/3D_Printing.mp4" type="video/mp4"></source>
+    Your browser does not support the video tag.
+  </video>
+</div>
+
+{% endblock %}
diff --git a/member/urls/events.py b/member/urls/events.py
@@ -8,7 +8,7 @@
     path('booking/create/<username>/', events.create_booking, name='create_booking'),
     path('booking/confirm/<room>/<start>/<end>/<date>/<rate>/', events.confirm_booking, name='confirm_booking'),
     path('calendar/', events.calendar, name='calendar'),
+    path('videos/', events.member_videos, name='videos'),
 ]
 
 # Copyright 2021 Office Nomads LLC (https://officenomads.com/) Licensed under the AGPL License, Version 3.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at https://www.gnu.org/licenses/agpl-3.0.html. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
diff --git a/member/views/events.py b/member/views/events.py
@@ -299,5 +299,11 @@ def calendar(request):
     return render(request, template, context)
 
 
-# Copyright 2021 Office Nomads LLC (https://officenomads.com/) Licensed under the AGPL License, Version 3.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at https://www.gnu.org/licenses/agpl-3.0.html. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+@login_required
+@user_passes_test(is_active_member, login_url='member:not_active')
+def member_videos(request):
+    context = {}
+    return render(request, 'member/events/member_videos.html', context)
 
+
+# Copyright 2021 Office Nomads LLC (https://officenomads.com/) Licensed under the AGPL License, Version 3.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at https://www.gnu.org/licenses/agpl-3.0.html. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.