[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26746] trunk/css/ie8.css

[<eromneg@us...>]

Revision: 26746
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26746&view=rev
Author:   eromneg
Date:     2010-04-23 08:44:44 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
[FIX] ie8 no longer needs a fixed width and causes problems with long menu items

Modified Paths:
--------------
    trunk/css/ie8.css

Modified: trunk/css/ie8.css
===================================================================
--- trunk/css/ie8.css	2010-04-23 04:38:37 UTC (rev 26745)
+++ trunk/css/ie8.css	2010-04-23 08:44:44 UTC (rev 26746)
@@ -1,3 +1,3 @@
 /* $Id$ */
 
-.cssmenu_horiz li {width: 11em}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26745] trunk

[<sylvieg@us...>]

Revision: 26745
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26745&view=rev
Author:   sylvieg
Date:     2010-04-23 04:38:37 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
[NEW]tracker: log tracker modification (todo: attach, img + display hisory)

Modified Paths:
--------------
    trunk/db/tiki.sql
    trunk/lib/trackers/trackerlib.php

Added Paths:
-----------
    trunk/installer/schema/20100422_tracker_log_tiki.sql

Modified: trunk/db/tiki.sql
===================================================================
--- trunk/db/tiki.sql	2010-04-23 04:05:42 UTC (rev 26744)
+++ trunk/db/tiki.sql	2010-04-23 04:38:37 UTC (rev 26745)
@@ -2228,6 +2228,18 @@
   FULLTEXT KEY `ft` (value)
 ) ENGINE=MyISAM;
 
