[Fmsystem-commits] [11327] bkbooking: stavanger bugfix

[Kjell Arne Espedal]

Revision: 11327
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11327
Author:   kjell
Date:     2013-09-26 08:08:58 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
bkbooking: stavanger bugfix

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.uievent.inc.php
    branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl

Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-09-26 
08:08:52 UTC (rev 11326)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-09-26 
08:08:58 UTC (rev 11327)
@@ -622,9 +622,9 @@
                                                        
if(phpgw::get_var('sendtorbuilding', 'POST'))
                                                        {
                                                                
-                                $subject = 
$config->config_data['event_conflict_mail_subject'];
+                                $subject = 
$config->config_data['event_mail_building_subject'];
 
-                                $body = 
"<p>".$config->config_data['event_mail_building_active_collision']."<br 
/>\n".phpgw::get_var('mail', 'POST')."</p>";
+                                $body = 
"<p>".$config->config_data['event_mail_building']."<br 
/>\n".phpgw::get_var('mail', 'POST')."</p>";
 
                                                                if 
($event['customer_organization_name']) {
                                                                        
$username = $event['customer_organization_name'];

Modified: 
branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl    
2013-09-26 08:08:52 UTC (rev 11326)
+++ branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl    
2013-09-26 08:08:58 UTC (rev 11327)
@@ -40,9 +40,15 @@
                        <dd class="yui-skin-sam">
                                <textarea 
id="field_event_mail_conflict_contact_active_collision" class="full-width 
settings" name="event_mail_conflict_contact_active_collision" 
type="text"><xsl:value-of 
select="config_data/event_mail_conflict_contact_active_collision"/></textarea>
                        </dd>
-            <dt><label 
for="field_event_mail_building_active_collision"><xsl:value-of 
select="php:function('lang', 'Mail text to building contact when conflicting 
event')"/></label></dt>
+            <dt><label 
for="field_event_mail_building_active_collision_subject"><xsl:value-of 
select="php:function('lang', 'Event message to building 
Subject')"/></label></dt>
+            <dd>
+                               <input id="field_event_mail_building_subject" 
name="event_mail_building_subject" type="text" size="50">
+                                       <xsl:attribute 
name="value"><xsl:value-of 
select="config_data/event_mail_building_subject"/></xsl:attribute>
+                               </input>
+            </dd>
+            <dt><label for="field_event_mail_building"><xsl:value-of 
select="php:function('lang', 'Mail text to building contact')"/></label></dt>
                        <dd class="yui-skin-sam">
-                               <textarea 
id="field_event_mail_building_active_collision" class="full-width settings" 
name="event_mail_building_active_collision" type="text"><xsl:value-of 
select="config_data/event_mail_building_active_collision"/></textarea>
+                               <textarea id="field_event_mail_building" 
class="full-width settings" name="event_mail_building" 
type="text"><xsl:value-of select="config_data/event_mail_building"/></textarea>
                        </dd>
 
             <dt><label for="field_event_canceled_mail_subject"><xsl:value-of 
select="php:function('lang', 'Event Canceled Subject')"/></label></dt>