mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-10 07:21:04 +01:00
Mobile theme W.I.P.:
- Implement plus button for calendar views and bring day view action into toolbar header, thanks Christoph Kaulich.
This commit is contained in:
parent
a11aff6be2
commit
3261906a09
@ -392,7 +392,7 @@ class calendar_uiviews extends calendar_ui
|
|||||||
{
|
{
|
||||||
foreach (array_keys($actions) as $key)
|
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;
|
$actions[$key]['toolbarDefault'] = false;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -141,7 +141,7 @@ form[id^="tracker-"] .dialogHeadbar {
|
|||||||
* @package calendar
|
* @package calendar
|
||||||
* @version $Id$
|
* @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 classes*/
|
||||||
@media print {
|
@media print {
|
||||||
.th td,
|
.th td,
|
||||||
@ -416,6 +416,9 @@ Hide subsequent headers in week view with non-consolidated owners
|
|||||||
* top:
|
* top:
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
.calendar_calTimeRow:not(.calendar_calWorkHours) {
|
||||||
|
background-color: rgba(120, 120, 120, 0.1);
|
||||||
|
}
|
||||||
/* time in a timeRow
|
/* time in a timeRow
|
||||||
*/
|
*/
|
||||||
.calendar_calTimeRowTime {
|
.calendar_calTimeRowTime {
|
||||||
@ -2610,15 +2613,42 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
|
|||||||
padding-right: 5px !important;
|
padding-right: 5px !important;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_date .ui-datepicker-header a span {
|
#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 {
|
#calendar-sidebox_date .ui-datepicker-header a.ui-state-hover {
|
||||||
top: 3px;
|
top: 3px;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_date .ui-datepicker-header a.ui-state-hover span {
|
#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;
|
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_cat_id,
|
||||||
#calendar_filter,
|
#calendar_filter,
|
||||||
#uical_select_owner,
|
#uical_select_owner,
|
||||||
@ -2686,4 +2716,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
|
|||||||
#calendar-toolbar {
|
#calendar-toolbar {
|
||||||
background-color: #cc0033;
|
background-color: #cc0033;
|
||||||
}
|
}
|
||||||
|
#calendar-view button.plus_button {
|
||||||
|
bottom: 65px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -57,4 +57,9 @@
|
|||||||
.quantity{margin-left:5px;}
|
.quantity{margin-left:5px;}
|
||||||
#popupMainDiv .et2_date.calendar_alarm_date_display {padding-left: 3px;}
|
#popupMainDiv .et2_date.calendar_alarm_date_display {padding-left: 3px;}
|
||||||
#calendar-toolbar {background-color: @calendar-color;}
|
#calendar-toolbar {background-color: @calendar-color;}
|
||||||
|
#calendar-view {
|
||||||
|
button.plus_button {
|
||||||
|
bottom: 65px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
34
calendar/templates/mobile/view.xet
Normal file
34
calendar/templates/mobile/view.xet
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
Egroupware
|
||||||
|
@license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
||||||
|
@package
|
||||||
|
@subpackage
|
||||||
|
@link http://www.egroupware.org
|
||||||
|
@author Nathan Gray
|
||||||
|
@version $Id$
|
||||||
|
-->
|
||||||
|
|
||||||
|
<!DOCTYPE overlay PUBLIC '-//Stylite AG//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
|
||||||
|
|
||||||
|
<overlay>
|
||||||
|
<template id="calendar.view">
|
||||||
|
<grid id="view" width="100%">
|
||||||
|
<columns>
|
||||||
|
<column/>
|
||||||
|
</columns>
|
||||||
|
<rows>
|
||||||
|
<row class="view_row">
|
||||||
|
<calendar-timegrid id="${row}"
|
||||||
|
onchange="var state = {}; if(widget.options.start_date == widget.options.end_date) state.view = 'day'; app.calendar.update_state(state);"
|
||||||
|
onevent_change="app.calendar.event_change"
|
||||||
|
disabled="true"
|
||||||
|
>
|
||||||
|
</calendar-timegrid>
|
||||||
|
</row>
|
||||||
|
|
||||||
|
</rows>
|
||||||
|
</grid>
|
||||||
|
<button class="plus_button" id="add" onclick="egw.open(null,'calendar','add')"/>
|
||||||
|
</template>
|
||||||
|
</overlay>
|
Loading…
Reference in New Issue
Block a user