[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10832] mobilefrontend : link to logout
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10832] mobilefrontend : link to logout |
|
Date: |
Thu, 14 Feb 2013 12:49:10 +0000 |
Revision: 10832
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10832
Author: sigurdne
Date: 2013-02-14 12:49:10 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
mobilefrontend : link to logout
Modified Paths:
--------------
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/head.tpl
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2013-02-14
12:47:54 UTC (rev 10831)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2013-02-14
12:49:10 UTC (rev 10832)
@@ -140,31 +140,10 @@
# $tpl_vars['help_text'] = lang('help');
# $tpl_vars['help_url'] = => '#';
}
- $bouser = CreateObject('bookingfrontend.bouser');
- if($bouser->is_logged_in())
- {
- $tpl_vars['login_text'] = $bouser->orgnr . ' :: ' .
lang('Logout');
- $tpl_vars['login_url'] = 'logout.php';
- }
- else
- {
- $tpl_vars['login_text'] = lang('Login');
- $tpl_vars['login_url'] =
'login.php?after='.urlencode($_SERVER['QUERY_STRING']);
- $config =
CreateObject('phpgwapi.config','bookingfrontend');
- $config->read();
- $login_parameter =
isset($config->config_data['login_parameter']) &&
$config->config_data['login_parameter'] ?
$config->config_data['login_parameter'] : '';
- $custom_login_url =
isset($config->config_data['custom_login_url']) &&
$config->config_data['custom_login_url'] ?
$config->config_data['custom_login_url'] : '';
- if($login_parameter)
- {
- $login_parameter = ltrim($login_parameter, '&');
- $tpl_vars['login_url'] .= "&{$login_parameter}";
- }
- if($custom_login_url)
- {
- $tpl_vars['login_url'] = $custom_login_url;
- }
- }
+ $tpl_vars['logout_text'] = lang('logout');
+ $tpl_vars['logout_url'] = 'logout.php';
+
$GLOBALS['phpgw']->template->set_var($tpl_vars);
$GLOBALS['phpgw']->template->pfp('out', 'head');
Modified: trunk/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.tpl 2013-02-14 12:47:54 UTC
(rev 10831)
+++ trunk/phpgwapi/templates/mobilefrontend/head.tpl 2013-02-14 12:49:10 UTC
(rev 10832)
@@ -29,21 +29,13 @@
<!-- END javascript -->
</head>
-<body>
- <div id="wrapper">
- <div id="header">
- <div id="login-bar">
- <a href="{manual_url}">{manual_text}</a> <a
href="{help_url}">{help_text}</a> <a href="{login_url}">{login_text}</a>
- </div>
- <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div
id="logo"></div></a>
- <div id="centerimage"></div>
- <form action="index.php" method="get" id="header-search"
class="{header_search_class}">
- <input type="hidden" name="menuaction"
value="bookingfrontend.uisearch.index" />
- <input class="query
-" type="text" name="searchterm"/>
- <xsl:text> </xsl:text><input type="submit"
value="{lbl_search}"/>
- </form>
- </div>
-<div class="yui-skin-sam" id='frontend'>
-<div id="line"></div>
- <div style='margin:0; padding: 0; line-height: 0'> </div>
+ <body>
+ <div id="wrapper">
+ <div id="header">
+ <div id="login-bar"><a
href="{logout_url}">{logout_text}</a></div>
+ <div id="logo"> </div>
+ <div id="centerimage"></div>
+ </div>
+ <div class="yui-skin-sam" id='frontend'>
+ <div id="line"></div>
+ <div style='margin:0; padding: 0; line-height:
0'> </div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10832] mobilefrontend : link to logout,
Sigurd Nes <=