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

[<Jy...@us...>]

Revision: 16995
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16995&view=rev
Author:   Jyhem
Date:     2009-02-28 15:32:19 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
[UI] Don't display "Go back" link when it does not make sense

Modified Paths:
--------------
    trunk/templates/tiki-information.tpl
    trunk/tiki-information.php
    trunk/tiki-login.php

Modified: trunk/templates/tiki-information.tpl
===================================================================
--- trunk/templates/tiki-information.tpl	2009-02-27 21:51:12 UTC (rev 16994)
+++ trunk/templates/tiki-information.tpl	2009-02-28 15:32:19 UTC (rev 16995)
@@ -11,7 +11,10 @@
 	 </div>
 
 	<p>
-	 <a href="javascript:history.back()" class="linkmenu">{tr}Go back{/tr}</a><br /><br />
+
+	{if $show_history_back_link eq 'y' }
+		<a href="javascript:history.back()" class="linkmenu">{tr}Go back{/tr}</a><br /><br />
+	{/if}
 	 <a href="{$prefs.tikiIndex}" class="linkmenu">{tr}Return to home page{/tr}</a>
 	</p>
 </div>

Modified: trunk/tiki-information.php
===================================================================
--- trunk/tiki-information.php	2009-02-27 21:51:12 UTC (rev 16994)
+++ trunk/tiki-information.php	2009-02-28 15:32:19 UTC (rev 16995)
@@ -11,5 +11,8 @@
 if (isset($_REQUEST['msg'])) {
 	$smarty->assign('msg', $_REQUEST['msg']);
 }
+if (isset($_REQUEST['show_history_back_link'])) {
+	$smarty->assign('show_history_back_link', $_REQUEST['show_history_back_link']);
+}
 $smarty->assign('mid', 'tiki-information.tpl');
 $smarty->display("tiki.tpl");

Modified: trunk/tiki-login.php
===================================================================
--- trunk/tiki-login.php	2009-02-27 21:51:12 UTC (rev 16994)
+++ trunk/tiki-login.php	2009-02-28 15:32:19 UTC (rev 16995)
@@ -323,6 +323,7 @@
 				$smarty->assign('msg', $msg.' '.tra('An email has been sent to you with the instructions to follow.'));
 			$smarty->assign('user', '');
 			unset($user);
+			$smarty->assign_by_ref('show_history_back_link', 'y');
 			$smarty->assign('mid', 'tiki-information.tpl');
 			$smarty->display("tiki.tpl");
 			die;


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