fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [14278] fixing forms


From: Saul
Subject: [Fmsystem-commits] [14278] fixing forms
Date: Wed, 04 Nov 2015 00:23:03 +0000

Revision: 14278
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14278
Author:   psaul
Date:     2015-11-04 00:23:02 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
fixing forms

Modified Paths:
--------------
    branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
    branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
    
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl

Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php      
2015-11-04 00:22:34 UTC (rev 14277)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php      
2015-11-04 00:23:02 UTC (rev 14278)
@@ -55,7 +55,7 @@
                        $config = CreateObject('phpgwapi.config','booking');
                        $config->read();
 
-                       if ($config->config_data['user_can_delete_allocations'] 
!= 'yes') {
+                       if ($config->config_data['user_can_delete'] != 'yes') {
 
                        $allocation = 
$this->bo->read_single(intval(phpgw::get_var('allocation_id', 'GET')));
                 $organization = 
$this->organization_bo->read_single($allocation['organization_id']);
@@ -105,7 +105,7 @@
                    $this->flash_form_errors($errors);
                                $allocation['cancel_link'] = 
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' => 
$allocation['building_id']));
 
-                               $this->use_yui_editor();
+//                             $this->use_yui_editor();
                                self::render_template('allocation_cancel', 
array('allocation'=>$allocation));
 
                        } else {
@@ -144,6 +144,11 @@
 
                                if($_SERVER['REQUEST_METHOD'] == 'POST')
                                {
+                    
+                    $_POST['from_'] = date("Y-m-d H:i:s", 
phpgwapi_datetime::date_to_timestamp($_POST['from_']));
+                    $_POST['to_'] = date("Y-m-d H:i:s", 
phpgwapi_datetime::date_to_timestamp($_POST['to_']));
+                    $_POST['repeat_until'] = date("Y-m-d", 
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until']));
+                    
                                        $from_date = $_POST['from_'];
                                        $to_date = $_POST['to_'];
        
@@ -206,6 +211,8 @@
                                                        $todate = date('Y-m-d 
H:i', strtotime($_POST['to_']) + ($interval*$i));
                                                        $allocation['from_'] = 
$fromdate;
                                                        $allocation['to_'] = 
$todate;
+                            $fromdate = pretty_timestamp($fromdate);
+                            $todate = pretty_timestamp($todate);
        
                                $id = 
$this->bo->so->get_allocation_id($allocation);                
                                                        if ($id) 
@@ -272,11 +279,17 @@
                        }
                                }
                                $this->flash_form_errors($errors);
-                               self::add_javascript('booking', 'booking', 
'allocation.js');
+//                             self::add_javascript('booking', 'booking', 
'allocation.js');
+                
+                $allocation['from_'] = pretty_timestamp($allocation['from_']);
+                $allocation['to_'] = pretty_timestamp($allocation['to_']);
+                
                                $allocation['resources_json'] = 
json_encode(array_map('intval', $allocation['resources']));
 #                              $allocation['cancel_link'] = 
self::link(array('menuaction' => 'bookingfrontend.uiallocation.show', 'id' => 
$allocation['id']));
                 $allocation['cancel_link'] = self::link(array('menuaction' => 
'bookingfrontend.uibuilding.schedule', 'id' => $allocation['building_id'], 
'date' => $allocation['from_']));
                                $allocation['application_link'] = 
self::link(array('menuaction' => 'bookingfrontend.uiapplication.show', 'id' => 
$allocation['application_id']));
+                
+                $GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 
'date');
        
                                if ($step < 2) 
                    {
@@ -294,9 +307,9 @@
                                                'recurring' => 
$_POST['recurring'],
                                                'outseason' => 
$_POST['outseason'],
                                                'interval' => 
$_POST['field_interval'],
-                                               'repeat_until' => 
$_POST['repeat_until'],
-                                               'from_date' => $from_date,
-                                               'to_date' => $to_date,
+                                               'repeat_until' => 
pretty_timestamp($_POST['repeat_until']),
+                                               'from_date' => 
pretty_timestamp($from_date),
+                                               'to_date' => 
pretty_timestamp($to_date),
                                                'message' => $_POST['message'],
                                                'valid_dates' => $valid_dates,
                                                'invalid_dates' => 
$invalid_dates

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
===================================================================
--- 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl    
    2015-11-04 00:22:34 UTC (rev 14277)
+++ 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl    
    2015-11-04 00:23:02 UTC (rev 14278)
@@ -130,7 +130,8 @@
     </form>
     </div>
     <script type="text/javascript">
-        YAHOO.booking.season_id = '<xsl:value-of 
select="allocation/season_id"/>';
+        var season_id = '<xsl:value-of select="allocation/season_id"/>';
+        /*
         <![CDATA[
         var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
             height: '300px',
@@ -153,5 +154,6 @@
         });
         descEdit.render();
         ]]>
+        */
 </script>
 </xsl:template>

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
===================================================================
--- 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl    
    2015-11-04 00:22:34 UTC (rev 14277)
+++ 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl    
    2015-11-04 00:23:02 UTC (rev 14278)
@@ -10,125 +10,165 @@
        <dd><xsl:value-of select="php:function('lang', 'Delete 
Information')"/></dd>
        <dd><xsl:value-of select="php:function('lang', 'Delete 
Information2')"/></dd>
        </dl>
-    <div class="clr"/>
+    <!--div class="clr"/-->
     <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 class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <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>
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <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>
+                </dl>
+            </div>
+        </div>
+        
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <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>
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <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>
+        </div>
+        
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <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>
+                        <!--input id="field_repeat_until" name="repeat_until" 
type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="repeat_until"/></xsl:attribute>
+                        </input-->
+                        <input class="datetime" id="field_repeat_until" 
name="repeat_until" type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="repeat_until"/></xsl:attribute>
+                        </input>
+                    </dd>
+                </dl>
+            </div>
+        </div>
+        
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <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>
+            </div>
+        </div>
+        
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <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>
+        </div>
+        
+        <div class="pure-g">
+            <div class="pure-control-group">
+                <div class="form-buttons">
+                    <input type="submit">
+                        <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Delete')"/></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>
-            </dd>
+            </div>
+        </div>
 
-
-            <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:both; 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', 'Delete')"/></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>
+        var season_id = '<xsl:value-of select="allocation/season_id"/>';
+        var initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Resource Type')"/>;
+    </script>
     <!--script type="text/javascript">
         YAHOO.booking.season_id = '<xsl:value-of 
select="allocation/season_id"/>';
         YAHOO.booking.initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
===================================================================
--- 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
        2015-11-04 00:22:34 UTC (rev 14277)
+++ 
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
        2015-11-04 00:23:02 UTC (rev 14278)
@@ -61,7 +61,7 @@
 
     </div>
     <script type="text/javascript">
-        YAHOO.booking.initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
+        var initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
     </script>
 </xsl:template>
 <xsl:template name="xmlsource">

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl  
2015-11-04 00:22:34 UTC (rev 14277)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl  
2015-11-04 00:23:02 UTC (rev 14278)
@@ -11,282 +11,287 @@
                        <xsl:value-of 
select="config/application_new_application"/>
                </p>            
                </xsl:if>
+        
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-2">
+                <dl class="form-2col">
+                    <div class="heading">1. <xsl:value-of 
select="php:function('lang', 'Why?')" /></div>
+                    <dt>
+                        <label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Activity')" /></label>
+                        <!--xsl:if test="config/application_activities">
+                        <p>
+                            <xsl:value-of 
select="config/application_activities"/>
+                        </p>           
+                        </xsl:if-->
+                    </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="../application/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_description"><xsl:value-of 
select="php:function('lang', 'Information about the event')" /></label>
+                        <!--xsl:if test="config/application_description">
+                        <p>
+                            <xsl:value-of 
select="config/application_description"/>
+                        </p>           
+                        </xsl:if-->
+                    </dt>
+                    <dd>
+                        <textarea id="field_description" class="full-width" 
name="description"><xsl:value-of select="application/description"/></textarea>
+                    </dd>
+                    <!--dt>
+                        <xsl:if test="config/application_equipment">
+                            <p>
+                                <xsl:value-of 
select="config/application_equipment"/>
+                            </p>
+                        </xsl:if>
+                    </dt>
+                    <dd>
+                        <textarea id="field_equipment" class="full-width" 
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
+                    </dd-->
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-2">
+                <dl class="form-col">
+                    <div class="heading">2. <xsl:value-of 
select="php:function('lang', 'How many?')" /></div>
+                    <!--xsl:if test="config/application_howmany">
+                    <p>
+                        <xsl:value-of select="config/application_howmany"/>
+                    </p>               
+                    </xsl:if-->
+                    <dt><label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Estimated number of participants')" 
/></label></dt>
+                    <dd>
+                        <table id="agegroup" class="pure-table">
+                            <thead>
+                                <tr><th/><th><xsl:value-of 
select="php:function('lang', 'Male')" /></th>
+                                <th><xsl:value-of select="php:function('lang', 
'Female')" /></th></tr>
+                            </thead>
+                            <tbody id="agegroup_tbody">
+                                <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="../application/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="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+                                            </input>
+                                        </td>
+                                    </tr>
+                                </xsl:for-each>
+                            </tbody>
+                        </table>
+                    </dd>
+                </dl>
+            </div>
+        </div>
 