+DROP TABLE IF EXISTS `tiki_tracker_item_field_logs`;
+CREATE TABLE `tiki_tracker_item_field_logs` (
+  `version` int(12) NOT NULL,
+  `itemId` int(12) NOT NULL default '0',
+  `fieldId` int(12) NOT NULL default '0',
+  `value` text,
+  `lang` char(16) default NULL,
+  INDEX `version` (`version`),
+  INDEX `itemId` (`itemId`),
+  INDEX `fieldId` (`itemId`)
+) ENGINE=MyISAM;
+
 DROP TABLE IF EXISTS `tiki_tracker_items`;
 CREATE TABLE `tiki_tracker_items` (
   `itemId` int(12) NOT NULL auto_increment,
@@ -3161,6 +3173,8 @@
 INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('Viewed', 'article', 'n');
 INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('%', 'system', 'y');
 INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('feature', 'system', 'y');
+INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('Updated', 'trackeritem', 'n');
+INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('Created', 'trackeritem', 'n');
 
 DROP TABLE IF EXISTS `tiki_freetags`;
 CREATE TABLE `tiki_freetags` (

Added: trunk/installer/schema/20100422_tracker_log_tiki.sql
===================================================================
--- trunk/installer/schema/20100422_tracker_log_tiki.sql	                        (rev 0)
+++ trunk/installer/schema/20100422_tracker_log_tiki.sql	2010-04-23 04:38:37 UTC (rev 26745)
@@ -0,0 +1,12 @@
+CREATE TABLE `tiki_tracker_item_field_logs` (
+  `version` int(12) NOT NULL,
+  `itemId` int(12) NOT NULL default '0',
+  `fieldId` int(12) NOT NULL default '0',
+  `value` text,
+  `lang` char(16) default NULL,
+  INDEX `version` (`version`),
+  INDEX `itemId` (`itemId`),
+  INDEX `fieldId` (`itemId`)
+) ENGINE=MyISAM;
+INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('Updated', 'trackeritem', 'n');
+INSERT IGNORE INTO tiki_actionlog_conf(action, `objectType`, status) VALUES ('Created', 'trackeritem', 'n');
\ No newline at end of file

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2010-04-23 04:05:42 UTC (rev 26744)
+++ trunk/lib/trackers/trackerlib.php	2010-04-23 04:38:37 UTC (rev 26745)
@@ -1133,6 +1133,7 @@
 		global $user, $smarty, $notificationlib, $prefs, $cachelib, $categlib, $tiki_p_admin_trackers, $userlib, $tikilib;
 		include_once('lib/categories/categlib.php');
 		include_once('lib/notifications/notificationlib.php');
+		global $logslib; include_once('lib/logs/logslib.php');
 		$fil = array();
 		if (!empty($itemId)) { // prefill with current value - in case a computed use some other fields
 			$query = 'select `value`, `fieldId` from `tiki_tracker_item_fields` where `itemId`=?';
@@ -1160,6 +1161,10 @@
 				$result = $this->query($query,array((int) $this->now,$user,(int) $itemId));
 				$status = $oldStatus;
 			}
+			$version = $this->last_log_version($itemId) + 1;
+			if (($logslib->add_action('Updated', $itemId, 'trackeritem', $version)) == 0) {
+				$version = 0;
+			}
 		} else {
 			if (!$status) {
 				$status = $this->getOne("select `value` from `tiki_tracker_options` where `trackerId`=? and `name`=?",array((int) $trackerId,'newItemStatus'));
@@ -1168,6 +1173,8 @@
 			$query = "insert into `tiki_tracker_items`(`trackerId`,`created`,`createdBy`,`lastModif`,`lastModifBy`,`status`) values(?,?,?,?,?,?)";
 			$result = $this->query($query,array((int) $trackerId,(int) $this->now,$user,(int) $this->now,$user,$status));
 			$new_itemId = $this->getOne("select max(`itemId`) from `tiki_tracker_items` where `created`=? and `trackerId`=?",array((int) $this->now,(int) $trackerId));
+			$logslib->add_action('Created', $new_itemId, 'trackeritem');
+			$version = 0;
 		}
 
 		if ($prefs['feature_categories'] == 'y') {
@@ -1186,6 +1193,9 @@
 			if (!empty($status)) {
 				$the_data .= $statusTypes[$status]['label'] . "\n\n";
 			}
+			if (!empty($itemId) && $oldStatus != $status) {
+			   $this->log($version, $itemId, -1, $oldStatus);
+			}
 		} else {
 			$the_data = '';
 		}
@@ -1353,7 +1363,11 @@
 					$my_new_categs = array_intersect($new_categs, $my_categs);
 					$my_del_categs = array_intersect($del_categs, $my_categs);
 					$my_remain_categs = array_intersect($remain_categs, $my_categs);
+					if (!empty($itemId)) {
+						$this->log($version, $itemId, $ins_fields['data'][$i]['fieldId'], array_intersect($old_categs, $my_categs));
+					}
 
+
 					if (count($my_new_categs) + count($my_del_categs) == 0) {
 							$the_data .= "$name -[(unchanged)]-:\n";
 					} else {
@@ -1375,7 +1389,7 @@
 					$the_data .= "\n";
 
 					if ($itemId) {
-						$query = "select `itemId` from `tiki_tracker_item_fields` where `itemId`=? and `fieldId`=?";
+						$query = "select `itemId`, `value` as `old_value` from `tiki_tracker_item_fields` where `itemId`=? and `fieldId`=?";
 						if ($this->getOne($query,array((int) $itemId, (int) $fieldId))) {
 							$query = "update `tiki_tracker_item_fields` set `value`=? where `itemId`=? and `fieldId`=?";
 							$this->query($query,array('',(int) $itemId,(int) $fieldId));
@@ -1410,19 +1424,30 @@
 							$query = "insert into `tiki_tracker_item_fields`(`itemId`,`fieldId`,`value`,`lang`) values(?,?,?,?)";
 							$this->query($query,array((int) $new_itemId,(int) $fieldId,(string)$linvalue['value'],(string)$linvalue['lang']));
 						}
+						if (!empty($itemId)) {
+						   $this->log($version, $itemId, $ins_fields['data'][$i]['fieldId'], $linvalue['value'], $linvalue['lang']);
+						}
 					}
 				} elseif ($ins_fields['data'][$i]['type']=='p') {
 					if ($ins_fields['data'][$i]['options_array'][0] == 'password') {
 						if (!empty($ins_fields['data'][$i]['value']) && $prefs['change_password'] == 'y' && ($e = $userlib->check_password_policy($ins_fields['data'][$i]['value'])) == '') {
 							$userlib->change_user_password($user, $ins_fields['data'][$i]['value']);
 						}
+						if (!empty($itemId)) {
+						   $this->log($version, $itemId, $ins_fields['data'][$i]['fieldId'], $ins_fields['data'][$i]['value']);
+						}
 					} elseif ($ins_fields['data'][$i]['options_array'][0] == 'email') {
 						if (!empty($ins_fields['data'][$i]['value']) && validate_email($ins_fields['data'][$i]['value'])) {
 							$userlib->change_user_email($user, $ins_fields['data'][$i]['value']);
 						}
-
+						if (!empty($itemId)) {
+						   $this->log($version, $itemId, $ins_fields['data'][$i]['fieldId'], $ins_fields['data'][$i]['value']);
+						}
 					} else {
 						$tikilib->set_user_preference($user, $ins_fields['data'][$i]['options_array'][0], $ins_fields['data'][$i]['value']);
+						if (!empty($iemId)) {
+						   $this->log($version, $itemId, $ins_fields['data'][$i]['fieldId'], $ins_fields['data'][$i]['value']);
+						}
 					}
 				} else {
 
@@ -1452,6 +1477,9 @@
 										$old_value_lines .= '> '.$line;
 									}
 									$the_data .= "[-[$name]-]:\n--[Old]--:\n$old_value_lines\n\n*-[New]-*:\n$new_value\n----------\n";
+									if (!empty($itemId)) {
+									   $this->log($version, $itemId, $ins_fields['data'][$i]['fieldId'], $old_value);
+									}
 								} else {
 									$the_data .= "[-[$name]-] -[(unchanged)]-:\n$new_value\n----------\n";
 								}
@@ -1703,8 +1731,8 @@
 		if (!empty($parsed)) {
 			$this->syncParsedText($parsed, array('type'=>'trackeritem', 'object'=>$itemId, 'name' => "Tracker Item $itemId", 'href'=>"tiki-view_tracker_item.php?itemId=$itemId"));
 		}
+		$logslib->add_action('Modified', $itemId, 'trackeritem', $version);
 
-
 		return $itemId;
 	}
 
