R54911 - in /trunk/calendar: js/ templates/default/ templates/pixelegg/

nathangray 2016-02-03 16:52:28 UTC #1

Author: nathangray
New Revision: 54911

URL: http://svn.stylite.de/viewvc/egroupware?rev=54911&view=rev
Log:
Sidebox calendar buttons

change button colors
change tooltip for added buttons to match jqueryui buttons
finally found (& removed) that 1px wiggle

Modified:
trunk/calendar/js/app.js
trunk/calendar/js/et2_widget_event.js
trunk/calendar/templates/default/app.css
trunk/calendar/templates/default/sidebox.xet
trunk/calendar/templates/pixelegg/app.css
trunk/calendar/templates/pixelegg/app.less

Modified: trunk/calendar/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/app.js?rev=54911&r1=54910&r2=54911&view=diff

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Wed Feb 3 17:52:28 2016
@@ -3115,7 +3115,7 @@
{
var temp_date = new Date(year, month-1, 1,0,0,0);
//temp_date.setUTCMinutes(temp_date.getUTCMinutes() + temp_date.getTimezoneOffset());

  				go_button.set_statustext(egw.lang(date('F',temp_date)));

  				go_button.btn.attr('title',egw.lang(date('F',temp_date)));

  				// Store current _displayed_ date in date button for clicking
  				temp_date.setUTCMinutes(temp_date.getUTCMinutes() - temp_date.getTimezoneOffset());

@@ -3194,6 +3194,7 @@

		// Set today button
		var today = $j('#calendar-sidebox_header_today');

  	today.attr('title',egw.lang('today'));

  	// Set go button
  	var go_button = date_widget.getRoot().getWidgetById('header_go');

@@ -3204,9 +3205,11 @@
temp_date.setUTCDate(1);
temp_date.setUTCMinutes(temp_date.getUTCMinutes() + temp_date.getTimezoneOffset());

  		go_button.attr('title', egw.lang(date('F',temp_date)));
  		// Store current _displayed_ date in date button for clicking
  		temp_date.setUTCMinutes(temp_date.getUTCMinutes() - temp_date.getTimezoneOffset());
  		go_button.attr('data-date', temp_date.toJSON());

  	}

  	// Dynamic resize of sidebox calendar to fill sidebox

Modified: trunk/calendar/js/et2_widget_event.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_event.js?rev=54911&r1=54910&r2=54911&view=diff

— trunk/calendar/js/et2_widget_event.js (original)
+++ trunk/calendar/js/et2_widget_event.js Wed Feb 3 17:52:28 2016
@@ -306,9 +306,6 @@
// Header
var title = !event.is_private ? event[‘title’] : egw.lang(‘private’);

```
  // Height specific section
```
```
  this._small_size();
```

  this.title
  	.html('<span class="calendar_calTimespan">'+this._get_timespan(event) + '<br /></span>')
  	.append('<span class="calendar_calEventTitle">'+title+'</span>')

@@ -350,6 +347,9 @@
.append(’

’+this.options.value.description+’

’);
}
}
+

```
  // Height specific section
```
```
  this._small_size();
```
},

