Merge branch 'dev' of /home/macgirvin/z into dev

This commit is contained in:
nobody 2021-05-28 00:38:21 -07:00
commit b4cf1f23dc

View file

@ -1,21 +1,20 @@
<div class="generic-content-wrapper-styled">
<h2>{{$title}}</h2>
<img src="{{$prj_icon}}" alt="project icon" />
<img src="{{$prj_icon}}" alt="project icon" /><br><br>
<h3>{{$sitenametxt}}</h3>
<div><a href="{{$url}}">{{$sitename}}</a></div>
<div><a href="{{$url}}">{{$sitename}}</a></div><br>
<h3>{{$headline}}</h3>
<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div><br>
<h3>{{$admin_headline}}</h3>
<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div><br>
<br><br>
<div><a href="help/TermsOfService">{{$terms}}</a></div>
<hr>
@ -27,17 +26,16 @@
{{if $prj_version}}
<div>{{$prj_version}}</div>
{{/if}}
<br>
<h3>{{$prj_linktxt}}</h3>
<div><a href="{{$prj_link}}">{{$prj_link}}</a></div>
<div><a href="{{$prj_link}}">{{$prj_link}}</a></div><br>
<h3>{{$prj_srctxt}}</h3>
<div><a href="{{$prj_src}}">{{$prj_src}}</a></div>
<div><a href="{{$prj_src}}">{{$prj_src}}</a></div><br>
<br><br>
<div>{{$prj_transport}}</div>
{{if $additional_fed}}