[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14119] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14119] fixing forms |
|
Date: |
Tue, 06 Oct 2015 00:06:28 +0000 |
Revision: 14119
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14119
Author: psaul
Date: 2015-10-06 00:06:27 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/allocation.xsl
branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
branches/dev-syncromind/booking/templates/base/allocation_new.xsl
branches/dev-syncromind/booking/templates/base/application.xsl
branches/dev-syncromind/booking/templates/base/system_message.xsl
branches/dev-syncromind/booking/templates/base/system_message_edit.xsl
Modified: branches/dev-syncromind/booking/templates/base/allocation.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++ branches/dev-syncromind/booking/templates/base/allocation.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -1,72 +1,48 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--ul class="pathway">
- <li>
- <a>
- <xsl:attribute name="href"><xsl:value-of
select="allocation/allocations_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Allocations')"
/>
- </a>
- </li>
- <li><xsl:value-of select="allocation/organization_name"/></li>
- </ul-->
-
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
- <div id="allocations">
- <h1>
- <xsl:value-of select="allocation/organization_name"/>
- </h1>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', allocation/from_)"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', allocation/to_)"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
- </label>
- <xsl:value-of select="allocation/season_name"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
- </label>
- <xsl:value-of
select="allocation/organization_name"/>
- </div>
- <div class="pure-control-group">
- <label style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4>
- </label>
- <div id="resources_container"
style="display:inline-block;"></div>
- </div>
+ <xsl:call-template name="msgbox"/>
+ <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
+ <div id="allocations" class="booking-container">
+ <h1>
+ <xsl:value-of select="allocation/organization_name"/>
+ </h1>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang', 'From')"
/></label>
+ <xsl:value-of select="php:function('pretty_timestamp',
allocation/from_)"/>
</div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang', 'To')"
/></label>
+ <xsl:value-of select="php:function('pretty_timestamp',
allocation/to_)"/>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Season')" /></label>
+ <xsl:value-of select="allocation/season_name"/>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Organization')" /></label>
+ <xsl:value-of select="allocation/organization_name"/>
+ </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;"></div>
+ </div>
</div>
- </form>
- <div class="pure-control-group">
- <xsl:if test="allocation/permission/write">
- <button>
- <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="allocation/edit_link"/>"</xsl:attribute>
- <!--xsl:attribute name="onclick">square();</xsl:attribute-->
- <xsl:value-of select="php:function('lang', 'Edit')" />
- </button>
- <button>
- <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="allocation/delete_link"/>"</xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Delete')" />
- </button>
- </xsl:if>
</div>
- <!--/div-->
+ </form>
+ <div class="pure-control-group">
+ <xsl:if test="allocation/permission/write">
+ <button class="pure-button pure-button-primary">
+ <xsl:attribute name="onclick">window.location.href="<xsl:value-of
select="allocation/edit_link"/>"</xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Edit')" />
+ </button>
+ <button class="pure-button pure-button-primary">
+ <xsl:attribute name="onclick">window.location.href="<xsl:value-of
select="allocation/delete_link"/>"</xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Delete')" />
+ </button>
+ </xsl:if>
+ </div>
<script type="text/javascript">
var resourceIds = '<xsl:value-of select="allocation/resource_ids"/>';
var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource
Type')"/>;
@@ -76,11 +52,4 @@
var colDefs = [{key: 'name', label: lang['Name'], formatter:
genericLink()}, {key: 'type', label: lang['Resource Type']}];
createTable('resources_container',resourcesURL,colDefs);
</script>
-<script type="text/javascript">
- function square()
- {
- location.href = "<xsl:value-of select="allocation/edit_link"/>";
- }
-</script>
-
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++ branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -1,16 +1,14 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<fieldset>
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
- <div id="allocation_delete">
+ <div id="allocation_delete" class="booking-container">
<div class="heading">
<legend><h3><xsl:value-of select="php:function('lang',
'Delete allocation')"/></h3></legend>
- </div>
-
+ </div>
<div class="pure-control-group">
<h4><xsl:value-of select="php:function('lang', 'Delete
Information')"/></h4>
<h4><xsl:value-of select="php:function('lang', 'Delete
Information2')"/></h4>
@@ -23,41 +21,31 @@
<input id="field_to" name="to_" type="hidden"
value="{allocation/to_}" />
</div>
<div class="pure-control-group">
- <label for="field_building"
style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
- </label>
+ <label for="field_building"
style="vertical-align:top;"><xsl:value-of select="php:function('lang',
'Building')" /></label>
<div class="autocomplete"
style="display:inline-block;">
<xsl:value-of select="allocation/building_name"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_org" style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
- </label>
+ <label for="field_org"
style="vertical-align:top;"><xsl:value-of select="php:function('lang',
'Organization')" /></label>
<div class="autocomplete"
style="display:inline-block;">
<xsl:value-of
select="allocation/organization_name"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_from" style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
- </label>
+ <label for="field_from"
style="vertical-align:top;"><xsl:value-of select="php:function('lang', 'From')"
/></label>
<div style="display:inline-block;">
<xsl:value-of select="allocation/from_"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_to" style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
- </label>
+ <label for="field_to"
style="vertical-align:top;"><xsl:value-of select="php:function('lang', 'To')"
/></label>
<div style="display:inline-block;">
<xsl:value-of select="allocation/to_"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_repeat_until"
style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></h4>
- </label>
+ <label for="field_repeat_until"
style="vertical-align:top;"><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></label>
<div style="display:inline-block;">
<div>
<label style="display: block
!important;text-align: left !important;">
@@ -85,9 +73,7 @@
</div>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Interval')" /></label>
<xsl:value-of select="../field_interval" />
<select id="field_interval" name="field_interval">
<option value="1">
@@ -116,7 +102,6 @@
</option>
</select>
</div>
-
</div>
</div>
</fieldset>
@@ -124,7 +109,7 @@
<input type="submit" class="pure-button pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')"/></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
Modified:
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
===================================================================
---
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -1,65 +1,71 @@
<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
Allocations')"/></dt>
- </dl>
+
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <form action="" method="POST" class="pure-form pure-form-aligned"
name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
+ <div id="allocation_delete" class="booking-container">
+ <fieldset>
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Delete Allocations')"/></h3></legend>
+ </div>
+ </fieldset>
+ <input type="hidden" name="organization_name"
value="{allocation/organization_name}"/>
+ <input type="hidden" name="organization_id"
value="{allocation/organization_id}"/>
+ <input type="hidden" name="building_name"
value="{allocation/building_name}"/>
+ <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
+ <input type="hidden" name="from_" value="{from_date}"/>
+ <input type="hidden" name="to_" value="{to_date}"/>
+ <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
+ <input type="hidden" name="cost"
value="{allocation/cost}"/>
+ <input type="hidden" name="season_id"
value="{allocation/season_id}"/>
+ <input type="hidden" name="field_building_id"
value="{allocation/building_id}"/>
+ <input type="hidden" name="step" value="{step}" />
+ <input type="hidden" name="recurring" value="{recurring}"
/>
+ <input type="hidden" name="repeat_until"
value="{repeat_until}" />
+ <input type="hidden" name="field_interval"
value="{interval}" />
+ <input type="hidden" name="outseason" value="{outseason}"
/>
+ <xsl:for-each select="allocation/resources">
+ <input type="hidden" name="resources[]" value="{.}" />
+ </xsl:for-each>
- <!-- <xsl:call-template name="xmlsource"/> -->
-
- <form action="" method="POST">
- <input type="hidden" name="organization_name"
value="{allocation/organization_name}"/>
- <input type="hidden" name="organization_id"
value="{allocation/organization_id}"/>
- <input type="hidden" name="building_name"
value="{allocation/building_name}"/>
- <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
- <input type="hidden" name="from_" value="{from_date}"/>
- <input type="hidden" name="to_" value="{to_date}"/>
- <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
- <input type="hidden" name="cost"
value="{allocation/cost}"/>
- <input type="hidden" name="season_id"
value="{allocation/season_id}"/>
- <input type="hidden" name="field_building_id"
value="{allocation/building_id}"/>
- <input type="hidden" name="step" value="{step}" />
- <input type="hidden" name="recurring"
value="{recurring}" />
- <input type="hidden" name="repeat_until"
value="{repeat_until}" />
- <input type="hidden" name="field_interval"
value="{interval}" />
- <input type="hidden" name="outseason"
value="{outseason}" />
- <xsl:for-each select="allocation/resources">
- <input type="hidden" name="resources[]"
value="{.}" />
- </xsl:for-each>
-
- <h4><xsl:value-of select="php:function('lang',
'Allocations that will be deleted')" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="valid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
-
- <h4><xsl:value-of select="php:function('lang',
'Allocations with existing bookings (%1)', count(result/invalid[from_]))"
/></h4>
- <div class="allocation-list">
- <xsl:for-each select="invalid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
- <div class="form-buttons">
- <input type="submit" name="create">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', '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 class="pure-control-group">
+ <h4><xsl:value-of select="php:function('lang',
'Allocations that will be deleted')" /></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="valid_dates">
+ <li>
+ <xsl:value-of select="from_"/> -
<xsl:value-of select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <h4><xsl:value-of select="php:function('lang',
'Allocations with existing bookings (%1)', count(result/invalid[from_]))"
/></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="invalid_dates">
+ <li>
+ <xsl:value-of select="from_"/> -
<xsl:value-of select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" name="create" class="pure-button
pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')" /></xsl:attribute>
+ </input>
+ <a class="cancel pure-button pure-button-primary">
+ <xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ </div>
+ </form>
</div>
<script type="text/javascript">
- YAHOO.booking.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/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -2,48 +2,35 @@
<style type="text/css">
.pure-control-group h4 {margin: 0px;}
</style>
- <!--div id="content"-->
- <!--dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang', 'New
allocation')"/></dt>
- </dl-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes" select="allocation/tabs"/>
- <div id="allocation_new">
-
- <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
-
+ <div id="allocation_new" class="booking-container">
+ <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
<div class="pure-control-group">
- <label for="field_building_name"><h4><xsl:value-of
select="php:function('lang', 'Building')" /></h4></label>
- <!--div class="autocomplete"-->
+ <label for="field_building_name"><xsl:value-of
select="php:function('lang', 'Building')" /></label>
<input id="field_building_id" name="building_id"
type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="allocation/building_id"/></xsl:attribute>
</input>
<input id="field_building_name" name="building_name"
type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/building_name"/></xsl:attribute>
</input>
- <!--div id="building_container"/-->
- <!--/div-->
</div>
<div class="pure-control-group">
- <label for="field_org_name"><h4><xsl:value-of
select="php:function('lang', 'Organization')" /></h4></label>
- <!--div class="autocomplete"-->
+ <label for="field_org_name"><xsl:value-of
select="php:function('lang', 'Organization')" /></label>
<input id="field_org_id" name="organization_id"
type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="allocation/organization_id"/></xsl:attribute>
</input>
<input id="field_org_name" name="organization_name"
type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/organization_name"/></xsl:attribute>
</input>
- <!--div id="org_container"/-->
- <!--/div-->
</div>
<div class="pure-control-group">
- <label for="field_weekday"><h4><xsl:value-of
select="php:function('lang', 'Weekday')" /></h4></label>
+ <label for="field_weekday"><xsl:value-of
select="php:function('lang', 'Weekday')" /></label>
<select name="weekday" id="field_weekday">
<option value="monday">
<xsl:if test="../allocation/weekday = 'monday'">
@@ -90,23 +77,19 @@
</select>
</div>
<div class="pure-control-group">
- <label for="field_from"><h4><xsl:value-of
select="php:function('lang', 'From')" /></h4></label>
- <!--div class="time-picker"-->
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label>
<input id="field_from" name="from_" type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/from_"/></xsl:attribute>
</input>
- <!--/div-->
</div>
<div class="pure-control-group">
- <label for="field_to"><h4><xsl:value-of
select="php:function('lang', 'To')" /></h4></label>
- <!--div class="time-picker"-->
+ <label for="field_to"><xsl:value-of
select="php:function('lang', 'To')" /></label>
<input id="field_to" name="to_" type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/to_"/></xsl:attribute>
</input>
- <!--/div-->
</div>
<div class="pure-control-group">
- <label for="outseason"><h4><xsl:value-of
select="php:function('lang', 'Recurring allocation')" /></h4></label>
+ <label for="outseason"><xsl:value-of
select="php:function('lang', 'Recurring allocation')" /></label>
<input type="checkbox" name="outseason" id="outseason">
<xsl:if test="outseason='on'">
<xsl:attribute
name="checked">checked</xsl:attribute>
@@ -115,9 +98,7 @@
<label style="text-align:left;margin-left:5px;"
for="outseason"><xsl:value-of select="php:function('lang', 'Out season')"
/></label>
</div>
<div class="pure-control-group">
- <label for="field_interval">
- <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
- </label>
+ <label for="field_interval"><xsl:value-of
select="php:function('lang', 'Interval')" /></label>
<xsl:value-of select="../field_interval" />
<select id="field_interval" name="field_interval">
<option value="1">
@@ -147,21 +128,17 @@
</select>
</div>
<div class="pure-control-group">
- <label style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
- </label>
+ <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>
<div class="pure-control-group">
- <label for="field_cost"><h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4></label>
+ <label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label>
<input id="field_cost" name="cost" type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/cost"/></xsl:attribute>
</input>
</div>
<div class="pure-control-group">
- <label style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4>
- </label>
+ <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>
</div>
@@ -170,22 +147,16 @@
<input type="submit" class="button pure-button
pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')"/></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel button pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
</form>
- <!--/div-->
<script type="text/javascript">
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', 'Name',
'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"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
- </script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++ branches/dev-syncromind/booking/templates/base/application.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -46,7 +46,7 @@
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
- <div id="application">
+ <div id="application" class="booking-container">
<fieldset>
<div class="pure-g">
<div class="pure-u-1">
@@ -281,17 +281,17 @@
</div>
<div class="pure-control-group">
<label>
- <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
+ <xsl:value-of
select="php:function('lang', 'Target audience')" />
</label>
- <label>
- <ul>
+ <div class="custom-container">
+ <ul class="list-left">
<xsl:for-each
select="audience">
<xsl:if
test="../application/audience=id">
<li><xsl:value-of
select="name"/></li>
</xsl:if>
</xsl:for-each>
</ul>
- </label>
+ </div>
</div>
<div class="pure-control-group">
<label style="vertical-align:
top;width: auto;">
@@ -467,7 +467,7 @@
</div>
<dl class="proplist-col">
<xsl:if test="application/edit_link">
- <button>
+ <button class="pure-button pure-button-primary">
<xsl:if
test="application/case_officer/is_current_user">
<xsl:attribute
name="onclick">window.location.href='<xsl:value-of
select="application/edit_link"/>'</xsl:attribute>
</xsl:if>
@@ -478,7 +478,7 @@
</button>
</xsl:if>
- <a href="{application/dashboard_link}"><xsl:value-of
select="php:function('lang', 'Back to Dashboard')" /></a>
+ <a class="pure-button pure-button-primary"
href="{application/dashboard_link}"><xsl:value-of select="php:function('lang',
'Back to Dashboard')" /></a>
</dl>
</form>
<!--/div-->
Modified: branches/dev-syncromind/booking/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/system_message.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++ branches/dev-syncromind/booking/templates/base/system_message.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -19,71 +19,52 @@
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="system_message/tabs"/>
- <div id="system_message">
-
- <input name="title" type="hidden"
value="{system_message/title}" />
- <input name="message" type="hidden"
value="{system_message/message}" />
- <input name="created" type="hidden"
value="{system_message/created}" />
- <input name="name" type="hidden"
value="{system_message/name}" />
- <input name="phone" type="hidden"
value="{system_message/phone}" />
- <input name="email" type="hidden"
value="{system_message/email}" />
- <input name="status" type="hidden" value="CLOSED" />
-
+ <xsl:value-of disable-output-escaping="yes"
select="system_message/tabs"/>
+ <div id="system_message" class="booking-container">
+ <input name="title" type="hidden"
value="{system_message/title}" />
+ <input name="message" type="hidden"
value="{system_message/message}" />
+ <input name="created" type="hidden"
value="{system_message/created}" />
+ <input name="name" type="hidden"
value="{system_message/name}" />
+ <input name="phone" type="hidden"
value="{system_message/phone}" />
+ <input name="email" type="hidden"
value="{system_message/email}" />
+ <input name="status" type="hidden" value="CLOSED" />
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Created')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Created')" /></label>
<xsl:value-of select="system_message/created"/>
</div>
<div class="pure-control-group">
- <label style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Message')" /></h4>
- </label>
+ <label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Message')" /></label>
<div
style="display:inline-block;max-width:80%;"><xsl:value-of
select="system_message/message" disable-output-escaping="yes"/></div>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Name')" /></label>
<xsl:value-of select="system_message/name"/>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Phone')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Phone')" /></label>
<xsl:value-of select="system_message/phone"/>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Email')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Email')" /></label>
<xsl:value-of select="system_message/email"/>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Type')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Type')" /></label>
<xsl:value-of select="system_message/type"/>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Status')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Status')" /></label>
<xsl:value-of select="system_message/status" />
</div>
-
</div>
</div>
<div class="form-buttons">
- <xsl:if test="system_message/status =
php:function('lang','NEW')"><input style="margin-right: 10px;" type="submit"
value="{php:function('lang', 'Close')}"/></xsl:if>
- <a class="button">
+ <xsl:if test="system_message/status =
php:function('lang','NEW')"><input class="pure-button pure-button-primary"
style="margin-right: 10px;" type="submit" value="{php:function('lang',
'Close')}"/></xsl:if>
+ <a class="button pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="system_message/back_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Back')" />
</a>
</div>
</form>
-
<!---/div-->
-
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/system_message_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/system_message_edit.xsl
2015-10-06 00:06:07 UTC (rev 14118)
+++ branches/dev-syncromind/booking/templates/base/system_message_edit.xsl
2015-10-06 00:06:27 UTC (rev 14119)
@@ -1,7 +1,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <!--div id="content"-->
- <dl class="form">
+ <!--dl class="form">
<dt class="heading">
<xsl:if test="not(system_message/id)">
<xsl:value-of select="php:function('lang', 'New
System Message')" />
@@ -10,46 +10,57 @@
<xsl:value-of select="php:function('lang',
'Edit System Message')" />
</xsl:if>
</dt>
- </dl>
+ </dl-->
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--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>
+ <form action="" method="POST" class="pure-form pure-form-aligned"
name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="system_message/tabs"/>
+ <div id="system_message" class="booking-container">
+ <div class="pure-control-group">
+ <label for="field_title"><xsl:value-of
select="php:function('lang', 'Title')" /></label>
+ <input name="title" type="text"
value="{system_message/title}" />
+ </div>
+ <div class="pure-control-group">
+ <label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label>
+ <div class="custom-container">
+ <textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label>
+ <input name="name" type="text"
value="{system_message/name}" />
+ </div>
+ <div class="pure-control-group">
+ <label for="field_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label>
+ <input name="phone" type="text"
value="{system_message/phone}" />
+ </div>
+ <div class="pure-control-group">
+ <label for="field_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label>
+ <input name="email" type="text"
value="{system_message/email}" />
+ </div>
+ <div class="pure-control-group">
+ <label for="field_time"><xsl:value-of
select="php:function('lang', 'Created')" /></label>
+ <input id="inputs" name="created" readonly="true"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="system_message/created"/></xsl:attribute>
+ </input>
+ </div>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <xsl:if test="not(system_message/id)"><input class="pure-button
pure-button-primary" type="submit" value="{php:function('lang',
'Save')}"/></xsl:if>
+ <xsl:if test="system_message/id"><input class="pure-button
pure-button-primary" type="submit" value="{php:function('lang',
'Save')}"/></xsl:if>
+ <a class="cancel pure-button pure-button-primary"
href="{system_message/cancel_link}">
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ </div>
+ </form>
+<!--/div-->
- <dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
- <dd class="yui-skin-sam">
- <textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
- </dd>
- <dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
- <dd><input name="name" type="text"
value="{system_message/name}" /></dd>
- <dt><label for="field_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label></dt>
- <dd><input name="phone" type="text"
value="{system_message/phone}" /></dd>
- <dt><label for="field_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label></dt>
- <dd><input name="email" type="text"
value="{system_message/email}" /></dd>
-
- <dt><label for="field_time"><xsl:value-of
select="php:function('lang', 'Created')" /></label></dt>
- <dd>
- <input id="inputs" name="created" readonly="true"
type="text">
- <xsl:attribute name="value"><xsl:value-of
select="system_message/created"/></xsl:attribute>
- </input>
- </dd>
- </dl>
-
- <div class="form-buttons">
- <xsl:if test="not(system_message/id)"><input
type="submit" value="{php:function('lang', 'Save')}"/></xsl:if>
- <xsl:if test="system_message/id"><input type="submit"
value="{php:function('lang', 'Save')}"/></xsl:if>
- <a class="cancel" href="{system_message/cancel_link}">
- <xsl:value-of select="php:function('lang',
'Cancel')" />
- </a>
- </div>
- </form>
-</div>
-
-<script type="text/javascript">
+<!--script type="text/javascript">
<![CDATA[
var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
height: '300px',
@@ -72,6 +83,6 @@
});
descEdit.render();
]]>
-</script>
+</script-->
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14119] fixing forms,
Saul <=