diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-19 18:44:33 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-19 18:44:33 +0100 |
| commit | 059886a1e493451dffddb0fd863cb002930eae9b (patch) | |
| tree | b23b06b3a26161574dfced1e87c71f94791c2263 | |
| parent | cd49ec92e38044c0707e91500ec482b26ae7f166 (diff) | |
| parent | ba52af786e0e2f27c36e82df9086dfb8d33d9062 (diff) | |
| download | volse-hubzilla-059886a1e493451dffddb0fd863cb002930eae9b.tar.gz volse-hubzilla-059886a1e493451dffddb0fd863cb002930eae9b.tar.bz2 volse-hubzilla-059886a1e493451dffddb0fd863cb002930eae9b.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | include/widgets.php | 1 | ||||
| -rwxr-xr-x | mod/events.php | 3 | ||||
| -rw-r--r-- | view/css/mod_events.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/events_side.tpl | 1 |
6 files changed, 19 insertions, 3 deletions
diff --git a/include/widgets.php b/include/widgets.php index f979ef2c4..a3f7444ec 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -671,7 +671,6 @@ function widget_eventsmenu($arr) { '$day' => t('Day View'), '$week' => t('Week View'), '$month' => t('Month View'), - '$today' => t('Today'), '$export' => t('Export'), '$upload' => t('Import'), '$submit' => t('Submit') diff --git a/mod/events.php b/mod/events.php index 230e386ce..53284e7a9 100755 --- a/mod/events.php +++ b/mod/events.php @@ -530,7 +530,8 @@ function events_content(&$a) { '$upload' => t('Import'), '$submit' => t('Submit'), '$prev' => t('Previous'), - '$next' => t('Next'), + '$next' => t('Next'), + '$today' => t('Today') )); if (x($_GET,'id')){ echo $o; killme(); } diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 2ed0f2b0a..ef8a0c4f7 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,3 +1,9 @@ +/* fix borders */ +#events-calendar { + margin-left: -1px; + margin-bottom: -1px; +} + #event-desc-textarea, #event-location-textarea { width: 400px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a01517e2f..0b5b6ef80 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -847,6 +847,16 @@ nav .acpopup { cursor: pointer; } +.fc-unthemed th, +.fc-unthemed td, +.fc-unthemed thead, +.fc-unthemed tbody, +.fc-unthemed .fc-divider, +.fc-unthemed .fc-row, +.fc-unthemed .fc-popover { + border-color: #ccc !important; +} + .eventcal { float: left; font-size: 20px; diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 03c6a5fb6..d481af2e9 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -6,6 +6,7 @@ <div class="btn-group"> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> + <button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button> </div> </div> diff --git a/view/tpl/events_side.tpl b/view/tpl/events_side.tpl index 4659063c3..b9a9062b1 100755 --- a/view/tpl/events_side.tpl +++ b/view/tpl/events_side.tpl @@ -4,6 +4,5 @@ <li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li> <li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li> <li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li> - <li><a href="#" onclick="changeView('today', false); return false;">{{$today}}</a></li> </ul> </div> |