[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31917] branches/experimental/xajax_removal

[<jonnybradley@us...>]

Revision: 31917
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31917&view=rev
Author:   jonnybradley
Date:     2011-01-14 22:38:04 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[ENH] modules revamp: Menus: menu_id and menu_class to allow more customisation and ease upgrade pain.

Modified Paths:
--------------
    branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php
    branches/experimental/xajax_removal/modules/mod-func-menu.php
    branches/experimental/xajax_removal/templates/modules/mod-menu.tpl

Modified: branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php
===================================================================
--- branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php	2011-01-14 22:36:55 UTC (rev 31916)
+++ branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php	2011-01-14 22:38:04 UTC (rev 31917)
@@ -40,14 +40,12 @@
 		$menu_cookie = 'y';
 	}
 	$smarty->assign_by_ref('menu_cookie', $menu_cookie);
-	if (!empty($css) && $css !== 'n' && $prefs['feature_cssmenus'] == 'y') {
+	if ($css !== 'n' && $prefs['feature_cssmenus'] == 'y') {
 		static $idCssmenu = 0;
-		if (isset($type) && ($type == 'vert' || $type == 'horiz')) {
-			$css = "cssmenu_$type.css";
-		} else {
-			$css = 'cssmenu.css';
-			$type = '';
+		if (empty($type)) {
+			$type = 'vert';
 		}
+		$css = "cssmenu_$type.css";
 		$headerlib->add_jsfile('lib/menubuilder/menu.js');
 		$tpl = 'tiki-user_cssmenu.tpl';
 		$smarty->assign('menu_type', $type);

Modified: branches/experimental/xajax_removal/modules/mod-func-menu.php
===================================================================
--- branches/experimental/xajax_removal/modules/mod-func-menu.php	2011-01-14 22:36:55 UTC (rev 31916)
+++ branches/experimental/xajax_removal/modules/mod-func-menu.php	2011-01-14 22:38:04 UTC (rev 31917)
@@ -32,10 +32,17 @@
 				'description' => tra('Use CSS Superfish menu. y|n (default y)'),
 				'filter' => 'alpha',
 			),
+			'menu_id' => array(
+				'name' => tra('Menu #id'),
+				'description' => tra('Id of the menu in the DOM'),
+			),
+			'menu_class' => array(
+				'name' => tra('Menu CSS class'),
+				'description' => tra('Class of the menu container'),
+			),
 		)
 	);
 }
 
-function module_menu( $mod_reference, &$module_params ) {
-	$module_params['css'] = empty($module_params['css']) ? 'y' : $module_params['css'];
+function module_menu( $mod_reference, $module_params ) {
 }

Modified: branches/experimental/xajax_removal/templates/modules/mod-menu.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/modules/mod-menu.tpl	2011-01-14 22:36:55 UTC (rev 31916)
+++ branches/experimental/xajax_removal/templates/modules/mod-menu.tpl	2011-01-14 22:38:04 UTC (rev 31917)
@@ -1,5 +1,7 @@
 {* $Id: mod-logo.tpl 23156 2009-11-12 22:24:46Z sylvieg $ *}
 
 {tikimodule error=$module_params.error title=$tpl_module_title name="menu" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
+{if !empty($module_params.menu_id)}<div class="{$module_params.menu_class}" id="{$module_params.menu_id}">{/if}
 {menu id=$module_params.id css=$module_params.css type=$module_params.type}
+{if !empty($module_params.menu_id)}</div>{/if}
 {/tikimodule}
\ No newline at end of file


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:[31916] branches/experimental/xajax_removal

[<jonnybradley@us...>]

Revision: 31916
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31916&view=rev
Author:   jonnybradley
Date:     2011-01-14 22:36:55 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[ENH] modules revamp: More usability & appearance fixes.

Modified Paths:
--------------
    branches/experimental/xajax_removal/css/admin.css
    branches/experimental/xajax_removal/installer/schema/20101230_create_top_modules_tiki.php
    branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
    branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl

Modified: branches/experimental/xajax_removal/css/admin.css
===================================================================
--- branches/experimental/xajax_removal/css/admin.css	2011-01-14 20:26:12 UTC (rev 31915)
+++ branches/experimental/xajax_removal/css/admin.css	2011-01-14 22:36:55 UTC (rev 31916)
@@ -300,7 +300,7 @@
 
 .module-placeholder {
 	width: 160px;
-	height: 160px;
+	minHeight: 40px;
 	list-style-type: none;
 	background-color: #ff8;
 	border: #884 2px solid;

Modified: branches/experimental/xajax_removal/installer/schema/20101230_create_top_modules_tiki.php
===================================================================
--- branches/experimental/xajax_removal/installer/schema/20101230_create_top_modules_tiki.php	2011-01-14 20:26:12 UTC (rev 31915)
+++ branches/experimental/xajax_removal/installer/schema/20101230_create_top_modules_tiki.php	2011-01-14 22:36:55 UTC (rev 31916)
@@ -41,7 +41,7 @@
 		if ($prefs['feature_sitemenu'] === 'y') {
 			$menuId = $installer->getOne( "SELECT `value` FROM `tiki_preferences` WHERE `name` = 'feature_topbar_id_menu'");
 			$installer->query( "INSERT INTO `tiki_modules` (name,position,ord,cache_time,params,groups) VALUES ".
-									"('menu','t',5,7200,'id=$menuId&type=horiz&css=y&nobox=y&style=clear%3Aboth%3B&class=main-menu','a:1:{i:0;s:9:\"Anonymous\";}');");
+									"('menu','t',5,7200,'id=$menuId&type=horiz&menu_id=tiki-top&menu_class=clearfix&nobox=y&style=float%3Aleft%3Bclear%3Aboth%3Bwidth%3A100%25%3B','a:1:{i:0;s:9:\"Anonymous\";}');");
 		}
 		// add site search
 		if($prefs['feature_sitesearch'] === 'y' ) {

Modified: branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
===================================================================
--- branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 20:26:12 UTC (rev 31915)
+++ branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 22:36:55 UTC (rev 31916)
@@ -27,9 +27,11 @@
 $(".modules").sortable( {
 	connectWith: ".modules",
 	items: ".module:not('.ui-draggable')",
-	forcePlaceholderSize: true,
-	forceHelperSize: true,
+//	forcePlaceholderSize: true,
+//	forceHelperSize: true,
+//	helper: "original",
 	placeholder: "module-placeholder",
+	revert: 200,
 	stop: function (event, ui) {
 		$("#save_modules a").show("fast").attr("sortable", $(this).attr("id"));
 	},
@@ -37,7 +39,6 @@
 		
 	},
 	receive: function(event, ui) {
-		//$("#save_modules a").show("fast");
 		
 		// check for list items arriving
 		var dropped = $("> li", this);

Modified: branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 20:26:12 UTC (rev 31915)
+++ branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 22:36:55 UTC (rev 31916)
@@ -29,6 +29,7 @@
 		<li>{tr}Modules with "position: absolute" in their style can be dragged in to position{/tr}</li>
 		<li>{tr}New modules can be dragged from the "All Modules" tab{/tr}</li>
 	</ul>
+	<p>{tr}More info here{/tr} {icon _id="help" link="http://dev.tiki.org/Modules+Revamp"}</p>;
 {/remarksbox}
 
 {tabset name='tabs_adminmodules'}


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:[31915] branches/experimental/xajax_removal/templates/ tiki-admin_modules.tpl

[<jonnybradley@us...>]

Revision: 31915
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31915&view=rev
Author:   jonnybradley
Date:     2011-01-14 20:26:12 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[DOC] modules revamp: Some help text etc

Modified Paths:
--------------
    branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl

Modified: branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 20:25:10 UTC (rev 31914)
+++ branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 20:26:12 UTC (rev 31915)
@@ -12,20 +12,31 @@
 </div>
 
 {if !empty($missing_params)}
-<div class="simplebox highlight">
-	{tr}The following required parameters are missing:{/tr}
-	<br/>
-	{section name=ix loop=$missing_params}
-		{$missing_params[ix]}
-		{if !$smarty.section.ix.last},&nbsp;{/if}
-	{/section}
-</div>
-<br />
+	{remarksbox type="warning" title="{tr}Modules Parameters{/tr}"}
+		{tr}The following required parameters are missing:{/tr}<br/>
+		{section name=ix loop=$missing_params}
+			{$missing_params[ix]}
+			{if !$smarty.section.ix.last},&nbsp;{/if}
+		{/section}
+	{/remarksbox}
 {/if}
 
+{remarksbox type="note" title="{tr}Modules Revamp{/tr}" icon="bricks"}
+	<em>{tr}Experimental. This feature is still under development{/tr}</em><br />
+	<ul>
+		<li>{tr}Drag the modules around to re-order then click save when ready{/tr}</li>
+		<li>{tr}Double click them to edit{/tr}</li>
+		<li>{tr}Modules with "position: absolute" in their style can be dragged in to position{/tr}</li>
+		<li>{tr}New modules can be dragged from the "All Modules" tab{/tr}</li>
+	</ul>
+{/remarksbox}
+
 {tabset name='tabs_adminmodules'}
 
 {tab name="{tr}Assigned modules{/tr}"}
+	{remarksbox type="note" title="{tr}Modules Revamp{/tr}" icon="bricks"}
+		<em>{tr}This tab remains for legacy purposes to allow editing "the old way"{/tr}</em>
+	{/remarksbox}
 	{if $prefs.feature_tabs neq 'y'}
 		<legend class="heading">
 			<span>
@@ -53,7 +64,7 @@
 				<td>{$top[user].ord}</td>
 				<td>{$top[user].cache_time}</td>
 				<td>{$top[user].rows}</td>
-				<td style="max-width: 40em; white-space: normal;">{$top[user].params|stringfix:"&":"<br />"}</td>
+				<td style="max-width: 40em; white-space: normal;font-size:smaller;">{$top[user].params|stringfix:"&":"<br />"}</td>
 				<td>{$top[user].module_groups}</td>
 				<td>
 					<a class="link" href="tiki-admin_modules.php?edit_assign={$top[user].moduleId}#assign" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a>
@@ -92,7 +103,7 @@
 				<td>{$left[user].ord}</td>
 				<td>{$left[user].cache_time}</td>
 				<td>{$left[user].rows}</td>
-				<td style="max-width: 40em; white-space: normal;">{$left[user].params|stringfix:"&":"<br />"}</td>
+				<td style="max-width: 40em; white-space: normal;font-size:smaller;">{$left[user].params|stringfix:"&":"<br />"}</td>
 				<td>{$left[user].module_groups}</td>
 				<td>
 					<a class="link" href="tiki-admin_modules.php?edit_assign={$left[user].moduleId}#assign" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a>
@@ -133,7 +144,7 @@
 				<td>{$right[user].ord}</td>
 				<td>{$right[user].cache_time}</td>
 				<td>{$right[user].rows}</td>
-				<td>{$right[user].params|stringfix:"&":"<br />"}</td>
+				<td style="max-width: 40em; white-space: normal;font-size:smaller;">{$right[user].params|stringfix:"&":"<br />"}</td>
 				<td>{$right[user].module_groups}</td>
 				<td>
 					<a class="link" href="tiki-admin_modules.php?edit_assign={$right[user].moduleId}#assign" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a>
@@ -174,7 +185,7 @@
 				<td>{$bottom[user].ord}</td>
 				<td>{$bottom[user].cache_time}</td>
 				<td>{$bottom[user].rows}</td>
-				<td style="max-width: 40em; white-space: normal;">{$bottom[user].params|stringfix:"&":"<br />"}</td>
+				<td style="max-width: 40em; white-space: normal;font-size:smaller;">{$bottom[user].params|stringfix:"&":"<br />"}</td>
 				<td>{$bottom[user].module_groups}</td>
 				<td>
 					<a class="link" href="tiki-admin_modules.php?edit_assign={$bottom[user].moduleId}#assign" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a>


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:[31914] branches/experimental/xajax_removal/lib/ codemirror_tiki/codemirror_tiki.php

[<jonnybradley@us...>]

Revision: 31914
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31914&view=rev
Author:   jonnybradley
Date:     2011-01-14 20:25:10 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[SVN] Manual merge from trunk

Modified Paths:
--------------
    branches/experimental/xajax_removal/lib/codemirror_tiki/codemirror_tiki.php

Modified: branches/experimental/xajax_removal/lib/codemirror_tiki/codemirror_tiki.php
===================================================================
--- branches/experimental/xajax_removal/lib/codemirror_tiki/codemirror_tiki.php	2011-01-14 19:37:41 UTC (rev 31913)
+++ branches/experimental/xajax_removal/lib/codemirror_tiki/codemirror_tiki.php	2011-01-14 20:25:10 UTC (rev 31914)
@@ -1,5 +1,4 @@
 <?php
-
 function tiki_syntax_highlighter_base() {
 	global $headerlib, $prefs;
 	


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

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31567] branches/proposals/6.x/lib/init/tra.php

[Sylvie Greverend <sgreverend@gm...>]

+1 seems reasonable too
On Tue, 2010-12-21 at 15:10 +0000, trebly@... wrote:
> Revision: 31567
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31567&view=rev
> Author:   trebly
> Date:     2010-12-21 15:10:43 +0000 (Tue, 21 Dec 2010)
> 
> Log Message:
> -----------
> [FIX] Crash : buglist 3481 (since 4.1): Reason during first tiki-setup after version upgrade tra.php can be called when $tikilib is not yet set then the function tra_impl crashes.
> I have justed added a first level isset on $tikilib
> 
> Modified Paths:
> --------------
>     branches/proposals/6.x/lib/init/tra.php
> 
> Modified: branches/proposals/6.x/lib/init/tra.php
> ===================================================================
> --- branches/proposals/6.x/lib/init/tra.php	2010-12-21 15:02:22 UTC (rev 31566)
> +++ branches/proposals/6.x/lib/init/tra.php	2010-12-21 15:10:43 UTC (rev 31567)
> @@ -4,6 +4,7 @@
>  // All Rights Reserved. See copyright.txt for details and a complete list of authors.
>  // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
>  // $Id$
> +// [FIX] Trebly:B00624-01
>  
>  /** translate a English string
>   * @param $content - English string
> @@ -102,10 +103,13 @@
>  
>  	if (isset($prefs['record_untranslated']) && $prefs['record_untranslated'] == 'y' && !empty($content) && $lg != 'en') {
>  		$query = 'select `id` from `tiki_untranslated` where `source`=? and `lang`=?';
> -		if (!$tikilib->getOne($query, array($content,$lg))) {
> -			$query = "insert into `tiki_untranslated` (`source`,`lang`) values (?,?)";
> -			$tikilib->query($query, array($content,$lg),-1,-1,false);
> -		}
> +		    // ### Trebly:B00624-01:added test on tikilib existence : on the first launch of tra tikilib is not yet set  
> +        if (isset($tikilib)) {
> +      		if (!$tikilib->getOne($query, array($content,$lg))) {
> +      			$query = "insert into `tiki_untranslated` (`source`,`lang`) values (?,?)";
> +      			$tikilib->query($query, array($content,$lg),-1,-1,false);
> +      		}
> +      	}	
>  	}
>  
>  	return tr_replace( $content, $args );
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> Lotusphere 2011
> Register now for Lotusphere 2011 and learn how
> to connect the dots, take your collaborative environment
> to the next level, and enter the era of Social Business.
> http://p.sf.net/sfu/lotusphere-d2d
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31913] branches/experimental/xajax_removal

[<jonnybradley@us...>]

Revision: 31913
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31913&view=rev
Author:   jonnybradley
Date:     2011-01-14 19:37:41 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[ENH] modules revamp: General usability and visual improvements.
The "smarty" name var for a module has to be the actual module name now - 2 fixed.

Modified Paths:
--------------
    branches/experimental/xajax_removal/css/admin.css
    branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
    branches/experimental/xajax_removal/modules/mod-func-action_calendar.php
    branches/experimental/xajax_removal/modules/mod-func-calendar_new.php
    branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl

Modified: branches/experimental/xajax_removal/css/admin.css
===================================================================
--- branches/experimental/xajax_removal/css/admin.css	2011-01-14 19:19:52 UTC (rev 31912)
+++ branches/experimental/xajax_removal/css/admin.css	2011-01-14 19:37:41 UTC (rev 31913)
@@ -299,11 +299,20 @@
 }
 
 .module-placeholder {
-	width: 200px;
-	height: 200px;
+	width: 160px;
+	height: 160px;
 	list-style-type: none;
-	background-color: #ff0;
+	background-color: #ff8;
+	border: #884 2px solid;
+	margin: 10px;
+	padding: 10px;
 }
 
+#module_list li {
+	list-style-image: url("../pics/icons/module.png");
+	user-select: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+}
 
 /* end from ui-revamp branch */

Modified: branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
===================================================================
--- branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 19:19:52 UTC (rev 31912)
+++ branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 19:37:41 UTC (rev 31913)
@@ -9,8 +9,13 @@
 $(dragZonesSelector).droppable({});
 $(".module", dragZonesSelector).each(function() {
 	if ($(this).css("position") === "absolute") {
+		var el = this;
 		$(this).draggable({
-			connectToSortable: ".modules"
+			connectToSortable: ".modules",
+			revert: "invalid",
+			stop: function (event, ui) {
+				$("#save_modules a").show("fast").attr("dragged", $(el).attr("id"));
+			}
 		}).mouseover(function(event, ui) {	// sortable gets muddled when dragging so disable it
 				$(dragZonesSelector).sortable("option", "disabled", true);
 		}).mouseout(function(event, ui) {
@@ -26,73 +31,91 @@
 	forceHelperSize: true,
 	placeholder: "module-placeholder",
 	stop: function (event, ui) {
-		$("#save_modules *").show("fast");
+		$("#save_modules a").show("fast").attr("sortable", $(this).attr("id"));
 	},
 	start: function (event, ui) {
 		
 	},
 	receive: function(event, ui) {
-		$("#save_modules").show();
+		//$("#save_modules a").show("fast");
+		
+		// check for list items arriving
+		var dropped = $("> li", this);
+		if (dropped.length) {
+			var zone = $(this);	//dropped.parents(".modules:first");	// odd? more than one?
+			if (zone && zone.attr("id") && zone.attr("id").match(/modules/)) {
+				var ord = $.inArray(dropped[0], zone.children());
+				var zoneStr = zone.attr("id").substring(0, 1);
+				var name = dropped.text().match(/\((.*?)\)$/);
+				if (name) {
+					name = name[1];
+				}
+				var options = {
+					modName: name,
+					modPos: zoneStr,
+					modOrd: ord,
+					dropped: dropped
+				};
+				if (zoneStr === "t" || zoneStr === "b") {
+					options.nobox = true;
+				}
+				dropped.addClass("module-placeholder");
+				showModuleEditForm(false, options);
+			}
+			
+		}
 	}
 });
 
 // disable all links in modules apart from app menu
-$(".module:not(.box-ApplicationMenu)").dblclick(function () { showModuleEditForm(this); })
-	.find("a, input").click( function (event) {
-		event.stopImmediatePropagation();
-		return false;
-	});
+$(".module:not(.box-ApplicationMenu)").find("a:not(.flipmodtitle), input").click( function (event) {
+	event.stopImmediatePropagation();
+	return false;
+});
 
+// set dbl click form action
+$(".module").dblclick(function () { showModuleEditForm(this); });
 
 // source list of all modules
-$("#module_list").sortable({
-	connectWith: ".modules",
-	items: "tr",
-	forcePlaceholderSize: true,
-	forceHelperSize: true,
-	placeholder: "module-placeholder",
+$("#module_list li").draggable({
+	connectToSortable: ".modules",
 	helper: "clone",
-	revert: true,
+	revert: "invalid",
+	start: function (event, ui) {	// stop flashing while dragging
+		$(document.body).css("user-select", "none");
+		$(document.body).css("-webkit-user-select", "none");
+		$(document.body).css("-moz-user-select", "none");
+	},
 	stop: function (event, ui) {
-		//$("#save_modules *").show("fast");
-		var dropped = $("tr:first", ".modules");
-		if (dropped.length) {
-			var zone = dropped.parents(".modules:first");	// odd? more than one?
-			var ord = $.inArray(dropped[0], zone.children());
-			var zoneStr = zone.attr("id").substring(0, 1);
-			var options =  { modName: $.trim($("td:first", ui.item).text()), modPos: zoneStr, modOrd: ord + 1 };
-			if (zoneStr === "t" || zoneStr === "b") {
-				options.nobox = true;
-			}
-			showModuleEditForm( false,options);
-		}
-	},
-	start: function (event, ui) {
-		
-	},
-	receive: function(event, ui) {
-		$("#save_modules").show();
+		$(document.body).css("user-select", "");
+		$(document.body).css("-webkit-user-select", "");
+		$(document.body).css("-moz-user-select", "");
 	}
 });
 
 $("#save_modules a").click(function(evt) {
-	// save module order
-	var ser = {};
-	$(".modules").each(function (){				/* do this on everything of class "modules" */
-		ser[$(this).attr("id")] = $(this).find(".module").map(function (){	/* do this on each child module */
-			return $(this).attr("id");
-		}).get();
-	});
-	$("#module-order").val($.toJSON(ser)).parents("form")[0].submit();
+	if ($(this).attr("sortable")) {
+		// save module order
+		var ser = {};
+		$(".modules").each(function() { /* do this on everything of class "modules" */
+			ser[$(this).attr("id")] = $(this).find(".module").map(function() { /* do this on each child module */
+				return $(this).attr("id");
+			}).get();
+		});
+		$("#module-order").val($.toJSON(ser)).parents("form")[0].submit();
+	} else if ($(this).attr("dragged")) {
+		$("#" + $(this).attr("dragged")).dblclick();
+		$(this).attr("dragged", "");
+	}
 	return false;
 });
 
 // show edit form dialogue
 showModuleEditForm = function(item, options) {
-	var modId = 0, modName, modPos = "", modOrd = 0, modStyle = "";
+	var modId = 0, modName, modPos = "", modOrd = 0, modStyle = "", dropped = null;
 	if (item) {
 		//alert("module edit form - TODO");
-		modName = $(item).attr("class").match(/box-\S+/);
+		modName = $(item).attr("class").match(/box-[\S_]+/);
 		if (modName) {
 			modName = modName[0].substring(4);
 		}
@@ -116,6 +139,7 @@
 		modName = options.modName;
 		modPos = options.modPos;
 		modOrd = options.modOrd;
+		dropped = options.dropped;
 	}
 	
 	if ($("#module_edit_div").length === 0) {
@@ -165,6 +189,9 @@
 		buttons: {
 			Cancel: function () {
 				$(this).dialog('close');
+				if (dropped) {
+					dropped.remove();
+				}
 			},
 			'Save': function() {
 				var bValid = true;

Modified: branches/experimental/xajax_removal/modules/mod-func-action_calendar.php
===================================================================
--- branches/experimental/xajax_removal/modules/mod-func-action_calendar.php	2011-01-14 19:19:52 UTC (rev 31912)
+++ branches/experimental/xajax_removal/modules/mod-func-action_calendar.php	2011-01-14 19:37:41 UTC (rev 31913)
@@ -52,7 +52,7 @@
 				$smarty->assign($tc_key, $tc_val);
 		}
 	
-		$smarty->assign('name', 'tiki_calendar');
+		$smarty->assign('name', 'action_calendar');
 	
 		$smarty->assign('daformat2', $tikilib->get_long_date_format());
 		$smarty->assign('var', '');

Modified: branches/experimental/xajax_removal/modules/mod-func-calendar_new.php
===================================================================
--- branches/experimental/xajax_removal/modules/mod-func-calendar_new.php	2011-01-14 19:19:52 UTC (rev 31912)
+++ branches/experimental/xajax_removal/modules/mod-func-calendar_new.php	2011-01-14 19:37:41 UTC (rev 31913)
@@ -135,7 +135,7 @@
 			$smarty->assign($tc_key, $tc_val);
 		}
 
-		$smarty->assign('name', 'calendar');
+		$smarty->assign('name', 'calendar_new');
 
 		$smarty->assign('daformat2', $tikilib->get_long_date_format());
 		$smarty->assign('var', '');

Modified: branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 19:19:52 UTC (rev 31912)
+++ branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 19:37:41 UTC (rev 31913)
@@ -505,17 +505,14 @@
 
 {tab name="{tr}All Modules{/tr}"}
 	<div style="height:400px;overflow:auto;">
-		{listfilter selectors='#module_list tr'}
-		<table class="formcolor" id="module_list">
+		{listfilter selectors='#module_list li'}
+		<ul id="module_list">
 			{foreach key=name item=info from=$all_modules_info}
-				<tr>
-					<td>{$name}</td>
-					<td>
-						{$info.name}
-					</td>
-				</tr>
+				<li>
+				{$info.name} <em>({$name})</em>
+				</li>
 			{/foreach}
-		</table>
+		</ul>
 	</div>
 {/tab}
 


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

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31886] branches/proposals/6.x/templates/modules/ mod-translation.tpl

[Sylvie Greverend <sgreverend@gm...>]

+1
On Thu, 2011-01-13 at 07:09 +0100, Pascal Kustner wrote:
> +1
> 
> pkdille
> 
> 2011/1/13 <chibaguy@...>
>         Revision: 31886
>         
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31886&view=rev
>         Author:   chibaguy
>         Date:     2011-01-13 01:47:16 +0000 (Thu, 13 Jan 2011)
>         
>         Log Message:
>         -----------
>         [bp/r31885][FIX] Slash missing from self-closed element
>         (<br />). (This was the only XHTML 1.0 Transitional validation
>         error at t.o/tiki-index.php.)
>         
>         Modified Paths:
>         --------------
>         
>          branches/proposals/6.x/templates/modules/mod-translation.tpl
>         
>         Modified:
>         branches/proposals/6.x/templates/modules/mod-translation.tpl
>         ===================================================================
>         ---
>         branches/proposals/6.x/templates/modules/mod-translation.tpl
>                2011-01-13 01:43:50 UTC (rev 31885)
>         +++
>         branches/proposals/6.x/templates/modules/mod-translation.tpl
>                2011-01-13 01:47:16 UTC (rev 31886)
>         @@ -114,7 +114,7 @@
>                                                        {/foreach}
>                                                </ul>
>                                                {/if}
>         -                               </div><br>
>         +                               </div><br />
>                                {/if}
>         
>                {/tikimodule}
>         
>         
>         This was sent by the SourceForge.net collaborative development
>         platform, the world's largest Open Source development site.
>         
>         ------------------------------------------------------------------------------
>         Protect Your Site and Customers from Malware Attacks
>         Learn about various malware tactics and how to avoid them.
>         Understand
>         malware threats, the impact they can have on your business,
>         and how you
>         can protect your company and customers by using code signing.
>         http://p.sf.net/sfu/oracle-sfdevnl
>         _______________________________________________
>         Tikiwiki-cvs mailing list
>         Tikiwiki-cvs@...
>         https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
> 
> ------------------------------------------------------------------------------
> Protect Your Site and Customers from Malware Attacks
> Learn about various malware tactics and how to avoid them. Understand 
> malware threats, the impact they can have on your business, and how you 
> can protect your company and customers by using code signing.
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________ Tikiwiki-cvs mailing list Tikiwiki-cvs@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31888] branches/proposals/6.x/templates

[Sylvie Greverend <sgreverend@gm...>]

+1
On Thu, 2011-01-13 at 02:13 +0000, chibaguy@... wrote:
> Revision: 31888
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31888&view=rev
> Author:   chibaguy
> Date:     2011-01-13 02:13:26 +0000 (Thu, 13 Jan 2011)
> 
> Log Message:
> -----------
> [bp/r31887][FIX] Slash missing from self-closed element (<br />) - validation error.
> 
> Modified Paths:
> --------------
>     branches/proposals/6.x/templates/mail/report.tpl
>     branches/proposals/6.x/templates/modules/mod-terminology.tpl
>     branches/proposals/6.x/templates/styles/darkshine/tiki.tpl
>     branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl
>     branches/proposals/6.x/templates/tiki-listpages_content.tpl
>     branches/proposals/6.x/templates/tiki-view_tracker_item.tpl
>     branches/proposals/6.x/templates/tracker_item_field_input.tpl
> 
> Modified: branches/proposals/6.x/templates/mail/report.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/mail/report.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/mail/report.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -1,11 +1,11 @@
>  {tr}Report for{/tr} {$report_user}.{if $report_preferences.type eq 'plain'}
>  
> -{else}<br>{/if}
> +{else}<br />{/if}
>  {tr}Last Report sent on{/tr} {$report_last_report_date}.{if $report_preferences.type eq 'plain'}
>  
> 
> -{else}<br><br>{/if}
> -{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br>{else}
> +{else}<br /><br />{/if}
> +{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br />{else}
>  
>  -----------------------
>  
> 
> Modified: branches/proposals/6.x/templates/modules/mod-terminology.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/modules/mod-terminology.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/modules/mod-terminology.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -1,6 +1,6 @@
>  {tikimodule title=$tpl_module_title name="terminology flip=$module_params.flip decorations=$module_params.decorations}
>    <div align="left">
> -    <b>{tr}Find term:{/tr}</b><br>
> +    <b>{tr}Find term:{/tr}</b><br />
>  	<div id="mod-search_wiki_pager1" style="display: block" class="clearfix box-data">
>        <form class="forms" method="post" action="tiki-listpages.php">
>        	{if $term_root_category_id != ''}
> 
> Modified: branches/proposals/6.x/templates/styles/darkshine/tiki.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/styles/darkshine/tiki.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/styles/darkshine/tiki.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -95,8 +95,8 @@
>  									{tr}The following modules could not be loaded{/tr}
>  									<p>
>  									{foreach from=$module_pref_errors key=index item=pref_error}
> -									<b>{$pref_error.mod_name}:</b><br>
> -									{tr}Preference was not set{/tr}: '{$pref_error.pref_name}'<br>
> +									<b>{$pref_error.mod_name}:</b><br />
> +									{tr}Preference was not set{/tr}: '{$pref_error.pref_name}'<br />
>  									{/foreach}
>  								{/remarksbox}
>  							{/if}
> 
> Modified: branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -16,7 +16,7 @@
>  	<td>Description</td><td><input name="playlist_description" /></td>
>  </tr>
>  </table>
> -<br>
> +<br />
>  <input type="hidden" name="playlistId" value="0">
>  <input type="submit" name="action" value="Create">
>  </form>
> @@ -29,9 +29,9 @@
>  {assign var=cant value=$kmixlist->totalCount}
>  
>  <form name="list" action="tiki-list_kaltura_playlists.php?type=mix&action=add_entries&playlistId={$playlistId}" method="post">
> -<br>
> +<br />
>  {include file="tiki-list_kaltura_mix_entries.tpl"}
> -<br>
> +<br />
>  <input type="hidden" name="playlistId" value="{$playlistId}">
>  <input type="hidden" name="action" value="add_entries">
>  <input type="hidden" name="type" value="mix">
> @@ -42,12 +42,12 @@
>  {else}
>  {title}Create Kaltura Playlist: Add Media Entries{/title}
>  {button _text="{tr}Mix Entries{/tr}" href="tiki-list_kaltura_playlists.php?type=mix&action=add_entries&playlistId=$playlistId" }
> -<br><br>
> +<br /><br />
>  {assign var=klist value=$kmedialist->objects}
>  {assign var=cant value=$kmedialist->totalCount}
>  <form action="tiki-list_kaltura_playlists.php?type=media&action=add_entries&playlistId={$playlistId}" method="post" >
>  {include file="tiki-list_kaltura_media_entries.tpl"}
> -<br>
> +<br />
>  <input type="hidden" name="playlistId" value="{$playlistId}">
>  <input type="hidden" name="action" value="add_entries">
>  <input type="hidden" name="type" value="media">
> @@ -69,7 +69,7 @@
>  <param name="flashvars" value="layoutId=playlistLight&uid=0&partner_id=23929&subp_id=2392900&k_pl_autoContinue=true&k_pl_autoInsertMedia=true&k_pl_0_name={$kplaylist->name}&k_pl_0_url=http%3A%2F%2Fwww.kaltura.com%2Findex.php%2Fpartnerservices2%2Fexecuteplaylist%3Fuid%3D%26partner_id%3D23929%26subp_id%3D2392900%26format%3D8%26ks%3D%7Bks%7D%26playlist_id%3D{$kplaylist->id}"/></object>
>  </td></tr>
>  <tr><td>
> -<br>
> +<br />
>  <table class="normal">
>  <tr><td width="200" class="even">Name </td><td class="even">{$kplaylist->name}</td></tr>
>  <tr><td width="200" class="odd">Description </td><td class="odd">{$kplaylist->description}</td></tr>
> @@ -90,8 +90,8 @@
>  {button _text="{tr}Media Entries{/tr}" href="tiki-list_kaltura_entries2.php?list=media&view=browse" }
>  <input type="submit" name="action" value="Create Playlist"/> 
>  <input type="submit" name="action" value="Delete"/>
> -<br>
> -<br>
> +<br />
> +<br />
>  <table class="normal">
>  		<tr>
>  			<th width="20">&nbsp;</th>
> 
> Modified: branches/proposals/6.x/templates/tiki-listpages_content.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tiki-listpages_content.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tiki-listpages_content.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -332,7 +332,7 @@
>  		<tr>
>  			<td colspan="{$cntcol}" class="odd">
>  				<b>{tr}No pages found{/tr}{if $find ne ''} {tr}with{/tr} &quot;{$find|escape}&quot;{/if}{if $initial ne ''}{tr} {if $find ne ''}and {/if}starting with{/tr} &quot;{$initial}&quot;{/if}.</b>
> -				{if $aliases_were_found == 'y'}<br><b>{tr}However, some page aliases fitting the query were found (see Aliases section above).{/tr}</b>{/if}
> +				{if $aliases_were_found == 'y'}<br /><b>{tr}However, some page aliases fitting the query were found (see Aliases section above).{/tr}</b>{/if}
>  			</td>
>  		</tr>
>  	{/section}
> 
> Modified: branches/proposals/6.x/templates/tiki-view_tracker_item.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tiki-view_tracker_item.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tiki-view_tracker_item.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -107,13 +107,13 @@
>  {if $tracker_info.showCreatedView eq 'y'}
>  	<tr>
>  		<td class="formlabel">{tr}Created{/tr}</td>
> -		<td colspan="3" class="formcontent">{$info.created|tiki_long_datetime}{if $tracker_info.showCreatedBy eq 'y'}<br>by {if $prefs.user_show_realnames eq 'y'}{if empty($info.createdBy)}Unknown{else}{$info.createdBy|username}{/if}{else}{if empty($info.createdBy)}Unknown{else}{$info.createdBy}{/if}{/if}{/if}</td>
> +		<td colspan="3" class="formcontent">{$info.created|tiki_long_datetime}{if $tracker_info.showCreatedBy eq 'y'}<br />by {if $prefs.user_show_realnames eq 'y'}{if empty($info.createdBy)}Unknown{else}{$info.createdBy|username}{/if}{else}{if empty($info.createdBy)}Unknown{else}{$info.createdBy}{/if}{/if}{/if}</td>
>  	</tr>
>  {/if}
>  {if $tracker_info.showLastModifView eq 'y'}
>  	<tr>
>  		<td class="formlabel">{tr}LastModif{/tr}</td>
> -		<td colspan="3" class="formcontent">{$info.lastModif|tiki_long_datetime}{if $tracker_info.showLastModifBy eq 'y'}<br>by {if $prefs.user_show_realnames eq 'y'}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy|username}{/if}{else}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy}{/if}{/if}{/if}</td>
> +		<td colspan="3" class="formcontent">{$info.lastModif|tiki_long_datetime}{if $tracker_info.showLastModifBy eq 'y'}<br />by {if $prefs.user_show_realnames eq 'y'}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy|username}{/if}{else}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy}{/if}{/if}{/if}</td>
>  	</tr>
>  {/if}
>  </table>
> 
> Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tracker_item_field_input.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -380,7 +380,7 @@
>  {elseif $field_value.type eq 'R'}
>  	{section name=jx loop=$field_value.options_array}
>  		{if $smarty.section.jx.first}
> -			{if $field_value.options_array[jx] eq '<br>' or $field_value.options_array[jx] eq '<br />'}
> +			{if $field_value.options_array[jx] eq '<br />' or $field_value.options_array[jx] eq '<br />'}
>  				{assign var=sepR value='<br />'}
>  			{else}
>  				{assign var=sepR value=' '}
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> Protect Your Site and Customers from Malware Attacks
> Learn about various malware tactics and how to avoid them. Understand 
> malware threats, the impact they can have on your business, and how you 
> can protect your company and customers by using code signing.
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31894] branches/proposals/6.x/_htaccess

[Sylvie Greverend <sgreverend@gm...>]

+1
On Thu, 2011-01-13 at 12:38 +0000, xavidp@... wrote:
> Revision: 31894
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31894&view=rev
> Author:   xavidp
> Date:     2011-01-13 12:38:31 +0000 (Thu, 13 Jan 2011)
> 
> Log Message:
> -----------
> [ENH][bp/r31893]Added param to increase php_value mac_execution_time (commented out by default)
> 
> Modified Paths:
> --------------
>     branches/proposals/6.x/_htaccess
> 
> Modified: branches/proposals/6.x/_htaccess
> ===================================================================
> --- branches/proposals/6.x/_htaccess	2011-01-13 12:35:12 UTC (rev 31893)
> +++ branches/proposals/6.x/_htaccess	2011-01-13 12:38:31 UTC (rev 31894)
> @@ -165,6 +165,9 @@
>  # increase memory
>  #php_value memory_limit 128M
>  
> +# increase execution time (default value in apache use to be 30, and in some cases of long wiki pages with many plugins it may take longer)
> +#php_value max_execution_time 90
> +
>  # In some cases you may see open_basedir warnings about Smarty accessing php files that it shouldn't
>  # The following line (uncommented) will reset the include path to use only Tiki's files which will solve this in most cases
>  #php_value include_path "." 
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> Protect Your Site and Customers from Malware Attacks
> Learn about various malware tactics and how to avoid them. Understand 
> malware threats, the impact they can have on your business, and how you 
> can protect your company and customers by using code signing.
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31912] branches/proposals/6.x/tiki-calendar_edit_item .php

[Sylvie Greverend <sgreverend@gm...>]

oops forget bp/r31911]
sorry
On Fri, 2011-01-14 at 19:19 +0000, sylvieg@... wrote:
> Revision: 31912
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31912&view=rev
> Author:   sylvieg
> Date:     2011-01-14 19:19:52 +0000 (Fri, 14 Jan 2011)
> 
> Log Message:
> -----------
> [FIX]calendar: fix personal calendar (partial rollback 22563). A personal calendar is shared by everybody that can see it - but user sees only his events
> 
> Modified Paths:
> --------------
>     branches/proposals/6.x/tiki-calendar_edit_item.php
> 
> Modified: branches/proposals/6.x/tiki-calendar_edit_item.php
> ===================================================================
> --- branches/proposals/6.x/tiki-calendar_edit_item.php	2011-01-14 19:14:07 UTC (rev 31911)
> +++ branches/proposals/6.x/tiki-calendar_edit_item.php	2011-01-14 19:19:52 UTC (rev 31912)
> @@ -47,14 +47,14 @@
>    $cal_id = $cal_data['calendarId'];
>    $calperms = Perms::get( array( 'type' => 'calendar', 'object' => $cal_id ) );
>    if ($cal_data["personal"] == "y") {
> -    if ($user && $user == $cal_data["user"]) {
> +    if ($user) {
>        $cal_data["tiki_p_view_calendar"] = 'y';
>      	$cal_data["tiki_p_view_events"] = 'y';
>        $cal_data["tiki_p_add_events"] = 'y';
>        $cal_data["tiki_p_change_events"] = 'y';
>      } else {
>        $cal_data["tiki_p_view_calendar"] = 'n';
> -    	$cal_data["tiki_p_view_events"] = 'n';
> +    	$cal_data["tiki_p_view_events"] = 'y';
>        $cal_data["tiki_p_add_events"] = 'n';
>        $cal_data["tiki_p_change_events"] = 'n';
>      }
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> Protect Your Site and Customers from Malware Attacks
> Learn about various malware tactics and how to avoid them. Understand 
> malware threats, the impact they can have on your business, and how you 
> can protect your company and customers by using code signing.
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31912] branches/proposals/6.x/tiki-calendar_edit_item .php

[<sylvieg@us...>]

Revision: 31912
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31912&view=rev
Author:   sylvieg
Date:     2011-01-14 19:19:52 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[FIX]calendar: fix personal calendar (partial rollback 22563). A personal calendar is shared by everybody that can see it - but user sees only his events

Modified Paths:
--------------
    branches/proposals/6.x/tiki-calendar_edit_item.php

Modified: branches/proposals/6.x/tiki-calendar_edit_item.php
===================================================================
--- branches/proposals/6.x/tiki-calendar_edit_item.php	2011-01-14 19:14:07 UTC (rev 31911)
+++ branches/proposals/6.x/tiki-calendar_edit_item.php	2011-01-14 19:19:52 UTC (rev 31912)
@@ -47,14 +47,14 @@
   $cal_id = $cal_data['calendarId'];
   $calperms = Perms::get( array( 'type' => 'calendar', 'object' => $cal_id ) );
   if ($cal_data["personal"] == "y") {
-    if ($user && $user == $cal_data["user"]) {
+    if ($user) {
       $cal_data["tiki_p_view_calendar"] = 'y';
     	$cal_data["tiki_p_view_events"] = 'y';
       $cal_data["tiki_p_add_events"] = 'y';
       $cal_data["tiki_p_change_events"] = 'y';
     } else {
       $cal_data["tiki_p_view_calendar"] = 'n';
-    	$cal_data["tiki_p_view_events"] = 'n';
+    	$cal_data["tiki_p_view_events"] = 'y';
       $cal_data["tiki_p_add_events"] = 'n';
       $cal_data["tiki_p_change_events"] = 'n';
     }


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:[31911] trunk/tiki-calendar_edit_item.php

[<sylvieg@us...>]

Revision: 31911
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31911&view=rev
Author:   sylvieg
Date:     2011-01-14 19:14:07 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[FIX]calendar: fix personal calendar (partial rollback 22563). A personal calendar is shared by everybody that can see it - but user sees only his events

Modified Paths:
--------------
    trunk/tiki-calendar_edit_item.php

Modified: trunk/tiki-calendar_edit_item.php
===================================================================
--- trunk/tiki-calendar_edit_item.php	2011-01-14 18:48:03 UTC (rev 31910)
+++ trunk/tiki-calendar_edit_item.php	2011-01-14 19:14:07 UTC (rev 31911)
@@ -43,14 +43,14 @@
   $cal_id = $cal_data['calendarId'];
   $calperms = Perms::get( array( 'type' => 'calendar', 'object' => $cal_id ) );
   if ($cal_data["personal"] == "y") {
-    if ($user && $user == $cal_data["user"]) {
+    if ($user) {
       $cal_data["tiki_p_view_calendar"] = 'y';
     	$cal_data["tiki_p_view_events"] = 'y';
       $cal_data["tiki_p_add_events"] = 'y';
       $cal_data["tiki_p_change_events"] = 'y';
     } else {
       $cal_data["tiki_p_view_calendar"] = 'n';
-    	$cal_data["tiki_p_view_events"] = 'n';
+    	$cal_data["tiki_p_view_events"] = 'y';
       $cal_data["tiki_p_add_events"] = 'n';
       $cal_data["tiki_p_change_events"] = 'n';
     }


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:[31910] trunk/lib

[<robertplummer@us...>]

Revision: 31910
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31910&view=rev
Author:   robertplummer
Date:     2011-01-14 18:48:03 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[FIX] a tighter codemirror integration, fixes for inserting and modding text with toolbar

Modified Paths:
--------------
    trunk/lib/codemirror_tiki/codemirror_tiki.php
    trunk/lib/jquery_tiki/tiki-jquery.js
    trunk/lib/tiki-js.js

Modified: trunk/lib/codemirror_tiki/codemirror_tiki.php
===================================================================
--- trunk/lib/codemirror_tiki/codemirror_tiki.php	2011-01-14 18:27:58 UTC (rev 31909)
+++ trunk/lib/codemirror_tiki/codemirror_tiki.php	2011-01-14 18:48:03 UTC (rev 31910)
@@ -1,5 +1,4 @@
 <?php
-
 function tiki_syntax_highlighter_base() {
 	global $headerlib, $prefs;
 	

Modified: trunk/lib/jquery_tiki/tiki-jquery.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery.js	2011-01-14 18:27:58 UTC (rev 31909)
+++ trunk/lib/jquery_tiki/tiki-jquery.js	2011-01-14 18:48:03 UTC (rev 31910)
@@ -1335,6 +1335,14 @@
 	}
 	textarea = $('#' +  area_id);
 	
+	//codemirror interation and preservation
+	var textareaEditor = getCodeMirrorFromInput(textarea);
+	var cursor, handle;
+	if (textareaEditor) {
+		cursor = textareaEditor.cursorPosition();
+		handle = textareaEditor.cursorLine();
+	}
+	
 	pickerDiv = document.createElement('div');
 	document.body.appendChild( pickerDiv );
 
@@ -1365,26 +1373,48 @@
 			};
 		} else {
 			link.onclick = function() {
-				insertAt( area_id, ins );
-		
-				textarea = $('#' +  area_id);	
-				// quick fix for Firefox 3.5 losing selection on changes to popup
-				if (typeof textarea.selectionStart != 'undefined') {
-					var tempSelectionStart = textarea.selectionStart;
-					var tempSelectionEnd = textarea.selectionEnd;	
+				if (textareaEditor) { //codemirror behavior
+					var newCursor = textareaEditor.cursorPosition(); //it could have possibly change, just double check
+					if (newCursor.character != cursor.character) {
+						cursor = newCursor;
+						handle = textareaEditor.cursorLine();
+					}
+					
+					if (!handle && !cursor.character) { //if a handle doesn't exist, just add it to the end of codemirror
+						handle = textareaEditor.lastLine();
+					}
+					
+					if (cursor.character) {
+						textareaEditor.insertIntoLine(handle, cursor.character, ins);
+					}
+					else {
+						textareaEditor.insertIntoLine(handle, 'end', ins);
+					}
+					
+					$('div.toolbars-picker').remove();
+					pickerDiv = false;
 				}
-	
-				$('div.toolbars-picker').remove();
-				pickerDiv = false;
-	
-				// quick fix for Firefox 3.5 losing selection on changes to popup
-	        	if (typeof textarea.selectionStart != 'undefined' && textarea.selectionStart != tempSelectionStart) {
-	                textarea.selectionStart = tempSelectionStart;
-	     		}
-				if (typeof textarea.selectionEnd != 'undefined' && textarea.selectionEnd != tempSelectionEnd) {
-	            	textarea.selectionEnd = tempSelectionEnd;
-	       		}
-	
+				else { //normal behavior
+					insertAt(area_id, ins);
+					
+					textarea = $('#' + area_id);
+					// quick fix for Firefox 3.5 losing selection on changes to popup
+					if (typeof textarea.selectionStart != 'undefined') {
+						var tempSelectionStart = textarea.selectionStart;
+						var tempSelectionEnd = textarea.selectionEnd;
+					}
+					
+					$('div.toolbars-picker').remove();
+					pickerDiv = false;
+					
+					// quick fix for Firefox 3.5 losing selection on changes to popup
+					if (typeof textarea.selectionStart != 'undefined' && textarea.selectionStart != tempSelectionStart) {
+						textarea.selectionStart = tempSelectionStart;
+					}
+					if (typeof textarea.selectionEnd != 'undefined' && textarea.selectionEnd != tempSelectionEnd) {
+						textarea.selectionEnd = tempSelectionEnd;
+					}
+				}
 				return false;
 			};
 		}
@@ -1398,6 +1428,8 @@
 		prepareLink( link, i, chr );
 		pickerDiv.appendChild( link );
 	}
+	
+	return false;
 }
 
 
@@ -1690,32 +1722,46 @@
 }
 
 function dialogFindFind( area_id ) {
+	var ta = $('#' + area_id);
+	var findInput = $("#tbFindSearch").removeClass("ui-state-error");
 	
-	var s, opt, ta, str, re, p = 0, m;
-	s = $("#tbFindSearch").removeClass("ui-state-error").val();
-	opt = "";
-	if ($("#tbFindCase").attr("checked")) {
-		opt += "i";
+	var $textareaEditor = getCodeMirrorFromInput(ta); //codemirror functionality
+	if ($textareaEditor) {
+		var cursor = $textareaEditor.getSearchCursor(findInput.val(), true, true);
+		if (cursor.findNext()) {
+			cursor.select();
+		}
+		else {
+			findInput.addClass("ui-state-error");
+		}
 	}
-	ta = $('#' + area_id);
-	str = ta.val();
-	re = new RegExp(s,opt);
-	p = getCaretPos(ta[0]);
-	if (p && p < str.length) {
-		m = re.exec(str.substring(p));
-	} else {
-		p = 0;
+	else { //standard functionality
+		var s, opt, str, re, p = 0, m;
+		s = findInput.val();
+		opt = "";
+		if ($("#tbFindCase").attr("checked")) {
+			opt += "i";
+		}
+		str = ta.val();
+		re = new RegExp(s, opt);
+		p = getCaretPos(ta[0]);
+		if (p && p < str.length) {
+			m = re.exec(str.substring(p));
+		}
+		else {
+			p = 0;
+		}
+		if (!m) {
+			m = re.exec(str);
+			p = 0;
+		}
+		if (m) {
+			setSelectionRange(ta[0], m.index + p, m.index + s.length + p);
+		}
+		else {
+			findInput.addClass("ui-state-error");
+		}
 	}
-	if (!m) {
-		m = re.exec(str);
-		p = 0;
-	}
-	if (m) {
-		setSelectionRange(ta[0], m.index + p, m.index + s.length + p);
-	} else {
-		$("#tbFindSearch").addClass("ui-state-error");
-	}
-
 }
 
 // Replace
@@ -1728,8 +1774,8 @@
 }
 
 function dialogReplaceReplace( area_id ) {
-	
-	var s = $("#tbReplaceSearch").val();
+	var findInput = $("#tbReplaceSearch").removeClass("ui-state-error");
+	var s = findInput.val();
 	var r = $("#tbReplaceReplace").val();
 	var opt = "";
 	if ($("#tbReplaceAll").attr("checked")) {
@@ -1738,9 +1784,29 @@
 	if ($("#tbReplaceCase").attr("checked")) {
 		opt += "i";
 	}
-	var str = $('#' + area_id).val();
+	var ta = $('#' + area_id);
+	var str = ta.val();
 	var re = new RegExp(s,opt);
-	$('#' + area_id).val(str.replace(re,r));
+	
+	var $textareaEditor = getCodeMirrorFromInput(ta); //codemirror functionality
+	if ($textareaEditor) {
+		var cursorHandle = $textareaEditor.cursorLine();
+		$textareaEditor.jumpToLine($textareaEditor.firstLine());
+		var cursor = $textareaEditor.getSearchCursor(findInput.val(), true, true);
+		var found = false;
+		while (cursor.findNext()) {
+			cursor.select();
+			$textareaEditor.replaceSelection(r);
+			found = true;
+		}
+		if (!found) {
+			findInput.addClass("ui-state-error");
+		}
+		$textareaEditor.jumpToLine($textareaEditor.firstLine());
+	}
+	else { //standard functionality
+		ta.val(str.replace(re, r));
+	}
 
 }
 

Modified: trunk/lib/tiki-js.js
===================================================================
--- trunk/lib/tiki-js.js	2011-01-14 18:27:58 UTC (rev 31909)
+++ trunk/lib/tiki-js.js	2011-01-14 18:48:03 UTC (rev 31910)
@@ -357,6 +357,11 @@
 }
 
 function getTASelection( textarea ) {
+	var $textareaEditor = getCodeMirrorFromInput($(textarea));
+	if ($textareaEditor) {
+		return $textareaEditor.selection();
+	}
+	
 	var ta_id = $(textarea).attr("id"), r, cked;
 	if ($('#cke_contents_' + ta_id).length !== 0) {
 		// get selection from ckeditor
@@ -389,6 +394,12 @@
 }
 
 function getCaretPos (textarea) {
+	var $textareaEditor = getCodeMirrorFromInput($(textarea));
+	if ($textareaEditor) {
+		var endPoint = $textareaEditor.cursorCoords();
+		return (endPoint.x ? endPoint.x : 0);
+	}
+	
 	if (typeof textarea.selectionEnd != 'undefined') {
 		return textarea.selectionEnd;
 	} else if ( document.selection ) {
@@ -413,6 +424,7 @@
 	
 	// inserts given text at selection or cursor position
 	var $textarea = $('#' + elementId);
+	var $textareaEditor = getCodeMirrorFromInput($textarea);
 	var toBeReplaced = /text|page|area_id/g; //substrings in replaceString to be replaced by the selection if a selection was done
 	var hiddenParents = $textarea.parents('fieldset:hidden:last');
 	if (hiddenParents.length) { hiddenParents.show(); }
@@ -489,13 +501,13 @@
 		return;
 	}
 	
-	$textareaEditor = getCodeMirrorFromInput($textarea);
 	if (!$textarea.length && elementId === "fgal_picker") {	// ckeditor file browser
 		$(".cke_dialog_contents").find("input:first").val(replaceString);
 		return;
 	}
 
-	( $textareaEditor ? $textareaEditor : $textarea[0] ).focus();
+	($textareaEditor ? $textareaEditor : $textarea).focus();
+	
 	var val = $textarea.val();
 	var selection = ( $textareaEditor ? $textareaEditor : $textarea ).selection();
 
@@ -553,42 +565,41 @@
 		setSelectionRange($textarea[0], selectionStart, selectionStart + newString.length);
 		
 	} else if ($textareaEditor) {
-		var handle;
+		var handle = $textareaEditor.cursorLine();
+		var cursor = $textareaEditor.cursorPosition();
+		
 		if (blockLevel) {
-			handle = $textareaEditor.cursorLine();
 			selection = $textareaEditor.lineContent(handle);
 		}
 		
-		if (selection) {
-			var newString = '';
-			
-			if( perLine ) {
-				var lines = selection.split("\n");
-				for( k = 0; lines.length > k; ++k ) {
-					if( lines[k].length !== 0 ) {
-						newString += replaceString.replace(toBeReplaced, lines[k]);
-					}
-					if( k != lines.length - 1 ) {
-						newString += "\n";
-					}
+		var newString = '';
+		
+		if( perLine ) {
+			var lines = selection.split("\n");
+			for( k = 0; lines.length > k; ++k ) {
+				if( lines[k].length !== 0 ) {
+					newString += replaceString.replace(toBeReplaced, lines[k]);
 				}
-			} else {
-				if (replaceSelection) {
-					newString = replaceString;
-				} else if (replaceString.match(toBeReplaced)) {
-					newString = replaceString.replace(toBeReplaced, selection);
-				} else {
-					newString = replaceString + '\n' + selection;
+				if( k != lines.length - 1 ) {
+					newString += "\n";
 				}
 			}
-			
-			if (handle) {
-				$textareaEditor.setLineContent(handle, newString);
+		} else {
+			if (replaceSelection) {
+				newString = replaceString;
+			} else if (replaceString.match(toBeReplaced)) {
+				newString = replaceString.replace(toBeReplaced, selection);
 			} else {
-				$textareaEditor.replaceSelection(newString);
+				newString = replaceString + '\n' + selection;
 			}
+		}
+		
+		if (blockLevel) {
+			$textareaEditor.setLineContent(handle, newString);
+		} else if (handle) {
+			$textareaEditor.replaceSelection(newString);
 		} else {
-			$textareaEditor.setCode($textareaEditor.getCode() + replaceString);
+			$textareaEditor.insertIntoLine($textareaEditor.lastLine(), 'end', newString);
 		}
 	} else { // insert at caret
 		$textarea.val(val.substring(0, selectionStart)
@@ -1821,5 +1832,4 @@
 	} else {
 		return false;
 	}
-}
-
+}
\ No newline at end of file


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:[31909] branches/proposals/6.x

[<sylvieg@us...>]

Revision: 31909
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31909&view=rev
Author:   sylvieg
Date:     2011-01-14 18:27:58 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[bp/r31752][NEW] Preference to prevent from accessing the site outside HTTPS to prevent session hijack

Modified Paths:
--------------
    branches/proposals/6.x/lib/prefs/session.php
    branches/proposals/6.x/lib/setup/prefs.php
    branches/proposals/6.x/templates/tiki-admin_include_security.tpl
    branches/proposals/6.x/tiki-setup_base.php

Modified: branches/proposals/6.x/lib/prefs/session.php
===================================================================
--- branches/proposals/6.x/lib/prefs/session.php	2011-01-14 17:41:34 UTC (rev 31908)
+++ branches/proposals/6.x/lib/prefs/session.php	2011-01-14 18:27:58 UTC (rev 31909)
@@ -40,5 +40,11 @@
 			'perspective' => false,
 			'size' => 10,
 		),
+		'session_protected' => array(
+			'name' => tra('Protect all sessions'),
+			'description' => tra('Always redirect to HTTPS to prevent session hijack through network sniffing.'),
+			'type' => 'flag',
+			'perspective' => false,
+		),
 	);
 }

Modified: branches/proposals/6.x/lib/setup/prefs.php
===================================================================
--- branches/proposals/6.x/lib/setup/prefs.php	2011-01-14 17:41:34 UTC (rev 31908)
+++ branches/proposals/6.x/lib/setup/prefs.php	2011-01-14 18:27:58 UTC (rev 31909)
@@ -1566,6 +1566,7 @@
 		'session_lifetime' => 0,
 		'session_silent' => 'n',
 		'session_cookie_name' => session_name(),
+		'session_protected' => 'n',
 		'shoutbox_autolink' => 'n',
 		'show_comzone' => 'n',
 		'tikiIndex' => 'tiki-index.php',

Modified: branches/proposals/6.x/templates/tiki-admin_include_security.tpl
===================================================================
--- branches/proposals/6.x/templates/tiki-admin_include_security.tpl	2011-01-14 17:41:34 UTC (rev 31908)
+++ branches/proposals/6.x/templates/tiki-admin_include_security.tpl	2011-01-14 18:27:58 UTC (rev 31909)
@@ -19,6 +19,8 @@
 			{preference name=feature_htmlpurifier_output}
 			{preference name=menus_item_names_raw}
 			
+			{preference name=session_protected}
+
 			{tr}Please also see:{/tr} <a href="tiki-admin.php?page=login">{tr}HTTPS (SSL) and other login preferences{/tr}</a>
 			
 		<fieldset>

Modified: branches/proposals/6.x/tiki-setup_base.php
===================================================================
--- branches/proposals/6.x/tiki-setup_base.php	2011-01-14 17:41:34 UTC (rev 31908)
+++ branches/proposals/6.x/tiki-setup_base.php	2011-01-14 18:27:58 UTC (rev 31909)
@@ -45,6 +45,7 @@
 	'session_storage' => 'default',
 	'session_silent' => 'n',
 	'session_cookie_name' => session_name(),
+	'session_protected' => 'n',
 	'tiki_cdn' => '',
 	'tiki_cdn_ssl' => '',
 	'language' => 'en',
@@ -66,6 +67,11 @@
 	$tikilib->query('insert into `tiki_preferences`(`name`,`value`) values(?,?)', array('lastUpdatePrefs', 1));
 }
 
+if ($prefs['session_protected'] == 'y' && ! isset($_SERVER['HTTPS'])) {
+	header("Location: https://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";);
+	exit;
+}
+
 global $cachelib;
 require_once ('lib/cache/cachelib.php');
 global $logslib;


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:[31908] branches/proposals/6.x

[<sylvieg@us...>]

Revision: 31908
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31908&view=rev
Author:   sylvieg
Date:     2011-01-14 17:41:34 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[bp/r 31907][FIX]upgrade: incorporate the fix from http://tiki.org/ReleaseNotes40 about disable accounts as a potential checkbox

Modified Paths:
--------------
    branches/proposals/6.x/installer/tiki-installer.php
    branches/proposals/6.x/templates/tiki-install.tpl

Modified: branches/proposals/6.x/installer/tiki-installer.php
===================================================================
--- branches/proposals/6.x/installer/tiki-installer.php	2011-01-14 17:33:01 UTC (rev 31907)
+++ branches/proposals/6.x/installer/tiki-installer.php	2011-01-14 17:41:34 UTC (rev 31908)
@@ -386,6 +386,21 @@
 	}
 }
 
+/* possible error after upgrade 4 */
+function fix_disable_accounts() {
+	global $installer;
+	$installer->query('update `users_users` set `waiting`=NULL where `waiting` = ? and `valid` is NULL', array('a'));
+}
+function list_disable_accounts() {
+	global $installer;
+	$result = $installer->query('select `login` from `users_users` where `waiting` = ? and `valid` is NULL', array('a'));
+	$ret = array();
+	while ($res = $result->fetchRow()) {
+		$ret[] = $res['login'];
+	}
+	return $ret;
+}
+
 function initTikiDB( &$api, &$driver, $host, $user, $pass, $dbname, $client_charset, &$dbTiki ) {
 	global $tikifeedback;
 	$dbcon = false;
@@ -920,6 +935,10 @@
 	if( isset( $_REQUEST['admin_account'] ) && ! empty( $_REQUEST['admin_account'] ) ) {
 		fix_admin_account( $_REQUEST['admin_account'] );
 	}
+	if (isset($_REQUEST['fix_disable_accounts']) && $_REQUEST['fix_disable_accounts'] == 'on') {
+		$ret = fix_disable_accounts();
+	}
+	
 }
 
 
@@ -994,6 +1013,9 @@
 	$smarty->assign( 'database_charset', $value );
 	
 }
+if ($install_step == '6') {
+	$smarty->assign('disableAccounts', list_disable_accounts());
+}
 
 $mid_data = $smarty->fetch('tiki-install.tpl');
 $smarty->assign('mid_data', $mid_data);

Modified: branches/proposals/6.x/templates/tiki-install.tpl
===================================================================
--- branches/proposals/6.x/templates/tiki-install.tpl	2011-01-14 17:33:01 UTC (rev 31907)
+++ branches/proposals/6.x/templates/tiki-install.tpl	2011-01-14 17:41:34 UTC (rev 31908)
@@ -534,6 +534,18 @@
 			</ol>
 			<p><strong>{tr}To do so enter the name of the main admin account in the field below{/tr}</strong></p>
 			<p>Administrator account (optional): <input type="text" name="admin_account"/> <em>The default account is <strong>admin</strong></em></p>
+			{if !empty($disableAccounts)}
+				<hr />
+				<label for="fix_disable_accounts">{tr}Check this box if you have a lot of disabled accounts after an upgrade to tiki4.{/tr}</label>
+				<input type="checkbox" id="fix_disable_accounts" name="fix_disable_accounts" />
+				<br/>
+				{tr}List of accounts that will be enabled:{/tr}
+				<ul>
+				{foreach from=$disableAccounts item=account}
+						 <li>{$account}</li>
+				{/foreach}
+				</ul>
+			{/if}
 		</fieldset>
 	{/if}
 </div>


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:[31907] trunk

[<sylvieg@us...>]

Revision: 31907
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31907&view=rev
Author:   sylvieg
Date:     2011-01-14 17:33:01 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[FIX]upgrade: incorporate the fix from http://tiki.org/ReleaseNotes40 about disable accounts as a potential checkbox

Modified Paths:
--------------
    trunk/installer/tiki-installer.php
    trunk/templates/tiki-install.tpl

Modified: trunk/installer/tiki-installer.php
===================================================================
--- trunk/installer/tiki-installer.php	2011-01-14 16:53:43 UTC (rev 31906)
+++ trunk/installer/tiki-installer.php	2011-01-14 17:33:01 UTC (rev 31907)
@@ -388,6 +388,21 @@
 	}
 }
 
+/* possible error after upgrade 4 */
+function fix_disable_accounts() {
+	global $installer;
+	$installer->query('update `users_users` set `waiting`=NULL where `waiting` = ? and `valid` is NULL', array('a'));
+}
+function list_disable_accounts() {
+	global $installer;
+	$result = $installer->query('select `login` from `users_users` where `waiting` = ? and `valid` is NULL', array('a'));
+	$ret = array();
+	while ($res = $result->fetchRow()) {
+		$ret[] = $res['login'];
+	}
+	return $ret;
+}
+
 function initTikiDB( &$api, &$driver, $host, $user, $pass, $dbname, $client_charset, &$dbTiki ) {
 	global $tikifeedback;
 	$dbcon = false;
@@ -931,6 +946,10 @@
 	if( isset( $_REQUEST['admin_account'] ) && ! empty( $_REQUEST['admin_account'] ) ) {
 		fix_admin_account( $_REQUEST['admin_account'] );
 	}
+	if (isset($_REQUEST['fix_disable_accounts']) && $_REQUEST['fix_disable_accounts'] == 'on') {
+		$ret = fix_disable_accounts();
+	}
+	
 }
 
 
@@ -1005,6 +1024,9 @@
 	$smarty->assign( 'database_charset', $value );
 	
 }
+if ($install_step == '6') {
+	$smarty->assign('disableAccounts', list_disable_accounts());
+}
 
 $mid_data = $smarty->fetch('tiki-install.tpl');
 $smarty->assign('mid_data', $mid_data);

Modified: trunk/templates/tiki-install.tpl
===================================================================
--- trunk/templates/tiki-install.tpl	2011-01-14 16:53:43 UTC (rev 31906)
+++ trunk/templates/tiki-install.tpl	2011-01-14 17:33:01 UTC (rev 31907)
@@ -534,6 +534,18 @@
 			</ol>
 			<p><strong>{tr}To do so enter the name of the main admin account in the field below{/tr}</strong></p>
 			<p>Administrator account (optional): <input type="text" name="admin_account"/> <em>The default account is <strong>admin</strong></em></p>
+			{if !empty($disableAccounts)}
+				<hr />
+				<label for="fix_disable_accounts">{tr}Check this box if you have a lot of disabled accounts after an upgrade to tiki4.{/tr}</label>
+				<input type="checkbox" id="fix_disable_accounts" name="fix_disable_accounts" />
+				<br/>
+				{tr}List of accounts that will be enabled:{/tr}
+				<ul>
+				{foreach from=$disableAccounts item=account}
+						 <li>{$account}</li>
+				{/foreach}
+				</ul>
+			{/if}
 		</fieldset>
 	{/if}
 </div>


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:[31906] branches/experimental/xajax_removal

[<jonnybradley@us...>]

Revision: 31906
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31906&view=rev
Author:   jonnybradley
Date:     2011-01-14 16:53:43 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[MRG] Automatic merge, trunk 31889 to 31900

Modified Paths:
--------------
    branches/experimental/xajax_removal/_htaccess
    branches/experimental/xajax_removal/lang/fr/language.php
    branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php
    branches/experimental/xajax_removal/lib/tikiaccesslib.php
    branches/experimental/xajax_removal/tiki-edit_article.php
    branches/experimental/xajax_removal/tiki-read_article.php

Property Changed:
----------------
    branches/experimental/xajax_removal/


Property changes on: branches/experimental/xajax_removal
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/proposals/4.x:24005
/trunk:31321-31557,31674-31889
   + /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/proposals/4.x:24005
/trunk:31321-31557,31674-31900

Modified: branches/experimental/xajax_removal/_htaccess
===================================================================
--- branches/experimental/xajax_removal/_htaccess	2011-01-14 16:50:17 UTC (rev 31905)
+++ branches/experimental/xajax_removal/_htaccess	2011-01-14 16:53:43 UTC (rev 31906)
@@ -163,6 +163,9 @@
 # increase memory
 #php_value memory_limit 128M
 
+# increase execution time (default value in apache use to be 30, and in some cases of long wiki pages with many plugins it may take longer)
+#php_value max_execution_time 90
+
 # In some cases you may see open_basedir warnings about Smarty accessing php files that it shouldn't
 # The following line (uncommented) will reset the include path to use only Tiki's files which will solve this in most cases
 #php_value include_path "." 

Modified: branches/experimental/xajax_removal/lang/fr/language.php
===================================================================
--- branches/experimental/xajax_removal/lang/fr/language.php	2011-01-14 16:50:17 UTC (rev 31905)
+++ branches/experimental/xajax_removal/lang/fr/language.php	2011-01-14 16:53:43 UTC (rev 31906)
@@ -2239,7 +2239,7 @@
 "To use <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">phplayersmenu</a>;, you can use one of the three following syntaxes" => "Pour utiliser <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">phplayersmenu</a>;, vous pouvez utiliser l'une des trois syntaxes suivantes",
 "To use a menu in a tiki format" => "Pour utiliser un menu dans un format tiki",
 "To use custom folder icons in menus, enter the path to the icon for the <strong>closed</strong> folder" => "Pour utiliser une icône personnalisée pour les répertoires, spécifier le chemin de l'icône pour un répertoire <strong>fermé</strong>",
-"To use feeds in a text area (Wiki page, etc), a <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">module</a> or a template, use {literal}{rss id=x}{/literal}, where x is the ID of the feed" => "Pour utiliser des flux RSS externe dans une zone de texte ( Page Wiki, etc), dans un <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">module</a> ou dans un gabarit, utiliser la syntaxe {literal}{rss id=x}{/literal}, où x est l'ID du flux",
+"To use feeds in a text area (Wiki page, etc), a <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">module</a> or a template, use {literal}{rss id=x}{/literal}, where x is the ID of the feed" => "Pour utiliser des flux RSS externes dans une zone de texte ( Page Wiki, etc), dans un <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">module</a> ou dans un gabarit, utiliser la syntaxe {literal}{rss id=x}{/literal}, où x est l'ID du flux",
 "To use Google Maps, you must generate a Google Maps API Key for your web site. See <a href=\"http://www.google.com/apis/maps/signup.html\">http://www.google.com/apis/maps/signup.html</a>; for details" => "To use Google Maps, you must generate a Google Maps API Key for your web site. See <a href=\"http://www.google.com/apis/maps/signup.html\">http://www.google.com/apis/maps/signup.html</a>; for details",
 "To use menu in a css/suckerfish format" => "Pour utiliser un menu dans un format css/suckerfish",
 "To use menus in a <a href=\"tiki-admin_modules.php\">module</a>, <a href=\"tiki-admin.php?page=look\">Look and Feel</a> or a template, use {literal}{menu id=x}{/literal}, where x is the ID of the menu" => "Pour utiliser les menus dans un <a href=\"tiki-admin_modules.php\">module</a>, <a href=\"tiki-admin.php?page=look\">Thème et apparence</a> ou un modèle, utilisez {literal}{menu id=x}{/literal}, où x est l'identifiant du menu",
@@ -2954,7 +2954,7 @@
 "CSS class to apply to the heading row" => "Classe CSS à appliquer à la ligne d'en-tête",
 "These features generally work but will probably be phased out in the future, because they are superseded by other features or because of evolution in Web technology" => "Ces fonctionnalités fonctionnent en général mais vont probablement être progressivement supprimés car elles sont remplacés par d'autres fonctionnalités ou à cause des évolutions des technologies WEB",
 "These features are generally known to have issues, and/or need admin help and/or user patience to work" => "Ces fonctionnalités sont, en générale, connues pour avoir des problèmes, et/oui nécessite l'aide d'un administrateur et/ou de la patience pour fonctionner",
-"External Feeds" => "Flux RSS externe",
+"External Feeds" => "Flux RSS externes",
 "Edit Account Settings" => "Modifier les paramètres du compte",
 "A new install will populate the database" => "Une nouvelle installation va peupler la base de données",
 "Complete these fields to configure common, general settings for your site" => "Complétez ces champs pour configurer les paramètres généraux et communs pour votre site",
@@ -11732,8 +11732,8 @@
 "Profile tester" => "Testeur de profil",
 "Global configuration" => "Configuration globale",
 "Cache duration" => "Durée du cache",
-"Use this page to configure the feeds generated by Tiki. To syndicate feeds from other sites, use the <strong>Admin</strong> &gt; <strong>External Feeds</strong> menu option, or" => "Utiliser cette page pour configurer les flux RSS générés pas Tiki. Pour syndiquer des flux RSS d'autres sites, utiliser <strong>Admin</strong> &gt; <strong>Flus RSS externe</strong>, ou",
-"External feeds" => "Flux RSS externe",
+"Use this page to configure the feeds generated by Tiki. To syndicate feeds from other sites, use the <strong>Admin</strong> &gt; <strong>External Feeds</strong> menu option, or" => "Utiliser cette page pour configurer les flux RSS générés pas Tiki. Pour syndiquer des flux d'autres sites, utiliser <strong>Admin</strong> &gt; <strong>Flus RSS externe</strong>, ou",
+"External feeds" => "Flux externes",
 "Specification" => "Spécification",
 "Enabling caching will override existing permissions - all content will be public. Enable this option <strong>only</strong> if your syndicated content should be public." => "Activer la mise en antémémoire (caching) va passer outre aux permissions existantes - Tout le contenu sera public. N'activer cette option <strong>que</strong> si votre contenu syndiqué peut être public.",
 "Feed for articles" => "Canaux de syndication des articles",
@@ -12094,7 +12094,7 @@
 "Add poll to pages" => "Ajouter un sondage à des pages",
 "Wiki pages" => "Pages Wiki",
 "Lock the pages" => "Verrouiller les pages",
-"Admin External Feeds" => "Administrer les flux externe (RSS)",
+"Admin External Feeds" => "Administrer les flux externes",
 "Tips" => "Astuces",
 "Content for the feed" => "Affichage du canal",
 "Publish in the future" => "Publier plus tard",

Modified: branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php
===================================================================
--- branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php	2011-01-14 16:50:17 UTC (rev 31905)
+++ branches/experimental/xajax_removal/lib/smarty_tiki/function.menu.php	2011-01-14 16:53:43 UTC (rev 31906)
@@ -91,7 +91,7 @@
 	$data = $smarty->fetch($tpl);
 	$data = preg_replace('/<ul>\s*<\/ul>/', '', $data);
 	$data = preg_replace('/<ol>\s*<\/ol>/', '', $data);
-	return '<div class="role_navigation">' . $data . '</div>';
+	return '<nav class="role_navigation">' . $data . '</nav>';
 }
 
 function compare_menu_options($a, $b) { return strcmp(tra($a['name']), tra($b['name'])); }

Modified: branches/experimental/xajax_removal/lib/tikiaccesslib.php
===================================================================
--- branches/experimental/xajax_removal/lib/tikiaccesslib.php	2011-01-14 16:50:17 UTC (rev 31905)
+++ branches/experimental/xajax_removal/lib/tikiaccesslib.php	2011-01-14 16:53:43 UTC (rev 31906)
@@ -115,6 +115,7 @@
 			if ($$permission != 'y') {
 				if ($permission_name) { $permission = $permission_name; }
 				$this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false);
+				if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];
 			}
 		}
 	}

