extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 16:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar bugs:

Browse Source 
- Fix non-blocking icon
- Set minimum width & height for events
This commit is contained in:
Nathan Gray 2015-09-14 15:31:58 +00:00
parent ff036416bf
commit f4ad64a757
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/inc/class.calendar_ui.inc.php
View File

@ -793,6 +793,7 @@ class calendar_ui
{ {
$event['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']); $event['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']);
} }
$event['non_blocking'] = boolval($event['non_blocking']);
if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches)) if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
{ {

4
calendar/templates/default/app.css
View File

@ -330,6 +330,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
border-width: 1px; border-width: 1px;
border-radius: 6px; border-radius: 6px;
border-style: solid; border-style: solid;
min-height: 1.2em;
min-width: 5px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
/* It is important there are no CSS transitions, it breaks resize */ /* It is important there are no CSS transitions, it breaks resize */
@ -413,6 +415,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
left: 0px; left: 0px;
right: 0px; right: 0px;
padding-left: 2px; padding-left: 2px;
min-height: 1em;
/* set via inline style on runtime /* set via inline style on runtime
* background-color: depending on category * background-color: depending on category
* color: white || black depending on cat; * color: white || black depending on cat;
@ -644,6 +647,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
overflow: hidden; overflow: hidden;
z-index: 20; z-index: 20;
border: 1px solid black; border: 1px solid black;
min-width: 5px;
/* set via inline style on runtime: /* set via inline style on runtime:
* left: depending on startime * left: depending on startime
* width: depending on length * width: depending on length

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

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @version $Id$
*/ */
/* $Id: app.css 53550 2015-09-02 22:40:38Z nathangray $ */ /* $Id: app.css 53581 2015-09-07 17:13:20Z hnategh $ */
/*Media print classes*/ /*Media print classes*/
@media print { @media print {
.th td, .th td,
@ -341,6 +341,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
border-width: 1px; border-width: 1px;
border-radius: 6px; border-radius: 6px;
border-style: solid; border-style: solid;
min-height: 1.2em;
min-width: 5px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
/* It is important there are no CSS transitions, it breaks resize */ /* It is important there are no CSS transitions, it breaks resize */
@ -418,6 +420,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
left: 0px; left: 0px;
right: 0px; right: 0px;
padding-left: 2px; padding-left: 2px;
min-height: 1em;
/* set via inline style on runtime /* set via inline style on runtime
* background-color: depending on category * background-color: depending on category
* color: white || black depending on cat; * color: white || black depending on cat;
@ -646,6 +649,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
overflow: hidden; overflow: hidden;
z-index: 20; z-index: 20;
border: 1px solid black; border: 1px solid black;
min-width: 5px;
/* set via inline style on runtime: /* set via inline style on runtime:
* left: depending on startime * left: depending on startime
* width: depending on length * width: depending on length