-               <dl class="form-2col">
-                       <div class="heading">1. <xsl:value-of 
select="php:function('lang', 'Why?')" /></div>
-                       <dt>
-                               <label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Activity')" /></label>
-                               <!--xsl:if test="config/application_activities">
-                               <p>
-                                       <xsl:value-of 
select="config/application_activities"/>
-                               </p>            
-                               </xsl:if-->
-                       </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="../application/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_description"><xsl:value-of 
select="php:function('lang', 'Information about the event')" /></label>
-                               <!--xsl:if 
test="config/application_description">
-                               <p>
-                                       <xsl:value-of 
select="config/application_description"/>
-                               </p>            
-                               </xsl:if-->
-                       </dt>
-                       <dd>
-                               <textarea id="field_description" 
class="full-width" name="description"><xsl:value-of 
select="application/description"/></textarea>
-                       </dd>
-            <!--dt>
-                <xsl:if test="config/application_equipment">
-                    <p>
-                        <xsl:value-of select="config/application_equipment"/>
-                    </p>
-                </xsl:if>
-            </dt>
-            <dd>
-                <textarea id="field_equipment" class="full-width" 
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
-            </dd-->
-               </dl>
-               <dl class="form-col">
-                       <div class="heading">2. <xsl:value-of 
select="php:function('lang', 'How many?')" /></div>
-                       <!--xsl:if test="config/application_howmany">
-                       <p>
-                               <xsl:value-of 
select="config/application_howmany"/>
-                       </p>            
-                       </xsl:if-->
-                       <dt><label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Estimated number of participants')" 
/></label></dt>
-                       <dd>
-                               <table id="agegroup" 
class="bookingfrontend-table">
-                    <thead>
-                        <tr><th/><th><xsl:value-of 
select="php:function('lang', 'Male')" /></th>
-                                           <th><xsl:value-of 
select="php:function('lang', 'Female')" /></th></tr>
-                    </thead>
-                    <tbody id="agegroup_tbody">
-                        <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="../application/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="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
-                                    </input>
-                                </td>
-                            </tr>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+                <dl class="form-col">
+                    <div class="heading">3. <xsl:value-of 
select="php:function('lang', 'Where?')" /></div>
+                    <!--xsl:if test="config/application_where">
+                        <p>
+                            <xsl:value-of select="config/application_where"/>
+                        </p>           
+                    </xsl:if-->
+                    <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')" /></label></dt>
+                    <dd>
+                        <div class="autocomplete">
+                            <input id="field_building_id" name="building_id" 
type="hidden">
+                                <xsl:attribute name="value"><xsl:value-of 
select="application/building_id"/></xsl:attribute>
+                            </input>
+                            <input id="field_building_name" 
name="building_name" type="text">
+                                <xsl:attribute name="value"><xsl:value-of 
select="application/building_name"/></xsl:attribute>
+                            </input>
+                            <div id="building_container"/>
+                        </div>
+                    </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>
+            </div>
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+                <dl class="form-col">
+                    <div class="heading">4. <xsl:value-of 
select="php:function('lang', 'When?')" /></div>
+                    <!--xsl:if test="config/application_when">
+                        <p>
+                            <xsl:value-of select="config/application_when"/>
+                        </p>           
+                    </xsl:if-->
+                    <div id="dates-container">
+                        <xsl:for-each select="application/dates">
+                            <xsl:variable name="index" select="position()-2" />
+                            <xsl:choose>
+                                <xsl:when test="position() > 1">
+                                    <div class="date-container">
+                                        <a href="javascript:void(0);" 
class="close-btn btnclose">-</a>
+                                        <dt><label 
for="start_date_{$index}"><xsl:value-of select="php:function('lang', 'From')" 
/></label></dt>
+                                        <dd>
+                                            <input class="newaddedpicker 
datetime" id="start_date_{$index}" type="text" name="from_[]">
+                                                <xsl:attribute name="value">
+                                                    <xsl:value-of 
select="from_" />
+                                                </xsl:attribute>
+                                            </input>
+                                        </dd>
+                                        <dt><label 
for="end_date_{$index}"><xsl:value-of select="php:function('lang', 'To')" 
/></label></dt>
+                                        <dd>
+                                            <input class="newaddedpicker 
datetime" id="end_date_{$index}" type="text" name="to_[]">
+                                                <xsl:attribute name="value">
+                                                    <xsl:value-of 
select="to_"/>
+                                                </xsl:attribute>
+                                            </input>
+                                        </dd>
+                                    </div>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <div class="date-container">
+                                        <a href="javascript:void(0);" 
class="close-btn btnclose">-</a>
+                                        <dt><label 
for="start_date"><xsl:value-of select="php:function('lang', 'From')" 
/></label></dt>
+                                        <dd>
+                                            <input class="datetime" 
id="start_date" type="text" name="from_[]">
+                                                <xsl:attribute name="value">
+                                                    <xsl:value-of 
select="from_" />
+                                                </xsl:attribute>
+                                            </input>
+                                        </dd>
+                                        <dt><label 
for="end_date"><xsl:value-of select="php:function('lang', 'To')" /></label></dt>
+                                        <dd>
+                                            <input class="datetime" 
id="end_date" type="text" name="to_[]">
+                                                <xsl:attribute name="value">
+                                                    <xsl:value-of 
select="to_"/>
+                                                </xsl:attribute>
+                                            </input>
+                                        </dd>
+                                    </div>
+                                </xsl:otherwise>
+                            </xsl:choose>
                         </xsl:for-each>
