Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[14516] trunk
|
From: <se...@us...> - 2008-08-26 09:18:31
|
Revision: 14516
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14516&view=rev
Author: sept_7
Date: 2008-08-26 09:18:41 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
[FIX] a better fix to tabs navigation
Modified Paths:
--------------
trunk/lib/setup/cookies.php
trunk/templates/header.tpl
trunk/templates/tiki-admin-include-look.tpl
trunk/tiki-admin_include_look.php
Modified: trunk/lib/setup/cookies.php
===================================================================
--- trunk/lib/setup/cookies.php 2008-08-26 03:48:35 UTC (rev 14515)
+++ trunk/lib/setup/cookies.php 2008-08-26 09:18:41 UTC (rev 14516)
@@ -52,3 +52,13 @@
return $default;
}
}
+
+if ($prefs['feature_tabs'] == 'y') {
+ if( isset($_GET['cookietab'])) {
+ $smarty->assign('cookietab',$_GET['cookietab']);
+ } elseif (count($_POST) > 0 and preg_replace(array('/\?.*$/','/^http.?:\/\//'),'',$_SERVER['HTTP_REFERER']) == preg_replace('/\?.*$/','',$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])) {
+ $smarty->assign('cookietab',$_COOKIE['tab']);
+ } else {
+ $smarty->assign('cookietab',1);
+ }
+}
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2008-08-26 03:48:35 UTC (rev 14515)
+++ trunk/templates/header.tpl 2008-08-26 09:18:41 UTC (rev 14516)
@@ -188,9 +188,8 @@
{/literal}
{/if}
</head>
-
<body {if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'}ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if}
- onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{elseif $smarty.server.HTTP_REFERER|regex_replace:"/\?.*$/":""|regex_replace:"/^http.?:\/\//":"" eq $smarty.server.HTTP_HOST|cat:$smarty.server.REQUEST_URI|regex_replace:"/\?.*$/":""}getCookie('tab',null,1){else}1{/if},5);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"
+ onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},5);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"
{if $section or $smarty.session.fullscreen eq 'y'}class="
{if $section}tiki_{$section}{/if} {if $smarty.session.fullscreen eq 'y'}fullscreen{/if}"{/if}>
<ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;">
Modified: trunk/templates/tiki-admin-include-look.tpl
===================================================================
--- trunk/templates/tiki-admin-include-look.tpl 2008-08-26 03:48:35 UTC (rev 14515)
+++ trunk/templates/tiki-admin-include-look.tpl 2008-08-26 09:18:41 UTC (rev 14516)
@@ -5,7 +5,7 @@
{tr}{$crumbs[$crumb]->title}{/tr}
{help crumb=$crumbs[$crumb]}</div>
- <form action="tiki-admin.php?page=look" onreset="return(confirm('{tr}Cancel Edit{/tr}'))" class="admin" method="post">
+ <form action="tiki-admin.php?page=look" id="look" name="look" onreset="return(confirm('{tr}Cancel Edit{/tr}'))" class="admin" method="post">
<div class="heading button" style="text-align: right">
<input type="submit" name="looksetup" value="{tr}Apply{/tr}" />
<input type="reset" name="looksetupreset" value="{tr}Reset{/tr}" />
Modified: trunk/tiki-admin_include_look.php
===================================================================
--- trunk/tiki-admin_include_look.php 2008-08-26 03:48:35 UTC (rev 14515)
+++ trunk/tiki-admin_include_look.php 2008-08-26 09:18:41 UTC (rev 14516)
@@ -120,7 +120,11 @@
if ( isset($_REQUEST["site_style"]) ) {
// If the theme has changed, reload the page to use the new theme
- header("location: tiki-admin.php?page=look");
+ $location= 'location: tiki-admin.php?page=look';
+ if ($prefs['feature_tabs'] == 'y') {
+ $location .= "&cookietab=".$_COOKIE['tab'];
+ }
+ header($location);
exit;
}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|