diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-12 01:26:01 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-12 01:26:01 -0800 |
| commit | e8958b1fb85ebcc4c51632a2de746b9aec6f354e (patch) | |
| tree | b4b74f9fe5f140bc53830a12691d831ffe6cfa3a /view/tpl | |
| parent | f0798f78333ef52c0859a57c71fd7502923b4242 (diff) | |
| parent | 07b67963f128157e85c891057da2c42c286166e7 (diff) | |
| download | volse-hubzilla-e8958b1fb85ebcc4c51632a2de746b9aec6f354e.tar.gz volse-hubzilla-e8958b1fb85ebcc4c51632a2de746b9aec6f354e.tar.bz2 volse-hubzilla-e8958b1fb85ebcc4c51632a2de746b9aec6f354e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/hq.tpl | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index a2a9f3f27..2b4e8c9f9 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -71,6 +71,9 @@ {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} + {{include file="field_input.tpl" field=$location}} + {{include file="field_input.tpl" field=$sellpage}} + <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <h3>{{$corporate}}</h3> diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl index bd27250e6..fce11ff83 100755 --- a/view/tpl/hq.tpl +++ b/view/tpl/hq.tpl @@ -1,9 +1,14 @@ {{if $no_messages}} <div class="alert alert-warning alert-dismissible fade show" role="alert"> - {{$no_messages_label}} <button type="button" class="close" data-dismiss="alert" aria-label="Close"> <span aria-hidden="true">×</span> </button> + <h3>{{$no_messages_label.0}}</h3> + <br> + {{$no_messages_label.1}} </div> {{/if}} +<div id="jot-popup"> +{{$editor}} +</div> |