Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r8472 -r8546
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8472)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8546)
@@ -188,8 +188,10 @@
 		$type_clauses = Array();
 
 		$user_id = $this->Application->RecallVar('user_id');
-		$type_clauses['my_items']['include'] = '%1$s.CreatedById = '.$user_id;
-		$type_clauses['my_items']['except'] = '%1$s.CreatedById <> '.$user_id;
+		$owner_field = $this->getOwnerField($event->Prefix);
+
+		$type_clauses['my_items']['include'] = '%1$s.'.$owner_field.' = '.$user_id;
+		$type_clauses['my_items']['except'] = '%1$s.'.$owner_field.' <> '.$user_id;
 		$type_clauses['my_items']['having_filter'] = false;
 
 		$type_clauses['pick']['include'] = '%1$s.EditorsPick = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
@@ -535,7 +537,8 @@
 				WHERE Status = '.STATUS_PENDING_EDITING.' AND OrgId IS NOT NULL';
 
 		if (isset($user_id)) {
-			$sql .= ' AND CreatedById = '.$user_id;
+			$owner_field = $this->getOwnerField($object->Prefix);
+			$sql .= ' AND '.$owner_field.' = '.$user_id;
 		}
 
 		$pending_ids = $this->Conn->GetCol($sql);
@@ -1710,8 +1713,10 @@
 				return true;
 			}
 			$perm_helper =& $this->Application->recallObject('PermissionsHelper');
-			if ($perm_helper->ModifyCheckPermission($object->GetDBField('CreatedById'), $object->GetDBField('CategoryId'), $event->Prefix) == 2) {
+			$owner_field = $this->getOwnerField($event->Prefix);
 
+			if ($perm_helper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $event->Prefix) == 2) {
+
 				// 1. clone original item
 				$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
 				$cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array($object->GetID()), null, null, null, true);
@@ -1764,7 +1769,9 @@
 
 		if ($event->status == erSUCCESS) {
 			$object =& $event->getObject();
-			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
+			$owner_field = $this->getOwnerField($event->Prefix);
+
+			$object->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
 		}
 	}
 
@@ -1860,9 +1867,11 @@
 			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
 			/* @var $temp_handler kTempTablesHandler */
 
+			$owner_field = $this->getOwnerField($event->Prefix);
+
 			foreach ($items_info as $id => $field_values) {
 				$object->Load($id);
-				$edit_perm = $perm_helper->ModifyCheckPermission($object->GetDBField('CreatedById'), $object->GetDBField('CategoryId'), $event->Prefix);
+				$edit_perm = $perm_helper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $event->Prefix);
 
  				if ($use_pending && !$object->GetDBField('OrgId') && ($edit_perm == STATUS_PENDING)) {
 					// pending editing enabled + not pending copy -> get/create pending copy & save changes to it
@@ -1945,8 +1954,10 @@
 		switch ($event->Name) {
 			case 'OnCreate':
 				$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
+				$owner_field = $this->getOwnerField($event->Prefix);
+
 				$this->Application->EmailEventAdmin($perm_prefix.'.'.$event_suffix); // there are no ADD.PENDING event for admin :(
-				$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $object->GetDBField('CreatedById'));
+				$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $object->GetDBField($owner_field));
 				break;
 
 			case 'OnUpdate':
@@ -2044,9 +2055,10 @@
 		}
 
 		$status = $object->GetDBField('Status');
-
 		$user_id = $this->Application->RecallVar('user_id');
-		if (($status == -2 || $status == STATUS_PENDING) && ($object->GetDBField('CreatedById') == $user_id)) {
+		$owner_field = $this->getOwnerField($event->Prefix);
+
+		if (($status == -2 || $status == STATUS_PENDING) && ($object->GetDBField($owner_field) == $user_id)) {
 			return true;
 		}
 
@@ -2105,6 +2117,16 @@
 		return parent::getPerPage($event);
 	}
 
+	function getOwnerField($prefix)
+	{
+		$owner_field = $this->Application->getUnitOption($prefix, 'OwnerField');
+		if (!$owner_field) {
+			$owner_field = 'CreatedById';
+		}
+
+		return $owner_field;
+	}
+
 }
 
 ?>