-                    </tbody>
-                               </table>
-                       </dd>
-               </dl>
-               <div class="clr"/>
-               <dl class="form-col">
-                       <div class="heading">3. <xsl:value-of 
select="php:function('lang', 'Where?')" /></div>
-                       <!--xsl:if test="config/application_where">
-                               <p>
-                                       <xsl:value-of 
select="config/application_where"/>
-                               </p>            
-                       </xsl:if-->
-                       <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')" /></label></dt>
-                       <dd>
-                               <div class="autocomplete">
-                                       <input id="field_building_id" 
name="building_id" type="hidden">
-                                               <xsl:attribute 
name="value"><xsl:value-of select="application/building_id"/></xsl:attribute>
-                                       </input>
-                                       <input id="field_building_name" 
name="building_name" type="text">
-                                               <xsl:attribute 
name="value"><xsl:value-of select="application/building_name"/></xsl:attribute>
-                                       </input>
-                                       <div id="building_container"/>
-                               </div>
-                       </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">
-                       <div class="heading">4. <xsl:value-of 
select="php:function('lang', 'When?')" /></div>
-                       <!--xsl:if test="config/application_when">
-                               <p>
-                                       <xsl:value-of 
select="config/application_when"/>
-                               </p>            
-                       </xsl:if-->
-                       <div id="dates-container">
-                               <xsl:for-each select="application/dates">
-                    <xsl:variable name="index" select="position()-2" />
-                    <xsl:choose>
-                        <xsl:when test="position() > 1">
-                            <div class="date-container">
-                                <a href="javascript:void(0);" class="close-btn 
btnclose">-</a>
-                                <dt><label 
for="start_date_{$index}"><xsl:value-of select="php:function('lang', 'From')" 
/></label></dt>
-                                <dd>
-                                    <input class="newaddedpicker datetime" 
id="start_date_{$index}" type="text" name="from_[]">
-                                        <xsl:attribute name="value">
-                                            <xsl:value-of select="from_" />
-                                        </xsl:attribute>
-                                    </input>
-                                </dd>
-                                <dt><label 
for="end_date_{$index}"><xsl:value-of select="php:function('lang', 'To')" 
/></label></dt>
-                                <dd>
-                                    <input class="newaddedpicker datetime" 
id="end_date_{$index}" type="text" name="to_[]">
-                                        <xsl:attribute name="value">
-                                            <xsl:value-of select="to_"/>
-                                        </xsl:attribute>
-                                    </input>
-                                </dd>
-                            </div>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <div class="date-container">
-                                <a href="javascript:void(0);" class="close-btn 
btnclose">-</a>
-                                <dt><label for="start_date"><xsl:value-of 
select="php:function('lang', 'From')" /></label></dt>
-                                <dd>
-                                    <input class="datetime" id="start_date" 
type="text" name="from_[]">
-                                        <xsl:attribute name="value">
-                                            <xsl:value-of select="from_" />
-                                        </xsl:attribute>
-                                    </input>
-                                </dd>
-                                <dt><label for="end_date"><xsl:value-of 
select="php:function('lang', 'To')" /></label></dt>
-                                <dd>
-                                    <input class="datetime" id="end_date" 
type="text" name="to_[]">
-                                        <xsl:attribute name="value">
-                                            <xsl:value-of select="to_"/>
-                                        </xsl:attribute>
-                                    </input>
-                                </dd>
-                            </div>
-                        </xsl:otherwise>
-                    </xsl:choose>
+                    </div>
+                    <dt><a href="javascript:void(0);" 
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another 
date')" /></a></dt>
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+                <dl class="form-col">
+                    <div class="heading">5. <xsl:value-of 
select="php:function('lang', 'Who?')" /></div>
+                    <!--xsl:if test="config/application_who">
+                        <p>
+                            <xsl:value-of select="config/application_who"/>
+                        </p>           
+                    </xsl:if-->
+                    <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Target audience')" /></label></dt>
+                    <dd>
+                        <!--div id="audience_container">&nbsp;</div-->
+                        <ul id= "audience"  
style="list-style:none;padding-left:10px;">
+                            <xsl:for-each select="audience">
+                                <li>
+                                    <label>
+                                        <input type="radio" name="audience[]">
+                                            <xsl:attribute 
name="value"><xsl:value-of select="id"/></xsl:attribute>
+                                            <xsl:if 
test="../application/audience=id">
+                                                <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                            </xsl:if>
+                                        </input>
+                                        <xsl:value-of select="name"/>
+                                    </label>
+                                </li>
+                            </xsl:for-each>
+                        </ul>
+                    </dd>
+                </dl>
+            </div>
+        </div>
 
