fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [7445] THe NSF template.


From: Thomas Lundquist
Subject: [Fmsystem-commits] [7445] THe NSF template.
Date: Tue, 28 Jun 2011 11:11:09 +0000

Revision: 7445
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7445
Author:   thomasez
Date:     2011-06-28 11:11:08 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
THe NSF template. A blatant copy of the base ones but replaced one logo.. 

Added Paths:
-----------
    branches/dev-thomasez/bookingfrontend/templates/nsf/
    branches/dev-thomasez/bookingfrontend/templates/nsf/access_denied.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_cancel.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_info.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/app_data.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_cancel.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit_preview.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_info.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_massupdate.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new_preview.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/building.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/building_schedule.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/config.tpl
    branches/dev-thomasez/bookingfrontend/templates/nsf/event_info.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/group.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/organization.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/report_numbers.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/resource.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/resource_schedule.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl
    branches/dev-thomasez/bookingfrontend/templates/nsf/system_message.xsl
    branches/dev-thomasez/phpgwapi/templates/nsf/
    branches/dev-thomasez/phpgwapi/templates/nsf/css/
    branches/dev-thomasez/phpgwapi/templates/nsf/css/frontend.css
    branches/dev-thomasez/phpgwapi/templates/nsf/footer.tpl
    branches/dev-thomasez/phpgwapi/templates/nsf/head.inc.php
    branches/dev-thomasez/phpgwapi/templates/nsf/head.tpl
    branches/dev-thomasez/phpgwapi/templates/nsf/images/
    branches/dev-thomasez/phpgwapi/templates/nsf/images/header_bg.png
    branches/dev-thomasez/phpgwapi/templates/nsf/images/header_fg.png
    branches/dev-thomasez/phpgwapi/templates/nsf/images/info.png
    branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/
    
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/aktivby_logo.jpg
    branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/bodyBg.gif
    
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/footerFjell_inkl_bunnlinje.gif
    
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/forsidebilde.jpg
    branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/logo.png
    
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/pageContainerBg.gif
    
branches/dev-thomasez/phpgwapi/templates/nsf/images/toppbanner_eventyrene_inspirator.png
    branches/dev-thomasez/phpgwapi/templates/nsf/js/
    branches/dev-thomasez/phpgwapi/templates/nsf/navbar.inc.php
    branches/dev-thomasez/phpgwapi/templates/nsf/navbar.tpl

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/access_denied.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/access_denied.xsl       
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/access_denied.xsl       
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,8 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       
+       <div id="content">
+               <div class="error"><xsl:value-of select="php:function('lang', 
'Access denied')" /></div>
+       </div>
+
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_cancel.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_cancel.xsl   
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_cancel.xsl   
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,153 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+       <dl class="form">
+       <dt class="heading"><xsl:value-of select="php:function('lang', 'Cancel 
allocation')"/></dt>
+       </dl>
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+    <form action="" method="POST">
+               <input type="hidden" name="application_id" 
value="{allocation/application_id}"/>
+        <input id="field_org_id" name="organization_id" type="hidden" 
value="{allocation/organization_id}" />
+        <input id="field_building_id" name="building_id" type="hidden" 
value="{allocation/building_id}" />
+        <input id="field_from" name="from_" type="hidden" 
value="{allocation/from_}" />
+        <input id="field_to" name="to_" type="hidden" value="{allocation/to_}" 
/>
+
+        <dl class="form-col">
+
+            <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')" /></label></dt>
+            <dd>
+                <div class="autocomplete">
+                        <xsl:value-of select="allocation/building_name"/>
+                </div>
+            </dd>
+
+
+            <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')" /></label></dt>
+            <dd>
+                <div>
+                    <xsl:value-of select="allocation/from_"/>
+                </div>
+            </dd>
+                       <dd>
+                <div> </div>
+                       </dd>
+                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Recurring allocation deletion')" /></label></dt>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="outseason" 
id="outseason">
+                                               <xsl:if test="outseason='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Out season')" />
+                               </label>
+                       </dd>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="recurring" 
id="recurring">
+                                               <xsl:if test="recurring='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Delete until')" />
+                               </label>
+                       </dd>
+                       <dd class="date-picker">
+                               <input id="field_repeat_until" 
name="repeat_until" type="text">
+                                       <xsl:attribute 
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
+                               </input>
+                       </dd>
+                       <dt><xsl:value-of select="php:function('lang', 
'Interval')" /></dt>
+                       <dd>
+                               <xsl:value-of select="../field_interval" />
+                               <select id="field_interval" 
name="field_interval">
+                                       <option value="1">
+                                               <xsl:if test="interval=1">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '1 week')" />
+                                       </option>
+                                       <option value="2">
+                                               <xsl:if test="interval=2">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '2 weeks')" />
+                                       </option>
+                                       <option value="3">
+                                               <xsl:if test="interval=3">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '3 weeks')" />
+                                       </option>
+                                       <option value="4">
+                                               <xsl:if test="interval=4">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '4 weeks')" />
+                                       </option>
+                               </select>
+                       </dd>
+        </dl>
+        <dl class="form-col">
+            <dt><label for="field_org"><xsl:value-of 
select="php:function('lang', 'Organization')" /></label></dt>
+            <dd>
+                <div class="autocomplete">
+                        <xsl:value-of select="allocation/organization_name"/>
+                </div>
+            </dd>
+            <dt><label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')" /></label></dt>
+            <dd>
+                <div>
+                    <xsl:value-of select="allocation/to_"/>
+                </div>
+            </dd>
+        </dl>
+
+               <div style='clear:left; padding:0; margin:0'/>
+
+        <dl class="form-col">
+               <dt><label for="field_message"><xsl:value-of 
select="php:function('lang', 'Message')" /></label></dt>
+               <dd class="yui-skin-sam">
+               <textarea id="field-message" name="message" 
type="text"><xsl:value-of select="system_message/message"/></textarea>
+               </dd>
+        </dl>
+
+        <div class="form-buttons">
+            <input type="submit">
+                               <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Cancel allocation')"/></xsl:attribute>
+                       </input>
+            <a class="cancel">
+                <xsl:attribute name="href"><xsl:value-of 
select="allocation/cancel_link"/></xsl:attribute>
+                <xsl:value-of select="php:function('lang', 'Cancel')" />
+            </a>
+        </div>
+    </form>
+    </div>
+    <script type="text/javascript">
+        YAHOO.booking.season_id = '<xsl:value-of 
select="allocation/season_id"/>';
+        <![CDATA[
+        var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
+            height: '300px',
+            width: '522px',
+            dompath: true,
+            animate: true,
+           handleSubmit: true,
+            toolbar: {
+                titlebar: '',
+                buttons: [
+                   { group: 'textstyle', label: ' ',
+                        buttons: [
+                            { type: 'push', label: 'Bold', value: 'bold' },
+                            { type: 'separator' },
+                            { type: 'push', label: 'HTML Link CTRL + SHIFT + 
L', value: 'createlink'}
+                        ]
+                    }
+                ]
+            }
+        });
+        descEdit.render();
+        ]]>
+</script>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_info.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_info.xsl     
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/allocation_info.xsl     
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,23 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <div class="close"><a onclick="YAHOO.booking.closeOverlay(); return 
false" href=""><xsl:value-of select="php:function('lang', 'Close')"/></a></div>
+       <h3><xsl:value-of select="php:function('lang', 'Allocation')"/> 
#<xsl:value-of select="allocation/id"/></h3>
+       <dl>
+               <dt><xsl:value-of select="php:function('lang', 'Where')"/></dt>
+               <dd>
+                       <a href="{allocation/building_link}"><xsl:value-of 
select="allocation/resources[position()=1]/building_name"/></a>
+                       (<xsl:value-of select="allocation/resource_info"/>)
+               </dd>
+               <dt><xsl:value-of select="php:function('lang', 'When')"/></dt>
+               <dd><xsl:value-of select="allocation/when"/></dd>
+               <dt><xsl:value-of select="php:function('lang', 'Who')"/></dt>
+               <dd>
+                       <a href="{allocation/org_link}"><xsl:value-of 
select="allocation/organization_name"/></a>
+               </dd>
+       </dl>
+       <xsl:if test="allocation/add_link">
+               <div class="actions">
+                       <button 
onclick="location.href='{allocation/add_link}'"><xsl:value-of 
select="php:function('lang', 'Create new booking')"/></button>
+                       <button 
onclick="location.href='{allocation/cancel_link}'"><xsl:value-of 
select="php:function('lang', 'Cancel allocation')"/></button>
+               </div>
+       </xsl:if>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/app_data.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/app_data.xsl            
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/app_data.xsl    
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,2 @@
+<xsl:template name="dummy">
+</xsl:template>


