[eGroupWare-svn] r55763 - in /trunk: calendar/js/ calendar/templates/default/ calendar/templates/pixelegg/ egroupware/api/js/etemplate/ egrou...

Author: hnategh
Date: Mon Apr 18 15:56:47 2016
New Revision: 55763

URL: http://svn.stylite.de/viewvc/egroupware?rev=55763&view=rev
Log:
Enable/Disable add participants based on participant value in calendar edit

Modified:
    trunk/calendar/js/app.js
    trunk/calendar/templates/default/edit.xet
    trunk/calendar/templates/pixelegg/app.css
    trunk/calendar/templates/pixelegg/app.less
    trunk/egroupware/api/js/etemplate/et2_widget_button.js
    trunk/egroupware/api/templates/default/etemplate2.css

Modified: trunk/calendar/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/app.js?rev=55763&r1=55762&r2=55763&view=diff
==============================================================================
--- trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Mon Apr 18 15:56:47 2016
@@ -1117,6 +1117,18 @@
 		{
 			et2_dialog.confirm(widget,'Delete this event','Delete');
 		}
+	},
+
+	/**
+	 * Change participant add button status based on
+	 * participants field value
+	 *
+	 */
+	participantOnChange: function () {
+		var add = this.et2.getWidgetById('add');
+		var participant = this.et2.getWidgetById('participant');
+
+		add.set_readonly(!Number(participant.get_value()));
 	},
 
 	/**
@@ -3288,13 +3300,13 @@
 		{
 			$j(window).trigger('resize');
 			this.setState({state:this.state});
-			
+
 			// Hide loader after 1 second as a fallback, it will also be hidden
 			// after loading is complete.
 			window.setTimeout(jQuery.proxy(function() {
 				egw.loading_prompt(this.appname,false);
 			}, this),1000);
-			
+
 		}
 	},
 

Modified: trunk/calendar/templates/default/edit.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/edit.xet?rev=55763&r1=55762&r2=55763&view=diff
==============================================================================
--- trunk/calendar/templates/default/edit.xet (original)
+++ trunk/calendar/templates/default/edit.xet Mon Apr 18 15:56:47 2016
@@ -54,9 +54,9 @@
 			</columns>
 			<rows>
 				<row class="th"></row>
-				<row disabled="@no_add" height="35">
-					<button align="center" id="add" image="add" background_image="1" novalidate="1"/>
-					<calendar-owner id="participant" allowFreeEntries="true" span="2" empty_label="Add new participants or resource"/>
+				<row disabled="@no_add" height="35" class="et2_toolbar">
+					<button align="center" id="add" image="add" novalidate="1"  background_image="1" readonly="true" ro_image="add"/>
+					<calendar-owner id="participant" allowFreeEntries="true" span="2" empty_label="Add new participants or resource" onchange="app.calendar.participantOnChange"/>
 					<textbox type="integer" align="center" id="quantity" min="1" size="3"/>
 					<menulist>
 						<menupopup class="selectRole" id="role"/>

Modified: trunk/calendar/templates/pixelegg/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.css?rev=55763&r1=55762&r2=55763&view=diff
==============================================================================
--- trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Mon Apr 18 15:56:47 2016
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 55754 2016-04-15 11:12:08Z hnategh $ */
+/* $Id: app.css 55760 2016-04-18 08:34:53Z hnategh $ */
 /*Media print classes*/
 @media print {
   #calendar-view.et2_container,
@@ -2383,8 +2383,9 @@
 }
 /*calendar series add*/
 #calendar-edit_add {
-  /*    .Complete_Button_add;
-    &:hover {.Complete_Button_add_hover;} */
+  padding-left: 24px;
+  background-size: 16px;
+  background-position: center;
 }
 #calendar-edit_add:active {
   background-color: #1aa200 !important;

Modified: trunk/calendar/templates/pixelegg/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.less?rev=55763&r1=55762&r2=55763&view=diff
==============================================================================
--- trunk/calendar/templates/pixelegg/app.less (original)
+++ trunk/calendar/templates/pixelegg/app.less Mon Apr 18 15:56:47 2016
@@ -1089,8 +1089,9 @@
 /*calendar series add*/
 #calendar-edit_add {
     &:active {background-color: @color_positive_action_active !important;}
-/*    .Complete_Button_add;
-    &:hover {.Complete_Button_add_hover;} */
+	padding-left:24px;
+	background-size:16px;
+	background-position: center;
 }
 /*calendar search freetime*/
 #calendar-edit_freetime{

Modified: trunk/egroupware/api/js/etemplate/et2_widget_button.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_button.js?rev=55763&r1=55762&r2=55763&view=diff
==============================================================================
--- trunk/egroupware/api/js/etemplate/et2_widget_button.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_button.js Mon Apr 18 15:56:47 2016
@@ -94,7 +94,7 @@
 			this.setDOMNode(this.image[0]);
 			return;
 		}
-		if (!this.options.readonly)
+		if (!this.options.readonly || this.options.ro_image)
 		{
 			this.btn = $j(document.createElement("button"))
 				.addClass("et2_button")

Modified: trunk/egroupware/api/templates/default/etemplate2.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/templates/default/etemplate2.css?rev=55763&r1=55762&r2=55763&view=diff
==============================================================================
--- trunk/egroupware/api/templates/default/etemplate2.css (original)
+++ trunk/egroupware/api/templates/default/etemplate2.css Mon Apr 18 15:56:47 2016
@@ -254,6 +254,7 @@
 	background-repeat: no-repeat;
 	background-size: 16px;
 	height: 24px;
+	background-position: center;
 }
 button.et2_button_with_image.et2_button_text {
 	background-position: 4px center;


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z