diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-22 14:08:20 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-22 14:08:20 -0800 |
| commit | 6f27e8db38c148172017255f9fe442c15b6a843a (patch) | |
| tree | 3fe23e767da49448be5d199c405ff1f5d6bf0f4d /view/tpl | |
| parent | 292b02b58ccb18d10de948d30ccc0cc6ba345d5e (diff) | |
| parent | 4c84a2ce615be12adfbeb1067b5c6652330027bb (diff) | |
| download | volse-hubzilla-6f27e8db38c148172017255f9fe442c15b6a843a.tar.gz volse-hubzilla-6f27e8db38c148172017255f9fe442c15b6a843a.tar.bz2 volse-hubzilla-6f27e8db38c148172017255f9fe442c15b6a843a.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Conflicts:
version.inc
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/event_head.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 346dfb154..ae5f21234 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -39,6 +39,8 @@ events: '{{$baseurl}}/events/json', header: false, lang: '{{$lang}}', + firstDay: {{$first_day}}, + eventLimit: 3, height: 'auto', diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 7c1f4578d..2c71c64fb 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -159,6 +159,7 @@ {{/foreach}} </select> </div> + {{include file="field_checkbox.tpl" field=$cal_first_day}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> |