Remove WIP header and highlight wiki in nav when selected

Also fix highlighting in collapsed nav

2 files changed, 24 insertions, 19 deletions

diff --git a/templates/main/base.html b/templates/main/base.html
index 9b25a724..d87376b1 100644
--- a/templates/main/base.html
+++ b/templates/main/base.html
@@ -35,30 +35,18 @@
         <div class="uk-offcanvas-content">
         {% endif %}
             {% include "main/navigation.html" %}
-            {% if current_page != "main.index" %}
-                {% block beta_error %}
-                    <div class="uk-container uk-section" style="padding-top: 10px; padding-bottom: 10px;">
-                        <div class="uk-container uk-container-small">
-                            <div class="uk-alert-danger" uk-alert>
-                                <p>
-                                    Please note: this site is under construction. What you see now may be vastly different
-                                    from the final project state. Feel free to chat to us on Discord if you're curious!
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                {% endblock %}
-            {% endif %}
             {% block content %}{% endblock %}
         </div>
 
         <footer>
             <div class="uk-section uk-section-secondary uk-container-medium uk-text-meta">
-                <div class="uk-text-center">
+                <div class="uk-text-center uk-text-meta">
                     <p>
                         This website uses <a href="https://python.org">Python</a> and
                         <a href="http://flask.pocoo.org/">Flask</a>, and was developed collaboratively on
                         <a href="https://github.com/discord-python/site">GitHub</a>.
+                        <br />
+                        For privacy &amp; GDPR-related info, please <a href="{{ url_for("main.about.privacy") }}">see this page</a>.
                     </p>
                 </div>
             </div>
diff --git a/templates/main/navigation.html b/templates/main/navigation.html
index d15b46f7..6a3aba8d 100644
--- a/templates/main/navigation.html
+++ b/templates/main/navigation.html
@@ -14,11 +14,17 @@
         <div class="uk-navbar-right">
             <ul class="uk-navbar-nav uk-visible@m">
                 {% if current_page == "main.index" %}
-                    <li class="uk-active"><a href="{{ url_for('main.index') }}"><i class="uk-icon fas fa-home"></i> &nbsp;Home</a></li>
+                    <li class="uk-active"><a href="{{ url_for('main.index') }}"><i class="uk-icon fas fa-home fa-fw"></i> &nbsp;Home</a></li>
                 {% else %}
                     <li><a href="{{ url_for('main.index') }}"><i class="uk-icon fas fa-home fa-fw"></i> &nbsp;Home</a></li>
                 {% endif %}
-                <li><a href="{{ url_for('wiki.index') }}"><i class="uk-icon fas fa-book fa-fw"></i> &nbsp;Wiki</a></li>
+
+                {% if current_page.startswith("wiki.") %}
+                    <li class="uk-active"><a href="{{ url_for('wiki.index') }}"><i class="uk-icon fas fa-book fa-fw"></i> &nbsp;Wiki</a></li>
+                {% else %}
+                    <li><a href="{{ url_for('wiki.index') }}"><i class="uk-icon fas fa-book fa-fw"></i> &nbsp;Wiki</a></li>
+                {% endif %}
+
                 <li><a href="{{ url_for('main.invite') }}"><i class="uk-icon fab fa-discord fa-fw"></i> &nbsp;Discord</a></li>
             </ul>
             <ul class="uk-navbar-nav">
@@ -27,8 +33,19 @@
                     <div class="uk-navbar-dropdown uk-background-secondary" uk-dropdown>
                         <ul class="uk-nav uk-navbar-dropdown-nav">
                             <li class="uk-nav-header uk-hidden@m">Navigation</li>
-                            <li class="uk-nav-item uk-hidden@m"><a href="{{ url_for('main.index') }}"><i class="uk-icon fas fa-home fa-fw"></i> &nbsp;Home</a></li>
-                            <li class="uk-nav-item uk-hidden@m"><a href="{{ url_for('wiki.index') }}"><i class="uk-icon fas fa-book fa-fw"></i> &nbsp;Wiki</a></li>
+
+                            {% if current_page == "main.index" %}
+                                <li class="uk-nav-item uk-active uk-hidden@m"><a href="{{ url_for('main.index') }}"><i class="uk-icon fas fa-home fa-fw"></i> &nbsp;Home</a></li>
+                            {% else %}
+                                <li class="uk-nav-item uk-hidden@m"><a href="{{ url_for('main.index') }}"><i class="uk-icon fas fa-home fa-fw"></i> &nbsp;Home</a></li>
+                            {% endif %}
+
+                            {% if current_page.startswith("wiki.") %}
+                                <li class="uk-nav-item uk-active uk-hidden@m"><a href="{{ url_for('wiki.index') }}"><i class="uk-icon fas fa-book fa-fw"></i> &nbsp;Wiki</a></li>
+                            {% else %}
+                                <li class="uk-nav-item uk-hidden@m"><a href="{{ url_for('wiki.index') }}"><i class="uk-icon fas fa-book fa-fw"></i> &nbsp;Wiki</a></li>
+                            {% endif %}
+
                             <li class="uk-nav-item uk-hidden@m"><a href="{{ url_for('main.invite') }}"><i class="uk-icon fab fa-discord fa-fw"></i> &nbsp;Discord</a></li>
                             <li class="uk-nav-divider uk-hidden@m"></li>