diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-21 17:18:44 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-21 17:18:44 +0100 |
| commit | 9ba1b8d7207c852e1cb323a25998065ca30b31a4 (patch) | |
| tree | 6938898d1e4f7a5686c34c7a664ccb37c47d741a /view | |
| parent | bd45bb3ad30c8867b957f63d5423e90b4b41afe9 (diff) | |
| parent | d726c921eb5902483dfeb82383829e9309f6b65c (diff) | |
| download | volse-hubzilla-9ba1b8d7207c852e1cb323a25998065ca30b31a4.tar.gz volse-hubzilla-9ba1b8d7207c852e1cb323a25998065ca30b31a4.tar.bz2 volse-hubzilla-9ba1b8d7207c852e1cb323a25998065ca30b31a4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
| -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> |