diff options
| author | Michael Meer <michael@meer.name> | 2014-01-27 10:37:15 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-27 10:37:15 +0100 |
| commit | a3bf272753183f61723fea5dccd52abe6f0662dd (patch) | |
| tree | 70a7e3a2e4ed5544abbddb8ee73226b638c01099 /view/tpl | |
| parent | 844df110586e6726581c620754fef5419f6bea5e (diff) | |
| parent | d67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e (diff) | |
| download | volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.gz volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.bz2 volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.zip | |
Merge branch 'master' of https://github.com/MicMee/red
to be in sync
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/siteinfo.tpl | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index b0f9d4a74..9b90fb4b0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -42,6 +42,7 @@ {{include file="field_input.tpl" field=$sitename}} {{include file="field_textarea.tpl" field=$banner}} + {{include file="field_textarea.tpl" field=$admininfo}} {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index f9c6e96ce..77f32b5bc 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -23,12 +23,11 @@ {{else}} <div class="cut-paste-desc">{{$cpdesc}}</div> <input type="text" id="cutpasteinput" name="cutpastelink" value="[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" onclick="this.select();" /><br /> +{{/if}} <div class="cut-paste-desc">{{$cpldesc}}</div> <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> -{{/if}} - <div id="attach-edit-perms" > {{$aclselect}} </div> diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index a60b406cf..4baa1969b 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -7,6 +7,8 @@ <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> +<p>{{$adminlabel}}</p> +<p>{{$admininfo}}</p> <p>{{$contact}}</p> <p>{{$plugins_text}}</p> {{if $plugins_list}} |