extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

calendar: fixed group planer

Browse Source
This commit is contained in:
Stefan Reinhardt 2014-04-01 09:23:56 +00:00
parent 9d54f29045
commit 518be5def7
5 changed files with 98 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

2
calendar/templates/default/edit_series.xet
View File

@ -3,7 +3,7 @@
<overlay>
<template id="calendar.edit_series" template="" lang="" group="0" version="1.7.003">
<vbox rows="1" cols="1" id="edit_series">
<hbox id="dialog-header" class="promptheader">
<hbox id="dialogHeader" class="promptheader">
<description value="This event is part of a series"/>
</hbox>
<vbox class="prompt" id="dialog-content">

12
calendar/templates/default/freetimesearch.xet
View File

@ -34,15 +34,15 @@
<column/>
</columns>
<rows>
<row class="dialog-header">
<row class="dialogHeader">
<description class="calendar_size120b" value="Freetime Search"/>
<description class="message" no_lang="1" id="msg"/>
</row>
<row class="dialog-operators high">
<row class="dialogOperators high">
<description value="Startdate / -time"/>
<date-time id="start" statustext="Startdate and -time of the search"/>
</row>
<row class="dialog-operators">
<row class="dialogOperators">
<description value="Duration"/>
<hbox>
<menulist>
@ -51,7 +51,7 @@
<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"/>
</hbox>
</row>
<row class="dialog-operators">
<row class="dialogOperators">
<description value="Timeframe"/>
<hbox>
<date-timeonly id="start_time" statustext="Timeframe to search"/>
@ -61,7 +61,7 @@
<listbox type="select-dow" rows="3" id="weekdays" statustext="Weekdays to use in search"/>
</hbox>
</row>
<row class="dialog-operators">
<row class="dialogOperators">
<button label="New search" id="search" statustext="new search with the above parameters"/>
<hbox>
<menulist>
@ -70,7 +70,7 @@
<button id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"/>
</hbox>
</row>
<row class="dialog-operators">
<row class="dialogOperators">
<template content="freetime" span="all" id="calendar.freetimesearch.rows"/>
</row>
</rows>

47
calendar/templates/pixelegg/app.css
View File

