Merge pull request #120 from ComputerScienceHouse/develop

Merge 2.5.3 into main

Author: mxmeinhold

gallery/templates/nav.html

@@ -26,6 +26,7 @@
                             </ul>
                         </li>
                     {% endif %}
+
                     {% if auth_dict['is_eboard'] or auth_dict['is_rtp'] %}
                         <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
@@ -34,17 +35,27 @@
                             <ul class="dropdown-menu" role="menu">
                                 {% if lockdown %}
                                     <li><a href="#" onclick="galleryLockdown(event);"><span class="glyphicon glyphicon-off"></span> Open Gallery</a></li>
-                                    {% else %}
+                                {% else %}
                                     <li><a href="#" onclick="galleryLockdown(event);"><span class="glyphicon glyphicon-lock"></span> Lockdown</a></li>
                                 {% endif %}
+
                                 {% if session['userinfo'].get('member-lock') %}
                                     <li><a href="#" onclick="memberModeToggle(event);"><span class="glyphicon glyphicon-star"></span> Switch to Admin Mode</a></li>
-                                    {% else %}
+                                {% else %}
                                     <li><a href="#" onclick="memberModeToggle(event);"><span class="glyphicon glyphicon-user"></span> Switch to Member Mode</a></li>
                                 {% endif %}
                             </ul>
                         </li>
+                    {% elif auth_dict['is_alumni'] %}
+                        <li>
+                            {% if session['userinfo'].get('member-lock') %}
+                                <a href="#" onclick="memberModeToggle(event);"><span class="glyphicon glyphicon-star"></span> Switch to Admin Mode</a>
+                            {% else %}
+                                <a href="#" onclick="memberModeToggle(event);"><span class="glyphicon glyphicon-user"></span> Switch to Member Mode</a></li>
+                            {% endif %}
+                        </li>
                     {% endif %}
+
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
                     <li class="dropdown navbar-user">

requirements.txt

@@ -7,11 +7,11 @@ blinker==1.9.0
 boto3==1.35.95
 botocore==1.35.99
 bytecode==0.16.1
-certifi==2021.10.8
-cffi==1.17.1
+certifi==2024.7.4
+cffi==2.0.0
 charset-normalizer==2.0.7
 click==8.1.8
-cryptography==35.0.0
+cryptography==46.0.1
 csh-ldap==2.4.0
 ddtrace==3.2.1
 decorator==4.4.2
@@ -34,7 +34,7 @@ itsdangerous==2.2.0
 Jinja2==3.1.6
 jmespath==0.10.0
 legacy-cgi==2.6.2
-Mako==1.1.5
+Mako==1.2.2
 MarkupSafe==3.0.2
 moviepy==0.2.3.5
 numpy==2.2.0
@@ -52,7 +52,7 @@ pydantic==2.10.6
 pydantic-settings==2.8.1
 pydantic_core==2.27.2
 pyjwkest==1.4.2
-pyOpenSSL==21.0.0
+pyOpenSSL==25.3.0
 python-dateutil==2.8.2
 python-dotenv==1.0.1
 python-ldap==3.4.0

setup.cfg

@@ -6,7 +6,7 @@ summary = Python Photo Gallery Written in Flask
 url = "https://github.com/ComputerScienceHouse/gallery"
 description-file = README.md
 license = MIT
-version = 2.5.2
+version = 2.5.3
 classifier =
     Natural Language :: English
     Operating System :: POSIX :: Linux