Property changes on: 
branches/dev-thomasez/bookingfrontend/templates/nsf/app_data.xsl
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/booking_cancel.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/booking_cancel.xsl      
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/booking_cancel.xsl      
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,170 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+       <dl class="form">
+       <dt class="heading"><xsl:value-of select="php:function('lang', 'Cancel 
bookings')"/></dt>
+       </dl>
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+    <form action="" method="POST">
+               <input type="hidden" name="application_id" 
value="{booking/application_id}"/>
+        <input type="hidden" name="group_id" value="{booking/group_id}" />
+        <input type="hidden" name="building_id" value="{booking/building_id}" 
/>
+        <input type="hidden" name="season_id" value="{booking/season_id}" />
+        <input type="hidden" name="from_" value="{booking/from_}" />
+        <input type="hidden" name="to_" value="{booking/to_}" />
+
+        <dl class="form-col">
+            <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')" /></label></dt>
+            <dd>
+                <div>
+                        <xsl:value-of select="booking/building_name"/>
+                </div>
+            </dd>
+            <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')" /></label></dt>
+            <dd>
+                <div>
+                    <xsl:value-of select="booking/from_"/>
+                </div>
+            </dd>
+            <dt><label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')"/></label></dt>
+            <dd>
+                <div>
+                    <xsl:value-of select="booking/to_"/>
+                </div>
+            </dd>
+                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Recurring allocation cancelation')" 
/></label></dt>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="outseason" 
id="outseason">
+                                               <xsl:if test="outseason='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Out season')" />
+                               </label>
+                       </dd>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="recurring" 
id="recurring">
+                                               <xsl:if test="recurring='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Cancel until')" />
+                               </label>
+                       </dd>
+                       <dd class="date-picker">
+                               <input id="field_repeat_until" 
name="repeat_until" type="text">
+                                       <xsl:attribute 
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
+                               </input>
+                       </dd>
+                       <dt><xsl:value-of select="php:function('lang', 
'Interval')" /></dt>
+                       <dd>
+                               <xsl:value-of select="../field_interval" />
+                               <select id="field_interval" 
name="field_interval">
+                                       <option value="1">
+                                               <xsl:if test="interval=1">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '1 week')" />
+                                       </option>
+                                       <option value="2">
+                                               <xsl:if test="interval=2">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '2 weeks')" />
+                                       </option>
+                                       <option value="3">
+                                               <xsl:if test="interval=3">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '3 weeks')" />
+                                       </option>
+                                       <option value="4">
+                                               <xsl:if test="interval=4">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '4 weeks')" />
+                                       </option>
+                               </select>
+                       </dd>
+        </dl>
+        <dl class="form-col">
+            <dt><label for="field_group"><xsl:value-of 
select="php:function('lang', 'Group')"/></label></dt>
+            <dd>
+                        <xsl:value-of select="booking/group_name"/>
+            </dd>
+            <dt><label for="field_season"><xsl:value-of 
select="php:function('lang', 'Season')"/></label></dt>
+            <dd>
+                        <xsl:value-of select="booking/season_name"/>
+            </dd>
+                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Cancel allocation also')" /></label></dt>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" 
name="delete_booking" id="delete_booking">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                                       <xsl:attribute 
name="disabled">disabled</xsl:attribute>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Cancel bookings')" />
+                               </label>
+                       </dd>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" 
name="delete_allocation" id="delete_allocation">
+                                               <xsl:if 
test="delete_allocation='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Cancel allocations')" />
+                               </label>
+                       </dd>
+        </dl>
+               <div style='clear:left; padding:0; margin:0'/>
+
+        <dl class="form-col">
+               <dt><label for="field_message"><xsl:value-of 
select="php:function('lang', 'Message')" /></label></dt>
+               <dd class="yui-skin-sam">
+               <textarea id="field-message" name="message" 
type="text"><xsl:value-of select="system_message/message"/></textarea>
+               </dd>
+        </dl>
+
+        <div class="form-buttons">
+            <input type="submit">
+                               <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Cancel booking')"/></xsl:attribute>
+                       </input>
+            <a class="cancel">
+                <xsl:attribute name="href"><xsl:value-of 
select="booking/cancel_link"/></xsl:attribute>
+                <xsl:value-of select="php:function('lang', 'Cancel')"/>
+            </a>
+        </div>
+    </form>
+    </div>
+    <script type="text/javascript">
+        YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
+        YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
+        <![CDATA[
+        var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
+            height: '150px',
+            width: '522px',
+            dompath: true,
+            animate: true,
+           handleSubmit: true,
+            toolbar: {
+                titlebar: '',
+                buttons: [
+                   { group: 'textstyle', label: ' ',
+                        buttons: [
+                            { type: 'push', label: 'Bold', value: 'bold' },
+                            { type: 'separator' },
+                            { type: 'push', label: 'HTML Link CTRL + SHIFT + 
L', value: 'createlink'}
+                        ]
+                    }
+                ]
+            }
+        });
+        descEdit.render();
+        ]]>
+</script>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit.xsl        
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit.xsl        
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,175 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+       <dl class="form">
+       <dt class="heading"><xsl:value-of select="php:function('lang', 
'Booking')"/> #<xsl:value-of select="booking/id"/></dt>
+       </dl>
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+    <form action="" method="POST">
+               <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
+               <input type="hidden" name="allocation_id" 
value="{booking/allocation_id}"/>
+               <input type="hidden" name="step" value="1"/>
+        <dl class="form-col">
+            <dt><label for="field_active"><xsl:value-of 
select="php:function('lang', 'Active')"/></label></dt>
+            <dd>
+                <select id="field_active" name="active">
+                    <option value="1">
+                       <xsl:if test="booking/active=1">
+                               <xsl:attribute 
name="selected">checked</xsl:attribute>
+                       </xsl:if>
+                        <xsl:value-of select="php:function('lang', 'Active')"/>
+                    </option>
+                    <option value="0">
+                       <xsl:if test="booking/active=0">
+                               <xsl:attribute 
name="selected">checked</xsl:attribute>
+                       </xsl:if>
+                        <xsl:value-of select="php:function('lang', 
'Inactive')"/>
+                    </option>
+                </select>
+            </dd>
+                       <dt><label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Activity')" /></label></dt>
+                       <dd>
+                               <select name="activity_id" id="field_activity">
+                                       <option value=""><xsl:value-of 
select="php:function('lang', '-- select an activity --')" /></option>
+                                       <xsl:for-each select="activities">
+                                               <option>
+                                                       <xsl:if 
test="../booking/activity_id = id">
+                                                               <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                                       </xsl:if>
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                       <xsl:value-of 
select="name"/>
+                                               </option>
+                                       </xsl:for-each>
+                               </select>
+                       </dd>
+            <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')"/></label></dt>
+            <dd>
+                <input id="field_building_id" name="building_id" type="hidden" 
value="{booking/building_id}"/>
+                   <xsl:value-of select="booking/building_name"/>
+            </dd>
+            <dt><label for="field_resources"><xsl:value-of 
select="php:function('lang', 'Resources')"/></label></dt>
+            <dd>
+                <div id="resources_container"><xsl:value-of 
select="php:function('lang', 'Select a building first')"/></div>
+            </dd>
+        </dl>
+        <dl class="form-col">
+            <dt><label for="field_org"><xsl:value-of 
select="php:function('lang', 'Organization')"/></label></dt>
+            <dd>
+                   <xsl:value-of select="booking/organization_name"/>
+            </dd>
+            <dt><label for="field_group"><xsl:value-of 
select="php:function('lang', 'Group')"/></label></dt>
+            <dd>
+                               <select name="group_id">
+                                               <option value=""><xsl:value-of 
select="php:function('lang', 'Select a group')"/></option>
+                                       <xsl:for-each select="groups">
+                                               <option value="{id}">
+                                                       <xsl:if 
test="../booking/group_id = id">
+                                                               <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                                       </xsl:if>
+                                                       <xsl:value-of 
select="name"/>
+                                               </option>
+                                       </xsl:for-each>
+                               </select>
+            </dd>
+            <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')"/></label></dt>
+            <dd>
+                <div class="datetime-picker">
+                <input id="field_from" name="from_" type="text">
+                    <xsl:attribute name="value"><xsl:value-of 
select="booking/from_"/></xsl:attribute>
+                </input>
+                </div>
+            </dd>
+            <dt><label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')"/></label></dt>
+            <dd>
+                <div class="datetime-picker">
+                <input id="field_to" name="to_" type="text">
+                    <xsl:attribute name="value"><xsl:value-of 
select="booking/to_"/></xsl:attribute>
+                </input>
+                </div>
+            </dd>
+                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Recurring booking')" /></label></dt>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="outseason" 
id="outseason">
+                                               <xsl:if test="outseason='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Out season')" />
+                               </label>
+                       </dd>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="recurring" 
id="recurring">
+                                               <xsl:if test="recurring='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Repeat until')" />
+                               </label>
+                       </dd>
+                       <dd class="date-picker">
+                               <input id="field_repeat_until" 
name="repeat_until" type="text">
+                                       <xsl:attribute 
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
+                               </input>
+                       </dd>
+        </dl>
+               <dl class="form-col">
+                       <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Target audience')" /></label></dt>
+                       <dd>
+                               <ul>
+                                       <xsl:for-each select="audience">
+                                               <li>
+                                                       <input type="checkbox" 
name="audience[]">
+                                                               <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                               <xsl:if 
test="../booking/audience=id">
+                                                                       
<xsl:attribute name="checked">checked</xsl:attribute>
+                                                               </xsl:if>
+                                                       </input>
+                                                       <label><xsl:value-of 
select="name"/></label>
+                                               </li>
+                                       </xsl:for-each>
+                               </ul>
+                       </dd>
+                       <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Number of participants')" /></label></dt>
+                       <dd>
+                               <table id="agegroup">
+                                       <tr><th/><th><xsl:value-of 
select="php:function('lang', 'Male')" /></th>
+                                           <th><xsl:value-of 
select="php:function('lang', 'Female')" /></th></tr>
+                                       <xsl:for-each select="agegroups">
+                                               <xsl:variable 
name="id"><xsl:value-of select="id"/></xsl:variable>
+                                               <tr>
+                                                       <th><xsl:value-of 
select="name"/></th>
+                                                       <td>
+                                                               <input 
type="text">
+                                                                       
<xsl:attribute name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+                                                                       
<xsl:attribute name="value"><xsl:value-of 
select="../booking/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+                                                               </input>
+                                                       </td>
+                                                       <td>
+                                                               <input 
type="text">
+                                                                       
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+                                                                       
<xsl:attribute name="value"><xsl:value-of 
select="../booking/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+                                                               </input>
+                                                       </td>
+                                               </tr>
+                                       </xsl:for-each>
+                               </table>
+                       </dd>
+               </dl>
+        <div class="form-buttons">
+            <input type="submit">
+                       <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Save')"/></xsl:attribute>
+                       </input>
+            <a class="cancel" href="" onclick="history.back(1); return false">
+                <xsl:value-of select="php:function('lang', 'Go back')"/>
+            </a>
+        </div>
+    </form>
+    </div>
+    <script type="text/javascript">
+        YAHOO.booking.initialSelection = <xsl:value-of 
select="booking/resources_json"/>;
+    </script>
+</xsl:template>

Added: 
branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit_preview.xsl
===================================================================
--- 
branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit_preview.xsl    
                            (rev 0)
+++ 
branches/dev-thomasez/bookingfrontend/templates/nsf/booking_edit_preview.xsl    
    2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,54 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+               <dl class="form">
+                       <dt class="heading"><xsl:value-of 
select="php:function('lang', 'Mass update')"/></dt>
+               </dl>
+               <xsl:call-template name="msgbox"/>
+               <xsl:call-template name="yui_booking_i18n"/>
+               <xsl:choose>
+                       <xsl:when test="step = 2">
+                               <p>
+                                       <xsl:value-of 
select="php:function('lang', '%1 bookings will be updated.', 
count(bookings/results))" />
+                               </p>
+                               <form action="" method="POST">
+                                       <input type="hidden" 
name="repeat_until" value="{repeat_until}"/>
+                                       <input type="hidden" name="recurring" 
value="{recurring}"/>
+                                       <input type="hidden" name="outseason" 
value="{outseason}"/>
+                                       <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
+                                       <input type="hidden" name="step" 
value="{step}"/>
+                                       <input type="hidden" name="group_id" 
value="{group_id}"/>
+                                       <input type="hidden" name="activity_id" 
value="{activity_id}"/>
+                                       <input type="hidden" name="building_id" 
value="{booking/building_id}"/>
+                                       <select size="10">
+                                               <xsl:for-each 
select="bookings/results">
+                                                       <option>
+                                                               <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                               <xsl:value-of 
select="from_"/> - <xsl:value-of select="to_"/>
+                                                       </option>
+                                               </xsl:for-each>
+                                       </select>
+                                       <xsl:if test="count(bookings/results) 
&gt; 0">
+                                               <div class="form-buttons">
+                                                       <input type="submit" 
style="float: right;">
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 
'Update')"/></xsl:attribute>
+                                                       </input>
+                                               </div>
+                                       </xsl:if>
+                               </form>
+                       </xsl:when>
+                       <xsl:when test="step = 3">
+                               <p>
+                                       <xsl:value-of 
select="php:function('lang', '%1 bookings were updated.', update_count)" />
+                                       <div class="form-buttons">
+                                       <a class="cancel">
+                               <xsl:attribute name="href"><xsl:value-of 
select="booking/cancel_link"/></xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 'Go 
back to calendar')" />
+                           </a>
+                                       </div>
+                               </p>
+
+                       </xsl:when>
+               </xsl:choose>
+    </div>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/booking_info.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/booking_info.xsl        
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/booking_info.xsl        
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,26 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <div class="close"><a onclick="YAHOO.booking.closeOverlay(); return 
false" href=""><xsl:value-of select="php:function('lang', 'Close')"/></a></div>
+       <h3><xsl:value-of select="php:function('lang', 'Booking')"/> 
#<xsl:value-of select="booking/id"/></h3>
+       <dl>
+               <dt><xsl:value-of select="php:function('lang', 
'Activity')"/></dt>
+               <dd><xsl:value-of select="booking/activity_name"/></dd>
+               <dt><xsl:value-of select="php:function('lang', 'Where')"/></dt>
+               <dd>
+                       <a href="{booking/building_link}"><xsl:value-of 
select="booking/resources[position()=1]/building_name"/></a>
+                       (<xsl:value-of select="booking/resource_info"/>)
+               </dd>
+               <dt><xsl:value-of select="php:function('lang', 'When')"/></dt>
+               <dd><xsl:value-of select="booking/when"/></dd>
+               <dt><xsl:value-of select="php:function('lang', 'Who')"/></dt>
+               <dd>
+                       <a href="{booking/org_link}"><xsl:value-of 
select="booking/group/organization_name"/></a>:
+                       <a href="{booking/group_link}"><xsl:value-of 
select="booking/group/name"/></a>
+               </dd>
+       </dl>
+       <xsl:if test="booking/edit_link">
+               <div class="actions">
+                       <button 
onclick="location.href='{booking/edit_link}'"><xsl:value-of 
select="php:function('lang', 'Edit booking')"/></button>
+                       <button 
onclick="location.href='{booking/cancel_link}'"><xsl:value-of 
select="php:function('lang', 'Cancel booking')"/></button>
+               </div>
+       </xsl:if>
+</xsl:template>

Added: 
branches/dev-thomasez/bookingfrontend/templates/nsf/booking_massupdate.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/booking_massupdate.xsl  
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/booking_massupdate.xsl  
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,140 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+               <dl class="form">
+                       <dt class="heading"><xsl:value-of 
select="php:function('lang', 'Mass update')"/></dt>
+               </dl>
+               <xsl:call-template name="msgbox"/>
+               <xsl:call-template name="yui_booking_i18n"/>
+               <xsl:choose>
+                       <xsl:when test="step = 2">
+                               <p>
+                                       <xsl:value-of 
select="php:function('lang', '%1 bookings will be updated.', 
count(booking/results))" />
+                               </p>
+                               <form action="" method="POST">
+                                       <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
+                                       <input type="hidden" name="step" 
value="{step}"/>
+                                       <input type="hidden" name="group_id" 
value="{group_id}"/>
+                                       <input type="hidden" name="activity_id" 
value="{activity_id}"/>
+                                       <select size="10">
+                                               <xsl:for-each 
select="booking/results">
+                                                       <option>
+                                                               <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                               <xsl:value-of 
select="from_"/> - <xsl:value-of select="to_"/>
+                                                       </option>
+                                               </xsl:for-each>
+                                       </select>
+                                       <xsl:if test="count(booking/results) 
&gt; 0">
+                                               <div class="form-buttons">
+                                                       <input type="submit" 
style="float: right;">
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 
'Update')"/></xsl:attribute>
+                                                       </input>
+                                               </div>
+                                       </xsl:if>
+                               </form>
+                       </xsl:when>
+                       <xsl:when test="step = 3">
+                               <p>
+                                       <xsl:value-of 
select="php:function('lang', '%1 bookings were updated.', update_count)" />
+                               </p>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <p>
+                                       <xsl:value-of 
select="php:function('lang', 'You are now about to update all bookings from 
this date and to the end of the season.')" />&nbsp;
+                                       <xsl:value-of 
select="php:function('lang', 'Please update the data and click the 
Next-button.')" />&nbsp;
+                                       <xsl:value-of 
select="php:function('lang', 'When clicking the Next-button you will be 
presented to a list of bookings that will be updated.')" />
+                               </p>
+                               <form action="" method="POST">
+                                       <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
+                                       <input type="hidden" 
name="allocation_id" value="{booking/allocation_id}"/>
+                                       <input type="hidden" name="step" 
value="1"/>
+                                       <dl class="form-col">
+                                               <dt><label 
for="field_activity"><xsl:value-of select="php:function('lang', 'Activity')" 
/></label></dt>
+                                               <dd>
+                                                       <select 
name="activity_id" id="field_activity">
+                                                               <option 
value=""><xsl:value-of select="php:function('lang', '-- select an activity 
--')" /></option>
+                                                               <xsl:for-each 
select="activities">
+                                                                       <option>
+                                                                               
<xsl:if test="../booking/activity_id = id">
+                                                                               
        <xsl:attribute name="selected">selected</xsl:attribute>
