[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[29403] branches/3.0

[<pk...@us...>]

Revision: 29403
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29403&view=rev
Author:   pkdille
Date:     2010-09-20 19:37:52 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
[QT] Quality Team Backport

r27816 | pkdille | 2010-06-30 22:33:40 +0200 (Wed, 30 Jun 2010) | 1 line
[bp/r 27815] [MOD] module since last visit new : Give the possibility to print last login date not as a link even if calendar is activated. Also give the possibility to have all sections folded by default

Modified Paths:
--------------
    branches/3.0/modules/mod-since_last_visit_new.php
    branches/3.0/templates/modules/mod-since_last_visit_new.tpl

Modified: branches/3.0/modules/mod-since_last_visit_new.php
===================================================================
--- branches/3.0/modules/mod-since_last_visit_new.php	2010-09-20 19:01:46 UTC (rev 29402)
+++ branches/3.0/modules/mod-since_last_visit_new.php	2010-09-20 19:37:52 UTC (rev 29403)
@@ -17,7 +17,7 @@
 
 if (!function_exists('mod_since_last_visit_new_help')) {
 	function mod_since_last_visit_new_help() {
-		return "showuser=n&showtracker=n&calendar_focus=ignore";
+		return "showuser=n&showtracker=n&calendar_focus=ignore&date_as_link=y&fold_sections=n";
 	}
 }
 
@@ -27,6 +27,23 @@
 	include_once('tiki-sefurl.php');
 	if (!$user) return false;
 
+	if (!isset($params['date_as_link']) || $params['date_as_link'] != 'n') {
+		$smarty->assign('date_as_link', 'y');
+	} else {
+		$smarty->assign('date_as_link', 'n');
+	}
+
+	if (!isset($params['fold_sections']) || $params['fold_sections'] != 'y') {
+		$smarty->assign('default_folding', 'block');
+		$smarty->assign('opposite_folding', 'none');
+	} else {
+		$smarty->assign('default_folding', 'none');
+		$smarty->assign('opposite_folding', 'block');
+	}
+
+	
+	$resultCount = $mod_reference['rows'];
+
 	global $tikilib, $userlib, $prefs;
 	$ret = array();
 	$ret["label"] = 'Since your last visit...';//get_strings tra("Since your last visit...");

Modified: branches/3.0/templates/modules/mod-since_last_visit_new.tpl
===================================================================
--- branches/3.0/templates/modules/mod-since_last_visit_new.tpl	2010-09-20 19:01:46 UTC (rev 29402)
+++ branches/3.0/templates/modules/mod-since_last_visit_new.tpl	2010-09-20 19:37:52 UTC (rev 29403)
@@ -7,7 +7,7 @@
 	{capture name=module_title}{tr}{$slvn_info.label}{/tr}{/capture}
 	{tikimodule error=$module_params.error title=$smarty.capture.module_title name="since_last_visit_new" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
 	<div style="margin-bottom: 5px; text-align:center;">
-		{if $prefs.feature_calendar eq 'y'}
+		{if $prefs.feature_calendar eq 'y' && $date_as_link eq 'y'}
 			<a class="linkmodule" href="tiki-calendar.php?todate={$slvn_info.lastLogin}" title="{tr}click to edit{/tr}">
 		{/if}
 		<b>{$slvn_info.lastLogin|tiki_short_date}</b>
@@ -25,15 +25,15 @@
 				{assign var=showcname value=show_$cname}
 
              	{if $pos eq 'trackers' or $pos eq 'utrackers'}
-					<div id="{$cname}" style="display:{if !isset($cookie.$showcname) or $cookie.$showcname eq 'y'}block{else}none{/if};">
+					<div id="{$cname}" style="display:{if !isset($cookie.$showcname) or $cookie.$showcname eq 'y'}{$default_folding}{else}{$opposite_folding}{/if};">
 
                 {****** Parse out the trackers *****}
 					{foreach key=tp item=tracker from=$slvn_item.tid}
 						{assign var=tcname value=$tracker.cname}
-						<div class="separator"  style="margin-left: 10px; display:{if !isset($cookie.$showcname) or $cookie.$showcname eq 'y'}block{else}none{/if};">
+						<div class="separator" style="margin-left: 10px; display:{if !isset($cookie.$showcname) or $cookie.$showcname eq 'y'}{$default_folding}{else}{$opposite_folding}{/if};">
 							{assign var=showtcname value=show_$tcname}
 							<a class="separator" href="javascript:flip('{$tcname}');">{$tracker.count}&nbsp;{tr}{$tracker.label}{/tr}</a>
-							<div id="{$tcname}" style="display:{if !isset($cookie.$showtcname) or $cookie.$showtcname eq 'y'}block{else}none{/if};"> 
+							<div id="{$tcname}" style="display:{if !isset($cookie.$showtcname) or $cookie.$showtcname eq 'y'}{$default_folding}{else}{$opposite_folding}{/if};">
 								{if $nonums != 'y'}<ol>{else}<ul>{/if}
 								{section name=xx loop=$tracker.list}
 									<li><a  class="linkmodule"
@@ -50,7 +50,7 @@
 					</div>
 
 				{else}
-					<div id="{$cname}" style="display:{if !isset($cookie.$showcname) or $cookie.$showcname eq 'y'}block{else}none{/if};">
+					 <div id="{$cname}" style="display:{if !isset($cookie.$showcname) or $cookie.$showcname eq 'y'}{$default_folding}{else}{$opposite_folding}{/if};">
 						{if $nonums != 'y'}<ol>{else}<ul>{/if}
 						{section name=ix loop=$slvn_item.list}
 							<li>
@@ -67,7 +67,5 @@
 			{/if}
 		{/foreach}
 	{/if}
-{*	<div style="color:#aaaaaa; text-align:right; font-size:8px; margin-bottom: 0;">SLV{$slvn_info.version}</div> *}
 	{/tikimodule}
 {/if}
-      


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