[Fmsystem-commits] [12706] bkbooking: stavanger update mail text and formating

[Kjell Arne Espedal]

Revision: 12706
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12706
Author:   kjell
Date:     2015-02-05 07:02:03 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
bkbooking: stavanger update mail text and formating

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.boapplication.inc.php
    branches/stavangerkommune/booking/inc/class.uievent.inc.php
    branches/stavangerkommune/booking/setup/phpgw_no.lang
    branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang

Modified: branches/stavangerkommune/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boapplication.inc.php   
2015-02-04 23:54:57 UTC (rev 12705)
+++ branches/stavangerkommune/booking/inc/class.boapplication.inc.php   
2015-02-05 07:02:03 UTC (rev 12706)
@@ -67,7 +67,7 @@
                                $buildingemail = 
$this->get_tilsyn_email($application['building_name']);
                                if ($buildingemail['email1'] != '' || 
$buildingemail['email2'] != '' || $buildingemail['email3'] != '') {
                                        $resourcename = 
implode(",",$this->get_resource_name($application['resources']));
-                                       $bsubject = "Aktivby: En søknad om 
leie/lån av ".$resourcename." på ".$application['building_name']." er godkjent";
+                                       $bsubject = 
$config->config_data['application_mail_subject'].": En søknad om leie/lån av 
".$resourcename." på ".$application['building_name']." er godkjent";
                                        $bbody = 
"<p>".$application['contact_name']." sin søknad  om leie/lån av 
".$resourcename." på ".$application['building_name']."</p>"; 
                                        $bbody .= "<p>Den ".$adates."er 
Godkjent</p>";
                     $bbody .= "<p><b>Ekstra informasjon fra søker:</b><br 
/>".$application['equipment']."</p>";

Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2015-02-04 
23:54:57 UTC (rev 12705)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2015-02-05 
07:02:03 UTC (rev 12706)
@@ -609,7 +609,7 @@
                                                        {
                                                                
                                 $subject = 
$config->config_data['event_conflict_mail_subject'];
-                                $body = 
"<p>".$config->config_data['event_mail_conflict_contact_active_collision']."\n".phpgw::get_var('mail',
 'POST')."\n";
+                                $body = 
"<p>".$config->config_data['event_mail_conflict_contact_active_collision']."<br 
/>\n".phpgw::get_var('mail', 'POST')."\n";
                                 $body .= '<br /><a href="'.$link.'">Link til 
'.$config->config_data['application_mail_systemname'].'</a></p>';
                                 $body .= 
"<p>".$config->config_data['application_mail_signature']."</p>";
                                                                $mail_sendt_to 
= '';
@@ -634,7 +634,7 @@
                                                        
if(phpgw::get_var('sendtocontact', 'POST'))
                                                        {
                                 $subject = 
$config->config_data['event_change_mail_subject'];
-                                $body = 
"<p>".$config->config_data['event_change_mail']."\n".phpgw::get_var('mail', 
'POST');
+                                $body = 
"<p>".$config->config_data['event_change_mail']."<br 
/>\n".phpgw::get_var('mail', 'POST');
                                 $body .= '<br /><a href="'.$link.'">Link til 
'.$config->config_data['application_mail_systemname'].'</a></p>';
                                                                
$this->send_mailnotification($event['contact_email'], $subject, $body);
                                                                $comment = 
$comment_text_log.'<br />Denne er sendt til '.$event['contact_email'];

Modified: branches/stavangerkommune/booking/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/booking/setup/phpgw_no.lang       2015-02-04 
23:54:57 UTC (rev 12705)
+++ branches/stavangerkommune/booking/setup/phpgw_no.lang       2015-02-05 
07:02:03 UTC (rev 12706)
@@ -667,4 +667,8 @@
 Users of current season or users the last 300 days     booking no      Brukere 
denne sesongen eller bruker de siste 300 dager.
 Last 300 days  booking no      Siste 300 dager
 Cancelation Email Addresses    booking no      Hvem som skal få kanselerings 
e-post. (saksbehandeler)
-One e-mail pr. line.   booking no      Bare en e-post adresse pr. linje.
\ No newline at end of file
+One e-mail pr. line.   booking no      Bare en e-post adresse pr. linje.
+Application email settings  booking no  Søknad epost innstillinger
+Application comment email settings  booking no  Søknad kommentar epost 
innstillinger
+Subject caseofficer booking no  Emne Saksbehandler
+Mail text for comment added booking no  Ekstra epost tekst for kommentar
\ No newline at end of file

Modified: branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang       
2015-02-04 23:54:57 UTC (rev 12705)
+++ branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang       
2015-02-05 07:02:03 UTC (rev 12706)
@@ -376,4 +376,4 @@
 Check calendar bookingfrontend no      Sjekk kalender
 You can't cancel event that has started, for help contacts site admin  
bookingfrontend no      Du kan ikke slette arrangement som er over.
 You can't extend the event, for that contact administrator     bookingfrontend 
no      Du kan ikke øke lengden på arrangementet, for det må du kontakte 
administrator
-You can't change resources to the event, for that contact administrator        
bookingfrontend no      Du kan ikke forandre på ressurser, ofr det må du 
kontakte administrator
\ No newline at end of file
+You can't change resources to the event, for that contact administrator        
bookingfrontend no      Du kan ikke forandre på ressurser, ofr det må du 
kontakte administrator