\ No newline at end of file
Index: trunk/themes/default2007/platform/designs/forms.tpl
===================================================================
diff -u -N
--- trunk/themes/default2007/platform/designs/forms.tpl	(revision 8514)
+++ trunk/themes/default2007/platform/designs/forms.tpl	(revision 0)
@@ -1,211 +0,0 @@
-<inp2:m_DefineElement name="error_message">
-	<table class="warning-cell fullwidth">
-		<tr>
-			<td width="30">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
-			</td>
-			<td class="warning-cell">
-				<inp2:m_phrase name="lu_Warning"/>
-			</td>			
-		</tr>
-	</table>
-	<br />
-	<inp2:m_phrase name="lu_AProblemInForm"/><br />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_field_caption">
-	<inp2:m_inc param="tab_index" by="1"/>
-	<td class="field-name">
-		<label for="<inp2:$prefix_InputName field="$field"/>">
-			<span class="field-caption <inp2:m_if check="{$prefix}_HasError" field="$field">error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
-		</label>
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_label" as_label="" currency="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/>
-		</td>
-    	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_password" style="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
-			</inp2:m_if>			
-			<input type="password" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>	
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_upload" style="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<input type="file" name="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
-				(<inp2:$prefix_Field field="$field"/>)
-			</inp2:m_if>
-			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>" />
-		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_hidden" db="">
-	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_date" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:$prefix_Error field="{$field}_date"/></span><br />
-			</inp2:m_if>		
-			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>	
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_time" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
-			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-			
-			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="" />
-		</td>
-		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
-				<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			&nbsp;<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_textarea" style="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">		
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:$prefix_Field field="$field"/></textarea>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_option_item">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_option_phrase">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
-				<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
-					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_endif/>
-			</select>
-		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_radio_item" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_radio_phrase" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
-				<inp2:$prefix_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
-			<inp2:m_else />
-				<inp2:$prefix_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
-			</inp2:m_if>
-		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_checkbox" style="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td>
-			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>" />
-			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
-		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-	</tr>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: trunk/core/units/general/cat_dbitem.php
===================================================================
diff -u -N -r8363 -r8546
--- trunk/core/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 8363)
+++ trunk/core/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 8546)
@@ -51,7 +51,11 @@
 		$this->UpdateFormattersSubFields(array('Modified'));
 
 		if ($this->mode != 't' && !$this->Application->IsAdmin()) {
-			$this->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
+			$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
+			if (!$owner_field) {
+				$owner_field = 'CreatedById';
+			}
+			$this->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
 		}
 
 		if ($this->useFilenames) {
Index: trunk/themes/default2007/platform/inc/script.js
===================================================================
diff -u -N -r8368 -r8546
--- trunk/themes/default2007/platform/inc/script.js	(.../script.js)	(revision 8368)
+++ trunk/themes/default2007/platform/inc/script.js	(.../script.js)	(revision 8546)
@@ -1 +1,4 @@
+function update_checkbox(cb, cb_hidden)
+{
+	cb_hidden.value = cb.checked ? 1 : 0;
+}
\ No newline at end of file
Index: trunk/themes/default2007/platform/designs/default_design.tpl
===================================================================
diff -u -N -r8503 -r8546
--- trunk/themes/default2007/platform/designs/default_design.tpl	(.../default_design.tpl)	(revision 8503)
+++ trunk/themes/default2007/platform/designs/default_design.tpl	(.../default_design.tpl)	(revision 8546)
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <inp2:m_include template="platform/designs/side_boxes"/>
 <inp2:m_include template="platform/designs/content_boxes"/>
-<inp2:m_include template="platform/designs/forms"/>
+<inp2:m_include template="platform/elements/forms"/>
 
 <inp2:m_RenderElement name="content" result_to_var="content"/>
 <inp2:m_RenderElement name="sidebar" result_to_var="sidebar"/>
@@ -12,7 +12,7 @@
 		<inp2:m_ModuleInclude template="elements/html_head" in-portal_template="platform/elements/html_head"/>
 	</head>
 	<body>
-	
+
 		<table class="markup_table fullwidth">
 			<tr>
 				<td>
@@ -25,7 +25,7 @@
 				</td>
 			</tr>
 		</table>
-		
+
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt=""/><br />
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
@@ -52,6 +52,6 @@
 				</td>
 			</tr>
 		</table>
-		
+
 	</body>
 </html>
\ No newline at end of file
Index: trunk/core/units/general/cat_tag_processor.php
===================================================================
diff -u -N -r8535 -r8546
--- trunk/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 8535)
+++ trunk/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 8546)
@@ -188,8 +188,13 @@
 			// original id found & greather then zero + show original
 			$display_original = isset($params['display_original']) && $params['display_original'];
 
