[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14365] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14365] fixing forms |
|
Date: |
Mon, 16 Nov 2015 22:40:39 +0000 |
Revision: 14365
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14365
Author: psaul
Date: 2015-11-16 22:40:38 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.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/booking_cancel.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
branches/dev-syncromind/bookingfrontend/templates/base/event_delete.xsl
branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
Added Paths:
-----------
branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-11-16 22:40:38 UTC (rev 14365)
@@ -110,6 +110,8 @@
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until',
'date');
// $this->use_yui_editor();
+
+ phpgwapi_jquery::init_ckeditor('field-message');
self::render_template('allocation_cancel',
array('allocation'=>$allocation));
} else {
@@ -148,7 +150,6 @@
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']));
@@ -297,6 +298,7 @@
if ($step < 2)
{
+ phpgwapi_jquery::init_ckeditor('field-message');
self::render_template('allocation_delete',
array('allocation' => $allocation,
'recurring' => $recurring,
'outseason' => $outseason,
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-16 22:40:38 UTC (rev 14365)
@@ -797,6 +797,8 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$allocation['building_id']));
// $this->use_yui_editor();
+
+ phpgwapi_jquery::init_ckeditor('field-message');
self::render_template('booking_cancel',
array('booking'=>$booking));
} else {
@@ -1030,6 +1032,7 @@
if ($step < 2)
{
+ phpgwapi_jquery::init_ckeditor('field-message');
self::render_template('booking_delete',
array('booking' => $booking,
'recurring' => $recurring,
'outseason' => $outseason,
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-11-16 22:40:38 UTC (rev 14365)
@@ -69,7 +69,7 @@
$currres = $event['resources'];
-// list($event, $errors) = $this->extract_and_validate($event);
+ list($event, $errors) = $this->extract_and_validate($event);
if ($event['customer_organization_number']) {
$orginfo =
$this->bo->so->get_org($event['customer_organization_number']);
@@ -213,7 +213,7 @@
} else {
$errors['not_admin'] = lang("You can't cancel events");
- }
+ }
} else {
$errors['started'] = lang("You can't cancel event that has
started, for help contacts site admin");
}
@@ -227,6 +227,11 @@
$activities = $activities['results'];
$this->install_customer_identifier_ui($event);
$this->add_template_helpers();
+
+ $event['from_'] = pretty_timestamp($event['from_']);
+ $event['to_'] = pretty_timestamp($event['to_']);
+
+ phpgwapi_jquery::init_ckeditor('field-message');
self::render_template('event_delete', array('event' => $event,
'activities' => $activities, 'can_delete_events' => $can_delete_events));
}
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-16 22:40:38 UTC (rev 14365)
@@ -16,6 +16,11 @@
parent::__construct();
$this->module = "bookingfrontend";
}
+
+ public function show() {
+ phpgwapi_jquery::init_ckeditor('field-message');
+ parent::show();
+ }
public function edit()
{
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -140,7 +140,7 @@
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+ <div class="pure-u-1 pure-u-lg-4-5">
<dl class="form-col">
<dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
<dd>
@@ -163,14 +163,13 @@
</div>
</div>
</div>
-
-
-
</form>
</div>
<script type="text/javascript">
+ var season_id = '<xsl:value-of select="allocation/season_id" />';
+ </script>
+ <!--script type="text/javascript">
var season_id = '<xsl:value-of select="allocation/season_id"/>';
- /*
<![CDATA[
var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
height: '300px',
@@ -193,6 +192,5 @@
});
descEdit.render();
]]>
- */
-</script>
+ </script-->
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -138,10 +138,10 @@
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+ <div class="pure-u-1 pure-u-lg-4-5">
<dl class="form-col">
<dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
- <dd class="yui-skin-sam">
+ <dd>
<textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
</dd>
</dl>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -164,10 +164,10 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+ <div class="pure-u-1 pure-u-lg-4-5">
<dl class="form-col">
<dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
- <dd class="yui-skin-sam">
+ <dd>
<textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
</dd>
</dl>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -153,10 +153,10 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+ <div class="pure-u-1 pure-u-lg-4-5">
<dl class="form-col">
<dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
- <dd class="yui-skin-sam">
+ <dd>
<textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
</dd>
</dl>
@@ -177,6 +177,7 @@
var season_id = '<xsl:value-of select="booking/season_id" />';
var group_id = '<xsl:value-of select="booking/group_id" />';
var initialSelection = '<xsl:value-of select="booking/resource_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="booking/season_id"/>';
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/event_delete.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/event_delete.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/templates/base/event_delete.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -1,78 +1,104 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div id="content">
-
- <dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang',
'Delete Event')"/></dt>
- </dl>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form">
+ <dt class="heading"><xsl:value-of
select="php:function('lang', 'Delete Event')"/></dt>
+ </dl>
+ </div>
+ </div>
+
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <dl class="form">
- <xsl:if test="can_delete_events=1">
- <dd><xsl:value-of select="php:function('lang', 'Event Delete
Information')"/></dd>
- </xsl:if>
- <xsl:if test="can_delete_events=0">
- <dd><xsl:value-of select="php:function('lang', 'Event Delete
Information2')"/></dd>
- </xsl:if>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form">
+ <xsl:if test="can_delete_events=1">
+ <dd><xsl:value-of select="php:function('lang', 'Event
Delete Information')"/></dd>
+ </xsl:if>
+ <xsl:if test="can_delete_events=0">
+ <dd><xsl:value-of select="php:function('lang', 'Event
Delete Information2')"/></dd>
+ </xsl:if>
- </dl>
- <div class="clr"/>
+ </dl>
+ </div>
+ </div>
+
<form action="" method="POST">
- <dl class="form-col">
- <dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label></dt>
- <dd>
- <div>
- <xsl:value-of select="event/building_name"/>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form-col">
+ <dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label></dt>
+ <dd>
+ <div>
+ <xsl:value-of select="event/building_name"/>
+ </div>
+ </dd>
+ <dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
+ <dd>
+ <div>
+ <xsl:value-of select="event/description"/>
+ </div>
+ </dd>
+ <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
+ <dd>
+ <div>
+ <xsl:for-each select="activities">
+ <xsl:if test="../event/activity_id = id">
+ <xsl:value-of select="name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </dd>
+ <dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label></dt>
+ <dd>
+ <div>
+ <xsl:value-of select="event/from_"/>
+ </div>
+ </dd>
+ <dt><label for="field_to"><xsl:value-of
select="php:function('lang', 'To')"/></label></dt>
+ <dd>
+ <div>
+ <xsl:value-of select="event/to_"/>
+ </div>
+ </dd>
+ </dl>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-lg-4-5">
+ <dl class="form-col">
+ <dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
+ <dd>
+ <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-u-1">
+ <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="event/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'Cancel')"/>
+ </a>
</div>
- </dd>
- <dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
- <dd>
- <div>
- <xsl:value-of select="event/description"/>
- </div>
- </dd>
- <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
- <dd>
- <div>
- <xsl:for-each select="activities">
- <xsl:if test="../event/activity_id = id">
- <xsl:value-of select="name"/>
- </xsl:if>
- </xsl:for-each>
- </div>
- </dd>
- <dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label></dt>
- <dd>
- <div>
- <xsl:value-of select="event/from_"/>
- </div>
- </dd>
- <dt><label for="field_to"><xsl:value-of
select="php:function('lang', 'To')"/></label></dt>
- <dd>
- <div>
- <xsl:value-of select="event/to_"/>
- </div>
- </dd>
- </dl>
- <div style='clear:left; padding:0; margin:0'/>
-
- <dl class="form-col">
- <dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
- <dd class="yui-skin-sam">
- <textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
- </dd>
- </dl>
- <div class="form-buttons">
- <input type="submit">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')"/></xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="event/cancel_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')"/>
- </a>
+ </div>
</div>
</form>
</div>
<script type="text/javascript">
+ var initialSelection = <xsl:value-of select="booking/resources_json" />
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')" />;
+ </script>
+ <!--script type="text/javascript">
YAHOO.event.initialSelection = <xsl:value-of
select="booking/resources_json"/>;
var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
<![CDATA[
@@ -97,5 +123,5 @@
});
descEdit.render();
]]>
- </script>
+ </script-->
</xsl:template>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -120,7 +120,7 @@
<ul id="audience">
<xsl:for-each select="audience">
<li>
- <input type="checkbox"
name="audience[]">
+ <input type="radio" name="audience[]">
<xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
<xsl:if
test="../event/audience=id">
<xsl:attribute
name="checked">checked</xsl:attribute>
Added: branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
(rev 0)
+++ branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -0,0 +1,211 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <div id="content">
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form-col">
+ <dt class="heading">
+ <xsl:if test="not(group/id)">
+ <xsl:value-of select="php:function('lang', 'New
Group')" />
+ </xsl:if>
+ <xsl:if test="group/id">
+ <xsl:value-of select="php:function('lang', 'Edit
Group')" />
+ </xsl:if>
+ </dt>
+ </dl>
+ </div>
+ </div>
+
+ <dl class="form">
+
+ </dl>
+
+ <xsl:call-template name="msgbox"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
+
+ <form action="" method="POST">
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-3">
+ <dl class="form-col">
+ <dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Group')" /></label></dt>
+ <dd><input name="name" type="text"
value="{group/name}" /></dd>
+ <dt><label for="field_shortname"><xsl:value-of
select="php:function('lang', 'Group shortname')" /></label></dt>
+ <dd><input name="shortname" type="text"
value="{group/shortname}" /></dd>
+ <dt><label for="field_organization"><xsl:value-of
select="php:function('lang', 'Organization')" /></label></dt>
+ <dd>
+ <div class="autocomplete">
+ <input id="field_organization_id"
name="organization_id" type="hidden" value="{group/organization_id}"/>
+ <input name="organization_name" type="text"
id="field_organization_name" value="{group/organization_name}">
+ <xsl:if test="group/organization_id">
+ <xsl:attribute
name='disabled'>disabled</xsl:attribute>
+ </xsl:if>
+ </input>
+ <div id="organization_container"/>
+ </div>
+ </dd>
+ <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
+ <dd>
+ <select name="activity_id" id="field_activity">
+ <option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if test="../group/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>
+ </dl>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-3">
+ <dl class="form-col">
+ <xsl:if test="group/id">
+ <dt><label for="field_active"><xsl:value-of
select="php:function('lang', 'Active')"/></label></dt>
+ <dd>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="group/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Active')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="group/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Inactive')"/>
+ </option>
+ </select>
+ </dd>
+ </xsl:if>
+ <dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
+ <dd>
+ <select id="field_show_in_portal"
name="show_in_portal">
+ <option value="0">
+ <xsl:if test="group/show_in_portal=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ <option value="1">
+ <xsl:if test="group/show_in_portal=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ </select>
+ </dd>
+ </dl>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-lg-4-5">
+ <dl class="form-col">
+ <dt><label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
+ <dd>
+ <textarea id="field_description"
name="description" type="text"><xsl:value-of
select="group/description"/></textarea>
+ </dd>
+ </dl>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-3">
+ <dl class="form-col">
+ <dt class='heading'><xsl:value-of
select="php:function('lang', 'Team leader 1')" /></dt>
+
+ <dt><label for="field_admin_name_1"><xsl:value-of
select="php:function('lang', 'Name')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_name_1'
name="contacts[0][name]" value='{group/contacts[1]/name}'/></dd>
+
+ <dt><label for="field_admin_email_1"><xsl:value-of
select="php:function('lang', 'Email')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_email_1'
name="contacts[0][email]" value='{group/contacts[1]/email}'/></dd>
+
+ <dt><label for="field_admin_phone_1"><xsl:value-of
select="php:function('lang', 'Phone')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_phone_1'
name="contacts[0][phone]" value='{group/contacts[1]/phone}'/></dd>
+ </dl>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-3">
+ <dl class="form-col">
+ <dt class='heading'><xsl:value-of
select="php:function('lang', 'Team leader 2')" /></dt>
+
+ <dt><label for="field_admin_name_2"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
+ <dd><input type='text' id='field_admin_name_2'
name="contacts[1][name]" value='{group/contacts[2]/name}'/></dd>
+
+ <dt><label for="field_admin_email_2"><xsl:value-of
select="php:function('lang', 'Email')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_email_2'
name="contacts[1][email]" value='{group/contacts[2]/email}'/></dd>
+
+ <dt><label for="field_admin_phone_2"><xsl:value-of
select="php:function('lang', 'Phone')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_phone_2'
name="contacts[1][phone]" value='{group/contacts[2]/phone}'/></dd>
+ </dl>
+ </div>
+ </div>
+
+ <!--dl class="form-col">
+ </dl-->
+ <!--dl class="form-col"-->
+ <!--<xsl:if test="not(new_form) and (currentapp =
'booking')">-->
+ <!--</xsl:if>-->
+ <!--/dl-->
+
+ <!--div style='clear:left; padding:0; margin:0'/-->
+
+
+
+
+
+ <div class="form-buttons">
+ <xsl:if test="not(group/id)"><input type="submit"
value="{php:function('lang', 'Add')}"/></xsl:if>
+ <xsl:if test="group/id"><input type="submit"
value="{php:function('lang', 'Save')}"/></xsl:if>
+ <a class="cancel" href="{group/cancel_link}">
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ </div>
+ </form>
+ </div>
+ <script type="text/javascript">
+ var endpoint = '<xsl:value-of select="module" />';
+ <![CDATA[
+ $(document).ready(function(){
+ JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: endpoint+'.uiorganization.index', phpgw_return_as: 'json'} ),
'field_organization_name', 'field_organization_id', 'organization_container');
+
//JqueryPortico.autocompleteHelper('index.php?menuaction='+endpoint+'.uiorganization.index&phpgw_return_as=json&','field_organization_name',
'field_organization_id','organization_container');
+ });
+ ]]>
+ </script>
+
+ <!--script type="text/javascript">
+ var endpoint = '<xsl:value-of select="module" />';
+ <![CDATA[
+ var descEdit = new YAHOO.widget.SimpleEditor('field-description', {
+ height: '300px',
+ width: '522px',
+ dompath: true,
+ animate: true,
+ handleSubmit: true,
+ toolbar: {
+ titlebar: '',
+ buttons: [
+ { group: 'textstyle', label: ' ',
+ buttons: [
+ { type: 'push', label: 'Bold', value: 'bold' },
+ { type: 'separator' },
+ { type: 'push', label: 'HTML Link CTRL + SHIFT +
L', value: 'createlink'}
+ ]
+ }
+ ]
+ }
+ });
+ descEdit.render();
+
+ YAHOO.booking.autocompleteHelper('index.php?menuaction=' + endpoint +
'.uiorganization.index&phpgw_return_as=json&',
+ 'field_organization_name',
+ 'field_organization_id',
+ 'organization_container'
+ );
+ ]]>
+ </script-->
+</xsl:template>
+
Added:
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
(rev 0)
+++
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -0,0 +1,299 @@
+<func:function name="phpgw:conditional">
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
+
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+</func:function>
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <div id="content">
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form">
+ <dt class="heading">
+ <xsl:if test="new_form">
+ <xsl:value-of select="php:function('lang', 'New
Organization')" />
+ </xsl:if>
+ <xsl:if test="not(new_form)">
+ <xsl:value-of select="php:function('lang', 'Edit
Organization')" />
+ </xsl:if>
+ </dt>
+ </dl>
+ </div>
+ </div>
+ <xsl:call-template name="msgbox"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
+
+ <form action="" method="POST">
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <dl class="form-col">
+ <dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Organization')" /></label></dt>
+ <dd>
+ <xsl:if test="currentapp = 'booking'">
+ <input id="inputs" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/name"/></xsl:attribute>
+ </input>
+ </xsl:if>
+ <xsl:if test="currentapp != 'booking'">
+ <input id="inputs" name="name" readonly="true"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/name"/></xsl:attribute>
+ </input>
+ </xsl:if>
+ </dd>
+ <dt><label for="field_shortname"><xsl:value-of
select="php:function('lang', 'Organization shortname')" /></label></dt>
+ <dd>
+ <xsl:if test="currentapp = 'booking'">
+ <input id="field_shortname" name="shortname"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/shortname"/></xsl:attribute>
+ </input>
+ </xsl:if>
+ <xsl:if test="currentapp != 'booking'">
+ <input id="field_shortname" name="shortname"
readonly="true" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/shortname"/></xsl:attribute>
+ </input>
+ </xsl:if>
+ </dd>
+ <dt><label
for="field_organization_number"><xsl:value-of select="php:function('lang',
'Organization number')" /></label></dt>
+ <dd>
+ <xsl:if test="currentapp = 'booking'">
+ <input id="field_organization_number"
name="organization_number" type="text"
value="{organization/organization_number}"/>
+ </xsl:if>
+ <xsl:if test="currentapp != 'booking'">
+ <input id="field_organization_number"
name="organization_number" type="text" readonly="true"
value="{organization/organization_number}"/>
+ </xsl:if>
+ </dd>
+ <dd>
+ </dd>
+
+ <dt><label for="field_customer_number"><xsl:value-of
select="php:function('lang', 'Customer number')" /></label></dt>
+ <dd>
+ <xsl:if test="currentapp = 'booking'">
+ <input name="customer_number" type="text"
id="field_customer_number" value="{organization/customer_number}"/>
+ </xsl:if>
+ <xsl:if test="currentapp != 'booking'">
+ <input name="customer_number" type="text"
id="field_customer_number" readonly="true"
value="{organization/customer_number}"/>
+ </xsl:if>
+ </dd>
+ <dt><label for="field_homepage"><xsl:value-of
select="php:function('lang', 'Homepage')" /></label></dt>
+ <dd>
+ <input id="field_homepage" name="homepage"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/homepage"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label></dt>
+ <dd>
+ <input id="field_phone" name="phone" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/phone"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label></dt>
+ <dd>
+ <input id="field_email" name="email" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="organization/email"/></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">
+ <xsl:if test="currentapp = 'booking'">
+ <xsl:copy-of
select="phpgw:booking_customer_identifier(organization)"/>
+ </xsl:if>
+ <xsl:if test="currentapp != 'booking'">
+ <xsl:copy-of
select="phpgw:booking_customer_identifier_show(organization)"/>
+ </xsl:if>
+ <xsl:if test="currentapp = 'booking'">
+ <dt><label
for="field_customer_internal"><xsl:value-of select="php:function('lang',
'Internal Customer')"/></label></dt>
+ <dd><xsl:copy-of
select="phpgw:option_checkbox(organization/customer_internal,
'customer_internal')"/></dd>
+ </xsl:if>
+ <dt><label for="field_street"><xsl:value-of
select="php:function('lang', 'Street')"/></label></dt>
+ <dd><input id="field_street" name="street" type="text"
value="{organization/street}"/></dd>
+
+ <dt><label for="field_zip_code"><xsl:value-of
select="php:function('lang', 'Zip code')"/></label></dt>
+ <dd><input type="text" name="zip_code"
id="field_zip_code" value="{organization/zip_code}"/></dd>
+
+ <dt><label for="field_city"><xsl:value-of
select="php:function('lang', 'Postal City')"/></label></dt>
+ <dd><input type="text" name="city" id="field_city"
value="{organization/city}"/></dd>
+
+ <dt><label for='field_district'><xsl:value-of
select="php:function('lang', 'District')"/></label></dt>
+ <dd>
+ <xsl:if test="currentapp = 'booking'">
+ <input type="text" name="district"
id="field_district" value="{organization/district}"/>
+ </xsl:if>
+ <xsl:if test="currentapp != 'booking'">
+ <input type="text" name="district"
id="field_district" readonly="true" value="{organization/district}"/>
+ </xsl:if>
+ </dd>
+ <xsl:if test="not(new_form) and (currentapp =
'booking')">
+ <dt><label for="field_active"><xsl:value-of
select="php:function('lang', 'Active')"/></label></dt>
+ <dd>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="organization/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Active')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="organization/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Inactive')"/>
+ </option>
+ </select>
+ </dd>
+ </xsl:if>
+ <!--<xsl:if test="not(new_form) and (currentapp =
'booking')">-->
+ <dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
+ <dd>
+ <select id="field_show_in_portal"
name="show_in_portal">
+ <option value="0">
+ <xsl:if test="organization/show_in_portal=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ <option value="1">
+ <xsl:if test="organization/show_in_portal=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ </select>
+ </dd>
+ <!--</xsl:if>-->
+ </dl>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form-col">
+ <dt style="margin-top: 40px;"><label
for="field_activity"><xsl:value-of select="php:function('lang', 'Activity')"
/></label></dt>
+ <dd>
+ <select name="activity_id" id="field_activity">
+ <option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if
test="../organization/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>
+ </dl>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-lg-4-5">
+ <div class="form-col">
+ <dt><label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
+ <dd>
+ <textarea id="field_description"
name="description" type="text"><xsl:value-of
select="organization/description"/></textarea>
+ </dd>
+ </div>
+ </div>
+ </div>
+
+ <xsl:if test='new_form or organization/permission/write'>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <dl class="form-col">
+ <dt class='heading'><xsl:value-of
select="php:function('lang', 'Admin 1')" /></dt>
+
+ <dt><label for="field_admin_name_1"><xsl:value-of
select="php:function('lang', 'Name')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_name_1'
name="contacts[0][name]" value='{organization/contacts[1]/name}'/></dd>
+
+ <input type="hidden" name="contacts[0][ssn]"
value=""/>
+
+ <dt><label for="field_admin_email_1"><xsl:value-of
select="php:function('lang', 'Email')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_email_1'
name="contacts[0][email]" value='{organization/contacts[1]/email}'/></dd>
+
+ <dt><label for="field_admin_phone_1"><xsl:value-of
select="php:function('lang', 'Phone')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_phone_1'
name="contacts[0][phone]" value='{organization/contacts[1]/phone}'/></dd>
+ </dl>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <dl class="form-col">
+ <dt class='heading'><xsl:value-of
select="php:function('lang', 'Admin 2')" /></dt>
+
+ <dt><label for="field_admin_name_2"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
+ <dd><input type='text' id='field_admin_name_2'
name="contacts[1][name]" value='{organization/contacts[2]/name}'/></dd>
+
+ <input type="hidden" name="contacts[1][ssn]"
value=""/>
+
+ <dt><label for="field_admin_email_2"><xsl:value-of
select="php:function('lang', 'Email')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_email_2'
name="contacts[1][email]" value='{organization/contacts[2]/email}'/></dd>
+
+ <dt><label for="field_admin_phone_2"><xsl:value-of
select="php:function('lang', 'Phone')" /></label><br /></dt>
+ <dd><input type='text' id='field_admin_phone_2'
name="contacts[1][phone]" value='{organization/contacts[2]/phone}'/></dd>
+ </dl>
+ </div>
+ </div>
+ </xsl:if>
+ <script type="text/javascript">
+ var endpoint = '<xsl:value-of select="module" />';
+ </script>
+
+ <!--script type="text/javascript">
+ var endpoint = '<xsl:value-of select="module" />';
+ <![CDATA[
+ var descEdit = new YAHOO.widget.SimpleEditor('field-description', {
+ height: '300px',
+ width: '522px',
+ dompath: true,
+ animate: true,
+ handleSubmit: true,
+ toolbar: {
+ titlebar: '',
+ buttons: [
+ { group: 'textstyle', label: ' ',
+ buttons: [
+ { type: 'push', label: 'Bold', value:
'bold' },
+ { type: 'separator' },
+ { type: 'push', label: 'HTML Link CTRL +
SHIFT + L', value: 'createlink'}
+ ]
+ }
+ ]
+ }
+ });
+ descEdit.render();
+
+ ]]>
+ </script-->
+ <div class="form-buttons">
+ <input type="submit">
+ <xsl:if test="new_form">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')" /></xsl:attribute>
+ </xsl:if>
+ <xsl:if test="not(new_form)">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')" /></xsl:attribute>
+ </xsl:if>
+ </input>
+ <a class="cancel">
+ <xsl:attribute name="href"><xsl:value-of
select="organization/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ </div>
+ </form>
+ </div>
+
+</xsl:template>
+
+
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-11-16 10:50:22 UTC (rev 14364)
+++ branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-11-16 22:40:38 UTC (rev 14365)
@@ -16,29 +16,46 @@
<!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST">
- <dl class="form-col">
- <dt><label for="field_title"><xsl:value-of
select="php:function('lang', 'Title')" /></label></dt>
- <dd><input name="title" type="text"
value="{system_message/title}" /></dd>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form-col">
+ <dt><label for="field_title"><xsl:value-of
select="php:function('lang', 'Title')" /></label></dt>
+ <dd><input name="title" type="text"
value="{system_message/title}" /></dd>
+ </dl>
+ </div>
+ </div>
- <dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
- <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>
- <dt><label for="field_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label></dt>
- <dd><input name="phone" type="text"
value="{system_message/phone}" /></dd>
- <dt><label for="field_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label></dt>
- <dd><input name="email" type="text"
value="{system_message/email}" /></dd>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-lg-4-5">
+ <dl class="form-col">
+ <dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
+ <dd>
+ <textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
+ </dd>
+ </dl>
+ </div>
+ </div>
- <dt><label for="field_time"><xsl:value-of
select="php:function('lang', 'Created')" /></label></dt>
- <dd>
- <input id="inputs" name="created" readonly="true"
type="text">
- <xsl:attribute name="value"><xsl:value-of
select="system_message/created"/></xsl:attribute>
- </input>
- </dd>
- </dl>
-
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="form-col">
+ <dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
+ <dd><input name="name" type="text"
value="{system_message/name}" /></dd>
+ <dt><label for="field_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label></dt>
+ <dd><input name="phone" type="text"
value="{system_message/phone}" /></dd>
+ <dt><label for="field_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label></dt>
+ <dd><input name="email" type="text"
value="{system_message/email}" /></dd>
+
+ <dt><label for="field_time"><xsl:value-of
select="php:function('lang', 'Created')" /></label></dt>
+ <dd>
+ <input id="inputs" name="created" readonly="true"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="system_message/created"/></xsl:attribute>
+ </input>
+ </dd>
+ </dl>
+ </div>
+ </div>
+
<div class="form-buttons">
<xsl:if test="not(system_message/id)"><input
type="submit" value="{php:function('lang', 'Save')}"/></xsl:if>
<xsl:if test="system_message/id"><input type="submit"
value="{php:function('lang', 'Save')}"/></xsl:if>
@@ -74,4 +91,3 @@
]]>
</script-->
</xsl:template>
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14365] fixing forms,
Saul <=