+                                                                               
</xsl:if>
+                                                                               
<xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                                               
<xsl:value-of select="name"/>
+                                                                       
</option>
+                                                               </xsl:for-each>
+                                                       </select>
+                                               </dd>
+                                               <dt><label 
for="field_group"><xsl:value-of select="php:function('lang', 
'Group')"/></label></dt>
+                                               <dd>
+                                                       <select name="group_id">
+                                                                       <option 
value=""><xsl:value-of select="php:function('lang', 'Select a 
group')"/></option>
+                                                               <xsl:for-each 
select="groups">
+                                                                       <option 
value="{id}">
+                                                                               
<xsl:if test="../booking/group_id = id">
+                                                                               
        <xsl:attribute name="selected">selected</xsl:attribute>
+                                                                               
</xsl:if>
+                                                                               
<xsl:value-of select="name"/>
+                                                                       
</option>
+                                                               </xsl:for-each>
+                                                       </select>
+                                               </dd>
+                                       </dl>
+                                       <dl class="form-col">
+                                               <dt><label 
for="field_from"><xsl:value-of select="php:function('lang', 'Target audience')" 
/></label></dt>
+                                               <dd>
+                                                       <ul>
+                                                               <xsl:for-each 
select="audience">
+                                                                       <li>
+                                                                               
<input type="checkbox" name="audience[]">
+                                                                               
        <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                                               
        <xsl:if test="../booking/audience=id">
+                                                                               
                <xsl:attribute name="checked">checked</xsl:attribute>
+                                                                               
        </xsl:if>
+                                                                               
</input>
+                                                                               
<label><xsl:value-of select="name"/></label>
+                                                                       </li>
+                                                               </xsl:for-each>
+                                                       </ul>
+                                               </dd>
+                                       </dl>
+                                       <dl class="form-col">
+                                               <dt><label 
for="field_from"><xsl:value-of select="php:function('lang', 'Number of 
participants')" /></label></dt>
+                                               <dd>
+                                                       <table id="agegroup">
+                                                               
<tr><th/><th><xsl:value-of select="php:function('lang', 'Male')" /></th>
+                                                                       
<th><xsl:value-of select="php:function('lang', 'Female')" /></th></tr>
+                                                               <xsl:for-each 
select="agegroups">
+                                                                       
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+                                                                       <tr>
+                                                                               
<th><xsl:value-of select="name"/></th>
+                                                                               
<td>
+                                                                               
        <input type="text">
+                                                                               
                <xsl:attribute name="name">male[<xsl:value-of 
select="id"/>]</xsl:attribute>
+                                                                               
                <xsl:attribute name="value"><xsl:value-of 
select="../booking/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+                                                                               
        </input>
+                                                                               
</td>
+                                                                               
<td>
+                                                                               
        <input type="text">
+                                                                               
                <xsl:attribute name="name">female[<xsl:value-of 
select="id"/>]</xsl:attribute>
+                                                                               
                <xsl:attribute name="value"><xsl:value-of 
select="../booking/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+                                                                               
        </input>
+                                                                               
</td>
+                                                                       </tr>
+                                                               </xsl:for-each>
+                                                       </table>
+                                               </dd>
+
+                                       </dl>
+                                       <div class="form-buttons">
+                                               <input type="submit" 
style="float: right;">
+                                               <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 
'Next')"/></xsl:attribute>
+                                               </input>
+                                       </div>
+                               </form>
+                       </xsl:otherwise>
+               </xsl:choose>
+    </div>
+    <script type="text/javascript">
+               YAHOO.util.Dom.setStyle(('header'), 'display', 'none');
+    </script>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new.xsl         
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new.xsl 
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,195 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+       <dl class="form">
+       <dt class="heading"><xsl:value-of select="php:function('lang', 'New 
Booking')"/></dt>
+       </dl>
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+    <form action="" method="POST">
+               <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
+               <input type="hidden" name="allocation_id" 
value="{booking/allocation_id}"/>
+        <dl class="form-col">
+                       <dt><label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Activity')" /></label></dt>
+                       <dd>
+                               <select name="activity_id" id="field_activity">
+                                       <option value=""><xsl:value-of 
select="php:function('lang', '-- select an activity --')" /></option>
+                                       <xsl:for-each select="activities">
+                                               <option>
+                                                       <xsl:if 
test="../booking/activity_id = id">
+                                                               <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                                       </xsl:if>
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                       <xsl:value-of 
select="name"/>
+                                               </option>
+                                       </xsl:for-each>
+                               </select>
+                       </dd>
+            <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')"/></label></dt>
+            <dd>
+                <input id="field_building_id" name="building_id" type="hidden" 
value="{booking/building_id}"/>
+                               <xsl:value-of select="booking/building_name"/>
+            </dd>
+            <dt><label for="field_resources"><xsl:value-of 
select="php:function('lang', 'Resources')"/></label></dt>
+            <dd>
+                <div id="resources_container"><xsl:value-of 
select="php:function('lang', 'Select a building first')"/></div>
+            </dd>
+        </dl>
+        <dl class="form-col">
+            <dt><label for="field_org"><xsl:value-of 
select="php:function('lang', 'Organization')"/></label></dt>
+            <dd>
+                   <xsl:value-of select="booking/organization_name"/>
+            </dd>
+            <dt><label for="field_group"><xsl:value-of 
select="php:function('lang', 'Group')"/></label></dt>
+            <dd>
+                               <select name="group_id">
+                                               <option value=""><xsl:value-of 
select="php:function('lang', 'Select a group')"/></option>
+                                       <xsl:for-each select="groups">
+                                               <option value="{id}">
+                                                       <xsl:if 
test="../booking/group_id = id">
+                                                               <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                                       </xsl:if>
+                                                       <xsl:value-of 
select="name"/>
+                                               </option>
+                                       </xsl:for-each>
+                               </select>
+            </dd>
+            <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')"/></label></dt>
+            <dd>
+                <div class="time-picker">
+                               <xsl:value-of select="date_from"/>
+                <input id="field_from" name="from_" type="text">
+                    <xsl:attribute name="value"><xsl:value-of 
select="booking/from_"/></xsl:attribute>
+                </input>
+                </div>
+            </dd>
+            <dt><label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')"/></label></dt>
+                       <dd>
+                       </dd>
+            <dd>
+                <div class="time-picker">
+                               <xsl:value-of select="date_to"/>
+                <input id="field_to" name="to_" type="text">
+                    <xsl:attribute name="value"><xsl:value-of 
select="booking/to_"/></xsl:attribute>
+                </input>
+                </div>
+                       </dd>
+
+
+                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Recurring booking')" /></label></dt>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="outseason" 
id="outseason">
+                                               <xsl:if test="outseason='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Out season')" />
+                               </label>
+                       </dd>
+                       <dd>
+                               <label>
+                                       <input type="checkbox" name="recurring" 
id="recurring">
+                                               <xsl:if test="recurring='on'">
+                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                               </xsl:if>
+                                       </input>
+                                       <xsl:value-of 
select="php:function('lang', 'Repeat until')" />
+                               </label>
+                       </dd>
+                       <dd class="date-picker">
+                               <input id="field_repeat_until" 
name="repeat_until" type="text">
+                                       <xsl:attribute 
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
+                               </input>
+                       </dd>
+                       <dt><xsl:value-of select="php:function('lang', 
'Interval')" /></dt>
+                       <dd>
+                               <xsl:value-of select="../field_interval" />
+                               <select id="field_interval" 
name="field_interval">
+                                       <option value="1">
+                                               <xsl:if test="interval=1">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '1 week')" />
+                                       </option>
+                                       <option value="2">
+                                               <xsl:if test="interval=2">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '2 weeks')" />
+                                       </option>
+                                       <option value="3">
+                                               <xsl:if test="interval=3">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '3 weeks')" />
+                                       </option>
+                                       <option value="4">
+                                               <xsl:if test="interval=4">
+                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:value-of 
select="php:function('lang', '4 weeks')" />
+                                       </option>
+                               </select>
+                       </dd>
+
+
+        </dl>
+               <dl class="form-col">
+                       <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Target audience')" /></label></dt>
+                       <dd>
+                               <ul>
+                                       <xsl:for-each select="audience">
+                                               <li>
+                                                       <input type="checkbox" 
name="audience[]">
+                                                               <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                                               <xsl:if 
test="../booking/audience=id">
+                                                                       
<xsl:attribute name="checked">checked</xsl:attribute>
+                                                               </xsl:if>
+                                                       </input>
+                                                       <label><xsl:value-of 
select="name"/></label>
+                                               </li>
+                                       </xsl:for-each>
+                               </ul>
+                       </dd>
+                       <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Number of participants')" /></label></dt>
+                       <dd>
+                               <table id="agegroup">
+                                       <tr><th/><th><xsl:value-of 
select="php:function('lang', 'Male')" /></th>
+                                           <th><xsl:value-of 
select="php:function('lang', 'Female')" /></th></tr>
+                                       <xsl:for-each select="agegroups">
+                                               <xsl:variable 
name="id"><xsl:value-of select="id"/></xsl:variable>
+                                               <tr>
+                                                       <th><xsl:value-of 
select="name"/></th>
+                                                       <td>
+                                                               <input 
type="text">
+                                                                       
<xsl:attribute name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+                                                                       
<xsl:attribute name="value"><xsl:value-of 
select="../booking/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+                                                               </input>
+                                                       </td>
+                                                       <td>
+                                                               <input 
type="text">
+                                                                       
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+                                                                       
<xsl:attribute name="value"><xsl:value-of 
select="../booking/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+                                                               </input>
+                                                       </td>
+                                               </tr>
+                                       </xsl:for-each>
+                               </table>
+                       </dd>
+               </dl>
+        <div class="form-buttons">
+            <input type="submit">
+                               <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Create')"/></xsl:attribute>
+                       </input>
+            <a class="cancel" href="" onclick="history.back(1); return false">
+                <xsl:value-of select="php:function('lang', 'Go back')"/>
+            </a>
+        </div>
+    </form>
+    </div>
+    <script type="text/javascript">
+        YAHOO.booking.initialSelection = <xsl:value-of 
select="booking/resources_json"/>;
+    </script>
+</xsl:template>

