diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-01-15 00:08:36 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-01-15 00:08:36 +0100 |
| commit | d347fe0c53fca52bc1d2b3d171d86494dad7835d (patch) | |
| tree | f8024f8926bc24315aa4ba0e445b3b5b44ceeec0 | |
| parent | 56af6ee752bc2e15a87b44f724d37e2622d675ca (diff) | |
| parent | b1433119cc0abf4bffed1a901bace0ca9e92e328 (diff) | |
| download | nextcloud-server-d347fe0c53fca52bc1d2b3d171d86494dad7835d.tar.gz nextcloud-server-d347fe0c53fca52bc1d2b3d171d86494dad7835d.zip | |
Merge branch 'calendar'
| -rw-r--r-- | apps/calendar/js/calendar.js | 13 | ||||
| -rwxr-xr-x | apps/calendar/templates/calendar.php | 14 |
2 files changed, 26 insertions, 1 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index ae586661ccc..33a78b3e322 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de> + * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de> * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl> * This file is licensed under the Affero General Public License version 3 or * later. @@ -345,6 +345,11 @@ Calendar={ } }, + reseticonhighlight: function(){ + $('#oneweekview_radio').css('color', '#000000'); + $('#onemonthview_radio').css('color', '#000000'); + $('#listview_radio').css('color', '#000000'); + }, Calendar:{ overview:function(){ if($('#choosecalendar_dialog').dialog('isOpen') == true){ @@ -669,12 +674,18 @@ $(document).ready(function(){ }); $('#oneweekview_radio').click(function(){ $('#calendar_holder').fullCalendar('changeView', 'agendaWeek'); + Calendar.UI.reseticonhighlight(); + $('#oneweekview_radio').css('color', '#6193CF'); }); $('#onemonthview_radio').click(function(){ $('#calendar_holder').fullCalendar('changeView', 'month'); + Calendar.UI.reseticonhighlight(); + $('#onemonthview_radio').css('color', '#6193CF'); }); $('#listview_radio').click(function(){ $('#calendar_holder').fullCalendar('changeView', 'list'); + Calendar.UI.reseticonhighlight(); + $('#listview_radio').css('color', '#6193CF'); }); $('#today_input').click(function(){ $('#calendar_holder').fullCalendar('today'); diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php index 50d3d70347a..6b2cd68c6fb 100755 --- a/apps/calendar/templates/calendar.php +++ b/apps/calendar/templates/calendar.php @@ -27,6 +27,20 @@ echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');'; echo '$(\'#dialog_holder\').load(OC.filePath(\'calendar\', \'ajax\', \'editeventform.php\') + \'?id=\' + ' . $_['showevent'] . ' , Calendar.UI.startEventDialog);'; } + + switch(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month')){ + case 'agendaWeek': + echo '$(\'#oneweekview_radio\').css(\'color\', \'#6193CF\');'; + break; + case 'month': + echo '$(\'#onemonthview_radio\').css(\'color\', \'#6193CF\');'; + break; + case 'list': + echo '$(\'#listview_radio\').css(\'color\', \'#6193CF\');'; + break; + default: + break; + } ?> }); </script> |