[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14162] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14162] fixing forms |
|
Date: |
Tue, 13 Oct 2015 00:15:13 +0000 |
Revision: 14162
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14162
Author: psaul
Date: 2015-10-13 00:15:12 +0000 (Tue, 13 Oct 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
branches/dev-syncromind/booking/templates/base/account_code_set.xsl
branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
branches/dev-syncromind/booking/templates/base/activities.xsl
branches/dev-syncromind/booking/templates/base/activity_edit.xsl
branches/dev-syncromind/booking/templates/base/activity_new.xsl
branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
branches/dev-syncromind/booking/templates/base/audience_edit.xsl
branches/dev-syncromind/booking/templates/base/audience_new.xsl
branches/dev-syncromind/booking/templates/base/documentation_form.xsl
branches/dev-syncromind/booking/templates/base/email_index.xsl
branches/dev-syncromind/booking/templates/base/email_preview.xsl
branches/dev-syncromind/booking/templates/base/email_receipt.xsl
branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
branches/dev-syncromind/booking/templates/base/permission_root_form.xsl
branches/dev-syncromind/booking/templates/base/report_freetime.xsl
branches/dev-syncromind/booking/templates/base/report_index.xsl
Modified:
branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,20 +1,10 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
-
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
- <!--dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang',
'Account Codes')"/> - <xsl:value-of select="php:function('lang',
'Labels')"/></dt>
- </dl-->
-
- <!--p><xsl:value-of select="php:function('lang',
'account_code_dimension_helptext')"/></p-->
-
<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="data/tabs"/>
- <div id="account_code">
+ <div id="account_code" class="booking-container">
<div class="pure-control-group">
<label>Article (pos 283 - 297)</label>
<input id="field_article"
name="article" type="text">
@@ -69,9 +59,8 @@
<xsl:attribute
name="value"><xsl:value-of select="config_data/dim_value_5"/></xsl:attribute>
</input>
</div>
- <div class="clr"/>
<div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'External account')"/></dt>
+ <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'External account')"/></h3></legend></div>
</div>
<div class="pure-control-group">
<p><xsl:value-of select="php:function('lang',
'External_account_helptext')"/></p>
@@ -116,10 +105,8 @@
</option>
</select>
</div>
-
- <div class="clr"/>
<div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Internal account')"/></dt>
+ <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'Internal account')"/></h3></legend></div>
</div>
<div class="pure-control-group">
<p><xsl:value-of select="php:function('lang',
'Internal_account_helptext')"/></p>
@@ -171,10 +158,8 @@
</select>
</div>
- <div class="clr"/>
-
<div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Export agresso')"/></dt>
+ <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'Export agresso')"/></h3></legend></div>
</div>
<div class="pure-control-group">
Modified: branches/dev-syncromind/booking/templates/base/account_code_set.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/account_code_set.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,17 +1,4 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--xsl:call-template name="yui_booking_i18n"/-->
- <!--div id="content"-->
- <!--ul class="pathway">
- <li>
- <a>
- <xsl:attribute name="href"><xsl:value-of
select="account_code_set/account_codes_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang',
'Account Codes')" />
- </a>
- </li>
- <li>
- <xsl:value-of select="account_code_set/name"/>
- </li>
- </ul-->
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
@@ -64,12 +51,12 @@
</xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/external_format != 'KOMMFAKT'">
+ <!--xsl:if test="config_data/external_format !=
'KOMMFAKT'"-->
<label>
<h4><xsl:value-of select="php:function('lang',
'Unit Prefix')" /></h4>
</label>
<xsl:value-of select="account_code_set/unit_prefix"/>
- </xsl:if>
+ <!--/xsl:if-->
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_1">
@@ -120,11 +107,10 @@
<div class="form-buttons">
<xsl:if test="account_code_set/permission/write">
<div class="form-buttons">
- <button
onclick="window.location.href='{account_code_set/edit_link}'">
+ <button
onclick="window.location.href='{account_code_set/edit_link}'"
class="pure-button pure-button-primary">
<xsl:value-of select="php:function('lang', 'Edit')" />
</button>
</div>
</xsl:if>
</div>
- <!--/div-->
</xsl:template>
Modified:
branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -16,13 +16,7 @@
</func:function>
<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',
phpgw:conditional(new_form, 'Add', 'Edit'))"/><xsl:text>
</xsl:text><xsl:value-of select="php:function('lang', 'Account Codes')"/></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-stacked" name="form">
<input type="hidden" name="tab" value=""/>
@@ -83,12 +77,12 @@
</xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/external_format!=
'KOMMFAKT'">
+ <!--xsl:if test="config_data/external_format =
'KOMMFAKT'"-->
<label for="field_unit_prefix">
<h4><xsl:value-of
select="php:function('lang', 'Unit Prefix')" /></h4>
</label>
<input name="unit_prefix" type="text"
id="field_unit_prefix" value="{account_code_set/unit_prefix}" maxlength='1'
class="pure-u-1" />
- </xsl:if>
+ <!--/xsl:if-->
</div>
</div>
<div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
@@ -169,7 +163,7 @@
</div>
<div class="form-buttons">
<input type="submit" value="{php:function('lang',
phpgw:conditional(new_form, 'Create', 'Save'))}" class="button pure-button
pure-button-primary"/>
- <a class="cancel" href="{account_code_set/cancel_link}">
+ <a class="cancel pure-button pure-button-primary"
href="{account_code_set/cancel_link}">
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
Modified: branches/dev-syncromind/booking/templates/base/activities.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activities.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/activities.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,8 +1,4 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<!--xsl:call-template name="yui_booking_i18n"/-->
-
-
<style id='toggle-box-css' type='text/css' scoped='scoped'>
.toggle-box {
display: none;
@@ -45,118 +41,103 @@
.toggle-box:checked + label:before {
content: "\2212";
}
-</style>
-
-<style>
#expandcontractdiv {border:1px dotted #dedede; margin:0 0 .5em 0;
padding:0.4em;}
#treeDiv { background: #fff; padding:1em; margin-top:1em; }
</style>
+<xsl:call-template name="msgbox"/>
+<div>
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+ <div id="activities">
+ <input type="hidden" name="application_id"
value="{booking/application_id}"/>
+ <form id="queryForm" method="GET" action="">
+ <input class="toggle-box" id="header1" type="checkbox" />
+ <label for="header1">
+ <xsl:value-of select="php:function('lang', 'toolbar')"/>
+ </label>
+ <div id="toolbar">
+ <!--xsl:if test="item/text and
normalize-space(item/text)"-->
+ <table id="toolbar_table" class="pure-table">
+ <thead>
+ <tr>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'name')"/>
+ </th>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'item')"/>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ </td>
+ <td>
+ <xsl:if test="links/add">
+ <input type="button"
class="pure-button pure-button-primary">
+ <xsl:attribute
name="onclick">javascript:window.open('<xsl:value-of select="links/add"/>',
"_self");</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Add Activity')"
/></xsl:attribute>
+ <xsl:attribute
name="id">new-button</xsl:attribute>
+ </input>
+ </xsl:if>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <xsl:if test="not(show_all='1')">
+ <input type="button"
class="pure-button pure-button-primary">
+ <xsl:attribute
name="onclick">javascript:window.open('<xsl:value-of
select="links/show_inactive"/>', "_self");</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'show all')"
/></xsl:attribute>
+ <xsl:attribute
name="id">new-button</xsl:attribute>
+ </input>
+ </xsl:if>
+ <xsl:if test="show_all='1'">
+ <input type="button"
class="pure-button pure-button-primary">
+ <xsl:attribute
name="onclick">javascript:window.open('<xsl:value-of
select="links/hide_inactive"/>', "_self");</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Show only active')"
/></xsl:attribute>
+ <xsl:attribute
name="id">new-button</xsl:attribute>
+ </input>
+ </xsl:if>
+ </td>
+ </tr>
+ </tbody>
+ </table>
-<form id="queryForm" method="GET" action="">
- <input class="toggle-box" id="header1" type="checkbox" />
- <label for="header1">
- <xsl:value-of select="php:function('lang', 'toolbar')"/>
- </label>
- <div id="toolbar">
- <!--xsl:if test="item/text and normalize-space(item/text)"-->
+ </div>
- <table id="toolbar_table" class="pure-table">
- <thead>
- <tr>
- <th>
- <xsl:value-of select="php:function('lang',
'name')"/>
- </th>
- <th>
- <xsl:value-of select="php:function('lang',
'item')"/>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- </td>
- <td>
- <xsl:if test="links/add">
- <input type="button" class="pure-button
pure-button-primary">
- <xsl:attribute
name="onclick">javascript:window.open('<xsl:value-of select="links/add"/>',
"_self");</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Add Activity')" /></xsl:attribute>
- <xsl:attribute
name="id">new-button</xsl:attribute>
- </input>
- </xsl:if>
- </td>
+ </form>
- </tr>
- <tr>
- <td></td>
- <td>
- <xsl:if test="not(show_all='1')">
- <input type="button" class="pure-button
pure-button-primary">
- <xsl:attribute
name="onclick">javascript:window.open('<xsl:value-of
select="links/show_inactive"/>', "_self");</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'show all')" /></xsl:attribute>
- <xsl:attribute
name="id">new-button</xsl:attribute>
- </input>
- </xsl:if>
- <xsl:if test="show_all='1'">
- <input type="button" class="pure-button
pure-button-primary">
- <xsl:attribute
name="onclick">javascript:window.open('<xsl:value-of
select="links/hide_inactive"/>', "_self");</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Show only active')" /></xsl:attribute>
- <xsl:attribute
name="id">new-button</xsl:attribute>
- </input>
- </xsl:if>
- </td>
- </tr>
- </tbody>
- </table>
+ <div id="tree_container">
+ <legend>
+ <h3><xsl:value-of select="php:function('lang', 'Current
Activities')" /></h3>
+ </legend>
- </div>
-</form>
+ <script type="text/javascript">
+ var activities = null;
+ <xsl:if test="treedata != ''">
+ activities = <xsl:value-of select="treedata"/>;
+ </xsl:if>
+ </script>
-<div id="tree_container">
- <legend>
- <h3><xsl:value-of select="php:function('lang', 'Current Activities')"
/></h3>
- </legend>
+ <!-- markup for expand/contract links -->
+ <div id="treecontrol">
+ <a id="collapse" title="Collapse the entire tree
below" href="#"><xsl:value-of select="php:function('lang', 'collapse
all')"/></a>
+ <xsl:text> | </xsl:text>
+ <a id="expand" title="Expand the entire tree below"
href="#"><xsl:value-of select="php:function('lang', 'expand all')"/></a>
+ </div>
-
-<!--div id="toolbar">
- <table class="yui-skin-sam" border="0" cellspacing="0" cellpadding="0"
style="padding:0px; margin:0px;">
- <tr>
- <xsl:if test="links/add">
- <td valign="top"><input id="new-button"
type="link" value="{php:function('lang', 'Add Activity')}"
href="{links/add}"/></td>
- </xsl:if>
- <xsl:if test="not(show_all='1')">
- <td valign="top"><input id="show-hide"
type="link" value="{php:function('lang', 'Show all')}"
href="{links/show_inactive}"/></td>
- </xsl:if>
- <xsl:if test="show_all='1'">
- <td valign="top"><input id="show-hide"
type="link" value="{php:function('lang', 'Show only active')}"
href="{links/hide_inactive}"/></td>
- </xsl:if>
- </tr>
- </table>
-</div-->
-
-
-
-
- <script type="text/javascript">
- var activities = null;
- <xsl:if test="treedata != ''">
- activities = <xsl:value-of select="treedata"/>;
- </xsl:if>
- </script>
-
-
-<!-- markup for expand/contract links -->
-
- <div id="treecontrol">
- <a id="collapse" title="Collapse the entire tree below"
href="#"><xsl:value-of select="php:function('lang', 'collapse all')"/></a>
- <xsl:text> | </xsl:text>
- <a id="expand" title="Expand the entire tree below"
href="#"><xsl:value-of select="php:function('lang', 'expand all')"/></a>
+ <div id="treeDiv"></div>
+ </div>
+ </div>
</div>
- <div id="treeDiv"></div>
- <script type="text/javascript">
+ </div>
+ <script type="text/javascript">
$("#treeDiv").jstree({
"core" : {
"multiple" : false,
@@ -185,37 +166,4 @@
$('#treeDiv').jstree('open_all');
});
</script>
-</div>
-
-
-
-<!--div style="padding: 0 2em"-->
-
-
-
-<!--script type="text/javascript">
-YAHOO.util.Event.addListener(window, "load", function() {
- var newButton = YAHOO.util.Dom.get('new-button');
- if(newButton)
- new YAHOO.widget.Button(newButton,
- {type: 'link',
- href: newButton.getAttribute('href')});
- var showHideButton = YAHOO.util.Dom.get('show-hide');
- new YAHOO.widget.Button(showHideButton,
- {type: 'link',
- href: showHideButton.getAttribute('href')});
-
-
-
- var tree = new YAHOO.widget.TreeView("tree_container", <xsl:value-of
select="treedata"/>);
-<xsl:if test="navi/add">
- tree.subscribe("labelClick", function(node) {
- window.location.href = node.href;
- });
-</xsl:if>
- tree.render();
-});
-</script-->
-
-<!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/activity_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,14 +1,10 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--h3><xsl:value-of select="php:function('lang', 'Edit
Activity')"/></h3-->
<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="activity/tabs"/>
<div id="activity_edit">
-
<div class="pure-control-group">
<label for="field_name">
<h4><xsl:value-of select="php:function('lang',
'Activity')"/></h4>
@@ -69,11 +65,10 @@
<input type="submit" class="button pure-button
pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="activity/cancel_link"></xsl:value-of></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
- </a>
+ </a>
</div>
</form>
- <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/activity_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,13 +1,10 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--h3><xsl:value-of select="php:function('lang', 'New activity')"
/></h3-->
<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="activity/tabs"/>
- <div id="activity_add">
+ <div id="activity_add">
<div class="pure-control-group">
<label for="field_name">
<h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4>
@@ -45,11 +42,10 @@
<input type="submit" class="button pure-button
pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Add')" /></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="activity/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
</form>
- <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,8 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--h3><xsl:value-of select="php:function('lang', 'Edit agegroup
group')"/></h3-->
<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">
@@ -55,14 +52,13 @@
<input type="submit" class="button pure-button
pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Update')" /></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="resource/cancel_link"></xsl:value-of></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
</form>
- <!--/div-->
<!--script type="text/javascript">
- YAHOO.booking.initialSelection = <xsl:value-of
select="booking/resources_json"/>;
+ var initialSelection = <xsl:value-of select="booking/resources_json"/>;
</script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,8 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content">
- <h3><xsl:value-of select="php:function('lang', 'Age group')" /></h3-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" class="pure-form pure-form-aligned"
id="form" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
@@ -34,11 +31,10 @@
<input type="submit" class="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 pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="agegroup/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
</form>
- <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/audience_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/audience_edit.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/audience_edit.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,8 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--h3><xsl:value-of select="php:function('lang', 'Edit target audience')"
/></h3-->
<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">
@@ -55,13 +52,12 @@
</div>
<div class="form-buttons">
<input type="submit" class="button pure-button
pure-button-primary">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')" /></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')" /></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="audience/cancel_link"></xsl:value-of></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
</form>
- <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/audience_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/audience_new.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/audience_new.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,8 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content">
- <h3><xsl:value-of select="php:function('lang', 'New target audience')"
/></h3-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" class="pure-form pure-form-aligned"
id="form" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
@@ -34,11 +31,10 @@
<input type="submit" class="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 pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="audience/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
</div>
</form>
- <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/documentation_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/documentation_form.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/documentation_form.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,13 +1,13 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--script type="text/javascript">
- YAHOO.booking.documentOwnerType = "<xsl:value-of
select="document/owner_type"/>";
- YAHOO.booking.documentOwnerAutocomplete = <xsl:value-of
select="document/inline"/> == 0;
- </script-->
-
- <!--div id="content"-->
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
+ <script type="text/javascript">
+ var documentOwnerType = "";
+ var documentOwnerAutocomplete = "";
+ documentOwnerType = "<xsl:value-of select="document/owner_type"/>";
+ documentOwnerAutocomplete = (documentOwnerAutocomplete) ?
documentOwnerAutocomplete : 0;
+ </script>
+ <xsl:call-template name="msgbox"/>
+
<form action="" method="POST" enctype='multipart/form-data' id='form'
class="pure-form pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
@@ -89,7 +89,7 @@
</xsl:choose>
</xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="document/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
</a>
Modified: branches/dev-syncromind/booking/templates/base/email_index.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -9,10 +9,10 @@
<div class="pure-control-group">
<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="building_id"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="building/id"/></xsl:attribute>
</input>
<input id="field_building_name" name="building_name"
type="text">
- <xsl:attribute name="value"><xsl:value-of
select="building_name"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="building/name"/></xsl:attribute>
</input>
</div>
<div class="pure-control-group">
Modified: branches/dev-syncromind/booking/templates/base/email_preview.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_preview.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/email_preview.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -6,7 +6,7 @@
<input type="hidden" name="tab" value=""/>
<input type="hidden" name="step" value="{step}"/>
<input type="hidden" name="seasons" value="{season}"/>
- <input type="hidden" name="building_id" value="{building}"/>
+ <input type="hidden" name="building_id" value="{building_id}"/>
<input type="hidden" name="mailbody" value="{mailbody}"/>
<input type="hidden" name="mailsubject" value="{mailsubject}"/>
<div id="tab-content">
Modified: branches/dev-syncromind/booking/templates/base/email_receipt.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_receipt.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/email_receipt.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -2,7 +2,7 @@
<div id="content">
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<p><xsl:value-of select="php:function('lang', '%1 e-mails were sent
successfully', ok_count)" /></p>
<xsl:if test="fail_count > 0">
Modified:
branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content_overlay"></div>
+ <!--div id="content_overlay"></div-->
<style typ="text/css" rel="stylesheet">
#week-selector {list-style: outside none none;}
#week-selector li {display: inline-block;}
@@ -62,8 +62,11 @@
</div>
</div>
</form>
-
+ <div id="dialog_schedule"></div>
<script type="text/javascript">
+
+ schedule.createDialogSchedule(300);
+
$(window).load(function() {
$('body').prepend($('#content_overlay'));
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
Modified:
branches/dev-syncromind/booking/templates/base/permission_root_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/permission_root_form.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/permission_root_form.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,24 +1,11 @@
<xsl:template match="data">
<div id="content">
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<xsl:apply-templates select="permission"/>
</div>
</xsl:template>
<xsl:template match="data/permission" xmlns:php="http://php.net/xsl";>
-
- <!-- Add pathway later -->
- <!--ul class="pathway">
- <li>
- <a>
- <xsl:attribute name="href"><xsl:value-of
select="buildings_link"/></xsl:attribute>
- <xsl:value-of select="top-nav-bar-buildings" />
- </a>
- </li>
- <li><xsl:value-of select="php:function('lang', 'Buildings')"/></li>
- </ul-->
-
<form action="" method="POST" class="pure-form pure-form-aligned"
id="form" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
@@ -26,13 +13,10 @@
<div id="permission_add">
<div class="pure-control-group">
<xsl:if test="id">
- <!-- An update, add id column -->
<input name='field_id' type='hidden'>
<xsl:attribute name="value"><xsl:value-of
select="id"/></xsl:attribute>
</input>
</xsl:if>
-
- <!-- Role -->
<label for="field_role" style="vertical-align:top;">
<h4><xsl:value-of select="php:function('lang',
'Role')" /></h4>
</label>
@@ -45,7 +29,6 @@
<xsl:if test="../../role = local-name()">
<xsl:attribute
name="selected">selected</xsl:attribute>
</xsl:if>
-
<xsl:attribute name="value"><xsl:value-of
select="local-name()"/></xsl:attribute>
<xsl:value-of select="php:function('lang',
string(node()))"/>
</option>
@@ -58,15 +41,12 @@
<label for="field_subject_name">
<h4><xsl:value-of select="php:function('lang',
'Account')" /></h4>
</label>
- <!--div class="autocomplete"-->
<input id="field_subject_name" name="subject_name"
type="text">
<xsl:attribute name="value"><xsl:value-of
select="subject_name"/></xsl:attribute>
</input>
<input id="field_subject_id" name="subject_id"
type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="subject_id"/></xsl:attribute>
</input>
- <!--div id="subject_container"/>
- </div-->
</div>
</div>
</div>
@@ -83,7 +63,7 @@
</xsl:choose>
</xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
</a>
Modified: branches/dev-syncromind/booking/templates/base/report_freetime.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/report_freetime.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/report_freetime.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -30,7 +30,7 @@
<label for="start_date">
<h4><xsl:value-of
select="php:function('lang', 'From')" /></h4>
</label>
- <input class="datetime" id="start_date"
name="start_date" type="text">
+ <input class="datetime" id="start_date"
name="from" type="text">
<xsl:attribute name="value"><xsl:value-of
select="from"/></xsl:attribute>
</input>
</div>
@@ -44,7 +44,7 @@
<label for="end_date">
<h4><xsl:value-of
select="php:function('lang', 'To')" /></h4>
</label>
- <input class="datetime" id="end_date"
name="end_date" type="text">
+ <input class="datetime" id="end_date"
name="to" type="text">
<xsl:attribute name="value"><xsl:value-of
select="to"/></xsl:attribute>
</input>
</div>
Modified: branches/dev-syncromind/booking/templates/base/report_index.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/report_index.xsl
2015-10-13 00:14:24 UTC (rev 14161)
+++ branches/dev-syncromind/booking/templates/base/report_index.xsl
2015-10-13 00:15:12 UTC (rev 14162)
@@ -1,25 +1,21 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
-
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
- <dl class="form">
- <dt class="heading">
- <xsl:value-of select="php:function('lang',
'Reports')" />
- </dt>
- </dl>
-
- <ul>
- <xsl:for-each select="reports">
- <li>
- <a class="cancel">
- <xsl:attribute
name="href"><xsl:value-of select="url"/></xsl:attribute>
- <xsl:value-of select="name" />
- </a>
- </li>
- </xsl:for-each>
- </ul>
-
- </div>
+ <xsl:call-template name="msgbox"/>
+ <div id="content">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+ <div id="reports" class="booking-container">
+ <ul style="list-style:outside none none;">
+ <xsl:for-each select="reports">
+ <li>
+ <a class="pure-button pure-button-primary">
+ <xsl:attribute name="href"><xsl:value-of
select="url"/></xsl:attribute>
+ <xsl:value-of select="name" />
+ </a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </div>
+ </div>
+ </div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14162] fixing forms,
Saul <=