Added: 
branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new_preview.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new_preview.xsl 
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/booking_new_preview.xsl 
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,83 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+       <dl class="form">
+       <dt class="heading"><xsl:value-of select="php:function('lang', 'New 
Booking')"/></dt>
+       </dl>
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+       <!-- <xsl:call-template name="xmlsource"/> -->
+
+           <form action="" method="POST">
+                       <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
+                       <input type="hidden" name="field_building_id" 
value="{booking/building_id}"/>
+                       <input type="hidden" name="allocation_id" 
value="{booking/allocation_id}"/>
+                       <input type="hidden" name="step" value="{step}" />
+                       <input type="hidden" name="from_" value="{from_date}" />
+                       <input type="hidden" name="to_" value="{to_date}" />
+                       <input type="hidden" name="repeat_until" 
value="{repeat_until}" />
+                       <input type="hidden" name="field_interval" 
value="{interval}" />
+                       <input type="hidden" name="recurring" 
value="{recurring}" />
+                       <input type="hidden" name="outseason" 
value="{outseason}" />
+                       <input type="hidden" name="activity_id" 
value="{booking/activity_id}" />
+                       <input type="hidden" name="group_id" 
value="{booking/group_id}" />
+                       <xsl:for-each select="booking/audience">
+                               <input type="hidden" name="audience[]" 
value="{.}" />
+                       </xsl:for-each>
+                       <xsl:for-each select="booking/resources">
+                               <input type="hidden" name="resources[]" 
value="{.}" />
+                       </xsl:for-each>
+                       <xsl:for-each select="booking/agegroups">
+                               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+                               <input type="hidden">
+                                       <xsl:attribute 
name="name">male[<xsl:value-of select="agegroup_id"/>]</xsl:attribute>
+                                       <xsl:attribute 
name="value"><xsl:value-of select="male"/></xsl:attribute>
+                               </input>
+                               <input type="hidden">
+                                       <xsl:attribute 
name="name">female[<xsl:value-of select="agegroup_id"/>]</xsl:attribute>
+                                       <xsl:attribute 
name="value"><xsl:value-of select="female"/></xsl:attribute>
+                               </input>
+                       </xsl:for-each>
+
+
+                       <h4><xsl:value-of select="php:function('lang', 
'Bookings that can be created')" /></h4>
+                       <div class="allocation-list">
+                               <xsl:for-each select="valid_dates">
+                                       <li>
+                                               <xsl:value-of select="from_"/> 
- <xsl:value-of select="to_"/>
+                                       </li>
+                               </xsl:for-each>
+                       </div>
+
+                       <h4><xsl:value-of select="php:function('lang', 
'Allocations colliding with existing bookings or allocations (%1)', 
count(result/invalid[from_]))" /></h4>
+                       <div class="allocation-list">
+                               <xsl:for-each select="invalid_dates">
+                                       <li>
+                                               <xsl:value-of select="from_"/> 
- <xsl:value-of select="to_"/>
+                                       </li>
+                               </xsl:for-each>
+                       </div>
+               <div class="form-buttons">
+                   <input type="submit" name="create">
+                               <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Create')" /></xsl:attribute>
+                               </input>
+                   <a class="cancel">
+                       <xsl:attribute name="href"><xsl:value-of 
select="season/wtemplate_link"/></xsl:attribute>
+                       <xsl:value-of select="php:function('lang', 'Cancel')" />
+                   </a>
+               </div>
+               </form>
+
+    </div>
+    <script type="text/javascript">
+        YAHOO.booking.initialSelection = <xsl:value-of 
select="booking/resources_json"/>;
+    </script>
+</xsl:template>
+<xsl:template name="xmlsource">
+  NODE <xsl:value-of select="name()"/>
+  ATTR { <xsl:for-each select="attribute::*"><xsl:value-of 
select="name()"/>=<xsl:value-of select="."/> </xsl:for-each> }
+  CHILDREN: { <xsl:for-each select="*"><xsl:call-template 
name="xmlsource"/></xsl:for-each> }
+  TEXT <xsl:value-of select="text()"/>
+  <br/>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/building.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/building.xsl            
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/building.xsl    
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,109 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       
+       <div id="content">
+               <ul class="pathway">
+                       <li><a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of 
select="php:function('lang', 'Home')" /></a></li>
+                       <li>
+                               <a href="{resource/building_link}">
+                                       <xsl:value-of select="building/name"/>
+                               </a>
+                       </li>
+               </ul>
+
+               <xsl:for-each select="building">        
+
+                       <xsl:if test="deactivate_calendar=0">
+                       <div>
+                       <button 
onclick="window.location.href='{schedule_link}'"><xsl:value-of 
select="php:function('lang', 'Building schedule')" /></button>
+-                              Søk ledig tid/informasjon om hva som skjer
+                       </div>
+                       </xsl:if>
+
+                       <dl class="proplist-col main">
+                               <xsl:if test="normalize-space(description)">
+                                       <dl class="proplist description">
+                                               <dt><xsl:value-of 
select="php:function('lang', 'Description')" /></dt>
+                                               <dd><xsl:value-of 
select="description" disable-output-escaping="yes"/></dd>
+                                       </dl>
+                               </xsl:if>
+                               
+                               <xsl:if test="normalize-space(homepage) or 
normalize-space(email) or normalize-space(phone) or normalize-space(street)">
+                                       <h3><xsl:value-of 
select="php:function('lang', 'Contact information')" /></h3>
+                       <xsl:if test="deactivate_sendmessage=0">
+
+                       <div>
+                       <button 
onclick="window.location.href='{message_link}'"><xsl:value-of 
select="php:function('lang', 'Send message')" /></button>
+-                              Meldig til saksbehandler for bygg
+                       </div>
+                       </xsl:if>
+
+
+                                       <dl class="contactinfo">
+                                               <xsl:if test="homepage and 
normalize-space(homepage)">
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'Homepage')" /></dt>
+                                                       <dd><a 
href="{homepage}"><xsl:value-of select="homepage"/></a></dd>
+                                               </xsl:if>
+                                       
+                                               <xsl:if test="email and 
normalize-space(email)">
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'Email')" /></dt>
+                                                       <dd><a 
href='mailto:{email}'><xsl:value-of select="email"/></a></dd>
+                                               </xsl:if>
+                                       
+                                               <xsl:if test="phone and 
normalize-space(phone)">
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'Telephone')" /></dt>
+                                                       <dd><xsl:value-of 
select="phone"/></dd>
+                                               </xsl:if>
+                                       
+                                               <xsl:if test="street and 
normalize-space(street)">
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'Address')" /></dt>
+                                                       <dd>
+                                                               <xsl:value-of 
select="street"/><br/>
+                                                               <xsl:value-of 
select="zip_code"/><span>&nbsp; </span>
+                                                               <xsl:value-of 
select="city"/><br/>
+                                                               <xsl:value-of 
select="district"/>
+                                                       </dd>
+                                               </xsl:if>
+                                       </dl>
+                               </xsl:if>
+                               
+                               <h3><xsl:value-of select="php:function('lang', 
'Bookable resources')" /></h3>
+                               <div id="resources_container"/>
+
+                               <h3><xsl:value-of select="php:function('lang', 
'Building users')" /></h3>
+                               <div id="building_users_container"/>
+
+                               <h3><xsl:value-of select="php:function('lang', 
'Documents')" /></h3>
+                               <div id="documents_container"/>
+                       </dl>
+                       <dl class="proplist-col images">        
+                               <div id="images_container"></div>
+                       </dl>
+                       
+                       <script type="text/javascript">
+                               var building_id = <xsl:value-of select="id"/>;
+                               var lang = <xsl:value-of 
select="php:function('js_lang', 'Name', 'category', 'Activity', 'Resource 
Type')"/>;
+                               <![CDATA[
+                               
+                               YAHOO.util.Event.addListener(window, "load", 
function() {
+                               var url = 
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
 + building_id + '&phpgw_return_as=json&';
+                               var colDefs = [{key: 'name', label: 
lang['Name'], formatter: YAHOO.booking.formatLink}, {key: 'type', label: 
lang['Resource Type']}, {key: 'activity_name', label: lang['Activity']}];
+                               
YAHOO.booking.inlineTableHelper('resources_container', url, colDefs);
+                               });
+                               
+                               var url = 
'index.php?menuaction=bookingfrontend.uidocument_building.index&sort=name&no_images=1&filter_owner_id='
 + building_id + '&phpgw_return_as=json&';
+                               var colDefs = [{key: 'description', label: 
lang['Name'], formatter: YAHOO.booking.formatLink}];
+                               
YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
+                               
+                               var url = 
'index.php?menuaction=bookingfrontend.uidocument_building.index_images&sort=name&filter_owner_id='
 + building_id + '&phpgw_return_as=json&';
+                               YAHOO.booking.inlineImages('images_container', 
url);
+                               
+                               var url = 
'index.php?menuaction=bookingfrontend.uiorganization.building_users&sort=name&building_id='
 + building_id + '&phpgw_return_as=json&';
+                               var colDefs = [{key: 'name', label: 
lang['Name'], formatter: YAHOO.booking.formatLink}, {key: 'activity_name', 
label: lang['Activity']}];
+                               
YAHOO.booking.inlineTableHelper('building_users_container', url, colDefs);
+                               ]]>
+                       </script>
+               </xsl:for-each>
+       </div>
+</xsl:template>
+

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/building_schedule.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/building_schedule.xsl   
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/building_schedule.xsl   
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,59 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       <iframe id="yui-history-iframe" 
src="{webserver_url}/phpgwapi/js/yahoo/history/assets/blank.html" 
style="position:absolute;top:0; left:0;width:1px; 
height:1px;visibility:hidden;"></iframe>
+       <input id="yui-history-field" type="hidden"/>
+       
+       <div id="content">
+               <xsl:if test="backend != 'true'">
+                       <ul class="pathway">
+                               <li><a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of 
select="php:function('lang', 'Home')" /></a></li>
+                               <li>
+                                       <a>
+                                               <xsl:attribute 
name="href"><xsl:value-of select="building/building_link"/></xsl:attribute>
+                                               <xsl:value-of 
select="building/name"/>
+                                       </a>
+                               </li>
+                               <li><xsl:value-of select="php:function('lang', 
'Schedule')"/></li>
+                       </ul>
+
+                       <xsl:call-template name="msgbox"/>
+
+                       <xsl:if test="building/deactivate_application=0">
+                               <button 
onclick="YAHOO.booking.newApplicationForm();"><xsl:value-of 
select="php:function('lang', 'New booking application')" /></button>
+                               - Søk ledig tid
+                       </xsl:if>
+               </xsl:if>
+
+               <ul id="week-selector">
+                       <li><a href="#" onclick="YAHOO.booking.prevWeek(); 
return false"><xsl:value-of select="php:function('lang', 'Previous 
week')"/></a></li>
+                       <li id="cal_container"/>
+                       <li><a href="#" onclick="YAHOO.booking.nextWeek(); 
return false"><xsl:value-of select="php:function('lang', 'Next 
week')"/></a></li>
+               </ul>
+
+        <div id="schedule_container"/>
+    </div>
+
+<script type="text/javascript">
+YAHOO.util.Event.addListener(window, "load", function() {
+       YAHOO.booking.setupWeekPicker('cal_container');
+       YAHOO.booking.datasourceUrl = '<xsl:value-of 
select="building/datasource_url"/>';
+       YAHOO.booking.newApplicationUrl = '<xsl:value-of 
select="building/application_link"/>';
+       
+    var handleHistoryNavigation = function (state) {
+               YAHOO.booking.date = parseISO8601(state);
+               YAHOO.booking.renderSchedule('schedule_container', 
YAHOO.booking.datasourceUrl, YAHOO.booking.date, 
YAHOO.booking.frontendScheduleColorFormatter, true);
+    };
+    var initialRequest = YAHOO.util.History.getBookmarkedState("date") || 
'<xsl:value-of select="building/date"/>';
+    YAHOO.util.History.register("date", initialRequest, 
handleHistoryNavigation);
+    YAHOO.util.History.onReady(function() {
+               var state = YAHOO.util.History.getBookmarkedState("date") || 
initialRequest;
+               if(state)
+                       handleHistoryNavigation(state);
+    });
+       YAHOO.util.History.initialize("yui-history-field", 
"yui-history-iframe");
+});
+<xsl:if test="backend = 'true'">
+       YAHOO.util.Dom.setStyle(('header'), 'display', 'none');
+</xsl:if>
+</script>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/config.tpl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/config.tpl              
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/config.tpl      
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,112 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+       <table border="0" align="center" width="85%">
+               <tr class="th">
+                       <td colspan="2">&nbsp;<b>{title}</b></td>
+               </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+               <tr class="row_on">
+                       <td colspan="2">&nbsp;</td>
+               </tr>
+               <tr class="row_off">
+                       <td 
colspan="2">&nbsp;<b>{lang_bookingfrontend_settings}</b></td>
+               </tr>
+          <tr class="row_on">
+           <td>{lang_remote_authentication}:</td>
+           <td>
+            <select name="newsettings[authentication_method]">
+{hook_authentication}
+            </select>
+           </td>
+          </tr>
+               <tr class="row_on">
+                       <td>{lang_custom_login_url}:</td>
+                       <td><input name="newsettings[custom_login_url]" 
value="{value_custom_login_url}"></td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_custom_login_url_parameter}:</td>
+                       <td><input name="newsettings[login_parameter]" 
value="{value_login_parameter}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_login_header_key}:</td>
+                       <td><input name="newsettings[header_key]" 
value="{value_header_key}"></td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_login_header_regular_expression}:</td>
+                       <td><input 
name="newsettings[header_regular_expression]" 
value="{value_header_regular_expression}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_login_soap_client_location}:</td>
+                       <td><input name="newsettings[soap_location]" 
value="{value_soap_location}"></td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_login_soap_client_uri}:</td>
+                       <td><input name="newsettings[soap_uri]" 
value="{value_soap_uri}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_login_soap_client_proxy_host}:</td>
+                       <td><input name="newsettings[soap_proxy_host]" 
value="{value_soap_proxy_host}"></td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_login_soap_client_proxy_port}:</td>
+                       <td><input name="newsettings[soap_proxy_port]" 
value="{value_soap_proxy_port}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_login_soap_client_encoding}:</td>
+                       <td><input name="newsettings[soap_encoding]" 
value="{value_soap_encoding}"></td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_login_soap_client_login}:</td>
+                       <td><input name="newsettings[soap_login]" 
value="{value_soap_login}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_login_soap_client_password}:</td>
+                       <td><input type ="password" 
name="newsettings[soap_password]" value="{value_soap_password}"></td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_login_soap_client_wsdl}:</td>
+                       <td><input name="newsettings[soap_wsdl]" 
value="{value_soap_wsdl}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_Debug}:</td>
+                       <td>
+                               <select name="newsettings[debug]">
+                                       <option value="" 
{selected_debug_}>NO</option>
+                                       <option value="1" 
{selected_debug_1}>YES</option>
+                               </select>
+                       </td>
+               </tr>
+               <tr class="row_on">
+                       <td>{lang_google_tracker_id}:</td>
+                       <td><input name="newsettings[tracker_id]" 
value="{value_tracker_id}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_url_to_external_logout}:
+                       <br/> Redirect is computed if url ends with '='
+                       </td>
+                       <td><input name="newsettings[external_logout]" 
value="{value_external_logout}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_bookingfrontend_host}:
+                       <br/> Needed for the return from the external_logout
+                       </td>
+                       <td><input name="newsettings[bookingfrontend_host]" 
value="{value_bookingfrontend_host}"></td>
+               </tr>
+
+<!-- END body -->
+<!-- BEGIN footer -->
+               <tr class="th">
+                       <td colspan="2">
+&nbsp;
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan="2" align="center">
+                               <input type="submit" name="submit" 
value="{lang_submit}">
+                               <input type="submit" name="cancel" 
value="{lang_cancel}">
+                       </td>
+               </tr>
+       </table>
+</form>
+<!-- END footer -->

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/event_info.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/event_info.xsl          
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/event_info.xsl  
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,29 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <div style="float: right"><a onclick="YAHOO.booking.closeOverlay(); 
return false" href=""><xsl:value-of select="php:function('lang', 
'Close')"/></a></div>
+       <h3><xsl:value-of select="php:function('lang', 'Event')"/> 
#<xsl:value-of select="event/id"/></h3>
+       <xsl:if test="event/is_public=1">
+               <div>
+                       <xsl:value-of select="event/description" 
disable-output-escaping="yes"/>
+               </div>
+       </xsl:if>
+       <dl>
+               <dt><xsl:value-of select="php:function('lang', 'Where')"/></dt>
+               <dd>
+                       <a href="{event/building_link}"><xsl:value-of 
select="event/resources[position()=1]/building_name"/></a>
+                       (<xsl:value-of select="event/resource_info"/>)
+               </dd>
+               <dt><xsl:value-of select="php:function('lang', 'When')"/></dt>
+               <dd><xsl:value-of select="event/when"/></dd>
+               <dt><xsl:value-of select="php:function('lang', 'Who')"/></dt>
+               <xsl:if test="event/is_public=1">
+                       <dd>
+                               <xsl:value-of select="event/contact_name"/>
+                       </dd>
+               </xsl:if>
+               <xsl:if test="event/is_public=0">
+                       <dd>
+                               <xsl:value-of select="php:function('lang', 
'Private event')"/>
+                       </dd>
+               </xsl:if>
+       </dl>
+</xsl:template>
\ No newline at end of file

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/group.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/group.xsl               
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/group.xsl       
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,53 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       
+    <div id="content">
+        <ul class="pathway">
+                       <li><a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of 
select="php:function('lang', 'Home')" /></a></li>
+            <li><a href="{group/organization_link}"><xsl:value-of 
select="group/organization_name"/></a></li>
+            <li><xsl:value-of select="group/name"/></li>
+        </ul>
+
+               <xsl:if test="group/permission/write">
+                   <span class="loggedin">
+                               <button 
onclick="window.location.href='{edit_self_link}'"><xsl:value-of 
select="php:function('lang', 'edit')" /></button>
+                               </span>
+               </xsl:if>
+        <xsl:call-template name="msgbox"/>
+
+        <dl class="proplist">
+            <dt><xsl:value-of select="php:function('lang', 'Group')" /></dt>
+            <dd><xsl:value-of select="group/name"/></dd>
+
+            <dt><xsl:value-of select="php:function('lang', 'Organization')" 
/></dt>
+            <dd><xsl:value-of select="group/organization_name"/></dd>
+                       
+                       <xsl:if test="group/description and 
normalize-space(group/description)">
+                               <dt><xsl:value-of select="php:function('lang', 
'Description')" /></dt>
+                       <dd><xsl:value-of select="group/description" 
disable-output-escaping="yes"/></dd>
+                       </xsl:if>
+                       
+                       <xsl:for-each select="group/contacts">
+                               <xsl:if test="normalize-space(.)">
+                                       <h3><xsl:value-of 
select="php:function('lang', 'Contact Person')" /></h3>
+                                       
+                                       <xsl:if test="name and 
string-length(normalize-space(name)) &gt; 0">
+                                               <dt><xsl:value-of 
select="php:function('lang', 'Name')" /></dt>
+                                               <dd><xsl:value-of 
select="name"/></dd>
+                                       </xsl:if>
+                                       
+                                       <xsl:if test="phone and 
string-length(normalize-space(phone)) &gt; 0">
+                                               <dt><xsl:value-of 
select="php:function('lang', 'Phone')" /></dt>
+                                               <dd><xsl:value-of 
select="phone"/></dd>
+                                       </xsl:if>
+                                       
+                                       <xsl:if test="email and 
string-length(normalize-space(email)) &gt; 0">
+                                               <dt><xsl:value-of 
select="php:function('lang', 'Email')" /></dt>
+                                               <dd><xsl:value-of 
select="email"/></dd>
+                                       </xsl:if>
+                               </xsl:if>
+                       </xsl:for-each>
+
+        </dl>
+    </div>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/organization.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/organization.xsl        
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/organization.xsl        
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,95 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       
+       <div id="content">
+               <ul class="pathway">
+                       <li><a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of 
select="php:function('lang', 'Home')" /></a></li>
+                       <li>
+                               <a href="{resource/building_link}">
+                                       <xsl:value-of 
select="resource/building_name"/>
+                               </a>
+                       </li>
+                       <li>
+                <xsl:value-of select="organization/name"/>
+                       </li>
+               </ul>
+
+               <xsl:if test="organization/permission/write">
+                       <span class="loggedin">
+               <button 
onclick="window.location.href='{organization/edit_link}'"><xsl:value-of 
select="php:function('lang', 'edit')" /></button>
+                       </span>
+               </xsl:if>
+               
+               <xsl:if test="organization/description and 
normalize-space(organization/description)">
+                       <dl class="proplist description">
+                   <dt><xsl:value-of select="php:function('lang', 
'Description')" /></dt>
+                   <dd><xsl:value-of select="organization/description" 
disable-output-escaping="yes"/></dd>
+               </dl>
+               </xsl:if>
+
+        <h3><xsl:value-of select="php:function('lang', 'Contact information')" 
/></h3>
+        <dl class="proplist contactinfo">
+       
+                       <xsl:if test="organization/homepage and 
normalize-space(organization/homepage)">                
+                   <dt><xsl:value-of select="php:function('lang', 'Homepage')" 
/></dt>
+                   <dd>
+                       <a target="blank" 
href="{organization/homepage}"><xsl:value-of select="organization/homepage" 
/></a>
+                   </dd>
+                       </xsl:if>
+                       
+                       <xsl:if test="organization/email and 
normalize-space(organization/email)">
+                               <dt><xsl:value-of select="php:function('lang', 
'Email')" /></dt>
+                   <dd><a href="mailto:{organization/email}";><xsl:value-of 
select="organization/email"/></a></dd>
+                       </xsl:if>
+
+                       <xsl:if test="organization/phone and 
normalize-space(organization/phone)">
+                           <dt><xsl:value-of select="php:function('lang', 
'Phone')" /></dt>
+                   <dd><xsl:value-of select="organization/phone"/></dd>        
+                       </xsl:if>
+
+                       <xsl:if test="organization/street and 
normalize-space(organization/street)">
+                                               <dt><xsl:value-of 
select="php:function('lang', 'Address')" /></dt>
+                                               <dd>
+                                                       <xsl:value-of 
select="organization/street"/><br/>
+                                                       <xsl:value-of 
select="organization/zip_code"/><span>&nbsp; </span>
+                                                       <xsl:value-of 
select="organization/city"/><br/>
+                                                       <xsl:value-of 
select="organization/district"/>
+                                               </dd>
+                       </xsl:if>
+
+        </dl>
+
+        <h3><xsl:value-of select="php:function('lang', 'Groups')" /></h3>
+        <div id="groups_container"/>
+
+                 <h3><xsl:value-of select="php:function('lang', 'Used 
buildings')" /></h3>
+        <div id="buildings_used_by_container"/>
+    </div>
+
+       <script type="text/javascript">
+               var organization_id = <xsl:value-of select="organization/id"/>;
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'Activity', 'Contact 1', 'Contact 2')"/>;
+       
+               <![CDATA[
+               YAHOO.util.Event.addListener(window, "load", function() {
+                       var url = 
'index.php?menuaction=bookingfrontend.uigroup.index&sort=name&filter_organization_id='
 + organization_id + '&phpgw_return_as=json&';
+                       var colDefs = [
+                               {key: 'name', label: lang['Name'], formatter: 
YAHOO.booking.formatLink}, 
+                               {key: 'link', 'hidden': true},
+                               {key: 'activity_name', label: lang['Activity']},
+                               {key: 'primary_contact_name', label: 
lang['Contact 1']},
+                               {key: 'secondary_contact_name', label: 
lang['Contact 2']}
+                       ];
+                       YAHOO.booking.inlineTableHelper('groups_container', 
url, colDefs);
+                       
+                       var url = 
'index.php?menuaction=bookingfrontend.uibuilding.find_buildings_used_by&sort=name&organization_id='
 + organization_id + '&phpgw_return_as=json&';
+                       var colDefs = [{key: 'name', label: lang['Name'], 
formatter: YAHOO.booking.formatLink}];
+                       
YAHOO.booking.inlineTableHelper('buildings_used_by_container', url, colDefs);
+               });
+               ]]>
+       </script>
+
+</xsl:template>
+
+
+

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/report_numbers.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/report_numbers.xsl      
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/report_numbers.xsl      
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,71 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+       <xsl:if test="step = 1">
+               <dl class="form">
+                       <dt class="heading"><xsl:value-of 
select="php:function('lang', 'Report numbers')"/></dt>
+               </dl>
+               <p><strong><xsl:value-of select="php:function('lang', 'Please 
enter correct numbers for the event')"/>:</strong></p>
+
+               <table id="agegroup">
+                       <tr>
+                               <th><xsl:value-of select="php:function('lang', 
'Where')" />:</th>
+                               <td><xsl:value-of select="building/name" /></td>
+                       </tr>
+                       <tr>
+                               <th><xsl:value-of select="php:function('lang', 
'When')" />:</th>
+                               <td><xsl:value-of 
select="php:function('pretty_timestamp', event_object/from_)" /> - 
<xsl:value-of select="php:function('pretty_timestamp', event_object/to_)" 
/></td>
+                       </tr>
+                       <xsl:if test="event_object/group_name">
+                       <tr>
+                               <th><xsl:value-of select="php:function('lang', 
'Who')" />:</th>
+                               <td><xsl:value-of 
select="event_object/group_name" /></td>
+                       </tr>
+                       </xsl:if>
+               </table>
+
+               <form action="" method="POST">
+                       <dl class="form-col">
+                               <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Number of participants')" /></label></dt>
+                               <dd>
+                                       <table id="agegroup">
+                                               <tr><th/><th><xsl:value-of 
select="php:function('lang', 'Male')" /></th>
+                                                       <th><xsl:value-of 
select="php:function('lang', 'Female')" /></th></tr>
+                                               <xsl:for-each 
select="agegroups">
+                                                       <xsl:variable 
name="id"><xsl:value-of select="id"/></xsl:variable>
+                                                       <tr>
+                                                               
<th><xsl:value-of select="name"/></th>
+                                                               <td>
+                                                                       <input 
type="text">
+                                                                               
<xsl:attribute name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+                                                                               
<xsl:attribute name="value"><xsl:value-of 
select="../event_object/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+                                                                       </input>
+                                                               </td>
+                                                               <td>
+                                                                       <input 
type="text">
+                                                                               
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+                                                                               
<xsl:attribute name="value"><xsl:value-of 
select="../event_object/agegroups/female[../agegroup_id = 
$id]"/></xsl:attribute>
+                                                                       </input>
+                                                               </td>
+                                                       </tr>
+                                               </xsl:for-each>
+                                       </table>
+                               </dd>
+                       </dl>
+                       <div class="form-buttons">
+                               <input type="submit">
+                               <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Save')"/></xsl:attribute>
+                               </input>
+                       </div>
+               </form>
+       </xsl:if>
+       <xsl:if test="step = 2">
+               <dl class="form">
+                       <dt class="heading"><xsl:value-of 
select="php:function('lang', 'Thank you')"/>!</dt>
+               </dl>
+               <p><dt class="heading"><xsl:value-of 
select="php:function('lang', 'The data was successfully updated')"/>!</dt></p>
+       </xsl:if>
+    </div>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/resource.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/resource.xsl            
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/resource.xsl    
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,62 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       
+       <div id="content">
+               <ul class="pathway">
+                       <li><a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of 
select="php:function('lang', 'Home')" /></a></li>
+                       <li>
+                               <a href="{resource/building_link}">
+                                       <xsl:value-of 
select="resource/building_name"/>
+                               </a>
+                       </li>
+                       <li>
+                <xsl:value-of select="resource/name"/>
+                       </li>
+               </ul>
+
+               <div>
+               <button 
onclick="window.location.href='{resource/schedule_link}'"><xsl:value-of 
select="php:function('lang', 'Resource schedule')" /></button>
+-                              Søk ledig tid/informasjon om hva som skjer
+               </div>
+
+               <dl class="proplist-col main">
+                       
+                       <xsl:if test="resource/description and 
normalize-space(resource/description)">
+                               <dt><xsl:value-of select="php:function('lang', 
'Description')" /></dt>
+                               <dd><xsl:value-of disable-output-escaping="yes" 
select="resource/description"/></dd>
+                       </xsl:if>
+                       
+                       <xsl:if test="resource/activity_name and 
normalize-space(resource/activity_name)">
+                               <dt><xsl:value-of select="php:function('lang', 
'Activity')" /></dt>
+                               <dd><xsl:value-of 
select="resource/activity_name"/></dd>
+                       </xsl:if>
+                       
+                       <dt><xsl:value-of select="php:function('lang', 
'Resource Type')" /></dt>
+                       <dd><xsl:value-of select="php:function('lang', 
string(resource/type))"/></dd>
+                       
+                       <h3><xsl:value-of select="php:function('lang', 
'Documents')" /></h3>
+                       <div id="documents_container"/>
+               </dl>
+               <dl class="proplist-col images">        
+                       <div id="images_container">
+                       </div>
+               </dl>
+       </div>
+
+       <script type="text/javascript">
+               var resource_id = <xsl:value-of select="resource/id"/>;
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'category', 'Activity')"/>;
+<![CDATA[
+       YAHOO.util.Event.addListener(window, "load", function() {
+
+       var url = 
'index.php?menuaction=bookingfrontend.uidocument_resource.index&sort=name&no_images=1&filter_owner_id='
 + resource_id + '&phpgw_return_as=json&';
+       var colDefs = [{key: 'name', label: lang['Name'], formatter: 
YAHOO.booking.formatLink}];
+       YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
+       
+       var url = 
'index.php?menuaction=bookingfrontend.uidocument_resource.index_images&sort=name&filter_owner_id='
 + resource_id + '&phpgw_return_as=json&';
+       YAHOO.booking.inlineImages('images_container', url);
+});
+]]>
+       </script>
+
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/resource_schedule.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/resource_schedule.xsl   
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/resource_schedule.xsl   
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,57 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+       <iframe id="yui-history-iframe" 
src="{webserver_url}/phpgwapi/js/yahoo/history/assets/blank.html" 
style="position:absolute;top:0; left:0;width:1px; 
height:1px;visibility:hidden;"></iframe>
+       <input id="yui-history-field" type="hidden"/>
+       
+       <div id="content">
+               <ul class="pathway">
+                       <li><a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of 
select="php:function('lang', 'Home')" /></a></li>
+                       <li>
+                               <a>
+                                       <xsl:attribute 
name="href"><xsl:value-of select="resource/building_link"/></xsl:attribute>
+                                       <xsl:value-of 
select="resource/building_name"/>
+                               </a>
+                       </li>
+                       <li>
+                               <a>
+                                       <xsl:attribute 
name="href"><xsl:value-of select="resource/resource_link"/></xsl:attribute>
+                                       <xsl:value-of select="resource/name"/>
+                               </a>
+                       </li>
+            <li><xsl:value-of select="php:function('lang', 'schedule')"/></li>
+               </ul>
+
+               <button 
onclick="window.location.href='{resource/application_link}'"><xsl:value-of 
select="php:function('lang', 'New booking application')" /></button>
+
+               <xsl:call-template name="msgbox"/>
+               <ul id="week-selector">
+                       <li><a href="#" onclick="YAHOO.booking.prevWeek(); 
return false"><xsl:value-of select="php:function('lang', 'Previous 
week')"/></a></li>
+                       <li id="cal_container"/>
+                       <li><a href="#" onclick="YAHOO.booking.nextWeek(); 
return false"><xsl:value-of select="php:function('lang', 'Next 
week')"/></a></li>
+               </ul>
+
+               <div id="schedule_container"/>
+       </div>
+
+<script type="text/javascript">
+YAHOO.util.Event.addListener(window, "load", function() {
+       YAHOO.booking.setupWeekPicker('cal_container');
+       YAHOO.booking.datasourceUrl = '<xsl:value-of 
select="resource/datasource_url"/>';
+       YAHOO.booking.newApplicationUrl = '<xsl:value-of 
select="resource/application_link"/>';
+       
+    var handleHistoryNavigation = function (state) {
+               YAHOO.booking.date = parseISO8601(state);
+               YAHOO.booking.renderSchedule('schedule_container', 
YAHOO.booking.datasourceUrl, YAHOO.booking.date, 
YAHOO.booking.frontendScheduleColorFormatter, false);
+    };
+    var initialRequest = YAHOO.util.History.getBookmarkedState("date") || 
'<xsl:value-of select="resource/date"/>';
+    YAHOO.util.History.register("date", initialRequest, 
handleHistoryNavigation);
+    YAHOO.util.History.onReady(function() {
+               var state = YAHOO.util.History.getBookmarkedState("date") || 
initialRequest;
+               if(state)
+                       handleHistoryNavigation(state);
+    });
+       YAHOO.util.History.initialize("yui-history-field", 
"yui-history-iframe");       
+});
+</script>
+
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl              
                (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl      
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,119 @@
+<xsl:template name="strip-tags" xmlns:php="http://php.net/xsl";>
+       <xsl:param name="text"/>
+       <xsl:choose>
+               <xsl:when test="contains($text, '&lt;')">
+                       <xsl:value-of select="substring-before($text, '&lt;')"/>
+                       <xsl:call-template name="strip-tags">
+                               <xsl:with-param name="text" select="concat(' ', 
substring-after($text, '&gt;'))"/>
+                       </xsl:call-template>
+               </xsl:when>
+               <xsl:otherwise>
+                       <xsl:value-of select="$text"/>
+               </xsl:otherwise>
+       </xsl:choose>
+</xsl:template>
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="yui_booking_i18n"/>
+  <div id="content">
+    <form action="" method="GET" id="search">
+      <input type="hidden" name="menuaction" 
value="bookingfrontend.uisearch.index" />
+      <xsl:choose>
+        <xsl:when test="search and string-length(search/searchterm) &gt; 0">
+          <input id="search" type="text" name="searchterm" 
value="{search/searchterm}"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <input id="search" type="text" name="searchterm" value="Søk hall, 
klubb eller aktivitet" onclick="value=''" />
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:text> </xsl:text><input type="submit" value="{php:function('lang', 
'Search')}"/>
+      <div class="hint">
+        F.eks. "<i>Haukelandshallen</i>", "<i>Nordnes bydelshus</i>", 
"<i>idrett</i>" eller "<i>kor</i>".
+      </div>
+    </form>
+       
+       <xsl:if test="not(search)">     
+               <div id="cloud">
+               <div>Velkommen til Norges Speiderforbund.<br />
+                       Her finner du informasjon om bygg, anlegg<br />
+                       som leies ut av oss.</div>
+               
+               </div>
+               <div style="text-align:center;">
+                       <img alt="" >
+                               <xsl:attribute name="src">
+                                       <xsl:value-of select="frontimage"/> 
+                               </xsl:attribute>
+                       </img>
+               </div>  
+
+       </xsl:if>
+       
+       <xsl:if test="search">  
+          <div id="result">
+             <h5>
+               <u><strong><xsl:value-of select="php:function('lang', 'Found %1 
results', search/results/total_records_sum)" /></strong></u>
+             </h5>
+             <br />
+             <br />
+             <xsl:if test="search/results/total_records_sum &gt; 0">
+               <ol id="result">
+                 <xsl:for-each select="search/results/results">
+                   <li>
+                     <div class="header">
+                       <a class="bui_single_view_link"><xsl:attribute 
name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of 
select="name"/></a>
+                       (<xsl:value-of select="php:function('lang', 
string(type))"/>)
+                     </div>
+                     <div class="details">
+                       <div>
+                         <dl>
+                           <dt><h4><xsl:value-of select="php:function('lang', 
'Description')" /></h4></dt>
+                           <dd class="description">
+                                                       <xsl:variable 
name="tag_stripped_description">
+                                                               
<xsl:call-template name="strip-tags">
+                                                                       
<xsl:with-param name="text" select="description"/>
+                                                               
</xsl:call-template>
+                                                       </xsl:variable>
+                                                       
+                             <xsl:choose>
+                               <xsl:when 
test="string-length($tag_stripped_description) &gt; 1">
+                                 <xsl:choose>
+                                   <xsl:when 
test="string-length($tag_stripped_description) &gt; 100">
+                                                                 <xsl:value-of 
select="substring($tag_stripped_description, 0, 97)"/>...
+                                   </xsl:when>
+                                   <xsl:otherwise>
+                                     <xsl:value-of 
select="$tag_stripped_description"/>
+                                   </xsl:otherwise>
+                                 </xsl:choose>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                 <xsl:value-of select="php:function('lang', 
'No description yet')" />
+                               </xsl:otherwise>
+                             </xsl:choose>
+                                               <div id="{img_container}"/>
+                                               <script type="text/javascript">
+                                               
YAHOO.util.Event.addListener(window, "load", function() {
+                                                       
YAHOO.booking.inlineImages('<xsl:value-of select="img_container"/>', 
'<xsl:value-of select="img_url"/>');
+                                               });
+                                               </script>
+
+                           </dd>
+                           <xsl:if test="string-length(homepage) &gt; 1">
+                             <dt><h4><xsl:value-of 
select="php:function('lang', 'Homepage')" /></h4></dt>
+                             <dd class="description">
+                               <a><xsl:attribute name="href"><xsl:value-of 
select="homepage"/></xsl:attribute><xsl:value-of select="homepage"/></a>
+                             </dd>
+                           </xsl:if>
+                         </dl>
+                       </div>
+                       <div class="clr"></div>
+                     </div>
+                   </li>
+
+                 </xsl:for-each>
+               </ol>
+             </xsl:if>
+           </div>
+       </xsl:if>
+  </div>
+</xsl:template>

