rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Code Issues Releases Wiki Activity

feat(custom_link): rename variable and import settings correctly

Browse source
This commit is contained in:
Cyprien de Cerval 2022-07-29 14:29:13 +02:00
parent 313af3e7f4
commit 89ba77c528
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/settings_local.template.py
View file

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

4
re2o/settings_local.example.py
View file

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

7
re2o/templatetags/custom_link.py
View file

@ -17,12 +17,13 @@
# You should have received a copy of the GNU General Public License along # 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., # 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 # 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 = template.Library()
@register.simple_tag @register.simple_tag
def nav_link_nologin(): def nav_link():
template = """ template = """
<li> <li>
<a href="{}"> <a href="{}">
@ -31,6 +32,6 @@ def nav_link_nologin():
</li> </li>
""" """
res = "" res = ""
for link in OPTIONNAL_LINK_RE2O: for link in settings.NAVBAR_LINKS:
res += template.format(link[0],link[1],link[2]) res += template.format(link[0],link[1],link[2])
return res return res

2
templates/nav.html
View file

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