@@ -2250,6 +2278,7 @@
 			$groupName = $this->groupName($options, $itemId, $groupInc);
 			$userlib->remove_group($groupName);
 		}
+		$this->remove_item_log($itemId);
 		return true;
 	}
 
@@ -3702,6 +3731,27 @@
 
 		/* the list of potential value is calculated by a javascript call to selectValues at the end of the tpl */
 	}
+	function log($version, $itemId, $fieldId, $value='', $lang='') {
+		if (empty($version)) {
+		   return;
+		}
+		$query = 'insert into `tiki_tracker_item_field_logs` (`version`, `itemId`, `fieldId`, `value`, `lang`) values(?,?,?,?,?)';
+		if (is_array($value)) {
+			foreach ($value as $v) {
+				$this->query($query, array($version, $itemId, $fieldId, $v, $lang));	
+			}
+		} else {
+			$this->query($query, array($version, $itemId, $fieldId, $value, $lang));
+		}
+	}
+	function last_log_version($itemId) {
+		$query = 'select max(`version`) from `tiki_tracker_item_field_logs` where `itemId` = ?';
+		return $this->getOne($query, array($itemId));
+	}
+	function remove_item_log($itemId) {
+		$query = 'delete from `tiki_tracker_item_field_logs` where `itemId`=?';
+		$this->query($query, $itemId); 
+	}
 
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26744] branches/5.x/templates/ tracker_item_field_input.tpl

[<sylvieg@us...>]

Revision: 26744
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26744&view=rev
Author:   sylvieg
Date:     2010-04-23 04:05:42 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
[FIX]tracker: br between multilingual text

Modified Paths:
--------------
    branches/5.x/templates/tracker_item_field_input.tpl

Modified: branches/5.x/templates/tracker_item_field_input.tpl
===================================================================
--- branches/5.x/templates/tracker_item_field_input.tpl	2010-04-22 19:22:18 UTC (rev 26743)
+++ branches/5.x/templates/tracker_item_field_input.tpl	2010-04-23 04:05:42 UTC (rev 26744)
@@ -167,8 +167,9 @@
 			{/jq}
 		{/if}
 	{else}
-    	{foreach from=$field_value.lingualvalue item=ling}
-    		<label for="{$field_value.ins_id|replace:'[':'_'|replace:']':''}_{$ling.lang}">{$ling.lang|langname}</label><br />
+    	{foreach from=$field_value.lingualvalue item=ling name=multi}
+    		<label for="{$field_value.ins_id|replace:'[':'_'|replace:']':''}_{$ling.lang}">{$ling.lang|langname}</label>
+			<br />
             {*prepend*}{if $field_value.options_array[2]}<span class="formunit">{$field_value.options_array[2]}&nbsp;</span>{/if}
         	<input type="text" id="{$field_value.ins_id|replace:'[':'_'|replace:']':''}_{$ling.lang}" name="{$field_value.ins_id}[{$ling.lang}]" value="{$ling.value|escape}" {if $field_value.options_array[1]}size="{$field_value.options_array[1]}" maxlength="{$field_value.options_array[1]}"{/if} /> {*@@ missing value*}
         	{*append*}{if $field_value.options_array[3]}<span class="formunit">&nbsp;{$field_value.options_array[3]}</span>{/if}
@@ -183,6 +184,7 @@
 					 });
 				{/jq}
 			{/if}
+			{if !$smarty.foreach.multi.last}<br />{/if}
 		{/foreach}
 	{/if}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.