-                                       <!--div class="date-container">
-                                               <a href="#" 
class="close-btn">-</a>
-                                               <dt><label 
for="field_from"><xsl:value-of select="php:function('lang', 'From')" 
/></label></dt>
-                                               <dd class="datetime-picker">
-                                                       <input id="field_from" 
name="from_[]" type="text">
-                                                               <xsl:attribute 
name="value"><xsl:value-of select="from_"/></xsl:attribute>
-                                                       </input>
-                                               </dd>
-                                               <dt><label 
for="field_to"><xsl:value-of select="php:function('lang', 'To')" /></label></dt>
-                                               <dd class="datetime-picker">
-                                                       <input id="field_to" 
name="to_[]" type="text">
-                                                               <xsl:attribute 
name="value"><xsl:value-of select="to_"/></xsl:attribute>
-                                                       </input>
-                                               </dd>
-                                       </div-->
-                               </xsl:for-each>
-                       </div>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+                <dl class="form-col">
+                    <div class="heading">6. <xsl:value-of 
select="php:function('lang', 'Contact information')" /></div>
+                    <!--xsl:if test="config/application_contact_information">
+                        <p>
+                            <xsl:value-of 
select="config/application_contact_information"/>
+                        </p>           
+                    </xsl:if-->
+                    <dt><label for="field_contact_name"><xsl:value-of 
select="php:function('lang', 'Name')" /></label></dt>
+                    <dd>
+                        <input id="field_contact_name" name="contact_name" 
type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="application/contact_name"/></xsl:attribute>
+                        </input>
+                    </dd>
+                    <dt><label for="field_contact_email"><xsl:value-of 
select="php:function('lang', 'E-mail address')" /></label></dt>
+                    <dd>
+                        <input id="field_contact_email" name="contact_email" 
type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="application/contact_email"/></xsl:attribute>
+                        </input>
+                    </dd>
+                    <dt><label for="field_contact_email2"><xsl:value-of 
select="php:function('lang', 'Confirm e-mail address')" /></label></dt>
+                    <dd>
+                        <input id="field_contact_email2" name="contact_email2" 
type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="application/contact_email2"/></xsl:attribute>
+                        </input>
+                    </dd>
+                    <dt><label for="field_contact_phone"><xsl:value-of 
select="php:function('lang', 'Phone')" /></label></dt>
+                    <dd>
+                        <input id="field_contact_phone" name="contact_phone" 
type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="application/contact_phone"/></xsl:attribute>
+                        </input>
+                    </dd>
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+                <dl class="form-col">
+                    <div class="heading">7. <xsl:value-of 
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of 
select="php:function('lang', 'invoice information')" /></div>
+                    <!--xsl:if test="config/application_responsible_applicant">
+                        <p>
+                            <xsl:value-of 
select="config/application_responsible_applicant"/>
+                        </p>           
+                    </xsl:if-->
+                    <xsl:copy-of 
select="phpgw:booking_customer_identifier(application, '')"/>
+                    <br />
+                    <!--xsl:if test="config/application_invoice_information">
+                        <p>
+                            <xsl:value-of 
select="config/application_invoice_information"/>
+                        </p>           
+                    </xsl:if-->
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+                <dl class="form-col">
+                    <div class="heading">. <xsl:value-of 
select="php:function('lang', 'Terms and conditions')" /></div>
+                    <!--xsl:if test="config/application_terms">
+                        <p>
+                            <xsl:value-of select="config/application_terms"/>
+                        </p>           
+                    </xsl:if-->
+                    <br />
+                    <div id='regulation_documents'>&nbsp;</div>
+                    <br />
+                    <!--xsl:if test="config/application_terms2">
+                        <p>
+                            <xsl:value-of select="config/application_terms2"/>
+                        </p>           
+                    </xsl:if-->
+                </dl>
+            </div>
+        </div>
 