Added: branches/dev-thomasez/bookingfrontend/templates/nsf/system_message.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/system_message.xsl      
                        (rev 0)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/system_message.xsl      
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,77 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div id="content">
+
+       <dl class="form">
+       <dt class="heading">
+                       <xsl:if test="not(system_message/id)">
+                               <xsl:value-of select="php:function('lang', 'New 
System Message')" />
+                       </xsl:if>
+                       <xsl:if test="system_message/id">
+                               <xsl:value-of select="php:function('lang', 
'Edit System Message')" />
+                       </xsl:if>
+               </dt>
+       </dl>
+
+    <xsl:call-template name="msgbox"/>
+       <xsl:call-template name="yui_booking_i18n"/>
+
+       <form action="" method="POST">
+               <dl class="form-col">
+                       <dt><label for="field_title"><xsl:value-of 
select="php:function('lang', 'Title')" /></label></dt>
+                       <dd><input name="title" type="text" 
value="{system_message/title}" /></dd>
+
+                       <dt><label for="field_message"><xsl:value-of 
select="php:function('lang', 'Message')" /></label></dt>
+                       <dd class="yui-skin-sam">
+                       <textarea id="field-message" name="message" 
type="text"><xsl:value-of select="system_message/message"/></textarea>
+                       </dd>
+                       <dt><label for="field_name"><xsl:value-of 
select="php:function('lang', 'Name')" /></label></dt>
+                       <dd><input name="name" type="text" 
value="{system_message/name}" /></dd>
+                       <dt><label for="field_phone"><xsl:value-of 
select="php:function('lang', 'Phone')" /></label></dt>
+                       <dd><input name="phone" type="text" 
value="{system_message/phone}" /></dd>
+                       <dt><label for="field_email"><xsl:value-of 
select="php:function('lang', 'Email')" /></label></dt>
+                       <dd><input name="email" type="text" 
value="{system_message/email}" /></dd>
+
+                       <dt><label for="field_time"><xsl:value-of 
select="php:function('lang', 'Created')" /></label></dt>
+                       <dd>
+                           <input id="inputs" name="created" readonly="true" 
type="text">
+                           <xsl:attribute name="value"><xsl:value-of 
select="system_message/created"/></xsl:attribute>
+                       </input>
+                       </dd>
+               </dl>
+               
+               <div class="form-buttons">
+                       <xsl:if test="not(system_message/id)"><input 
type="submit" value="{php:function('lang', 'Save')}"/></xsl:if>
+                       <xsl:if test="system_message/id"><input type="submit" 
value="{php:function('lang', 'Save')}"/></xsl:if>
+                       <a class="cancel" href="{system_message/cancel_link}">
+                               <xsl:value-of select="php:function('lang', 
'Cancel')" />
+                       </a>
+               </div>
+       </form>
+</div>
+
+<script type="text/javascript">
+<![CDATA[
+var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
+    height: '300px',
+    width: '522px',
+    dompath: true,
+    animate: true,
+       handleSubmit: true,
+        toolbar: {
+            titlebar: '',
+            buttons: [
+               { group: 'textstyle', label: ' ',
+                    buttons: [
+                        { type: 'push', label: 'Bold', value: 'bold' },
+                        { type: 'separator' },
+                        { type: 'push', label: 'HTML Link CTRL + SHIFT + L', 
value: 'createlink'}
+                    ]
+                }
+            ]
+        }
+});
+descEdit.render();
+]]>
+</script>
+</xsl:template>
+

