Rollback branch

articles/templates/articles/_patterns/commenting.html

@@ -8,7 +8,7 @@ <h1 class="heading__component-title">{% trans "Share your feedback" %}</h1>
     {% endif %}
     {# <!-- ========== start THREADED COMMENTS ========== --> #}
     {% get_comment_form for page as form %}
-    <!-- {% if user.is_authenticated %}
+    {% if user.is_authenticated %}
         {% if settings.home.SiteSettings.comment_posting %}
             <form action="{% comment_form_target %}" method="post" class="commenting-form">
             {% csrf_token %}
@@ -29,7 +29,7 @@ <h1 class="heading__component-title">{% trans "Share your feedback" %}</h1>
                 <a href="{% url 'auth_login' %}" class="call-to-action__submit">{% trans "Log in to leave a comment." %}</a>
             </div>
         {% endif %}
-    {% endif %} -->
+    {% endif %}
 
     {% get_comment_list for page as comment_list root_only %}
     {% if comment_list %}

comments/templates/comments/reply.html

@@ -10,7 +10,7 @@ <h1 class="heading__primary">{% trans "Add your reply" %}</h1>
   <p class="commenting-thread__msg">{{ parent.comment }}</p>
   <p class="commenting-thread__publish-date">{{ parent.submit_date }}</p>
  {% get_comment_form for parent as form %}
-    <!-- {% if user.is_authenticated %}
+    {% if user.is_authenticated %}
         {% if settings.home.SiteSettings.comment_posting %}
             <form action="{% comment_form_target %}" method="post" class="commenting-form">
             {% csrf_token %}
@@ -31,7 +31,7 @@ <h1 class="heading__primary">{% trans "Add your reply" %}</h1>
                 <a href="{% url 'auth_login' %}" class="call-to-action__submit">{% trans "Log in to leave a comment." %}</a>
             </div>
         {% endif %}
-    {% endif %} -->
+    {% endif %}
 {% endblock %}
 
 

forms/templates/forms/_patterns/form.html

@@ -17,6 +17,6 @@
             </a>
         </div>
     {% endif %}
-<!-- {% else %}
-    <h2 class="forms__subtitle">{% trans "To fill in the form, you must log in." %}</h2> -->
+{% else %}
+    <h2 class="forms__subtitle">{% trans "To fill in the form, you must log in." %}</h2>
 {% endif %}

forms/templates/forms/springster/legacy-polls/_form-page-input-type-checks.html

@@ -6,7 +6,7 @@
     </div>
     <div class="polls__inner">
         <h1 class="forms__title">{{page.title}}</h1>
-        <!-- {% if user.is_authenticated and user.is_active or request.is_preview or page.allow_anonymous_submissions %}
+        {% if user.is_authenticated and user.is_active or request.is_preview or page.allow_anonymous_submissions %}
 
             {% if form %}
                 <p class="forms__paragraph">{{ page.intro|richtext }}</p>
@@ -42,7 +42,7 @@ <h1 class="forms__title">{{page.title}}</h1>
             <h2 class="forms__subtitle">
                 {% trans "To fill in the form, you must log in." %}
             </h2>
-        {% endif %} -->
+        {% endif %}
     </div>
 </div>
 <div class="breadcrumbs">

geweb/templates/_patterns/expanded_footer-nav.html

@@ -10,12 +10,12 @@
             <a href="{% url 'view_my_profile' %}" class="nav-list__anchor">{% trans "Profile" %}</a>
         {% endif %}
 
-        <!-- <li class="nav-list__item">
+        <li class="nav-list__item">
             {% if not user.is_authenticated %}
                 <a href="{% url 'auth_login' %}" class="nav-list__anchor">{% trans "Log in" %}</a>
             {% else %}
                 <a href="{% url 'auth_logout' %}" class="nav-list__anchor">{% trans "Log out" %}</a>
             {% endif %}
-        </li> -->
+        </li>
     </ul>
 </nav>

geweb/templates/ninyampinga/_nav-dropdown.html

@@ -11,7 +11,7 @@
                     </a>
                 </li>
 
-                <!-- <li class="nav-list__item">
+                <li class="nav-list__item">
                     {% if not user.is_authenticated %}
                         <a href="{% url 'auth_login' %}" class="nav-list__anchor">{% trans 'Sign up' %}</a>
                     {% else %}
@@ -25,7 +25,7 @@
                     {% else %}
                         <a href="{% url 'auth_logout' %}" class="nav-list__anchor">{% trans 'Log in' %}</a>
                     {% endif %}
-                </li> -->
+                </li>
             </ul>
         </div>
 

geweb/templates/ninyampinga/footer.html

@@ -41,7 +41,7 @@ <h3 class="heading__basic">
             </ul>
 
             <ul class="nav-list nav-list--column3">
-                <!-- {% if not user.is_authenticated %}
+                {% if not user.is_authenticated %}
                     <li class="nav-list__item">
                         <a href="{% url 'user_register' %}" class="nav-list__anchor">
                             {% trans "Join us" %}
@@ -61,7 +61,7 @@ <h3 class="heading__basic">
                     <li class="nav-list__item">
                         <a href="{% url 'auth_logout' %}" class="nav-list__anchor">{% trans "Log out" %}</a>
                     </li>
-                {% endif %} -->
+                {% endif %}
             </ul>
         </div>
     </div>

geweb/templates/springster/header.html

@@ -6,7 +6,7 @@
     <header id="header-wrapper" class="header-wrapper">
         <div class="menu">
             <ul class="menu-list">
-                <!-- <li id="profile" class="menu-list__item">
+                <li id="profile" class="menu-list__item">
                     {% if not user.is_authenticated %}
                         <a  href="{% url 'user_register' %}" class="menu-list__anchor">
                             {% trans "Sign up" %} 
@@ -16,7 +16,7 @@
                             {% trans "Profile" %} 
                         </a>
                     {% endif %}
-                </li> -->
+                </li>
                 <li class="menu-list__item">
                     <a href="/" class="menu-list__anchor logo logo--center">
                         <img alt="Springster" src="{% static 'img/springster/springster-logo.svg' %}" width="97" height="24">

geweb/templates/tujibebe/header.html

@@ -5,7 +5,7 @@
     <header id="header-wrapper" class="header-wrapper">
         <div class="menu">
             <ul class="menu-list">
-                <!-- <li id="profile" class="menu-list__item">
+                <li id="profile" class="menu-list__item">
                     {% if not user.is_authenticated %}
                         <a  href="{% url 'user_register' %}" class="menu-list__anchor">
                             {% trans "Sign up" %} 
@@ -15,7 +15,7 @@
                             {% trans "Profile" %} 
                         </a>
                     {% endif %}
-                </li> -->
+                </li>
                 <li class="menu-list__item">
                     <a href="/" class="menu-list__anchor logo logo--center">
                         <img alt="Tujibebe" src="{% static 'img/tujibebe/tujibebe_white.svg' %}" width="115" height="35"  >

geweb/templates/zathu/footer.html

@@ -8,7 +8,7 @@
             {% include "../_patterns/nav.html" with suffix="zathu" %}
             {% include "../_patterns/footer-nav.html" with suffix="zathu" %}
         </div>
-        <!-- <div class="nav-list footer-profiles">
+        <div class="nav-list footer-profiles">
             <div class="nav-list__item">
               {% if not user.is_authenticated %}
                 <a href="{% url 'auth_login' %}" class="nav-list__anchor">{% trans "Log in" %}</a>
@@ -24,7 +24,7 @@
                 {% endif %}
             </div>
             {% include "../_patterns/language.html" with position="bottom" %}
-        </div> -->
+        </div>
     </div>
 
 

geweb/templates/zathu/header.html

@@ -14,13 +14,13 @@
                     <li class="nav-list__item">
                         <a class="nav-list__anchor" href="#footer">{% trans "Menu" %}</a>
                     </li>
-                    <!-- {% comment %} <li class="nav-list__item">
+                    {% comment %} <li class="nav-list__item">
                         {% if not user.is_authenticated %}
                             <a href="{% url 'user_register' %}" class="nav-list__anchor">{% trans "Sign up" %}</a>
                         {% else %}
                             <a href="{% url 'view_my_profile' %}" class="nav-list__anchor">{% trans "Profile" %}</a>
                         {% endif %}
-                    </li> {% endcomment %} -->
+                    </li> {% endcomment %}
                     <li id="search" class="nav-list__item">
                         <a class="nav-list__anchor" href="#footer">
                             <label>{% trans "Search" %}</label>

home/templates/home/_patterns/forms-page.html

@@ -18,10 +18,10 @@ <h3 class="forms-page__subtitle">{{form.introduction|safe}}</h3>
                 <a href="{% pageurl form %}" class="call-to-action__submit call-to-action__submit--enhanced">
                     <span class="call-to-action__label">{% trans "Enter" %}</span>
                 </a>
-            <!-- {% else %}
+            {% else %}
                 <a href="{% url 'auth_login' %}" class="call-to-action__submit call-to-action__submit--enhanced">
                     <span class="call-to-action__label">{% trans "Log in to answer" %} </span>
-                </a> -->
+                </a>
             {% endif %}
         {% endif %}
     </div>

home/templates/wagtailadmin/login.html

@@ -4,6 +4,4 @@
 {% block submit_buttons %}
   <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Signing in…' %}">{% icon name="spinner" %}<em>{% trans 'Sign in' %}</em></button>
   <a  href="/login/google-oauth2/"><button style="margin-top: 10px;" type="button" class="button">{% trans 'Google' %}</button></a>
-
-  <button class="button" onclick="location.href='{% url 'social:begin' 'google-oauth2' %}'" type="button">Google+</button>
 {% endblock %}

nginx/conf.d/django.conf

@@ -44,12 +44,6 @@ server {
         proxy_set_header X-Forwarded-Ssl "";
         proxy_pass http://gunicorn;
     }
-
-    add_header X-Frame-Options SAMEORIGIN always;
-    add_header X-Content-Type-Options nosniff always;
-    add_header Strict-Transport-Security "max-age=31536000" always;
-    add_header Content-Security-Policy "default-src https: 'self';" always;
-    add_header Referrer-Policy "same-origin" always;
 }
 
 # redirect all requests with the prefix www. to the site without www

