Removing unnecessary configurations

ciudadanointeligente · Aug 7, 2017 · 6334dfd · 6334dfd
1 parent 128b25e
commit 6334dfd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/votai_general_theme/templates/base.html b/votai_general_theme/templates/base.html
@@ -60,11 +60,9 @@
     {% block extra_css %}
     {% endblock extra_css %}
 </head>
-    <body{% if config.LAUNCHED or config.SHOW_NAVBAR or user.is_authenticated %} class="navbar_visible"{% endif %}>
+    <body class="navbar_visible">
       <div>
-        {% if config.SHOW_NAVBAR or user.is_authenticated %}
-          {% include '_navbar.html' %}
-        {% endif %}
+        {% include '_navbar.html' %}
         {% block everything %}
         <div class="{% block content_container %}container content_padding{% endblock content_container %}">
             {% block content %}

diff --git a/votai_general_theme/templates/basewithnofixed_navbar.html b/votai_general_theme/templates/basewithnofixed_navbar.html
@@ -5,7 +5,7 @@
 {% load i18n %}
 {% load thumbnail %}
 {% load votainteligente_extras %}
-<html lang="es"{% if config.SHOW_NAVBAR or user.is_authenticated %} class="navbar_visible"{% endif %}>
+<html lang="es" class="navbar_visible">
 <head>
     <meta charset="utf-8">
     <title>{% trans "Vota Inteligente" %} {% block title %}- {{ config.WEBSITE_GENERAL_SETTINGS_HOME_TITLE }}{% endblock title %}</title>
@@ -61,11 +61,9 @@
     {% block extra_css %}
     {% endblock extra_css %}
 </head>
-    <body{% if config.SHOW_NAVBAR or user.is_authenticated %} class="navbar_visible"{% endif %}>
+    <body class="navbar_visible">
       <div>
-        {% if config.SHOW_NAVBAR or user.is_authenticated %}
           {% include '_navbar.html' with fixed_nav_class="nav-detalle-propuesta" %}
-        {% endif %}
         {% block everything %}
         <div class="{% block content_container %}container content_padding{% endblock content_container %}">
             {% block content %}

diff --git a/votai_general_theme/templates/index.html b/votai_general_theme/templates/index.html
@@ -5,10 +5,6 @@
 
 
 {% block everything %}
-{% if config.LAUNCHED or user.is_staff %}
 {% include "index_first_launch.html" %}
-{% else %}
-{% include "index_pre_launch.html" %}
-{% endif %}
 
 {% endblock everything %}
diff --git a/votainteligente/votainteligente_settings.py b/votainteligente/votainteligente_settings.py
@@ -355,7 +355,6 @@
 
 CONSTANCE_CONFIG = {
     'SOUL_MATE_INFO_ABOUT_CANDIDATES_MINUTES':(0,'Duracion cache media naranja'),
-    'LAUNCHED':(False,'Está el sitio lanzado???'),
     'INFINITE_CACHE':(1440,'Tiempo Cache'),
     'DEFAULT_AREA': ('chile-pais', u'El territorio que mostramos por defecto'),
     'AREAS_ARE_FORCED_IN_PROPOSALS' : (False, u'No te preguntamos por el territorio de la propuesta y asumimos que es el que viene por defecto'),
@@ -375,7 +374,6 @@
     'HIDDEN_AREAS': ('fundacion-ciudadano-inteligente', 'Seccion oculta'),
     'NAV_BAR': ('profiles, questionary, soulmate, facetoface, ask, ranking', 'Menu de navegacion'),
     'CAN_CREATE_TEST_PROPOSAL': (False, u'Se pueden crear propuestas de prueba?'),
-    'SHOW_NAVBAR': (False, u'Se debe mostrar el navbar a los visitantes??? (atento aquí por que a los usuarios loggeados se lo vamos a mostrar igual)'),
     'SEARCH_SUBSCRIPTION_ENABLED': (True, u'Suscribirse a una búsqueda está habilitado? esto sólo esconde los links.'),
     'WEBSITE_METADATA_AUTHOR': ('', 'Nombre del autor'),
     'WEBSITE_METADATA_DESCRIPTION': ('', 'Descripcion del sitio'),