Browse Source

feat(custom_link): rename variable and import settings correctly

fix-autocapture^2
Cyprien de Cerval 3 years ago
parent
commit
89ba77c528
  1. 4
      docker/settings_local.template.py
  2. 4
      re2o/settings_local.example.py
  3. 7
      re2o/templatetags/custom_link.py
  4. 2
      templates/nav.html

4
docker/settings_local.template.py

@ -100,5 +100,5 @@ OPTIONNAL_APPS_RE2O = ()
# Some Django apps you want to add in you local project
OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + ()
# Some optinnal link for the navbar in a tuple (link,class,text)
OPTIONNAL_LINK_RE2O = ()
# Some optinnal link for the navbar in a tuple (link,icon class,text)
NAVBAR_LINKS = ()

4
re2o/settings_local.example.py

@ -118,8 +118,8 @@ OPTIONNAL_APPS_RE2O = ()
# Some Django apps you want to add in you local project
OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + ()
# Some optinnal link for the navbar in a tuple (link,class,text)
OPTIONNAL_LINK_RE2O = ()
# Some optinnal link for the navbar in a tuple (link,icon class,text)
NAVBAR_LINKS= ()
# Add statiffiles dir that were installed using system packaging
# Example to reproduce re2o2.9 behavior

7
re2o/templatetags/custom_link.py

@ -17,12 +17,13 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.from django import template
from re2o.settings_local import OPTIONNAL_LINK_RE2O
from django import template
from django.conf import settings
register = template.Library()
@register.simple_tag
def nav_link_nologin():
def nav_link():
template = """
<li>
<a href="{}">
@ -31,6 +32,6 @@ def nav_link_nologin():
</li>
"""
res = ""
for link in OPTIONNAL_LINK_RE2O:
for link in settings.NAVBAR_LINKS:
res += template.format(link[0],link[1],link[2])
return res

2
templates/nav.html

@ -266,7 +266,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</li>
{% acl_end %}
{% autoescape off %}
{% nav_link_nologin %}
{% nav_link %}
{% endautoescape %}
</ul>
<ul class="nav navbar-nav navbar-right">

Loading…
Cancel
Save