+			$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
+			if (!$owner_field) {
+				$owner_field = 'CreatedById';
+			}
+
 			$object =& $this->getObject($params);
-			$perm_value = $this->PermHelper->ModifyCheckPermission($object->GetDBField('CreatedById'), $object->GetDBField('CategoryId'), $this->Prefix);
+			$perm_value = $this->PermHelper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $this->Prefix);
 
 			return $display_original && ($perm_value == 1) && $this->Application->GetVar($this->Prefix.'.original_id');
 		}
Index: trunk/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -N
--- trunk/themes/default2007/platform/elements/forms.tpl	(revision 0)
+++ trunk/themes/default2007/platform/elements/forms.tpl	(revision 8546)
@@ -0,0 +1,211 @@
+<inp2:m_DefineElement name="error_message">
+	<table class="warning-cell fullwidth">
+		<tr>
+			<td width="30">
+				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
+			</td>
+			<td class="warning-cell">
+				<inp2:m_phrase name="lu_Warning"/>
+			</td>			
+		</tr>
+	</table>
+	<br />
+	<inp2:m_phrase name="lu_AProblemInForm"/><br />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_field_caption">
+	<inp2:m_inc param="tab_index" by="1"/>
+	<td class="field-name">
+		<label for="<inp2:$prefix_InputName field="$field"/>">
+			<span class="field-caption <inp2:m_if check="{$prefix}_HasError" field="$field">error</inp2:m_if>">
+			<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
+		</label>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_label" as_label="" currency="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td valign="top" class="field-value">
+			<inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/>
+		</td>
+    	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_password" style="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>			
+			<input type="password" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>	
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_upload" style="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<input type="file" name="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
+			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
+				(<inp2:$prefix_Field field="$field"/>)
+			</inp2:m_if>
+			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>" />
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_hidden" db="">
+	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>" />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_date" class="" is_last="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="{$field}_date"/></span><br />
+			</inp2:m_if>		
+			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			<script type="text/javascript">
+				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
+			</script>
+			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="" />
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>	
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_time" class="">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
+			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+			
+			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="" />
+		</td>
+		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
+				<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			<script type="text/javascript">
+				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
+			</script>
+			&nbsp;<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_textarea" style="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">		
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:$prefix_Field field="$field"/></textarea>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_option_item">
+	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_option_phrase">
+	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
+				<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
+					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_else/>
+					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_endif/>
+			</select>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_radio_item" onclick="">
+	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_radio_phrase" onclick="">
+	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
+				<inp2:$prefix_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
+			<inp2:m_else />
+				<inp2:$prefix_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
+			</inp2:m_if>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_checkbox" style="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td>
+			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>" />
+			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));">
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
\ No newline at end of file
Index: trunk/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r8450 -r8546
--- trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 8450)
+++ trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 8546)
@@ -137,7 +137,12 @@
 			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
 			$ci_table = $this->Application->getUnitOption('ci', 'TableName');
 
-			$sql = 'SELECT item_table.'.$id_field.', item_table.CreatedById, ci.CategoryId
+			$owner_field = $this->Application->getUnitOption($prefix, 'OwnerField');
+			if (!$owner_field) {
+				$owner_field = 'CreatedById';
+			}
+
+			$sql = 'SELECT item_table.'.$id_field.', item_table.'.$owner_field.' AS CreatedById, ci.CategoryId
 					FROM '.$table_name.' item_table
 					LEFT JOIN '.$ci_table.' ci ON ci.ItemResourceId = item_table.ResourceId
 					WHERE item_table.'.$id_field.' IN ('.$ids.') AND (ci.PrimaryCat = 1)';