[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14320] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14320] fixing forms |
|
Date: |
Tue, 10 Nov 2015 22:50:09 +0000 |
Revision: 14320
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14320
Author: psaul
Date: 2015-11-10 22:50:04 +0000 (Tue, 10 Nov 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
branches/dev-syncromind/booking/templates/base/allocation_new.xsl
branches/dev-syncromind/booking/templates/base/application_edit.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
branches/dev-syncromind/booking/templates/base/booking_edit.xsl
branches/dev-syncromind/booking/templates/base/booking_new.xsl
branches/dev-syncromind/booking/templates/base/email_index.xsl
branches/dev-syncromind/booking/templates/base/event_edit.xsl
branches/dev-syncromind/booking/templates/base/event_new.xsl
branches/dev-syncromind/booking/templates/base/report_new.xsl
branches/dev-syncromind/booking/templates/base/season_edit.xsl
branches/dev-syncromind/booking/templates/base/season_new.xsl
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
branches/dev-syncromind/bookingfrontend/templates/fjell/application_new.xsl
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_new.xsl
branches/dev-syncromind/bookingfrontend/templates/fjell/event_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/stavanger/application_new.xsl
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_new.xsl
branches/dev-syncromind/bookingfrontend/templates/stavanger/event_edit.xsl
Modified: branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -45,11 +45,11 @@
</div>
<div class="pure-control-group">
<label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Season')" /></label>
- <div id="season_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="season_container"
style="display:inline-block;"><span class="select_first_text"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></span></div>
</div>
<div class="pure-control-group">
<label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="resources_container"
style="display:inline-block;"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
<div class="pure-control-group">
<label for="field_org_name"><xsl:value-of
select="php:function('lang', 'Organization')" /></label>
Modified: branches/dev-syncromind/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -139,7 +139,7 @@
</div>
<div class="pure-control-group">
<label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Season')" /></label>
- <div id="season_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="season_container"
style="display:inline-block;"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
<div class="pure-control-group">
<label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label>
@@ -152,7 +152,7 @@
</div>
<div class="pure-control-group">
<label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="resources_container"
style="display:inline-block;"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/application_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -90,7 +90,7 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="resources_container"
style="display:inline-block;"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -119,7 +119,7 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="resources_container"
style="display:inline-block;"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
</fieldset>
</div>
Modified: branches/dev-syncromind/booking/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/booking_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -73,11 +73,11 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Season')"/></label>
- <div id="season_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
+ <div id="season_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Resources')"/></label>
- <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
@@ -96,7 +96,7 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Group')"/></label>
- <div id="group_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
+ <div id="group_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
<div class="pure-control-group">
<label for="field_from"><xsl:value-of
select="php:function('lang', 'From')"/></label>
Modified: branches/dev-syncromind/booking/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -50,11 +50,11 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Season')"/></label>
- <div id="season_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
+ <div id="season_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Resources')"/></label>
- <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
@@ -77,7 +77,7 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Group')"/></label>
- <div id="group_container"><xsl:value-of
select="php:function('lang', 'Select an organization first')"/></div>
+ <div id="group_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select an
organization first')" /></span></div>
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'From')"/></label>
Modified: branches/dev-syncromind/booking/templates/base/email_index.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -20,7 +20,7 @@
</div>
<div class="pure-control-group">
<label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Season')" /></label>
- <div id="season_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="season_container"
style="display:inline-block;"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
<div class="pure-control-group">
<label for="field_mailsubject"><xsl:value-of
select="php:function('lang', 'Mail subject')" /></label>
Modified: branches/dev-syncromind/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -125,7 +125,7 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></div>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
Modified: branches/dev-syncromind/booking/templates/base/event_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/event_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -83,7 +83,7 @@
</div>
<div class="pure-control-group">
<label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></div>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/report_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/report_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/report_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -136,7 +136,7 @@
</h4>
</label>
<div
id="resources_container">
-
<xsl:value-of select="php:function('lang', 'Select a building first')" />
+ <span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span>
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/season_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/season_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/season_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -39,7 +39,7 @@
<label>
<xsl:value-of select="php:function('lang',
'Resources')" />
</label>
- <div id="resources-container"
class="custom-container"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></div>
+ <div id="resources-container"
class="custom-container"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
<div class="pure-control-group">
<label for="status_field">
Modified: branches/dev-syncromind/booking/templates/base/season_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/season_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/booking/templates/base/season_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -45,7 +45,7 @@
<label>
<xsl:value-of select="php:function('lang',
'Resources')" />
</label>
- <div id="resources-container"
class="custom-container"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></div>
+ <div id="resources-container"
class="custom-container"><span class="select_first_text"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></span></div>
</div>
<div class="pure-control-group">
<label for="status_field">
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-10 22:50:04 UTC (rev 14320)
@@ -123,6 +123,10 @@
}
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
+ $_POST['from_'] = ($_POST['from_']) ? date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['from_'])) : "";
+ $_POST['to_'] = ($_POST['to_']) ? date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_'])) : "";
+ $_POST['repeat_until'] = ($_POST['repeat_until']) ?
date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) : "";
+
$today = getdate();
$booking = extract_values($_POST,
$this->fields);
if(strlen($_POST['from_']) < 6)
@@ -225,12 +229,32 @@
$this->flash_form_errors($errors);
self::add_javascript('bookingfrontend',
'bookingfrontend', 'booking.js');
array_set_default($booking, 'resources', array());
+
+ $booking['from_'] = pretty_timestamp($booking['from_']);
+ $booking['to_'] = pretty_timestamp($booking['to_']);
+ $booking['repeat_until'] =
pretty_timestamp($booking['repeat_until']);
+
+ foreach($bookings['results'] as &$b)
+ {
+ $b['from_'] = pretty_timestamp($b['from_']);
+ $b['to_'] = pretty_timestamp($b['to_']);
+ $b['repeat_until'] = pretty_timestamp($b['repeat_until']);
+ }
+
+ if(!$activity_id)
+ {
+ $activity_id = phpgw::get_var('activity_id',
'int', 'REQUEST', -1);
+ }
+ $activity_path = $this->activity_bo->get_path($activity_id);
+ $top_level_activity = $activity_path ? $activity_path[0]['id'] :
-1;
+
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
$booking['cancel_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uibuilding.schedule', 'id'=> $booking['building_id']));
- $agegroups = $this->agegroup_bo->fetch_age_groups();
+ $agegroups =
$this->agegroup_bo->fetch_age_groups($top_level_activity);
$agegroups = $agegroups['results'];
- $audience = $this->audience_bo->fetch_target_audience();
+ $audience =
$this->audience_bo->fetch_target_audience($top_level_activity);
$audience = $audience['results'];
+ $booking['audience_json'] =
json_encode(array_map('intval',$booking['audience']));
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
$groups =
$this->group_bo->so->read(array('filters'=>array('organization_id'=>$allocation['organization_id'],
'active'=>1)));
@@ -242,6 +266,11 @@
{
$res_names[] = array('id' => $res['id'],'name'
=> $res['name']);
}
+
+ $GLOBALS['phpgw']->jqcal->add_listener('field_from', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('field_to', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until',
'date');
+
if ($step < 2)
{
self::render_template('booking_new',
array('booking' => $booking,
@@ -607,6 +636,12 @@
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
+ foreach($booking['results'] as &$b)
+ {
+ $b['from_'] = pretty_timestamp($b['from_']);
+ $b['to_'] = pretty_timestamp($b['to_']);
+ }
+
self::add_javascript('bookingfrontend', 'bookingfrontend',
'booking_massupdate.js');
self::render_template('booking_massupdate',
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-10 22:50:04 UTC (rev 14320)
@@ -51,8 +51,10 @@
}
$this->flash_form_errors($errors);
+
+ phpgwapi_jquery::init_ckeditor('field-message');
- $this->use_yui_editor();
+// $this->use_yui_editor();
self::render_template('system_message',
array('system_message' => $system_message));
}
}
Modified: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-11-10 22:50:04 UTC (rev 14320)
@@ -1,8 +1,9 @@
var building_id_selection;
-
+var organization_id_selection = "";
$(document).ready(function(){
-//
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
'field_building_name', 'field_building_id', 'building_container');
-//
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uigroup.index&phpgw_return_as=json&',
'field_group_name', 'field_group_id', 'group_container');
+
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
'field_building_name', 'field_building_id', 'building_container');
+
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uigroup.index&phpgw_return_as=json&',
'field_group_name', 'field_group_id', 'group_container');
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
'field_org_name', 'field_org_id', 'org_container');
$("#field_activity").change(function(){
var oArgs =
{menuaction:'bookingfrontend.uiapplication.get_activity_data',
activity_id:$(this).val()};
@@ -62,17 +63,31 @@
$(window).load(function(){
var building_id = $('#field_building_id').val();
+ var organization_id = $('#field_org_id').val();
if (building_id) {
+ populateSelectSeason(building_id, season_id);
populateTableChkResources(building_id, initialSelection);
building_id_selection = building_id
}
+ if (organization_id) {
+ populateSelectGroup(organization_id, group_id);
+ organization_id_selection = organization_id;
+ }
$('#field_building_name').on("autocompleteselect", function(event, ui) {
var building_id = ui.item.value;
if (building_id != building_id_selection) {
+ populateSelectSeason(building_id, '');
populateTableChkResources(building_id, []);
building_id_selection = building_id;
}
});
+ $('#field_org_name').on('autocompleteselect', function(event, ui){
+ var organization_id = ui.item.value;
+ if (organization_id != organization_id_selection) {
+ populateSelectGroup(organization_id, '');
+ organization_id_selection = organization_id;
+ }
+ });
});
function populateTableChk (url, container, colDefs) {
@@ -86,7 +101,19 @@
populateTableChk(url, container, colDefsResources);
}
+function populateSelectGroup (organization_id, selection) {
+ var url =
'index.php?menuaction=booking.uigroup.index&filter_organization_id=' +
organization_id + '&phpgw_return_as=json';
+ var container = $('#group_container');
+ var attr = [{name: 'name',value: 'group_id'},{name: 'data-validation',
value: 'required'}];
+ populateSelect(url, selection, container, attr);
+};
+function populateSelectSeason (building_id, selection) {
+ var url =
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
+ var container = $('#season_container');
+ var attr = [{name: 'name',value: 'season_id'},{name: 'data-validation',
value: 'required'}];
+ populateSelect(url, selection, container, attr);
+}
//populateResourceTable = function(building_id, selection) {
// YAHOO.booking.checkboxTableHelper('resources_container',
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&',
// 'resources[]', selection);
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -76,7 +76,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
</div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -125,7 +125,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
</div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -63,7 +63,7 @@
<dl class="form-col">
<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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
</div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -26,7 +26,7 @@
</select>
<xsl:if test="count(booking/results)
> 0">
<div class="form-buttons">
- <input type="submit"
style="float: right;">
+ <input type="submit">
<xsl:attribute
name="value"><xsl:value-of select="php:function('lang',
'Update')"/></xsl:attribute>
</input>
</div>
@@ -129,7 +129,7 @@
</dd>
</dl>
<div class="form-buttons">
- <input type="submit"
style="float: right;">
+ <input type="submit">
<xsl:attribute
name="value"><xsl:value-of select="php:function('lang',
'Next')"/></xsl:attribute>
</input>
</div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -21,8 +21,8 @@
<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 class="yui-skin-sam"
style="width:100%;max-width:500px;">
+ <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>
@@ -49,7 +49,7 @@
</form>
</div>
-<script type="text/javascript">
+<!--script type="text/javascript">
<![CDATA[
var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
height: '300px',
@@ -72,6 +72,6 @@
});
descEdit.render();
]]>
-</script>
+</script-->
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/fjell/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/fjell/application_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/fjell/application_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -116,7 +116,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified:
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/fjell/booking_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/fjell/booking_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -51,7 +51,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified:
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/fjell/booking_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/fjell/booking_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -33,7 +33,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified: branches/dev-syncromind/bookingfrontend/templates/fjell/event_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/fjell/event_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/fjell/event_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -69,7 +69,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified:
branches/dev-syncromind/bookingfrontend/templates/stavanger/application_new.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/stavanger/application_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++
branches/dev-syncromind/bookingfrontend/templates/stavanger/application_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -116,7 +116,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified:
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_edit.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -51,7 +51,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified:
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_new.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_new.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -33,7 +33,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
Modified:
branches/dev-syncromind/bookingfrontend/templates/stavanger/event_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/stavanger/event_edit.xsl
2015-11-10 17:24:52 UTC (rev 14319)
+++ branches/dev-syncromind/bookingfrontend/templates/stavanger/event_edit.xsl
2015-11-10 22:50:04 UTC (rev 14320)
@@ -69,7 +69,7 @@
</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>
+ <div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
</dd>
</dl>
<dl class="form-col">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14320] fixing forms,
Saul <=