-
-                       <dt><a href="javascript:void(0);" 
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another 
date')" /></a></dt>
-               </dl>
-               <dl class="form-col">
-                       <div class="heading">5. <xsl:value-of 
select="php:function('lang', 'Who?')" /></div>
-                       <!--xsl:if test="config/application_who">
-                               <p>
-                                       <xsl:value-of 
select="config/application_who"/>
-                               </p>            
-                       </xsl:if-->
-                       <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'Target audience')" /></label></dt>
-                       <dd>
-                               <!--div id="audience_container">&nbsp;</div-->
-                <ul id= "audience"  style="list-style:none;padding-left:10px;">
-                    <xsl:for-each select="audience">
-                        <li>
-                            <label>
-                                <input type="radio" name="audience[]">
-                                    <xsl:attribute name="value"><xsl:value-of 
select="id"/></xsl:attribute>
-                                    <xsl:if test="../application/audience=id">
-                                        <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                    </xsl:if>
-                                </input>
-                                <xsl:value-of select="name"/>
-                            </label>
-                        </li>
-                    </xsl:for-each>
-                </ul>
-                       </dd>
-               </dl>
-               <div class="clr"/>
-               <dl class="form-col">
-                       <div class="heading"><br />6. <xsl:value-of 
select="php:function('lang', 'Contact information')" /></div>
-                       <!--xsl:if 
test="config/application_contact_information">
-                               <p>
-                                       <xsl:value-of 
select="config/application_contact_information"/>
-                               </p>            
-                       </xsl:if-->
-                       <dt><label for="field_contact_name"><xsl:value-of 
select="php:function('lang', 'Name')" /></label></dt>
-                       <dd>
-                               <input id="field_contact_name" 
name="contact_name" type="text">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="application/contact_name"/></xsl:attribute>
-                               </input>
-                       </dd>
-                       <dt><label for="field_contact_email"><xsl:value-of 
select="php:function('lang', 'E-mail address')" /></label></dt>
-                       <dd>
-                               <input id="field_contact_email" 
name="contact_email" type="text">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="application/contact_email"/></xsl:attribute>
-                               </input>
-                       </dd>
-                       <dt><label for="field_contact_email2"><xsl:value-of 
select="php:function('lang', 'Confirm e-mail address')" /></label></dt>
-                       <dd>
-                               <input id="field_contact_email2" 
name="contact_email2" type="text">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="application/contact_email2"/></xsl:attribute>
-                               </input>
-                       </dd>
-                       <dt><label for="field_contact_phone"><xsl:value-of 
select="php:function('lang', 'Phone')" /></label></dt>
-                       <dd>
-                               <input id="field_contact_phone" 
name="contact_phone" type="text">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="application/contact_phone"/></xsl:attribute>
-                               </input>
-                       </dd>
-               </dl>
-               <dl class="form-col">
-                       <div class="heading">7. <xsl:value-of 
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of 
select="php:function('lang', 'invoice information')" /></div>
-                       <!--xsl:if 
test="config/application_responsible_applicant">
-                               <p>
-                                       <xsl:value-of 
select="config/application_responsible_applicant"/>
-                               </p>            
-                       </xsl:if-->
-                       <xsl:copy-of 
select="phpgw:booking_customer_identifier(application, '')"/>
-                       <br />
-                       <!--xsl:if 
test="config/application_invoice_information">
-                               <p>
-                                       <xsl:value-of 
select="config/application_invoice_information"/>
-                               </p>            
-                       </xsl:if-->
-               </dl>
-               <dl class="form-col">
-                       <div class="heading"><br />8. <xsl:value-of 
select="php:function('lang', 'Terms and conditions')" /></div>
-                       <!--xsl:if test="config/application_terms">
-                               <p>
-                                       <xsl:value-of 
select="config/application_terms"/>
-                               </p>            
-                       </xsl:if-->
-                       <br />
-                       <div id='regulation_documents'>&nbsp;</div>
-                       <br />
-                       <!--xsl:if test="config/application_terms2">
-                               <p>
-                                       <xsl:value-of 
select="config/application_terms2"/>
-                               </p>            
-                       </xsl:if-->
-               </dl>
                <div class="form-buttons">
                        <input type="submit">
                                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Send')"/></xsl:attribute>
