[Fmsystem-commits] [9999] bkbooking: nsf bug fix application fixed backend template to get text from same as frontend

[Kjell Arne Espedal]

Revision: 9999
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9999
Author:   kjell
Date:     2012-09-13 13:03:38 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
bkbooking: nsf bug fix application fixed backend template to get text from same 
as frontend

Modified Paths:
--------------
    branches/dev-thomasez/booking/inc/class.uiapplication.inc.php
    branches/dev-thomasez/booking/templates/base/application.xsl

Modified: branches/dev-thomasez/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uiapplication.inc.php       
2012-09-13 10:40:50 UTC (rev 9998)
+++ branches/dev-thomasez/booking/inc/class.uiapplication.inc.php       
2012-09-13 13:03:38 UTC (rev 9999)
@@ -633,6 +633,9 @@
                
                public function show()
                {
+            $config    = CreateObject('phpgwapi.config','booking');
+                       $config->read();
+                       $application_text = $config->config_data;
                        $id = intval(phpgw::get_var('id', 'GET'));
                        $application = $this->bo->read_single($id);
 
@@ -732,6 +735,6 @@
                        self::check_date_availability($application);
                        self::render_template('application', 
array('application' => $application, 
                                                                  'audience' => 
$audience, 'agegroups' => $agegroups,
-                                                                 
'num_associations'=>$num_associations,'comments' => $comments));
+                                                                 
'num_associations'=>$num_associations,'comments' => $comments,'config' => 
$application_text));
                }
        }

Modified: branches/dev-thomasez/booking/templates/base/application.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application.xsl        
2012-09-13 10:40:50 UTC (rev 9998)
+++ branches/dev-thomasez/booking/templates/base/application.xsl        
2012-09-13 13:03:38 UTC (rev 9999)
@@ -223,11 +223,19 @@
                </dl>
                <dl class="form-col">
                        <div class="heading"><br />8. <xsl:value-of 
select="php:function('lang', 'Terms and conditions')" /></div>
-                       <p>Alle som leier lokaler hos Bergen kommune må 
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter 
og husreglement.</p>
+                       <xsl:if test="config/application_terms">
+                               <p>
+                                       <xsl:value-of 
select="config/application_terms"/>
+                               </p>            
+                       </xsl:if>
                        <br />
                        <div id='regulation_documents'>&nbsp;</div>
                        <br />
-                       <p><xsl:value-of select="php:function('lang', 'To 
borrow premises you must verify that you have read terms and conditions')" 
/></p>
+                       <xsl:if test="config/application_terms2">
+                               <p>
+                                       <xsl:value-of 
select="config/application_terms2"/>
+                               </p>            
+                       </xsl:if>
                </dl>
 
         <div class="clr"/>