[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17348] Stable: Merge 17343:17346 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17348] Stable: Merge 17343:17346 from trunk |
|
Date: |
Wed, 22 Nov 2017 05:33:30 -0500 (EST) |
Revision: 17348
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17348
Author: sigurdne
Date: 2017-11-22 05:33:29 -0500 (Wed, 22 Nov 2017)
Log Message:
-----------
Stable: Merge 17343:17346 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
Removed Paths:
-------------
branches/Version-2_0-branch/bookingfrontend/templates/fjell/
branches/Version-2_0-branch/bookingfrontend/templates/stavanger/
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-11-22 10:26:18 UTC (rev 17347)
+++ branches/Version-2_0-branch 2017-11-22 10:33:29 UTC (rev 17348)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346
\ No newline at end of property
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-11-22 10:26:18 UTC (rev
17347)
+++ branches/Version-2_0-branch/bookingfrontend 2017-11-22 10:33:29 UTC (rev
17348)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173,17175-17188,17190-17195,17214,17303-17311
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173,17175-17188,17190-17195,17214,17303-17311,17344-17346
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-11-22 10:26:18 UTC (rev 17347)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-11-22 10:33:29 UTC (rev 17348)
@@ -54,7 +54,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
$stylesheets[] =
"/phpgwapi/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
@@ -62,7 +62,7 @@
$stylesheets[] = "/{$app}/templates/portico/css/base.css";
$stylesheets[] =
"/{$app}/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
$stylesheets[] = "/phpgwapi/templates/bkbooking/css/frontend.css";
- $stylesheets[] = "/bookingfrontend/css/bookingfrontend.css";
+ $stylesheets[] = "/bookingfrontend/css/bookingfrontend.css";
foreach ( $stylesheets as $stylesheet )
{
@@ -180,20 +180,21 @@
$robots = '<meta name="robots" content="none">';
}
- $test = $GLOBALS['phpgw']->common->get_on_events();
- $test = str_replace('window.onload =
function()','$(document).ready(function()',$test);
- $test = str_replace("\n}\n","\n})\n",$test);
+ $test = $GLOBALS['phpgw']->common->get_on_events();
+ $test = str_replace('window.onload =
function()','$(document).ready(function()',$test);
+ $test = str_replace("\n}\n","\n})\n",$test);
$app = lang($app);
$tpl_vars = array
(
'css' => $GLOBALS['phpgw']->common->get_css(),
'javascript' => $GLOBALS['phpgw']->common->get_javascript(),
- 'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
+ 'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
+ 'site_url' =>
$GLOBALS['phpgw']->link('/bookingfrontend/',
array('menuaction'=>'bookingfrontend.uisearch.index')),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'webserver_url' => $webserver_url,
// 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
- 'win_on_events' => $test,
+ 'win_on_events' => $test,
'navbar_config' => $_navbar_config,
'metainfo_author' => $author,
'metainfo_keywords' => $keywords,
@@ -211,8 +212,8 @@
# $tpl_vars['help_url'] = => '#';
}
$bouser = CreateObject('bookingfrontend.bouser');
- $org = CreateObject('bookingfrontend.uiorganization');
- $orgid = $org->get_orgid($bouser->orgnr);
+ $org = CreateObject('bookingfrontend.uiorganization');
+ $orgid = $org->get_orgid($bouser->orgnr);
if($bouser->is_logged_in())
{
$tpl_vars['organization_json'] =
json_encode(phpgwapi_cache::session_get($bouser->get_module(),
$bouser::ORGARRAY_SESSION_KEY));
@@ -219,15 +220,19 @@
$tpl_vars['change_org_header'] = lang('Change organization');
- if ( $bouser->orgname == '000000000') {
- $tpl_vars['login_text_org'] = lang('SSN not registred');
- $tpl_vars['login_text'] = lang('Logout');
- $tpl_vars['org_url'] = '#';
- } else {
- $tpl_vars['login_text_org'] = $bouser->orgname;
- $tpl_vars['login_text'] = lang('Logout');
- $tpl_vars['org_url'] =
"/bookingfrontend/?menuaction=bookingfrontend.uiorganization.show&id=".$orgid;
- }
+ if ( $bouser->orgname == '000000000')
+ {
+ $tpl_vars['login_text_org'] = lang('SSN not registred');
+ $tpl_vars['login_text'] = lang('Logout');
+ $tpl_vars['org_url'] = '#';
+ }
+ else
+ {
+ $tpl_vars['login_text_org'] = $bouser->orgname;
+ $tpl_vars['login_text'] = lang('Logout');
+ $tpl_vars['org_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/',
array('menuaction'=>'bookingfrontend.uiorganization.show', 'id'=> $orgid));
+ // $tpl_vars['org_url'] =
"/bookingfrontend/?menuaction=bookingfrontend.uiorganization.show&id=".$orgid;
+ }
$tpl_vars['login_text'] = $bouser->orgnr . ' :: ' .
lang('Logout');
$tpl_vars['login_url'] = 'logout.php';
}
Modified: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
2017-11-22 10:26:18 UTC (rev 17347)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
2017-11-22 10:33:29 UTC (rev 17348)
@@ -12,44 +12,42 @@
<link rel="icon" href="{img_icon}" type="image/x-ico">
<link rel="shortcut icon" href="{img_icon}">
<!-- BEGIN stylesheet -->
- <link href="{stylesheet_uri}" type="text/css" rel="StyleSheet">
+ <link href="{stylesheet_uri}" type="text/css" rel="StyleSheet">
<!-- END stylesheet -->
{css}
<script type="text/javascript">
- <!--
+ <!--
var strBaseURL = '{str_base_url}';
- //-->
+ //-->
</script>
{javascript}
<!-- BEGIN javascript -->
- <script type="text/javascript"
src="{javascript_uri}"></script>
- <!-- END javascript -->
+ <script type="text/javascript" src="{javascript_uri}"></script>
+ <!-- END javascript -->
<script type="text/javascript">
<!--
{win_on_events}
- //-->
+ //-->
</script>
</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-->
- <a href="{manual_url}">{manual_text}</a> <a
href="{help_url}">{help_text}</a> <a href="{org_url}">{login_text_org}</a><a
href="{login_url}">{login_text}</a> <span id="change"></span>
- </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="{manual_url}">{manual_text}</a> <a href="{help_url}">{help_text}</a> <a
href="{login_url}">{login_text}</a-->
+ <a
href="{manual_url}">{manual_text}</a> <a href="{help_url}">{help_text}</a> <a
href="{org_url}">{login_text_org}</a><a href="{login_url}">{login_text}</a>
<span id="change"></span>
+ </div>
+ <a href="{site_url}"><div id="logo"></div></a>
+ <div id="centerimage"></div>
+ <form action="{site_url}" method="get"
id="header-search" class="{header_search_class}">
+ <input class="query" type="text"
name="searchterm"/>
+ <xsl:text> </xsl:text><input
type="submit" value="tralala{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>
Modified:
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-11-22 10:26:18 UTC (rev 17347)
+++ branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-11-22 10:33:29 UTC (rev 17348)
@@ -51,9 +51,9 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
- $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
- $stylesheets[] = "/{$app}/css/bookingfrontend.css";
+ $stylesheets[] = "/{$app}/css/bookingfrontend.css";
$stylesheets[] = "/phpgwapi/templates/bookingfrontend/css/frontend.css";
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
@@ -173,19 +173,19 @@
phpgwapi_cache::session_set('phpgwapi', 'footer_info', $footer_info);
$test = $GLOBALS['phpgw']->common->get_on_events();
- $test = str_replace('window.onload =
function()','$(document).ready(function()',$test);
- $test = str_replace("\n}\n","\n})\n",$test);
+ $test = str_replace('window.onload =
function()','$(document).ready(function()',$test);
+ $test = str_replace("\n}\n","\n})\n",$test);
$tpl_vars = array
(
'css' => $GLOBALS['phpgw']->common->get_css(),
'javascript' => $GLOBALS['phpgw']->common->get_javascript(),
- 'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
+ 'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' => $site_title,
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
'webserver_url' => $webserver_url,
- 'win_on_events' => $test,
+ 'win_on_events' => $test,
'metainfo_author' => $author,
'metainfo_keywords' => $keywords,
'metainfo_description' => $description,
@@ -203,8 +203,8 @@
// _debug_array($user);
$bouser = CreateObject('bookingfrontend.bouser');
- $org = CreateObject('bookingfrontend.uiorganization');
- $orgid = $org->get_orgid($bouser->orgnr);
+ $org = CreateObject('bookingfrontend.uiorganization');
+ $orgid = $org->get_orgid($bouser->orgnr);
if($bouser->is_logged_in())
{
$tpl_vars['organization_json'] =
json_encode(phpgwapi_cache::session_get($bouser->get_module(),
$bouser::ORGARRAY_SESSION_KEY));
@@ -211,18 +211,18 @@
$tpl_vars['change_org_header'] = lang('Change organization');
- if ( $bouser->orgname == '000000000')
- {
- $tpl_vars['login_text_org'] = lang('SSN not registred');
- $tpl_vars['login_text'] = lang('Logout');
- $tpl_vars['org_url'] = '#';
- }
- else
- {
- $tpl_vars['login_text_org'] = $bouser->orgname;
- $tpl_vars['login_text'] = lang('Logout');
- $tpl_vars['org_url'] =
"/bookingfrontend/?menuaction=bookingfrontend.uiorganization.show&id=".$orgid;
- }
+ if ( $bouser->orgname == '000000000')
+ {
+ $tpl_vars['login_text_org'] = lang('SSN not registred');
+ $tpl_vars['login_text'] = lang('Logout');
+ $tpl_vars['org_url'] = '#';
+ }
+ else
+ {
+ $tpl_vars['login_text_org'] = $bouser->orgname;
+ $tpl_vars['login_text'] = lang('Logout');
+ $tpl_vars['org_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/',
array('menuaction'=>'bookingfrontend.uiorganization.show', 'id'=> $orgid));
+ }
$tpl_vars['login_text'] = $bouser->orgnr . ' :: ' .
lang('Logout');
$tpl_vars['login_url'] = 'logout.php';
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17348] Stable: Merge 17343:17346 from trunk,
sigurdne <=