expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity

fix YEAR separate for title banner and for current_year beging investigated

Browse Source
This commit is contained in:
Philip Sargent 2024-07-20 13:52:39 +02:00
parent 210174b901
commit 78bc7323e9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/base.html
View File

@ -11,15 +11,17 @@
</head> </head>
<body> <body>
{% if year %} {% if year %}
{% firstof year as current_year %} {% firstof year as current_year %}
{% else %} {% else %}
{% firstof "2024" as current_year %} {% now "Y" as current_year %} <!-- the year now -->
{% endif %} {% endif %}
{% now "Y" as now_year %} <!-- the year now as used in header text -->
<div id="header"> <div id="header">
<h1>CUCC Expeditions to Austria: 1976 - {{current_year}}</h1> <h1>CUCC Expeditions to Austria: 1976 - {{now_year}}</h1>
<div id="editLinks"> {% block loginInfo %} <div id="editLinks"> {% block loginInfo %}
{% if settings.DEVSERVER %}<b style="color:red">RUNNING ON LOCALSERVER</b>{% endif %} {% if settings.DEVSERVER %}<b style="color:red; font-size:x-large">RUNNING ON LOCALSERVER</b>&nbsp;&nbsp;{% endif %}
<a href="/">Home</a> | <a href="/">Home</a> |
<a id="cuccLink" href="http://camcaving.uk/">CUCC</a> | <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
<a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> | <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |

5
templates/menu.html
View File

@ -1,9 +1,10 @@
{% if not homepage %} {% if not homepage %}
{% if year %} {% if year %}
{% firstof year as current_year %} {% firstof year as current_year %}
{% else %} {% else %}
{% firstof "2024" as current_year %} {% now "Y" as current_year %} <!-- the year now -->
{% endif %} {% endif %}
<div id="menu"> <div id="menu">
<ul id="menulinks"> <ul id="menulinks">
<li><a href="/index.htm">Home</a></li> <li><a href="/index.htm">Home</a></li>