Added support for attribute descriptor 'translate': '\!no_lang', fixed problem with selectbox options not being read from sel_options, removed attributes from init function as they were either outdated or not used

etemplate/js/et2_checkbox.js

@@ -50,7 +50,7 @@ var et2_checkbox = et2_inputWidget.extend({
 		}
 	},
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.input = null;

etemplate/js/et2_date.js

@@ -37,7 +37,7 @@ var et2_date = et2_inputWidget.extend({
 	 */
 	date: new Date(),
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.input = null;

etemplate/js/et2_description.js

@@ -27,7 +27,7 @@ var et2_description = et2_baseWidget.extend({
 			"name": "Caption",
 			"type": "string",
 			"description": "Displayed text",
-			"translate": true
+			"translate": "!no_lang"
 		},
 
 		/**
@@ -78,7 +78,7 @@ var et2_description = et2_baseWidget.extend({
 	legacyOptions: ["font_style", "href", "activate_links", "for", 
 		"extra_link_target", "extra_link_popup", "extra_link_title"],
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.value = "";

etemplate/js/et2_grid.js

@@ -23,7 +23,7 @@
  */ 
 var et2_grid = et2_DOMWidget.extend({
 
-	init: function(_parent) {
+	init: function() {
 		// Create the table body and the table
 		this.tbody = $j(document.createElement("tbody"));
 		this.table = $j(document.createElement("table"))

etemplate/js/et2_hbox.js

@@ -24,7 +24,7 @@ var et2_hbox = et2_baseWidget.extend({
 
 	createNamespace: true,
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.alignData = {

etemplate/js/et2_hrule.js

@@ -21,7 +21,7 @@
  */ 
 var et2_hrule = et2_baseWidget.extend({
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.setDOMNode(document.createElement("hr"));

etemplate/js/et2_number.js

@@ -40,7 +40,7 @@ var et2_number = et2_textbox.extend({
 		}
 	},
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 	},
 

etemplate/js/et2_radiobox.js

@@ -43,7 +43,7 @@ var et2_radiobox = et2_inputWidget.extend({
 		}
 	},
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.input = null;

etemplate/js/et2_selectbox.js

@@ -52,17 +52,17 @@ var et2_selectbox = et2_inputWidget.extend({
 
 	legacyOptions: ["rows"],
 
-	init: function(_parent, _attrs) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		// Only allow options inside this element
 		this.supportedWidgetClasses = [et2_option];
 
 		// Legacy options could have row count or empty label in first slot	 
-		if(typeof _attrs.rows == "string" && isNaN(_attrs.rows)) {	 
-			this.options.empty_label = _attrs.rows;	 
-			this.options.rows = 1;	 
-		}	 
+		if(typeof this.options.rows == "string" && isNaN(this.options.rows)) {
+			this.options.empty_label = this.options.rows;
+			this.options.rows = 1;
+		}
 		if(this.options.rows > 1) this.options.multiple = true;
 		this.createInputWidget();
 	},
@@ -149,7 +149,7 @@ var et2_selectbox = et2_inputWidget.extend({
 			}
 
 			// Create the widget and add it as a child
-			this.addChild(et2_createWidget("option", attrs));
+			et2_createWidget("option", attrs, this);
 		}
 	}
 });
@@ -165,7 +165,7 @@ et2_register_widget(et2_selectbox, ["menupopup", "listbox", "select-cat",
  */
 var et2_selectbox_ro = et2_selectbox.extend({
 
-	init: function(_parent, _attrs) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.supportedWidgetClasses = [];

etemplate/js/et2_tabs.js

@@ -27,7 +27,7 @@ var et2_tabbox = et2_DOMWidget.extend({
 	 * Currently selected tab
 	 */
 	selected_index: 0,
-	init: function(_parent, _type) {
+	init: function() {
 		// Create the outer tabbox container
 		this.container = $j(document.createElement("div"))
 			.addClass("et2_tabbox");
@@ -47,8 +47,7 @@ var et2_tabbox = et2_DOMWidget.extend({
 		this.tabData = [];
 	},
 
-	destroy: function(_parent, _type) {
-
+	destroy: function() {
 		this._super.apply(this, arguments);
 
 		this.container = null;

etemplate/js/et2_template.js

@@ -49,7 +49,7 @@ var et2_template = et2_DOMWidget.extend({
 	/**
 	 * Initializes this template widget as a simple container.
 	 */
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.proxiedTemplate = null;

etemplate/js/et2_textbox.js

@@ -52,7 +52,7 @@ var et2_textbox = et2_inputWidget.extend({
 		},
 	},
 
-	init: function(_parent) {
+	init: function() {
 		this._super.apply(this, arguments);
 
 		this.input = null;

etemplate/js/et2_widget.js

@@ -514,14 +514,13 @@ var et2_widget = Class.extend({
 		}
 
 		// Translate the attributes
-		if (!_attrs["no_lang"])
+		for (var key in _attrs)
 		{
-			for (var key in _attrs)
+			if (_attrs[key] && typeof this.attributes[key] != "undefined")
 			{
-				if (typeof this.attributes[key] != "undefined" && this.attributes[key].translate)
-				{
-					_attrs[key] = egw.lang(_attrs[key]);
-				}
+				if (this.attributes[key].translate === true || 
+				   (this.attributes[key].translate === "!no_lang" && !_attrs["no_lang"]))
+				_attrs[key] = egw.lang(_attrs[key]);
 			}
 		}
 	},

etemplate/js/test/et2_test_timesheet_edit.json

@@ -70,7 +70,7 @@ var timesheet_data = {
         "button[save]":false,
         "button[save_new]":false,
         "button[apply]":false,
-        "ts_owner":true,
+/*        "ts_owner":true,*/
         "tabs":{
             "customfields":true
         }

etemplate/js/test/et2_test_timesheet_edit.xet

@@ -129,7 +129,7 @@
 					</menulist>
 				</row>
 				<row class="row">
-					<description value="Project" options=",,,ts_project"/>
+					<description no_lang="true" value="Project" options=",,,ts_project"/>
 					<grid spacing="1" padding="1">
 						<columns>
 							<column/>