Modified: branches/experimental/xajax_removal/tiki-edit_article.php
===================================================================
--- branches/experimental/xajax_removal/tiki-edit_article.php	2011-01-14 16:50:17 UTC (rev 31905)
+++ branches/experimental/xajax_removal/tiki-edit_article.php	2011-01-14 16:53:43 UTC (rev 31906)
@@ -24,16 +24,35 @@
 	}
 }
 
-if (isset($_REQUEST["articleId"])) {
-	$articleId = $_REQUEST["articleId"];
+if (!empty($_REQUEST['articleId'])) {
+	$articleId = $_REQUEST['articleId'];
+	$article_data = $artlib->get_article($_REQUEST['articleId']);
+	if ($article_data === false) {
+		$smarty->assign('errortype', 401);
+		$smarty->assign('msg', tra('Permission denied'));
+		$smarty->display('error.tpl');
+		die;
+	}
+
+	if (!$article_data) {
+		$smarty->assign('msg', tra("Article not found"));
+		$smarty->display("error.tpl");
+		die;
+	}
 } else {
 	$articleId = 0;
 }
 
-if (isset($_REQUEST['cancel_edit']) && $articleId) {
-	header ("location: tiki-read_article.php?articleId=$articleId");
+if (isset($_REQUEST['cancel_edit'])) {
+	if (empty($articleId)) {
+		header('localtion: tiki-view_articles.php');
+		die;
+	}
+	include_once('tiki-sefurl.php');
+	header ('location: '.filter_out_sefurl("tiki-read_article.php?articleId=$articleId", $smarty, 'article', $artice_data['title']));
 	die;
 }
+
 // We need separate numbering of previews, since we access preview images by this number
 if (isset($_REQUEST["previewId"])) {
 	$previewId = $_REQUEST["previewId"];
@@ -89,20 +108,7 @@
 // GGG - You have to check for the actual value of the articleId because it
 //  will be 0 when you select preview while creating a new article.
 if (isset($_REQUEST["articleId"]) and $_REQUEST["articleId"] > 0) {
-	$article_data = $artlib->get_article($_REQUEST["articleId"]);
-	if ($article_data === false) {
-		$smarty->assign('errortype', 401);
-		$smarty->assign('msg', tra('Permission denied'));
-		$smarty->display('error.tpl');
-		die;
-	}
 
-	if (!$article_data) {
-		$smarty->assign('msg', tra("Article not found"));
-		$smarty->display("error.tpl");
-		die;
-	}
-
 		$cat_lang = $article_data["lang"];
 	$publishDate = $article_data["publishDate"];
 	$expireDate = $article_data["expireDate"];
@@ -406,8 +412,8 @@
 		$ispublished = 'y';
 	else
 		$ispublished = 'n';
-		
-	$artid = $artlib->replace_article(strip_tags($_REQUEST["title"], '<a><pre><p><img><hr><b><i>')
+	$_REQUEST['title'] = strip_tags($_REQUEST["title"], '<a><pre><p><img><hr><b><i>');
+	$artid = $artlib->replace_article($_REQUEST['title']
 																	, $_REQUEST["authorName"]
 																		, $_REQUEST["topicId"]
 																		, $useImage
@@ -436,7 +442,6 @@
 																		, $_REQUEST['list_image_x']
 																		, $ispublished
 																		);
-
 	$cat_type = 'article';
 	$cat_objid = $artid;
 	$cat_desc = substr($_REQUEST["heading"], 0, 200);
@@ -465,7 +470,8 @@
 	// Remove preview cache because it won't be used any more
 	@$artlib->delete_image_cache("preview",$previewId);
 
-	header ("location: tiki-read_article.php?articleId=$artid");
+	include_once('tiki-sefurl.php');
+	header ('location: '.	filter_out_sefurl("tiki-read_article.php?articleId=$artid", $smarty, 'article', $_REQUEST['title']));
 }
 $smarty->assign_by_ref('errors', $errors);
 

Modified: branches/experimental/xajax_removal/tiki-read_article.php
===================================================================
--- branches/experimental/xajax_removal/tiki-read_article.php	2011-01-14 16:50:17 UTC (rev 31905)
+++ branches/experimental/xajax_removal/tiki-read_article.php	2011-01-14 16:53:43 UTC (rev 31906)
@@ -17,6 +17,7 @@
 $article_data = $artlib->get_article($_REQUEST["articleId"]);
 $tikilib->get_perm_object($_REQUEST['articleId'], 'article');
 if ($article_data === false) {
+	if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];
 	$smarty->assign('errortype', 401);
 	$smarty->assign('msg', tra('Permission denied'));
 	$smarty->display('error.tpl');


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:[31905] branches/experimental/xajax_removal

[<jonnybradley@us...>]

Revision: 31905
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31905&view=rev
Author:   jonnybradley
Date:     2011-01-14 16:50:17 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[ENH] modules revamp: Drag zone to zone working. Absolute positioned top & bottom modules now draggable (double click to save). Various other fixes.

Modified Paths:
--------------
    branches/experimental/xajax_removal/lib/modules/modlib.php
    branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
    branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl

Modified: branches/experimental/xajax_removal/lib/modules/modlib.php
===================================================================
--- branches/experimental/xajax_removal/lib/modules/modlib.php	2011-01-14 01:15:36 UTC (rev 31904)
+++ branches/experimental/xajax_removal/lib/modules/modlib.php	2011-01-14 16:50:17 UTC (rev 31905)
@@ -136,7 +136,7 @@
 	function reorder_modules($module_order) {
 		global $user;
 		$all_modules = $this->get_modules_for_user($user, $this->module_zones);
-		$section_map = array('modules_top' => 't', 'modules_left' => 'l', 'modules_right' => 'r', 'modules_bottom' => 'b', 'modules_pagetop' => 't2', 'modules_pagebottom' => 'b2' );
+		$section_map = array('top_modules' => 't', 'left_modules' => 'l', 'right_modules' => 'r', 'bottom_modules' => 'b', 'pagetop_modules' => '1', 'pagebottom_modules' => '2' );
 		$bindvars = array();
 		$query = '';
 		foreach ($module_order as $zone => $contents) {
@@ -145,10 +145,12 @@
     			$i = $index;
     			preg_match('/\d+$/', $module, $m);
     			if (count($m)) {
-    				$m = $m[0];
-	    			if ($all_modules[$zone][$index]['moduleId'] != $m || $all_modules[$zone][$index]['ord'] != $index + 1) {
-	    				$query .= 'UPDATE `tiki_modules` SET `ord`=? WHERE `moduleId`=?;';
+    				$m = (int) $m[0];
+    				//$module_order->$zone[$index] = $m;	// store as into for next bit
+	    			if ($all_modules[$zone][$index]['moduleId'] != $m || ($all_modules[$zone][$index]['ord'] != $index + 1 || $all_modules[$zone][$index]['position'] != $section_initial)) {
+	    				$query .= 'UPDATE `tiki_modules` SET `ord`=?, `position`=? WHERE `moduleId`=?;';
 						$bindvars[] = (int) $index + 1;
+						$bindvars[] = $section_initial;
 						$bindvars[] = (int) $m;
 	    			}
     			}

Modified: branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
===================================================================
--- branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 01:15:36 UTC (rev 31904)
+++ branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 16:50:17 UTC (rev 31905)
@@ -4,15 +4,24 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id: $
 
-$(".module", "#top_modules").each(function() {
-	if ($(this).css("position") === "absolute" || $(this).css("position") === "static") {
-		$(this).draggable({ connectToSortable: ".modules" });
+// drag & drop ones first
+var dragZonesSelector = "#top_modules, #bottom_modules";
+$(dragZonesSelector).droppable({});
+$(".module", dragZonesSelector).each(function() {
+	if ($(this).css("position") === "absolute") {
+		$(this).draggable({
+			connectToSortable: ".modules"
+		}).mouseover(function(event, ui) {	// sortable gets muddled when dragging so disable it
+				$(dragZonesSelector).sortable("option", "disabled", true);
+		}).mouseout(function(event, ui) {
+				$(dragZonesSelector).sortable("option", "disabled", false);
+		});
 	}
 });
 
-$(".modules:not(#top_modules)").sortable( {	//:not(#top_modules)
+$(".modules").sortable( {
 	connectWith: ".modules",
-	items: "div.module",
+	items: ".module:not('.ui-draggable')",
 	forcePlaceholderSize: true,
 	forceHelperSize: true,
 	placeholder: "module-placeholder",
@@ -26,14 +35,24 @@
 		$("#save_modules").show();
 	}
 });
-$(".module").dblclick(function () { showModuleEditForm(this); });
 
+// disable all links in modules apart from app menu
+$(".module:not(.box-ApplicationMenu)").dblclick(function () { showModuleEditForm(this); })
+	.find("a, input").click( function (event) {
+		event.stopImmediatePropagation();
+		return false;
+	});
+
+
+// source list of all modules
 $("#module_list").sortable({
 	connectWith: ".modules",
 	items: "tr",
 	forcePlaceholderSize: true,
 	forceHelperSize: true,
 	placeholder: "module-placeholder",
+	helper: "clone",
+	revert: true,
 	stop: function (event, ui) {
 		//$("#save_modules *").show("fast");
 		var dropped = $("tr:first", ".modules");
@@ -81,10 +100,12 @@
 		if (modId) {
 			modId = modId[0];
 			var id = $("div:first", item).attr("id");
-			modPos = id.match(/.\d+$/);
-			if (modPos) {
-				modOrd = modPos[0].substring( 1, modPos[0].length);
-				modPos = modPos[0].substring( 0, 1);
+			if (id) {
+				modPos = id.match(/.\d+$/);
+				if (modPos) {
+					modOrd = modPos[0].substring(1, modPos[0].length);
+					modPos = modPos[0].substring(0, 1);
+				}
 			}
 			modStyle = $(item).attr("style");
 			if (modStyle && !modStyle.match("absolute")) {
@@ -108,14 +129,14 @@
 		assign_name: modName,
 		moduleId: modId,
 		assign_position: modPos,
-		assign_order: modOrd,
-		preview: true
+		assign_order: modOrd
+		//preview: true
 	};
 	if (item) {
 		postData.edit_assign = modId;
-		postData.assign_params = { style: modStyle };
+		//postData.assign_params = { style: modStyle };
 	} else {
-//		postData.preview = true;
+		postData.preview = true;
 	}
 	
 	$.post("tiki-admin_modules.php", postData, function(data) {
@@ -125,8 +146,12 @@
 					.dialog( "option", "position", 'center' )
 					.find("table input[type='submit']").hide();
 			if (options && options.nobox) {
-				$('input[name*=nobox]').val("y")
+				$('input[name*=nobox]').val("y");
 			}
+			if (modStyle) {
+				// preload style field with style if position:absolute (unnecessary spaces removed)
+				$('input[name*=style]').val(modStyle.replace(/\:\s*/g, ":").replace(/\;\s*/g, ";"));
+			}
 			ajaxLoadingHide();
 		},
 	"html");

Modified: branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 01:15:36 UTC (rev 31904)
+++ branches/experimental/xajax_removal/templates/tiki-admin_modules.tpl	2011-01-14 16:50:17 UTC (rev 31905)
@@ -505,6 +505,7 @@
 
 {tab name="{tr}All Modules{/tr}"}
 	<div style="height:400px;overflow:auto;">
+		{listfilter selectors='#module_list tr'}
 		<table class="formcolor" id="module_list">
 			{foreach key=name item=info from=$all_modules_info}
 				<tr>


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

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31899] branches/proposals/6.x

[Stephane Casset <sept@lo...>]

Le Thu, Jan 13, 2011 at 07:25:33PM +0000, sylvieg@... écrivait :
> Revision: 31899
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31899&view=rev
> Author:   sylvieg
> Date:     2011-01-13 19:25:33 +0000 (Thu, 13 Jan 2011)
> 
> Log Message:
> -----------
> [bp/r31898][FIX]permission: when permission when not log-in, encourage
> to come back to the page where the error occurs

+1

> Modified Paths:
> --------------
>     branches/proposals/6.x/lib/tikiaccesslib.php
>     branches/proposals/6.x/tiki-read_article.php
> 
> Modified: branches/proposals/6.x/lib/tikiaccesslib.php
> ===================================================================
> --- branches/proposals/6.x/lib/tikiaccesslib.php	2011-01-13 19:19:16 UTC (rev 31898)
> +++ branches/proposals/6.x/lib/tikiaccesslib.php	2011-01-13 19:25:33 UTC (rev 31899)
> @@ -115,6 +115,7 @@
>  			if ($$permission != 'y') {
>  				if ($permission_name) { $permission = $permission_name; }
>  				$this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false);
> +				if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];
>  			}
>  		}
>  	}
> 
> Modified: branches/proposals/6.x/tiki-read_article.php
> ===================================================================
> --- branches/proposals/6.x/tiki-read_article.php	2011-01-13 19:19:16 UTC (rev 31898)
> +++ branches/proposals/6.x/tiki-read_article.php	2011-01-13 19:25:33 UTC (rev 31899)
> @@ -17,6 +17,7 @@
>  $article_data = $artlib->get_article($_REQUEST["articleId"]);
>  $tikilib->get_perm_object($_REQUEST['articleId'], 'article');
>  if ($article_data === false) {
> +	if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];
>  	$smarty->assign('errortype', 401);
>  	$smarty->assign('msg', tra('Permission denied'));
>  	$smarty->display('error.tpl');
> 
> 

A+
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           casset@...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31894] branches/proposals/6.x/_htaccess

[Stephane Casset <sept@lo...>]

Le Thu, Jan 13, 2011 at 12:38:31PM +0000, xavidp@... écrivait :
> Revision: 31894
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31894&view=rev
> Author:   xavidp
> Date:     2011-01-13 12:38:31 +0000 (Thu, 13 Jan 2011)
> 
> Log Message:
> -----------
> [ENH][bp/r31893]Added param to increase php_value mac_execution_time
> (commented out by default)

+1, should be on doc.tiki.org too

> Modified Paths:
> --------------
>     branches/proposals/6.x/_htaccess
> 
> Modified: branches/proposals/6.x/_htaccess
> ===================================================================
> --- branches/proposals/6.x/_htaccess	2011-01-13 12:35:12 UTC (rev 31893)
> +++ branches/proposals/6.x/_htaccess	2011-01-13 12:38:31 UTC (rev 31894)
> @@ -165,6 +165,9 @@
>  # increase memory
>  #php_value memory_limit 128M
>  
> +# increase execution time (default value in apache use to be 30, and in some cases of long wiki pages with many plugins it may take longer)
> +#php_value max_execution_time 90
> +
>  # In some cases you may see open_basedir warnings about Smarty accessing php files that it shouldn't
>  # The following line (uncommented) will reset the include path to use only Tiki's files which will solve this in most cases
>  #php_value include_path "." 
> 
> 

A+
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           casset@...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31888] branches/proposals/6.x/templates

[Stephane Casset <sept@lo...>]

Le Thu, Jan 13, 2011 at 02:13:26AM +0000, chibaguy@... écrivait :
> Revision: 31888
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31888&view=rev
> Author:   chibaguy
> Date:     2011-01-13 02:13:26 +0000 (Thu, 13 Jan 2011)
> 
> Log Message:
> -----------
> [bp/r31887][FIX] Slash missing from self-closed element (<br />) -
> validation error.

+1

> Modified Paths:
> --------------
>     branches/proposals/6.x/templates/mail/report.tpl
>     branches/proposals/6.x/templates/modules/mod-terminology.tpl
>     branches/proposals/6.x/templates/styles/darkshine/tiki.tpl
>     branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl
>     branches/proposals/6.x/templates/tiki-listpages_content.tpl
>     branches/proposals/6.x/templates/tiki-view_tracker_item.tpl
>     branches/proposals/6.x/templates/tracker_item_field_input.tpl
> 
> Modified: branches/proposals/6.x/templates/mail/report.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/mail/report.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/mail/report.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -1,11 +1,11 @@
>  {tr}Report for{/tr} {$report_user}.{if $report_preferences.type eq 'plain'}
>  
> -{else}<br>{/if}
> +{else}<br />{/if}
>  {tr}Last Report sent on{/tr} {$report_last_report_date}.{if $report_preferences.type eq 'plain'}
>  
>  
> -{else}<br><br>{/if}
> -{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br>{else}
> +{else}<br /><br />{/if}
> +{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br />{else}
>  
>  -----------------------
>  
> 
> Modified: branches/proposals/6.x/templates/modules/mod-terminology.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/modules/mod-terminology.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/modules/mod-terminology.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -1,6 +1,6 @@
>  {tikimodule title=$tpl_module_title name="terminology flip=$module_params.flip decorations=$module_params.decorations}
>    <div align="left">
> -    <b>{tr}Find term:{/tr}</b><br>
> +    <b>{tr}Find term:{/tr}</b><br />
>  	<div id="mod-search_wiki_pager1" style="display: block" class="clearfix box-data">
>        <form class="forms" method="post" action="tiki-listpages.php">
>        	{if $term_root_category_id != ''}
> 
> Modified: branches/proposals/6.x/templates/styles/darkshine/tiki.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/styles/darkshine/tiki.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/styles/darkshine/tiki.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -95,8 +95,8 @@
>  									{tr}The following modules could not be loaded{/tr}
>  									<p>
>  									{foreach from=$module_pref_errors key=index item=pref_error}
> -									<b>{$pref_error.mod_name}:</b><br>
> -									{tr}Preference was not set{/tr}: '{$pref_error.pref_name}'<br>
> +									<b>{$pref_error.mod_name}:</b><br />
> +									{tr}Preference was not set{/tr}: '{$pref_error.pref_name}'<br />
>  									{/foreach}
>  								{/remarksbox}
>  							{/if}
> 
> Modified: branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -16,7 +16,7 @@
>  	<td>Description</td><td><input name="playlist_description" /></td>
>  </tr>
>  </table>
> -<br>
> +<br />
>  <input type="hidden" name="playlistId" value="0">
>  <input type="submit" name="action" value="Create">
>  </form>
> @@ -29,9 +29,9 @@
>  {assign var=cant value=$kmixlist->totalCount}
>  
>  <form name="list" action="tiki-list_kaltura_playlists.php?type=mix&action=add_entries&playlistId={$playlistId}" method="post">
> -<br>
> +<br />
>  {include file="tiki-list_kaltura_mix_entries.tpl"}
> -<br>
> +<br />
>  <input type="hidden" name="playlistId" value="{$playlistId}">
>  <input type="hidden" name="action" value="add_entries">
>  <input type="hidden" name="type" value="mix">
> @@ -42,12 +42,12 @@
>  {else}
>  {title}Create Kaltura Playlist: Add Media Entries{/title}
>  {button _text="{tr}Mix Entries{/tr}" href="tiki-list_kaltura_playlists.php?type=mix&action=add_entries&playlistId=$playlistId" }
> -<br><br>
> +<br /><br />
>  {assign var=klist value=$kmedialist->objects}
>  {assign var=cant value=$kmedialist->totalCount}
>  <form action="tiki-list_kaltura_playlists.php?type=media&action=add_entries&playlistId={$playlistId}" method="post" >
>  {include file="tiki-list_kaltura_media_entries.tpl"}
> -<br>
> +<br />
>  <input type="hidden" name="playlistId" value="{$playlistId}">
>  <input type="hidden" name="action" value="add_entries">
>  <input type="hidden" name="type" value="media">
> @@ -69,7 +69,7 @@
>  <param name="flashvars" value="layoutId=playlistLight&uid=0&partner_id=23929&subp_id=2392900&k_pl_autoContinue=true&k_pl_autoInsertMedia=true&k_pl_0_name={$kplaylist->name}&k_pl_0_url=http%3A%2F%2Fwww.kaltura.com%2Findex.php%2Fpartnerservices2%2Fexecuteplaylist%3Fuid%3D%26partner_id%3D23929%26subp_id%3D2392900%26format%3D8%26ks%3D%7Bks%7D%26playlist_id%3D{$kplaylist->id}"/></object>
>  </td></tr>
>  <tr><td>
> -<br>
> +<br />
>  <table class="normal">
>  <tr><td width="200" class="even">Name </td><td class="even">{$kplaylist->name}</td></tr>
>  <tr><td width="200" class="odd">Description </td><td class="odd">{$kplaylist->description}</td></tr>
> @@ -90,8 +90,8 @@
>  {button _text="{tr}Media Entries{/tr}" href="tiki-list_kaltura_entries2.php?list=media&view=browse" }
>  <input type="submit" name="action" value="Create Playlist"/> 
>  <input type="submit" name="action" value="Delete"/>
> -<br>
> -<br>
> +<br />
> +<br />
>  <table class="normal">
>  		<tr>
>  			<th width="20">&nbsp;</th>
> 
> Modified: branches/proposals/6.x/templates/tiki-listpages_content.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tiki-listpages_content.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tiki-listpages_content.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -332,7 +332,7 @@
>  		<tr>
>  			<td colspan="{$cntcol}" class="odd">
>  				<b>{tr}No pages found{/tr}{if $find ne ''} {tr}with{/tr} &quot;{$find|escape}&quot;{/if}{if $initial ne ''}{tr} {if $find ne ''}and {/if}starting with{/tr} &quot;{$initial}&quot;{/if}.</b>
> -				{if $aliases_were_found == 'y'}<br><b>{tr}However, some page aliases fitting the query were found (see Aliases section above).{/tr}</b>{/if}
> +				{if $aliases_were_found == 'y'}<br /><b>{tr}However, some page aliases fitting the query were found (see Aliases section above).{/tr}</b>{/if}
>  			</td>
>  		</tr>
>  	{/section}
> 
> Modified: branches/proposals/6.x/templates/tiki-view_tracker_item.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tiki-view_tracker_item.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tiki-view_tracker_item.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -107,13 +107,13 @@
>  {if $tracker_info.showCreatedView eq 'y'}
>  	<tr>
>  		<td class="formlabel">{tr}Created{/tr}</td>
> -		<td colspan="3" class="formcontent">{$info.created|tiki_long_datetime}{if $tracker_info.showCreatedBy eq 'y'}<br>by {if $prefs.user_show_realnames eq 'y'}{if empty($info.createdBy)}Unknown{else}{$info.createdBy|username}{/if}{else}{if empty($info.createdBy)}Unknown{else}{$info.createdBy}{/if}{/if}{/if}</td>
> +		<td colspan="3" class="formcontent">{$info.created|tiki_long_datetime}{if $tracker_info.showCreatedBy eq 'y'}<br />by {if $prefs.user_show_realnames eq 'y'}{if empty($info.createdBy)}Unknown{else}{$info.createdBy|username}{/if}{else}{if empty($info.createdBy)}Unknown{else}{$info.createdBy}{/if}{/if}{/if}</td>
>  	</tr>
>  {/if}
>  {if $tracker_info.showLastModifView eq 'y'}
>  	<tr>
>  		<td class="formlabel">{tr}LastModif{/tr}</td>
> -		<td colspan="3" class="formcontent">{$info.lastModif|tiki_long_datetime}{if $tracker_info.showLastModifBy eq 'y'}<br>by {if $prefs.user_show_realnames eq 'y'}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy|username}{/if}{else}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy}{/if}{/if}{/if}</td>
> +		<td colspan="3" class="formcontent">{$info.lastModif|tiki_long_datetime}{if $tracker_info.showLastModifBy eq 'y'}<br />by {if $prefs.user_show_realnames eq 'y'}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy|username}{/if}{else}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy}{/if}{/if}{/if}</td>
>  	</tr>
>  {/if}
>  </table>
> 
> Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/tracker_item_field_input.tpl	2011-01-13 01:57:17 UTC (rev 31887)
> +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl	2011-01-13 02:13:26 UTC (rev 31888)
> @@ -380,7 +380,7 @@
>  {elseif $field_value.type eq 'R'}
>  	{section name=jx loop=$field_value.options_array}
>  		{if $smarty.section.jx.first}
> -			{if $field_value.options_array[jx] eq '<br>' or $field_value.options_array[jx] eq '<br />'}
> +			{if $field_value.options_array[jx] eq '<br />' or $field_value.options_array[jx] eq '<br />'}
>  				{assign var=sepR value='<br />'}
>  			{else}
>  				{assign var=sepR value=' '}
> 
> 

A+
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           casset@...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31886] branches/proposals/6.x/templates/modules/ mod-translation.tpl

[Stephane Casset <sept@lo...>]

Le Thu, Jan 13, 2011 at 01:47:16AM +0000, chibaguy@... écrivait :
> Revision: 31886
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31886&view=rev
> Author:   chibaguy
> Date:     2011-01-13 01:47:16 +0000 (Thu, 13 Jan 2011)
> 
> Log Message:
> -----------
> [bp/r31885][FIX] Slash missing from self-closed element (<br />).
> (This was the only XHTML 1.0 Transitional validation error at
> t.o/tiki-index.php.)

+1

> Modified Paths:
> --------------
>     branches/proposals/6.x/templates/modules/mod-translation.tpl
> 
> Modified: branches/proposals/6.x/templates/modules/mod-translation.tpl
> ===================================================================
> --- branches/proposals/6.x/templates/modules/mod-translation.tpl	2011-01-13 01:43:50 UTC (rev 31885)
> +++ branches/proposals/6.x/templates/modules/mod-translation.tpl	2011-01-13 01:47:16 UTC (rev 31886)
> @@ -114,7 +114,7 @@
>  						{/foreach}
>  					</ul>
>  					{/if}
> -				</div><br>
> +				</div><br />
>  			{/if}
>  		
>  	{/tikimodule}
> 
> 

A+
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           casset@...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31904] branches/experimental/xajax_removal/lib/ modules/tiki-admin_modules.js

[<jonnybradley@us...>]

Revision: 31904
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31904&view=rev
Author:   jonnybradley
Date:     2011-01-14 01:15:36 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
modules revamp: draggable modules (unfinshed)

Modified Paths:
--------------
    branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js

Modified: branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js
===================================================================
--- branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 01:14:38 UTC (rev 31903)
+++ branches/experimental/xajax_removal/lib/modules/tiki-admin_modules.js	2011-01-14 01:15:36 UTC (rev 31904)
@@ -4,8 +4,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id: $
 
+$(".module", "#top_modules").each(function() {
+	if ($(this).css("position") === "absolute" || $(this).css("position") === "static") {
+		$(this).draggable({ connectToSortable: ".modules" });
+	}
+});
 
-$(".modules").sortable({
+$(".modules:not(#top_modules)").sortable( {	//:not(#top_modules)
 	connectWith: ".modules",
 	items: "div.module",
 	forcePlaceholderSize: true,
@@ -37,7 +42,7 @@
 			var ord = $.inArray(dropped[0], zone.children());
 			var zoneStr = zone.attr("id").substring(0, 1);
 			var options =  { modName: $.trim($("td:first", ui.item).text()), modPos: zoneStr, modOrd: ord + 1 };
-			if (zoneStr === "t") {
+			if (zoneStr === "t" || zoneStr === "b") {
 				options.nobox = true;
 			}
 			showModuleEditForm( false,options);
@@ -65,7 +70,7 @@
 
 // show edit form dialogue
 showModuleEditForm = function(item, options) {
-	var modId = 0, modName, modPos = "", modOrd = 0;
+	var modId = 0, modName, modPos = "", modOrd = 0, modStyle = "";
 	if (item) {
 		//alert("module edit form - TODO");
 		modName = $(item).attr("class").match(/box-\S+/);
@@ -81,6 +86,10 @@
 				modOrd = modPos[0].substring( 1, modPos[0].length);
 				modPos = modPos[0].substring( 0, 1);
 			}
+			modStyle = $(item).attr("style");
+			if (modStyle && !modStyle.match("absolute")) {
+				modStyle = "";	// use style from object if draggable
+			}
 		}
 	} else { // new module assignment
 		modName = options.modName;
@@ -99,12 +108,14 @@
 		assign_name: modName,
 		moduleId: modId,
 		assign_position: modPos,
-		assign_order: modOrd
+		assign_order: modOrd,
+		preview: true
 	};
 	if (item) {
 		postData.edit_assign = modId;
+		postData.assign_params = { style: modStyle };
 	} else {
-		postData.preview = true;
+//		postData.preview = true;
 	}
 	
 	$.post("tiki-admin_modules.php", postData, function(data) {


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:[31903] branches/experimental/xajax_removal/templates/ tiki.tpl

[<jonnybradley@us...>]

Revision: 31903
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31903&view=rev
Author:   jonnybradley
Date:     2011-01-14 01:14:38 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
[FIX] modules revamp: expose bottom_modules

Modified Paths:
--------------
    branches/experimental/xajax_removal/templates/tiki.tpl

Modified: branches/experimental/xajax_removal/templates/tiki.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki.tpl	2011-01-13 23:23:56 UTC (rev 31902)
+++ branches/experimental/xajax_removal/templates/tiki.tpl	2011-01-14 01:14:38 UTC (rev 31903)
@@ -143,7 +143,10 @@
 			{if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if}<footer id="footer">
 				<div class="footerbgtrap">
 					<div id="bottom_modules" class="content modules"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}>
-		{include file='tiki-bot_bar.tpl'}
+						{section name=homeix loop=$bottom_modules}
+							{$bottom_modules[homeix].data}
+						{/section}
+						{include file='tiki-bot_bar.tpl'}
 					</div>
 				</div>
 			</footer>{* -- END of footer -- *}{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.footer_shadow_end}</div>{/if}


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