From ee39e3cf7268b260ac12d0dd8157a47fdd579ff0 Mon Sep 17 00:00:00 2001 From: ken restivo Date: Wed, 18 Nov 2015 19:12:22 -0800 Subject: Bump version so migrator tool can verify that mods to account.php etc in 312cc41 and 1f2a408 were applied. --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index a1de68ee0..369ed3cb7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-18.1220 +2015-11-18.1221 -- cgit v1.2.3 From 929f524e774e856c3ee5f65740614696089bd86a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Nov 2015 11:17:24 +0100 Subject: css fixes --- view/css/mod_events.css | 6 ++++++ view/theme/redbasic/css/style.css | 10 ++++++++++ 2 files changed, 16 insertions(+) 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; -- cgit v1.2.3 From ba52af786e0e2f27c36e82df9086dfb8d33d9062 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Nov 2015 11:38:34 +0100 Subject: move today button from aside to section title --- include/widgets.php | 1 - mod/events.php | 3 ++- view/tpl/events-js.tpl | 1 + view/tpl/events_side.tpl | 1 - 4 files changed, 3 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/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 @@
+
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 @@
  • {{$month}}
  • {{$week}}
  • {{$day}}
  • -
  • {{$today}}
  • -- cgit v1.2.3