[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12375] bkbooking: stavanger update
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [12375] bkbooking: stavanger update |
Date: |
Wed, 26 Nov 2014 06:42:16 +0000 |
Revision: 12375
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12375
Author: kjell
Date: 2014-11-26 06:41:52 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
Modified: branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
2014-11-25 23:18:56 UTC (rev 12374)
+++ branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
2014-11-26 06:41:52 UTC (rev 12375)
@@ -113,6 +113,7 @@
login common no Logg inn
logout common no Logg ut
SSN not registred common no Du er ikke registert i
Frivillighetsregisteret eller organisasjonen din mangler organisasjonesnummer i
AktivBy
+No valid identification returned from login common no Ingen gyldig
identifikasjon returnert fra innlogging.
male bookingfrontend no Mann
mar bookingfrontend no mars
may bookingfrontend no mai
Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
2014-11-25 23:18:56 UTC (rev 12374)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
2014-11-26 06:41:52 UTC (rev 12375)
@@ -217,13 +217,17 @@
$tpl_vars['login_text_org'] = lang('SSN not registred');
$tpl_vars['login_text'] = lang('Logout');
$tpl_vars['org_url'] = '#';
+ } elseif ( $bouser->orgname == '000000001') {
+ $tpl_vars['login_text_org'] = lang('No valid identification
returned from login');
+ $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;
}
-# $tpl_vars['login_url'] = 'logout.php'; #dev
- $tpl_vars['login_url'] = '/logout.php';
+ $tpl_vars['login_url'] = 'logout.php'; #dev
+# $tpl_vars['login_url'] = '/logout.php';
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12375] bkbooking: stavanger update,
Kjell Arne Espedal <=