diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2024-07-20 13:52:39 +0200 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2024-07-20 13:52:39 +0200 |
| commit | 78bc7323e9b1c34f74f2c1c59d1333820cedb4f1 (patch) | |
| tree | 279789fc81024a9c012aa8364ca7c4eec757118b | |
| parent | 210174b901d2c0f78952113690a03031ec82886f (diff) | |
| download | troggle-78bc7323e9b1c34f74f2c1c59d1333820cedb4f1.tar.gz troggle-78bc7323e9b1c34f74f2c1c59d1333820cedb4f1.tar.bz2 troggle-78bc7323e9b1c34f74f2c1c59d1333820cedb4f1.zip | |
fix YEAR separate for title banner and for current_year beging investigated
| -rw-r--r-- | templates/base.html | 10 | ||||
| -rw-r--r-- | templates/menu.html | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/templates/base.html b/templates/base.html index 7e7cdf8..62d1685 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,15 +11,17 @@ </head> <body> {% if year %} -{% firstof year as current_year %} +{% firstof year as current_year %} {% else %} -{% firstof "2024" as current_year %} +{% now "Y" as current_year %} <!-- the year now --> {% endif %} +{% now "Y" as now_year %} <!-- the year now as used in header text --> + <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 %} - {% 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> {% endif %} <a href="/">Home</a> | <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> | <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> | diff --git a/templates/menu.html b/templates/menu.html index d6d1b80..cda2740 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -1,9 +1,10 @@ {% if not homepage %} {% if year %} -{% firstof year as current_year %} +{% firstof year as current_year %} {% else %} -{% firstof "2024" as current_year %} +{% now "Y" as current_year %} <!-- the year now --> {% endif %} + <div id="menu"> <ul id="menulinks"> <li><a href="/index.htm">Home</a></li> |