@@ -306,6 +311,5 @@
                var initialSelection = <xsl:value-of 
select="application/resources_json"/>;
                var initialAudience = <xsl:value-of 
select="application/audience_json"/>;
                var lang = <xsl:value-of select="php:function('js_lang', 
'From', 'To', 'Resource Type', 'Name', 'Accepted', 'Document', 'You must accept 
to follow all terms and conditions of lease first.')"/>;
-               var tableClass = 'bookingfrontend-table 
bookingfrontend-table-striped';
        </script>
 </xsl:template>

Modified: branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/building.xsl 
2015-11-04 00:22:34 UTC (rev 14277)
+++ branches/dev-syncromind/bookingfrontend/templates/base/building.xsl 
2015-11-04 00:23:02 UTC (rev 14278)
@@ -101,9 +101,9 @@
                 paginatorTableBuilding_users.limit = 10;
                 createPaginatorTable('building_users_container', 
paginatorTableBuilding_users);
 
-                createTable('resources_container', resourcesURL, 
colDefsResources, rResources, 'bookingfrontend-table 
bookingfrontend-table-striped');
-                createTable('documents_container', documentURL, 
colDefsDocument, 'data', 'bookingfrontend-table bookingfrontend-table-striped');
-                createTable('building_users_container', building_usersURL, 
colDefsBuilding_users, rBuilding_users, 'bookingfrontend-table 
bookingfrontend-table-striped', paginatorTableBuilding_users);
+                createTable('resources_container', resourcesURL, 
colDefsResources, rResources);
+                createTable('documents_container', documentURL, 
colDefsDocument);
+                createTable('building_users_container', building_usersURL, 
colDefsBuilding_users, rBuilding_users, '', paginatorTableBuilding_users);
                 //createnInlineImages('images_container', 
'document_buildingURL');
 
 /*                                

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
--- 
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl    
    2015-11-04 00:22:34 UTC (rev 14277)
+++ 
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl    
    2015-11-04 00:23:02 UTC (rev 14278)
@@ -23,25 +23,18 @@
                                - 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-->
-                <ul id="week-selector">
-                    <li><a id="btnPrevWeek" class="moveWeek" 
onclick="schedule.prevWeek(); return false"><xsl:value-of 
select="php:function('lang', 'Previous week')"/></a></li>
-                    <li id="cal_container">
-                        <div>
-                            <span><xsl:value-of select="php:function('lang', 
'Week')" />: </span>
-                            <label id="numberWeek"></label>
-                            <input type="text" id="datepicker" />
-                            <img id="pickerImg" src="{building/picker_img}" />
-                        </div>
-                    </li>
-                    <li><a id="btnPrevWeek" class="moveWeek" 
onclick="schedule.nextWeek(); return false"><xsl:value-of 
select="php:function('lang', 'Next week')"/></a></li>
-                </ul>
-
+        <ul id="week-selector">
+            <li><a id="btnPrevWeek" class="moveWeek" 
onclick="schedule.prevWeek(); return false"><xsl:value-of 
select="php:function('lang', 'Previous week')"/></a></li>
+            <li id="cal_container">
+                <div>
+                    <span><xsl:value-of select="php:function('lang', 'Week')" 
/>: </span>
+                    <label id="numberWeek"></label>
+                    <input type="text" id="datepicker" />
+                    <img id="pickerImg" src="{building/picker_img}" />
+                </div>
+            </li>
+            <li><a id="btnPrevWeek" class="moveWeek" 
onclick="schedule.nextWeek(); return false"><xsl:value-of 
select="php:function('lang', 'Next week')"/></a></li>
+        </ul>
         <div id="schedule_container"/>
     </div>
     <div id="dialog_schedule"></div>
@@ -54,10 +47,9 @@
             schedule.newApplicationUrl = '<xsl:value-of 
select="building/application_link"/>';
             schedule.includeResource = true;
             schedule.colFormatter = 'frontendScheduleDateColumn';
-            schedule.classTable = 'bookingfrontend-table';
             var handleHistoryNavigation = function (state) {
                 schedule.date = parseISO8601(state);
-                schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, schedule.colFormatter, 
schedule.includeResource, schedule.classTable);
+                schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, schedule.colFormatter, 
schedule.includeResource);
             };
 
             var initialRequest = getUrlData("date") || '<xsl:value-of 
select="building/date"/>';

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl     
2015-11-04 00:22:34 UTC (rev 14277)
+++ branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl     
2015-11-04 00:23:02 UTC (rev 14278)
@@ -86,8 +86,8 @@
                 ];
                 var colDefsBuilding = [{key: 'name', label: lang['Name'], 
formatter: genericLink}];
                 
-                createTable('groups_container', groupURL, colDefsGroup, '', 
'bookingfrontend-table bookingfrontend-table-striped');
-                createTable('buildings_used_by_container', buildingURL, 
colDefsBuilding, rBuilding, 'bookingfrontend-table 
bookingfrontend-table-striped');
+                createTable('groups_container', groupURL, colDefsGroup);
+                createTable('buildings_used_by_container', buildingURL, 
colDefsBuilding, rBuilding);
 
 /*     
                <![CDATA[

Modified: branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl 
2015-11-04 00:22:34 UTC (rev 14277)
+++ branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl 
2015-11-04 00:23:02 UTC (rev 14278)
@@ -53,7 +53,7 @@
 
         var colDefsDocumentsResource = [{key: 'name', label: lang['Name'], 
formatter: genericLink}];
 
-        createTable('documents_container', documentsResourceURL, 
colDefsDocumentsResource, 'data', 'bookingfrontend-table 
bookingfrontend-table-striped');
+        createTable('documents_container', documentsResourceURL, 
colDefsDocumentsResource);
         //createnInlineImages('images_container', 'documentResourceImagesURL');
 
 /*

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
--- 
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl    
    2015-11-04 00:22:34 UTC (rev 14277)
+++ 
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl    
    2015-11-04 00:23:02 UTC (rev 14278)
@@ -54,10 +54,9 @@
         schedule.newApplicationUrl = '<xsl:value-of 
select="resource/application_link" />';
         schedule.includeResource = false;
         schedule.colFormatter = 'frontendScheduleDateColumn';
-        schedule.classTable = 'bookingfrontend-table';
         var handleHistoryNavigation = function (state) {
             schedule.date = parseISO8601(state);
-            schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, schedule.colFormatter, 
schedule.includeResource, schedule.classTable);
+            schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, schedule.colFormatter, 
schedule.includeResource);
         }
         
         var initialRequest = getUrlData("date") || '<xsl:value-of 
select="resource/date" />';




reply via email to

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