Added: branches/dev-thomasez/phpgwapi/templates/nsf/css/frontend.css
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/nsf/css/frontend.css               
                (rev 0)
+++ branches/dev-thomasez/phpgwapi/templates/nsf/css/frontend.css       
2011-06-28 11:11:08 UTC (rev 7445)
@@ -0,0 +1,370 @@
+body {
+    font: normal small verdana,sans-serif;
+    margin: 0;
+    text-align: left;
+    background: white;
+}
+button { padding: .3em .6em; margin: .4em 0;}
+a:link, a:visited { color: black;}
+div#wrapper {}
+ul#metanav {
+    float: right;
+    list-style-type: none;
+       padding-top: 10px;
+}
+ul#metanav a, ul#sidebar a { color: #700; }
+div#content {
+    margin: 0 2em;
+    min-height: 500px;
+}
+#header-search  { 
+    float: right;
+    margin: -1.5em 1em 1em 1em;
+}
+#header-search.hidden  { display: none; }
+#header-search .query { width: 15em;}
+
+div#header {
+    background: url(../images/header_bg.png) repeat-x;
+    height: 129px;
+}
+div#header a {
+       float: left;
+}
+div#logo {
+    width: 730px;
+    height: 145px;
+    margin-left: 0px;
+}
+div#centerimage {
+    background: url(../images/header_fg.png) no-repeat;
+       background-position: bottom center;
+       margin: 0 auto;
+       padding-top: 0px;
+       height: 145px;
+       overflow: hidden;
+}
+div#footer {
+    border-top: 1px solid #aaa;
+    padding-top: .3em;
+    color: #666;
+    font-size: 90%;
+}
+ul.nav { 
+    list-style-type: 0;
+    padding-left: 0;
+}
+div.clr {clear: both;}
+ul.nav a { color: inherit; }
+ul.nav li { display: inline;}
+ul.nav li:before { content: '⇒ '; font-size: 90%; color: #444;}
+ul.nav li:first-child:before { display: none; }
+#login-bar {
+    clear: right;
+    float: right;
+    padding: .5em 1em 0 0;
+}
+form#search {
+    text-align: center;
+    padding-top: 5em;
+}
+input#search {
+    font-size: 120%;
+    color: #666;
+    width: 20em;
+}
+div.hint {
+       margin-top: 0.4em;
+    font-size: 90%;
+    color: #444;
+}
+div.hint i { color: #383;}
+
+ol#result {
+    padding-left: 0;
+}
+ol#result dl { margin: 0; }
+
+ol#result .header {
+    font-size: 120%;
+    background-color: #eee;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: .1em 0em .25em .2em;
+    margin-top: .5em;
+}
+ol#result .details {
+}
+ol#result .details h4 {
+    margin: 0.2em 0 0 0;
+    font-weight: normal;
+    font-style: italic;
+    color: #888;
+}
+ol#result .details .col {
+    padding: 0em 0.2em 0.4em 0.2em;
+    /*float: left;*/
+    width: 50%;
+    /*border: 1px solid #eee;*/
+}
+ol#result .details .moreInfo {
+    margin-top: .4em;
+}
+
+ol#result li:last-child {
+       border-bottom: 1px solid #ccc;
+}
+
+dl.form {}
+
+dl.form dt {
+    font-style: italic;
+    font-weight: bolder;
+    margin: .5em 0 .1em 0;
+    color: #002;
+}
+
+dl.form dt label { font-size: 90%; color: #733; font-style: italic;}
+dl.form dd {
+    float: left;
+    margin: 0 0 0 .4em;
+}
+table.fancyTable {
+    border-spacing: 0;
+    border: 1px solid #ccc;
+}
+table.fancyTable thead th {
+    font-weight: normal;
+    border-bottom: 1px solid #777;
+    padding: .1em .3em;
+    font-size: 85%;
+    font-style: italic;
+    color: #744;
+}
+table.fancyTable tbody td {
+    padding: .2em .7em;
+    border-bottom: 1px solid white;
+}
+table.fancyTable tbody tr:hover td {
+    background: #ffe;
+    border-bottom-color: #cca;
+}
+table.fancyTable tbody td.godkand { color: #474; }
+table.fancyTable tbody td.avslag { color: #744; }
+table.fancyTable tbody td.inskickad { color: #447; }
+table.fancyTable tbody td.ny { color: #447; }
+table.fancyTable tbody td a{ color: inherit; text-decoration: inherit;}
+
+div#help {
+    width: 15em;
+    float: right;
+    background: #3287d8;
+    border: 1px solid #66a;
+    border-radius: .6em;
+    -moz-border-radius: .6em;
+    -webkit-border-radius: .6em;
+    color: white;
+}
+div#help dl { margin: .2em .8em; min-height: 10em;}
+div#help dl dd { font-style: italic;}
+div#help h2 { 
+    margin: 0; 
+    font-size: 80%; 
+    padding: .1em .5em;
+    font-weight: normal;
+    border-bottom: 1px solid #67b1ff;
+}
+#weekView tr.time td { border-top: 1px solid #aaa;}
+#weekView tr td:first-child { background: #ddd;}
+
+
+#cloud {
+    text-align: center;
+    list-style-type: none;
+    padding-left: 0;
+    color: #888;
+    margin: 3em 0;
+    font-size: 120%;
+}
+#cloud div { padding: .2em};
+#cloud strong { padding: .2em};
+
+#cloud li { display: inline; white-space: nowrap; padding: 0 .2em;}
+#cloud li.small { font-size: 100%;}
+#cloud li.medium { font-size: 130%;}
+#cloud li.large { font-size: 200%; color: #777;}
+#cloud li.xlarge { font-size: 240%; color: #555;}
+#cloud li:hover { text-decoration: underline; cursor: pointer; }
+
+dl.tooltip  { width: 300px;}
+
+dl.tooltip dt {
+    float: left;
+    clear: left;
+    width: 7em;
+    font-style: italic;
+}
+
+dl.tooltip dd {
+    float: left;
+}
+
+div.info:hover { 
+    background-image: url(../images/info.png);
+    background-repeat: no-repeat;
+    background-position: 100% 0%;
+}
+
+dl.contactinfo {}
+dl.contactinfo dt {
+  margin-left: 1em;
+}
+dl.contactinfo dd {
+  margin-left: 2em;
+}
+
+/*#frontend {
+       width: 900px;
+}*/
+
+#frontend dl.proplist-col {
+       width: 300px;
+}
+
+#frontend dl.proplist-col.main {
+       width: 400px;
+}
+
+#frontend dl.proplist-col.images {
+       float:right;
+       clear:right;
+}
+
+
+
+#frontend h2 { margin-bottom: 0.1em;}
+#frontend dl.proplist.images dd img { width: 300px; border:1px solid #777; 
padding: 1px;}
+#frontend dl.proplist.images dl { margin-bottom: 1.5em; }
+
+#frontend #result dl.proplist.images dt { display: none;}
+#frontend #result dl.proplist.images dd { display: inline; padding-right: 1em;}
+#frontend #result dl.proplist.images dd img { width: auto; height: 120px; 
border:1px solid black;}
+
+
+#agegroup {
+    background: #eee;
+    white-space: nowrap;
+}
+#agegroup, #agegroup td, #agegroup th { width: 1%; }
+#agegroup td, #agegroup th { padding: .1em .3em;}
+#agegroup td input { width: 3em; }
+
+#overlay-info { padding: 1em; }
+#overlay-info h3 { margin: 0 0 .9em 0; }
+#overlay-info dt { font-style: italic; font-weight: bolder; font-size: 90%;}
+#overlay-info dd { padding-left: 2em; }
+#overlay-info .close { float: right; }
+#overlay-info .actions { margin-top: 1em;}
+
+.yui-calendar td.calcell {
+       border:0px !important;
+}
+.yui-skin-sam .yui-dt TABLE TH{
+       border: none !important;
+}
+.yui-skin-sam .yui-dt TABLE TD{
+       border: none !important;
+}
+
+/* CSS for newlayout */
+body{
+color: #575757;
+margin:0;
+padding:0;
+width:100%;
+height:100%;
+background: #fff url('../images/newlayout/bodyBg.gif') repeat-x;text-align: 
center;width:100%;
+}
+
+#wrapper{
+background-color: #fff;
+width: 1000px;
+textalign: left;
+margin: 0 auto;
+overflow: hidden;
+padding: 0 0px 40px;
+}
+
+#header{
+overflow: hidden;
+line-height: 1;
+width: 1000px;
+background-image: none !important;
+height: 155 !important;
+}
+
+#login-bar{
+margin-top:10px;
+}
+
+#login-bar a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
+#logo{
+background: url(../images/toppbanner_eventyrene_inspirator.png) no-repeat;
+float: left;
+width: 730px;
+height: 145px;
+margin: 0 0 0 20px !important;
+}
+
+#centerimage{
+display: block !important;
+margin-right: 5px !important;
+width: 130px !important;
+height: 140px !important;
+background: url(../images/newlayout/aktivby_logo.jpg) no-repeat !important;
+padding: 7px 0px 0px 100px !important;
+}
+
+#header-search{
+margin: -3em 1em 1em 1em;
+}
+
+#frontend{
+background-image: url(../images/newlayout/pageContainerBg.gif);
+background-repeat: repeat-x;
+}
+
+#line{
+border-top: 5px solid #B11F24; 
+clear: left;
+height: 30px;
+width: 960px;
+margin-left: 20px;
+}
+ #content{
+text-align:left;
+}
+
+#cloud{
+text-align:left;
+margin-left: 280px;
+}
+
+#footer{
+border: none !important;
+background:url('../images/newlayout/footerFjell_inkl_bunnlinje.gif') no-repeat 
scroll center top transparent;
+clear:both;
+overflow:auto;
+height:160px;
+}
+
+#footer_address{
+padding-top: 1.5em;
+}
+
+

