diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index 3471221875..208d4863ff 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -392,7 +392,7 @@ class calendar_uiviews extends calendar_ui { foreach (array_keys($actions) as $key) { - if (!in_array($key, array('add','weekend','next', 'today','previous'))) { + if (!in_array($key, array('day_view','weekend','next', 'today','previous'))) { $actions[$key]['toolbarDefault'] = false; } else { diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css index 73129d9848..d34b66ff59 100644 --- a/calendar/templates/mobile/app.css +++ b/calendar/templates/mobile/app.css @@ -141,7 +141,7 @@ form[id^="tracker-"] .dialogHeadbar { * @package calendar * @version $Id$ */ -/* $Id: app.css 55127 2016-02-23 22:23:01Z nathangray $ */ +/* $Id: app.css 55492 2016-03-22 15:09:39Z nathangray $ */ /*Media print classes*/ @media print { .th td, @@ -416,6 +416,9 @@ Hide subsequent headers in week view with non-consolidated owners * top: */ } +.calendar_calTimeRow:not(.calendar_calWorkHours) { + background-color: rgba(120, 120, 120, 0.1); +} /* time in a timeRow */ .calendar_calTimeRowTime { @@ -2610,15 +2613,42 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { padding-right: 5px !important; } #calendar-sidebox_date .ui-datepicker-header a span { - background-image: url('../../../phpgwapi/js/jquery/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png'); + width: 20px; + height: 20px; } #calendar-sidebox_date .ui-datepicker-header a.ui-state-hover { top: 3px; } #calendar-sidebox_date .ui-datepicker-header a.ui-state-hover span { - background-image: url('../../../pixelegg/images/ui-icons_egw_color_2_256x240_0C5DA5.png'); transition: none; } +#calendar-sidebox_header_go { + width: 20px; + height: 20px; + background-image: url('../../../pixelegg/images/check.png'); + text-indent: 140%; + border: none; + border-radius: 0px; + background-size: contain; + background-color: transparent; +} +#calendar-sidebox_header_go:hover { + background-color: transparent; +} +#calendar-sidebox_header_today { + width: 20px; + height: 20px; + background-image: url('../../../pixelegg/images/bullet.png'); + text-indent: 140%; + border: none; + border-radius: 0px; + margin-left: 7px; + background-size: contain; + background-color: transparent; +} +#calendar-sidebox_header_today:hover { + background-color: transparent; +} #calendar_cat_id, #calendar_filter, #uical_select_owner, @@ -2686,4 +2716,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar-toolbar { background-color: #cc0033; } + #calendar-view button.plus_button { + bottom: 65px; + } } diff --git a/calendar/templates/mobile/app.less b/calendar/templates/mobile/app.less index 7eba423167..421b376d53 100644 --- a/calendar/templates/mobile/app.less +++ b/calendar/templates/mobile/app.less @@ -57,4 +57,9 @@ .quantity{margin-left:5px;} #popupMainDiv .et2_date.calendar_alarm_date_display {padding-left: 3px;} #calendar-toolbar {background-color: @calendar-color;} + #calendar-view { + button.plus_button { + bottom: 65px; + } + } } \ No newline at end of file diff --git a/calendar/templates/mobile/view.xet b/calendar/templates/mobile/view.xet new file mode 100644 index 0000000000..bd3cf3b49d --- /dev/null +++ b/calendar/templates/mobile/view.xet @@ -0,0 +1,34 @@ + + + + + + + +