@ -11,7 +11,17 @@
* @package calendar
* @version $Id$
*/
/* $Id: app.css 45952 2014-02-25 14:50:35Z hnategh $ */
/* $Id: app.css 46220 2014-03-12 13:42:34Z hnategh $ */
/* Header classes */
tr.dialogHeader td,
tr.dialogHeader2 td,
tr.dialogHeader3 td,
tr.dialogHeader4 td,
tr.dialogOperators td,
.dialogFooterToolbar {
padding: 5px 0 5px 0;
vertical-align: middle;
}
.calendar_inputFullWidth input {
width: 100%;
}
@ -577,7 +587,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
}
/**
* Calendar Drag and Drop
*
* Class for div to show forbiden drop
*/
.calendar_d-n-d_timeCounter > span {
position: absolute;
@ -606,6 +616,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
width: 100%;
text-align: center;
}
/*Class for div to demonstrate dragging time*/
.calendar_d-n-d_timeCounter {
font-size: 1.1em;
font-weight: bold;
@ -821,7 +832,7 @@ div.calendar {
/*border: 0px solid @gray_50;*/
/*padding: 1px 3px 1px 1px;*/
/*padding: 0px;*/
background: #fff;
background-color: #ffdd73;
color: #000;
-webkit-box-shadow: inset 1px 2px 1px #000000;
-moz-box-shadow: inset 1px 2px 1px #000000;
@ -1638,11 +1649,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
background-repeat: repeat-x;
}
.calendar_calDayTodos .calendar_calDayTodosHeader a img {
border: 1px solid rgba(0, 0, 0, 0.15);
/*.border_normal;*/
/*.box_shadow_standard_light;*/
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
/*.rounded (3px);*/
color: #000000;
-webkit-appearance: none;
-webkit-transition-property: background-color;
@ -1675,7 +1684,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
background: #ffffff;
}
.calendar_calDayTodos .calendar_calDayTodosTable table tr:nth_child(odd) {
background: #fafafa;
background: #f2f2f2;
}
.calendar_calDayTodos .calendar_calDayTodosTable table td {
padding: 3px;
@ -1740,7 +1749,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
background-color: #ffffff;
}
.row_off {
background-color: #fafafa;
background-color: #f2f2f2;
}
/* calendar_plannerWidget represents the whole planner, consiting of the calendar_plannerHeader and multiple plannerRowWidgets
*/
@ -1885,7 +1894,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
overflow: hidden;
z-index: 20;
border: 1px solid black;
min-width: 5%;
min-width: 5px;
/* set via inline style on runtime:
* left: depending on startime
* width: depending on length
@ -1939,11 +1948,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
border-collapse: collapse;
border-spacing: 0px;
background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.15);
/*.border_normal;*/
/*.box_shadow_standard_light;*/
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
/*.rounded (3px);*/
color: #000000;
-webkit-appearance: none;
-webkit-transition-property: background-color;
@ -2032,11 +2039,9 @@ textarea.prefValue {
/*edit series*/
button#series {
background-image: url('../images/edit.png') !important;
border: 1px solid rgba(0, 0, 0, 0.15);
/*.border_normal;*/
/*.box_shadow_standard_light;*/
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
/*.rounded (3px);*/
color: #000000;
-webkit-appearance: none;
-webkit-transition-property: background-color;
@ -2091,11 +2096,9 @@ button#series:active {
/*edit exception*/
button#exception {
background-image: url('../images/edit.png') !important;
border: 1px solid rgba(0, 0, 0, 0.15);
/*.border_normal;*/
/*.box_shadow_standard_light;*/
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
/*.rounded (3px);*/
color: #000000;
-webkit-appearance: none;
-webkit-transition-property: background-color;

59
calendar/templates/pixelegg/app.less
View File

@ -133,12 +133,11 @@ div.calendar { position: relative; }
thead {
.title { /* This holds the current "month, year" */
font-weight: bold; /* Pressing it will take you to the current date */
/*text-align: center;*/
background-color: @egw_color_2_e;
/*color: #000;*/
/*padding: 2px;*/
&:hover {background-color: @gray_10 !important;}
}
@ -227,7 +226,7 @@ div.calendar { position: relative; }
/*border: 0px solid @gray_50;*/
/*padding: 1px 3px 1px 1px;*/
/*padding: 0px;*/
background: #fff;
background-color: @egw_color_1_e;
color: #000;
-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 1);
-moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 1);
@ -240,7 +239,9 @@ div.calendar { position: relative; }
td.today { /* Cell showing selected date */
font-weight: normal;
color: #00f;
color: @color_hint ;
background-color: @egw_color_1_a;
}
.disabled { color: #999; }
@ -796,9 +797,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
/* marks a day in the colum-header as holiday
*/
.calendar_calHoliday{
background-color: @egw_color_1_e;
background-color: @egw_color_2_e;
a {
color: @gray_90 !important;
color: @gray_10 !important;
font-size: 0.9em;
}
}
@ -904,6 +905,14 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.dimension_height_s;
line-height: 12px;
z-index: 30;
a {
img {
position: relative;
top: 0px;
}
}
}
.calendar_calGridHeader{ border: none; }
@ -912,6 +921,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_calDayColHeader img {
vertical-align: middle;
}
/*header for the weekCol*/
.calendar_calWeekNavHeader,.calendar_calMonthNavHeader{
top: 3px;
left: 0px;
@ -935,7 +947,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
}
}
// little workaraound for Month view
.calendar_calMonthNavHeader{
a {
img {top: 0px;}
}
}
.calendar_calWeekNavHeader,.calendar_calMonthNavHeader img{
vertical-align: middle;
@ -1187,6 +1204,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
* CSS settings for the planner views (calendar_plannerWidget) *
******************************************************/
.row_on { background-color: @color_even;}
.row_off { background-color: @color_odd;}
/* calendar_plannerWidget represents the whole planner, consiting of the calendar_plannerHeader and multiple plannerRowWidgets
*/
.calendar_plannerWidget {
@ -1323,7 +1343,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
overflow: hidden;
z-index: 20;
border: 1px solid black;
min-width: 5%;
min-width: 5px;
/* set via inline style on runtime:
* left: depending on startime
* width: depending on length
@ -1516,16 +1536,25 @@ div#calendar-container {
.basefontfamily;
thead {
// first row
// Help
.button {background-color: @egw_color_1_e;}
// Month
.title {
border: none;
box-shadow: none;
-webkit-box-shadow: none;
background-color: @egw_color_1_a;
background-color: @egw_color_1_e;
}
// second row
// << today >>
.headrow { color: @gray_90;}
.headrow {
color: @gray_90;
// nav + today
td {background-color: @egw_color_1_a;}
}
// daynames
.daynames {
@ -1563,8 +1592,16 @@ div#calendar-container {
// Select Fields in Sidemenu
#calendar_cat_id,
#calendar_filter,
#uical_select_owner {font-size: 11px;}
#uical_select_owner,
#calendar_merge{
font-size: 11px;
}
// Owner
#uical_select_owner {margin: 9px 0 9px;}
// insert a document
#calendar_merge {margin: 9px 0 0 0;}
// Last Element in Sidemenu - rounded
/*#calendar_sidebox_content {