Added: branches/dev-thomasez/phpgwapi/templates/nsf/footer.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/nsf/footer.tpl                     
        (rev 0)
+++ branches/dev-thomasez/phpgwapi/templates/nsf/footer.tpl     2011-06-28 
11:11:08 UTC (rev 7445)
@@ -0,0 +1,10 @@
+               </div>
+<div id="footer">
+
+</div>
+<div id="footer_address">
+Norges Speiderforbund
+</div>
+
+       </body>
+</html>

Added: branches/dev-thomasez/phpgwapi/templates/nsf/head.inc.php
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/nsf/head.inc.php                   
        (rev 0)
+++ branches/dev-thomasez/phpgwapi/templates/nsf/head.inc.php   2011-06-28 
11:11:08 UTC (rev 7445)
@@ -0,0 +1,172 @@
+<?php
+       phpgw::import_class('phpgwapi.yui');
+       phpgw::import_class('phpgwapi.template_portico');
+
+       if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
+       {
+               $GLOBALS['phpgw_info']['server']['site_title'] = lang('please 
set a site name in admin &gt; siteconfig');
+       }
+
+       $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
+
+       $config         = CreateObject('phpgwapi.config','bookingfrontend');
+       $config->read();
+
+       $tracker_id = isset($config->config_data['tracker_id']) && 
$config->config_data['tracker_id'] ? $config->config_data['tracker_id'] : '';
+       unset($config);
+       $tracker_code1 = <<<JS
+               var gaJsHost = (("https:" == document.location.protocol) ? 
"https://ssl."; : "http://www.";);
+               document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+JS;
+       $tracker_code2 = <<<JS
+               try 
+               {
+                       var pageTracker = _gat._getTracker("{$tracker_id}");
+                       pageTracker._trackPageview();
+               }
+               catch(err)
+               {
+                       alert(err);
+               }
+JS;
+
+       if($tracker_id)
+       {
+               $GLOBALS['phpgw']->js->add_code('', $tracker_code1);
+               $GLOBALS['phpgw']->js->add_code('', $tracker_code2);
+       }
+
+       $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
+       $GLOBALS['phpgw']->template->set_unknowns('remove');
+       $GLOBALS['phpgw']->template->set_file('head', 'head.tpl');
+       $GLOBALS['phpgw']->template->set_block('head', 'stylesheet', 
'stylesheets');
+       $GLOBALS['phpgw']->template->set_block('head', 'javascript', 
'javascripts');
+
+       $javascripts = array();
+
+       phpgwapi_yui::load_widget('dragdrop');
+       phpgwapi_yui::load_widget('element');
+       phpgwapi_yui::load_widget('container');
+       phpgwapi_yui::load_widget('connection');
+       phpgwapi_yui::load_widget('resize');
+       phpgwapi_yui::load_widget('layout');
+
+       phpgwapi_yui::load_widget('button');
+       $stylesheets = array
+               (
+                       
"/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css",
+                       
"/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css",
+                       "/phpgwapi/js/yahoo/resize/assets/skins/sam/resize.css",
+                       "/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css",
+               );
+       $stylesheets[] = "/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css";
+       $stylesheets[] = 
"/phpgwapi/js/yahoo/button/assets/skins/sam/button.css";
+       $stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
+       $stylesheets[] = 
"/phpgwapi/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+       $stylesheets[] = "/{$app}/templates/base/css/base.css";
+       $stylesheets[] = "/{$app}/templates/portico/css/base.css";
+       $stylesheets[] = 
"/{$app}/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+       $stylesheets[] = "/phpgwapi/templates/nsf/css/frontend.css";
+
+       foreach ( $stylesheets as $stylesheet )
+       {
+               if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
+               {
+                       $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri', 
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+                       $GLOBALS['phpgw']->template->parse('stylesheets', 
'stylesheet', true);
+               }
+       }
+
+       foreach ( $javascripts as $javascript )
+       {
+               if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
+               {
+                       $GLOBALS['phpgw']->template->set_var( 'javascript_uri', 
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+                       $GLOBALS['phpgw']->template->parse('javascripts', 
'javascript', true);
+               }
+       }
+
+       // Construct navbar_config by taking into account the current selected 
menu
+       // The only problem with this loop is that leafnodes will be included
+       $navbar_config = execMethod('phpgwapi.template_portico.retrieve_local', 
'navbar_config');
+
+       if( isset($GLOBALS['phpgw_info']['flags']['menu_selection']) )
+       {
+               if(!isset($navbar_config))
+               {
+                       $navbar_config = array();
+               }
+
+               $current_selection = 
$GLOBALS['phpgw_info']['flags']['menu_selection'];
+
+               while($current_selection)
+               {
+                       $navbar_config["navbar::$current_selection"] = true;
+                       $current_selection = implode("::", explode("::", 
$current_selection, -1));
+               }
+
+               phpgwapi_template_portico::store_local('navbar_config', 
$navbar_config);
+       }
+
+       $_navbar_config                 = json_encode($navbar_config);
+       //TODO Sigurd 8.july 2010: This one should be moved to frontend config
+       $config = CreateObject('phpgwapi.config','booking');
+       $config->read();
+       $logofile_frontend = isset($config->config_data['logopath_frontend']) 
&& $config->config_data['logopath_frontend'] ? 
$config->config_data['logopath_frontend'] : 
"/phpgwapi/templates/nsf/images/toppbanner_eventyrene_inspirator.png";
+error_log("lff:" . $logofile_frontend);
+
+       $bodoc = CreateObject('booking.bodocumentation');
+       
+       $manual  =  $bodoc->so->getFrontendDoc();       
+
+       $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'),
+               'site_title'    => 
"{$GLOBALS['phpgw_info']['server']['site_title']}",
+               'str_base_url'  => $GLOBALS['phpgw']->link('/', array(), true),
+               'webserver_url' => 
$GLOBALS['phpgw_info']['server']['webserver_url'],
+               'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
+               'navbar_config' => $_navbar_config,
+               'lbl_search'    => lang('Search'),
+               'logofile'              => $logofile_frontend,
+               'header_search_class'   => 
'hidden'//(isset($_GET['menuaction']) && $_GET['menuaction'] == 
'bookingfrontend.uisearch.index' ? 'hidden' : '')
+       );
+       if ($manual !== null) 
+       {
+               $tpl_vars['manual_text'] = lang('manual');
+               $tpl_vars['manual_url'] = $manual;
+#              $tpl_vars['help_text'] = lang('help');
+#              $tpl_vars['help_url'] = => '#';
+       }
+       $bouser = CreateObject('bookingfrontend.bouser');
+       if($bouser->is_logged_in())
+       {
+               $tpl_vars['login_text'] = $bouser->orgnr . ' :: ' . 
lang('Logout');
+               $tpl_vars['login_url'] = 'logout.php';
+       }
+       else
+       {
+               $tpl_vars['login_text'] = lang('Login');
+               $tpl_vars['login_url'] = 
'login.php?after='.urlencode($_SERVER['QUERY_STRING']);
+               $config         = 
CreateObject('phpgwapi.config','bookingfrontend');
+               $config->read();
+               $login_parameter = 
isset($config->config_data['login_parameter']) && 
$config->config_data['login_parameter'] ? 
$config->config_data['login_parameter'] : '';
+               $custom_login_url = 
isset($config->config_data['custom_login_url']) && 
$config->config_data['custom_login_url'] ? 
$config->config_data['custom_login_url'] : '';
+               if($login_parameter)
+               {
+                       $login_parameter = ltrim($login_parameter, '&');
+                       $tpl_vars['login_url'] .= "&{$login_parameter}";
+               }
+               if($custom_login_url)
+               {
+                       $tpl_vars['login_url'] = $custom_login_url;
+               }
+       }
+
+       $GLOBALS['phpgw']->template->set_var($tpl_vars);
+
+       $GLOBALS['phpgw']->template->pfp('out', 'head');
+       unset($tpl_vars);