profiles/templates/profiles/_patterns/forgot-password-form.html

@@ -1,9 +1,6 @@
 {% load i18n %}
-<div class="error-page">
-    <h1 class="heading">{% trans "Page not found" %}</h1>
-    <h1 class="subheading">{% trans "Sorry, this page could not be found." %}</h2>
-</div>
-<!-- <form method="post" action="{% url 'forgot_password' %}" class="profiles__form">
+
+<form method="post" action="{% url 'forgot_password' %}" class="profiles__form">
 {% csrf_token %}
     {% if form.errors %}
         <ul class="error-list">
@@ -28,4 +25,4 @@ <h4 class="heading__micro">{% trans "Security question" %}</h4>
     <div class="call-to-action">
         <input type="submit" value="{% trans 'Forgot PIN' %}" class="call-to-action__submit"/>
     </div>
-</form> -->
+</form>

profiles/templates/profiles/_patterns/register-form.html

@@ -1,10 +1,7 @@
 {% load static wagtailsettings_tags wagtailcore_tags i18n %}
 {% get_settings %}
-<div class="error-page">
-    <h1 class="heading">{% trans "Page not found" %}</h1>
-    <h1 class="subheading">{% trans "Sorry, this page could not be found." %}</h2>
-</div>
-<!-- <form method="post" action="{% url 'user_register' %}" class="profiles__form">
+
+<form method="post" action="{% url 'user_register' %}" class="profiles__form">
     {% csrf_token %}
     {% for field in form %}
         <fieldset {% if field.name == "terms_and_conditions" %}class="profiles__split"{% endif %}>
@@ -23,4 +20,4 @@ <h1 class="subheading">{% trans "Sorry, this page could not be found." %}</h2>
     <div class="call-to-action">
         <input type="submit" value="{% trans 'Sign up' %}" class="call-to-action__submit" />
     </div>
-  </form> -->
+  </form>

profiles/templates/profiles/ninyampinga/forgot_password.html

@@ -1,9 +1,6 @@
 {% load i18n %}
-<div class="error-page">
-    <h1 class="heading">{% trans "Page not found" %}</h1>
-    <h1 class="subheading">{% trans "Sorry, this page could not be found." %}</h2>
-</div>
-<!-- <div class="profiles">
+
+<div class="profiles">
     <div class="profiles__inner">
         <div class="component">
             <div class="component__super">
@@ -12,4 +9,4 @@ <h1 class="super-title">{% trans "Forgot PIN" %}</h1>
         </div>
         {% include "../_patterns/forgot-password-form.html" %}
     </div>
-</div> -->
+</div>