diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-25 17:52:58 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-25 17:52:58 +0200 |
| commit | b22fa9f7f4b77569c29b0fc881373393281b7bf4 (patch) | |
| tree | 510549743c5dede2ab5360a516768264fb29336b /view | |
| parent | 414b5ea6f3ad616c5211b0e9d4b811c149decf26 (diff) | |
| parent | ba94f824b992f9ed787a71c2956388e975058ca8 (diff) | |
| download | volse-hubzilla-b22fa9f7f4b77569c29b0fc881373393281b7bf4.tar.gz volse-hubzilla-b22fa9f7f4b77569c29b0fc881373393281b7bf4.tar.bz2 volse-hubzilla-b22fa9f7f4b77569c29b0fc881373393281b7bf4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/uexport.tpl | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index e2ce3c552..26434b20a 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -78,6 +78,7 @@ {{include file="field_input.tpl" field=$proxyuser}} {{include file="field_input.tpl" field=$timeout}} {{include file="field_input.tpl" field=$delivery_interval}} + {{include file="field_input.tpl" field=$delivery_batch_count}} {{include file="field_input.tpl" field=$poll_interval}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$abandon_days}} diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index b9a1b9572..7eafd97a6 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -8,5 +8,12 @@ <p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> <p>{{$full}}</p> + + <p>{{$extra}}</p> + <p>{{$extra2}}</p> + <p>{{$extra3}}</p> + + <p>{{$extra4}}</p> + </div> </div> |