Added: branches/dev-thomasez/phpgwapi/templates/nsf/head.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/nsf/head.tpl                       
        (rev 0)
+++ branches/dev-thomasez/phpgwapi/templates/nsf/head.tpl       2011-06-28 
11:11:08 UTC (rev 7445)
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+       "http://www.w3.org/TR/html4/loose.dtd";>
+<!-- BEGIN head -->
+<html>
+       <head>
+               <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8">
+               <meta name="author" content="phpGroupWare 
http://www.phpgroupware.org";>
+               <meta name="description" content="phpGroupWare">
+               <meta name="keywords" content="phpGroupWare">
+               <meta name="robots" content="none">
+               <title>{site_title}</title>
+               <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">
+        <!-- END stylesheet -->
+
+               {css}
+
+               <script type="text/javascript">
+               <!--
+                       var strBaseURL = '{str_base_url}';
+                       {win_on_events}
+               //-->
+               </script>
+               {javascript}
+               <!-- BEGIN javascript -->
+                       <script type="text/javascript" 
src="{javascript_uri}"></script>
+       <!-- END javascript -->
+
+       </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>
+       </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'>&nbsp;</div>

Added: branches/dev-thomasez/phpgwapi/templates/nsf/images/header_bg.png
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/header_bg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/dev-thomasez/phpgwapi/templates/nsf/images/header_fg.png
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/header_fg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/dev-thomasez/phpgwapi/templates/nsf/images/info.png
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/info.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/aktivby_logo.jpg
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/aktivby_logo.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/bodyBg.gif
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/bodyBg.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/footerFjell_inkl_bunnlinje.gif
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/footerFjell_inkl_bunnlinje.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/forsidebilde.jpg
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/forsidebilde.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/logo.png
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/logo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/pageContainerBg.gif
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/newlayout/pageContainerBg.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/toppbanner_eventyrene_inspirator.png
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/nsf/images/toppbanner_eventyrene_inspirator.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/dev-thomasez/phpgwapi/templates/nsf/navbar.inc.php
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/nsf/navbar.inc.php                 
        (rev 0)
+++ branches/dev-thomasez/phpgwapi/templates/nsf/navbar.inc.php 2011-06-28 
11:11:08 UTC (rev 7445)
@@ -0,0 +1,202 @@
+<?php
+
+       function parse_navbar($force = False)
+       {
+               $navbar = array();
+//             if(!isset($GLOBALS['phpgw_info']['flags']['nonavbar']) || 
!$GLOBALS['phpgw_info']['flags']['nonavbar'])
+               {
+                       $navbar = execMethod('phpgwapi.menu.get', 'navbar');
+               }
+
+               $user = $GLOBALS['phpgw']->accounts->get( 
$GLOBALS['phpgw_info']['user']['id'] );
+
+               $var = array
+               (
+                       'home_url'              => 
$GLOBALS['phpgw']->link('/home.php'),
+                       'home_text'             => lang('home'),
+                       'home_icon'             => 'icon icon-home',
+                       'about_url'             => 
$GLOBALS['phpgw']->link('/about.php', array('app' => 
$GLOBALS['phpgw_info']['flags']['currentapp']) ),
+                       'about_text'    => lang('about'),
+                       'logout_url'    => 
$GLOBALS['phpgw']->link('/logout.php'),
+                       'logout_text'   => lang('logout'),
+                       'user_fullname' => $user->__toString()
+               );
+
+               if ( $GLOBALS['phpgw']->acl->check('run', PHPGW_ACL_READ, 
'preferences') )
+               {
+                       $var['preferences_url'] = 
$GLOBALS['phpgw']->link('/preferences/index.php');
+                       $var['preferences_text'] = lang('preferences');
+               }
+
+               if ( isset($GLOBALS['phpgw_info']['user']['apps']['manual']) )
+               {
+                       $var['help_url'] = "javascript:openwindow('"
+                        . $GLOBALS['phpgw']->link('/index.php', array
+                        (
+                               'menuaction'=> 'manual.uimanual.help',
+                               'app' => 
$GLOBALS['phpgw_info']['flags']['currentapp'],
+                               'section' => 
isset($GLOBALS['phpgw_info']['apps']['manual']['section']) ? 
$GLOBALS['phpgw_info']['apps']['manual']['section'] : '',
+                               'referer' => phpgw::get_var('menuaction')
+                        )) . "','700','600')";
+
+                       $var['help_text'] = lang('help');
+                       $var['help_icon'] = 'icon icon-help';
+               }
+
+               if ( isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
+               {
+                       $var['debug_url'] = "javascript:openwindow('"
+                        . $GLOBALS['phpgw']->link('/index.php', array
+                        (
+                               'menuaction'=> 'property.uidebug_json.index'
+                        )) . "','','')";
+
+                       $var['debug_text'] = lang('debug');
+                       $var['debug_icon'] = 'icon icon-debug';
+               }
+
+               $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
+               $GLOBALS['phpgw']->template->set_file('navbar', 'navbar.tpl');
+
+               $flags = &$GLOBALS['phpgw_info']['flags'];
+               $var['current_app_title'] = isset($flags['app_header']) ? 
$flags['app_header'] : lang($GLOBALS['phpgw_info']['flags']['currentapp']);
+               $flags['menu_selection'] = isset($flags['menu_selection']) ? 
$flags['menu_selection'] : '';
+
+               $GLOBALS['phpgw']->template->set_var($var);
+               $GLOBALS['phpgw']->template->pfp('out','navbar');
+
+               register_shutdown_function('parse_footer_end');
+       }
+
+       function item_expanded($id)
+       {
+               static $navbar_state;
+               if( !isset( $navbar_state ) )
+               {
+                       $navbar_state = 
execMethod('phpgwapi.template_portico.retrieve_local', 'navbar_config');
+               }
+               return isset( $navbar_state[ $id ]);
+       }
+
+       function render_item($item, $id='', $children='')
+       {
+               $icon_style = $expand_class = $current_class = $link_class = 
$parent_class = '';
+               static $blank_image;
+               if ( !isset($blank_image) )
+               {
+                       $blank_image = 
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'blank.png');
+               }
+               if ( isset($item['image']) )
+               {
+                       $icon_style = ' style="background-image: url(' . 
$GLOBALS['phpgw']->common->image($item['image'][0], $item['image'][1]) . ')"';
+               }
+               if ( $children )
+               {
+                       $expand_class = item_expanded($id) ? ' 
class="expanded"' : ' class="collapsed"';
+                       $parent_class = ' parent';
+               }
+               if ( $id == 
"navbar::{$GLOBALS['phpgw_info']['flags']['menu_selection']}" )
+               {
+                       $current_class = 'current';
+               }
+
+               $link_class =" class=\"{$current_class}{$parent_class}\"";
+
+               $out = <<<HTML
+                               <li{$expand_class}>
+
+HTML;
+               if( $expand_class )
+               {
+               $out .= <<<HTML
+                                                       <img 
src="{$blank_image}"{$expand_class}width="16" height="16" alt="+/-" />
+
+HTML;
+               }
+               return <<<HTML
+$out
+                                       <a 
href="{$item['url']}"{$link_class}{$icon_style} id="{$id}">
+                                               <span>{$item['text']}</span>
+                                       </a>
+{$children}
+                               </li>
+
+HTML;
+       }
+
+       function render_submenu($parent, $menu)
+       {
+               $out = '';
+               foreach ( $menu as $key => $item )
+               {
+                       $children = isset($item['children']) ? render_submenu(  
"{$parent}::{$key}", $item['children']) : '';
+                       $out .= render_item($item, "navbar::{$parent}::{$key}", 
$children);
+                       //$debug .= "{$parent}::{$key}<br>";
+               }
+
+               $out = <<<HTML
+                       <ul>
+{$out}
+                       </ul>
+
+HTML;
+               return $out;
+       }
+
+       function parse_footer_end()
+       {
+               // Stop the register_shutdown_function causing the footer to be 
included twice - skwashd dec07
+               static $footer_included = false;
+               if ( $footer_included )
+               {
+                       return true;
+               }
+
+               $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
+               $GLOBALS['phpgw']->template->set_file('footer', 'footer.tpl');
+
+               $var = array
+               (
+                       'powered_by'    => lang('Powered by phpGroupWare 
version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
+               );
+
+               $GLOBALS['phpgw']->template->set_var($var);
+
+               $GLOBALS['phpgw']->template->pfp('out', 'footer');
+
+               $footer_included = true;
+       }
+
+       /**
+       * Callback for usort($navbar)
+       *
+       * @param array $item1 the first item to compare
+       * @param array $item2 the second item to compare
+       * @return int result of comparision
+       */
+       function sort_navbar($item1, $item2)
+       {
+               $a =& $item1['order'];
+               $b =& $item2['order'];
+
+               if ($a == $b)
+               {
+                       return strcmp($item1['text'], $item2['text']);
+               }
+               return ($a < $b) ? -1 : 1;
+       }
+
+       /**
+       * Organise the navbar properly
+       *
+       * @param array $navbar the navbar items
+       * @return array the organised navbar
+       */
+       function prepare_navbar(&$navbar)
+       {
+               // if ( isset($navbar['admin']) )
+               // {
+               //      $navbar['admin']['children'] = 
execMethod('phpgwapi.menu.get', 'admin');
+               // }
+               // uasort($navbar, 'sort_navbar');
+       }

Added: branches/dev-thomasez/phpgwapi/templates/nsf/navbar.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/nsf/navbar.tpl                     
        (rev 0)
+++ branches/dev-thomasez/phpgwapi/templates/nsf/navbar.tpl     2011-06-28 
11:11:08 UTC (rev 7445)
@@ -0,0 +1 @@
+ 
\ No newline at end of file




reply via email to

[Prev in Thread] Current Thread [Next in Thread]