/**

Modified: trunk/calendar/templates/default/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/app.css?rev=54911&r1=54910&r2=54911&view=diff

— trunk/calendar/templates/default/app.css (original)
+++ trunk/calendar/templates/default/app.css Wed Feb 3 17:52:28 2016
@@ -555,12 +555,13 @@
.calendar_calTimeGrid:not(.calendar_calTimeGridList) *:not(.calendar_calDayColAllDay) > .calendar_calEvent::after {
width: 100%;
background-color: rgba(255,255,255,0.9);

height: 0.9em;

height: 5px;
content: “\02026”;
left: 0px;
float: right;
padding-bottom: 5em;
text-indent: 5px;
line-height: 5px;
}
/**

User has not accepted the invitation

Modified: trunk/calendar/templates/default/sidebox.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/sidebox.xet?rev=54911&r1=54910&r2=54911&view=diff

— trunk/calendar/templates/default/sidebox.xet (original)
+++ trunk/calendar/templates/default/sidebox.xet Wed Feb 3 17:52:28 2016
@@ -15,13 +15,13 @@

  	<buttononly id="header_today" label="â¢" icon="nope" statustext="Today" onclick="

  	<buttononly id="header_today" label="â¢" icon="nope" onclick="

var tempDate = new Date();
var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);
var change = {date: today.toJSON()};
if(app.calendar.state.view == ‘planner’) { change.planner_days = Math.ceil((new Date(app.calendar.state.last) - new Date(app.calendar.state.first)) / (24*3600000));}
app.calendar.update_state(change);return false;"/>

  	<buttononly id="header_go" label="&#8629;" icon="nope" statustext="Go" class="ui-corner-all" onclick="var change = {date: widget.btn.attr('data-date')}; if(app.calendar.state.view == 'planner') { change.planner_days = 0;change.first=change.date;var d = new Date(change.date);d = new Date(d.getFullYear(),d.getUTCMonth() + 1, 0);change.last=d.toJSON();} else if ( app.calendar.state.view == 'listview') {change.filter='month';} else {change.view = 'month';}app.calendar.update_state(change);" />

  	<buttononly id="header_go" label="&#8629;" icon="nope" class="ui-corner-all" onclick="var change = {date: widget.btn.attr('data-date')}; if(app.calendar.state.view == 'planner') { change.planner_days = 0;change.first=change.date;var d = new Date(change.date);d = new Date(d.getFullYear(),d.getUTCMonth() + 1, 0);change.last=d.toJSON();} else if ( app.calendar.state.view == 'listview') {change.filter='month';} else {change.view = 'month';}app.calendar.update_state(change);" />
  	<date id="date" class="et2_fullWidth" inline="true" onchange="var view_change = app.calendar.sidebox_changes_views.indexOf(app.calendar.state.view);

Modified: trunk/calendar/templates/pixelegg/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.css?rev=54911&r1=54910&r2=54911&view=diff

— trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Wed Feb 3 17:52:28 2016
@@ -11,7 +11,7 @@

@package calendar
@version $Id$
/
-/ $Id: app.css 54904 2016-02-02 21:12:44Z nathangray $ /
+/ $Id: app.css 54905 2016-02-02 22:59:13Z nathangray $ */
/Media print classes/
@media print {
.th td,
@@ -560,12 +560,13 @@
.calendar_calTimeGrid:not(.calendar_calTimeGridList) *:not(.calendar_calDayColAllDay) > .calendar_calEvent::after {
width: 100%;
background-color: rgba(255, 255, 255, 0.9);

height: 0.9em;

height: 5px;
content: “\02026”;
left: 0px;
float: right;
padding-bottom: 5em;
text-indent: 5px;
line-height: 5px;
}
/**

User has not accepted the invitation
@@ -2545,8 +2546,19 @@
#calendar-sidebox_date .ui-datepicker-year {
padding-right: 15px !important;
}
-#calendar-sidebox_date #calendar-sidebox_header_today {

background-image: url(images/today.png);
+#calendar-sidebox_date .ui-datepicker-header a span {

background-image: url(’…/…/…/phpgwapi/js/jquery/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png’);
+}
+#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,
+#calendar-sidebox_header_today {
background-color: #0c5da5;
}
#calendar_cat_id,
#calendar_filter,

Modified: trunk/calendar/templates/pixelegg/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.less?rev=54911&r1=54910&r2=54911&view=diff

— trunk/calendar/templates/pixelegg/app.less (original)
+++ trunk/calendar/templates/pixelegg/app.less Wed Feb 3 17:52:28 2016
@@ -11,6 +11,7 @@

@package calendar
@version $Id$
*/

@import (reference) “…/…/…/pixelegg/less/definitions.less”;
@@ -1369,9 +1370,21 @@
.ui-datepicker-year {
padding-right: 15px !important;
}

#calendar-sidebox_header_today {

  background-image: url(images/today.png);

}

.ui-datepicker-header a span {

  background-image: url('../../../phpgwapi/js/jquery/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png')

}
.ui-datepicker-header a.ui-state-hover {
```
  top: 3px;
```
```
  span {
```

  	background-image: url('../../../pixelegg/images/ui-icons_egw_color_2_256x240_0C5DA5.png');

```
  	transition: none;
```
```
  }
```
}
+}

+#calendar-sidebox_header_go,
+#calendar-sidebox_header_today {

background-color: #0c5da5;
}
// Select Fields in Sidemenu
#calendar_cat_id,

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs