[Customisation Database Commits] r292 - in /trunk/titania: includes/core/titania.php styles/default/template/overall_footer.html

[David Lewis]

Author: HighwayofLife
Date: Sun Jul 12 10:06:13 2009
New Revision: 292

Log:
Missed a couple items for users when they are logged out. - changes from r288
Also removed some un-used items in the overall_footer
Fixes #7

Modified:
    trunk/titania/includes/core/titania.php
    trunk/titania/styles/default/template/overall_footer.html

Modified: trunk/titania/includes/core/titania.php
==============================================================================
*** trunk/titania/includes/core/titania.php (original)
--- trunk/titania/includes/core/titania.php Sun Jul 12 10:06:13 2009
***************
*** 256,261 ****
--- 256,262 ----
  		else
  		{
  			$u_login_logout = append_sid(self::$absolute_board . 'ucp.' . PHP_EXT, 'mode=login&redirect=' . self::$page);
+ 			$l_login_logout = phpbb::$user->lang['LOGIN'];
  		}
  
  		// Send a proper content-language to the output
***************
*** 273,281 ****
  			'CURRENT_TIME'			=> sprintf(phpbb::$user->lang['CURRENT_TIME'], phpbb::$user->format_date(time(), false, true)),
  
  			// rewrite the login URL to redirect to the currently viewed page.
! 			'U_LOGIN_LOGOUT'			=> $u_login_logout,
! 			'L_LOGIN_LOGOUT'			=> $l_login_logout,
! 			'LOGIN_REDIRECT'			=> self::$page,
  
  			'SESSION_ID'				=> phpbb::$user->session_id,
  			'PHPBB_ROOT_PATH'			=> self::$absolute_board,
--- 274,284 ----
  			'CURRENT_TIME'			=> sprintf(phpbb::$user->lang['CURRENT_TIME'], phpbb::$user->format_date(time(), false, true)),
  
  			// rewrite the login URL to redirect to the currently viewed page.
! 			'U_LOGIN_LOGOUT'		=> $u_login_logout,
! 			'L_LOGIN_LOGOUT'		=> $l_login_logout,
! 			'LOGIN_REDIRECT'		=> self::$page,
! 			'S_LOGIN_ACTION'		=> append_sid(self::$absolute_board . 'ucp.' . PHP_EXT, 'mode=login'),
! 
  
  			'SESSION_ID'				=> phpbb::$user->session_id,
  			'PHPBB_ROOT_PATH'			=> self::$absolute_board,

Modified: trunk/titania/styles/default/template/overall_footer.html
==============================================================================
*** trunk/titania/styles/default/template/overall_footer.html (original)
--- trunk/titania/styles/default/template/overall_footer.html Sun Jul 12 10:06:13 2009
***************
*** 21,33 ****
  
  			<ul class="linklist">
  				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
! 					<!-- IF not S_IS_BOT -->
! 						<!-- IF S_VIEWFORUM and S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
! 						<!-- IF S_VIEWTOPIC and U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
! 						<!-- IF S_VIEWTOPIC and U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
! 						<!-- IF S_VIEWTOPIC and U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
! 					<!-- ENDIF -->
! 				<li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a> &bull; <!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> &bull; <!-- ENDIF -->{S_TIMEZONE}</li>
  			</ul>
  
  			<span class="corners-bottom"><span></span></span></div>
--- 21,27 ----
  
  			<ul class="linklist">
  				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
! 				<li class="rightside"><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF --></li>
  			</ul>
  
  			<span class="corners-bottom"><span></span></span></div>