kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

templates: overwrite default templates from upstream

Browse Source
This commit is contained in:
Milan
2023-03-19 21:55:03 +01:00
parent d6ee7aa0c7
commit 72eada03c4
7 changed files with 19 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/agenda/templates/default/series_names.html
View File

@@ -18,13 +18,8 @@ Access-Control-Allow-Origin: *
style="display:none;"
>
<<<<<<<< HEAD:website/agenda/templates/coloradio/series_names.html
<option value="">- Sendereihe ausw&auml;hlen -</option>
<TMPL_LOOP series_names><option value="<TMPL_VAR series_name escape=0>"<TMPL_VAR selected escape=0>><TMPL_VAR series_name> <!--(<TMPL_VAR sum>)--></option>
========
<option value="">- Sendereihe -</option>
<TMPL_LOOP series_names><option value="<TMPL_VAR series_name escape=none>"<TMPL_VAR selected escape=none>><TMPL_VAR series_name> (<TMPL_VAR sum>)</option>
>>>>>>>> calcms/master:website/agenda/templates/default/series_names.html
</TMPL_LOOP>
</select>