[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14002] fixing forms toolbars
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14002] fixing forms toolbars |
|
Date: |
Thu, 24 Sep 2015 00:03:33 +0000 |
Revision: 14002
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14002
Author: psaul
Date: 2015-09-24 00:03:32 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
fixing forms toolbars
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
branches/dev-syncromind/booking/inc/class.uiresource.inc.php
branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
branches/dev-syncromind/booking/templates/base/activities.xsl
branches/dev-syncromind/booking/templates/base/building_form.xsl
branches/dev-syncromind/booking/templates/base/group_edit.xsl
branches/dev-syncromind/booking/templates/base/organization_edit.xsl
branches/dev-syncromind/booking/templates/base/resource_form.xsl
branches/dev-syncromind/booking/templates/base/system_message.xsl
Modified: branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -38,7 +38,8 @@
"type"=>"text",
"href" =>
self::link(array('menuaction' => 'booking.uiactivity.edit',
'id'
=> $activity['id'])), 'target' => '_self',
-
'label' => $activity['name'],
+
'label' => $activity['name'],
+
'text' => $activity['name'],
'children' => $this->treeitem($children, $activity['id'], $show_all)
);
if (!$this->bo->allow_write($activity))
{
@@ -73,7 +74,8 @@
$children[$activity['parent_id']][] = $activity;
}
$treedata = json_encode($this->treeitem($children,
null, $show_all));
- phpgwapi_yui::load_widget('treeview');
+// phpgwapi_yui::load_widget('treeview');
+ phpgwapi_jquery::load_widget('treeview');
$links = array(
'show_inactive' =>
self::link(array('menuaction' => 'booking.uiactivity.index', 'show_all' =>
'true')),
'hide_inactive' =>
self::link(array('menuaction' => 'booking.uiactivity.index', 'show_all' => ''))
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -2,7 +2,7 @@
phpgw::import_class('booking.uicommon');
phpgw::import_class('booking.boorganization');
- phpgw::import_class('booking.uidocument_building');
+ phpgw::import_class('booking.uidocument_building');
phpgw::import_class('booking.uipermission_building');
// phpgw::import_class('phpgwapi.uicommon_jquery');
@@ -64,6 +64,7 @@
'name' =>
'season',
'ui' =>
'season',
'text' =>
lang('Season').':',
+ 'depends' =>
'building',
'requestGenerator' => 'requestWithBuildingFilter',
),
array('type' =>
'filter',
@@ -382,8 +383,8 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
array_set_default($allocation, 'cost', '0');
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'time');
+ $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'time');
$tabs = array();
$tabs['generic'] = array('label' => lang('Allocation
New'), 'link' => '#allocation_new');
Modified:
branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -42,6 +42,7 @@
$settings = array();
$settings['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+ phpgwapi_jquery::init_ckeditor('field_description');
// $this->use_yui_editor();
self::render_template_xsl('application_settings',
array('config_data' =>$config->config_data, 'data' => $settings));
}
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-24
00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-24
00:03:32 UTC (rev 14002)
@@ -71,6 +71,7 @@
'name' =>
'season',
'ui' =>
'season',
'text' =>
lang('Season').':',
+ 'depends' =>
'building',
'requestGenerator' => 'requestWithBuildingFilter',
),
array('type' =>
'filter',
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -164,6 +164,7 @@
// $this->use_yui_editor();
phpgwapi_jquery::load_widget('autocomplete');
+ phpgwapi_jquery::init_ckeditor('field_description');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
New'), 'link' => '#building_form');
@@ -207,6 +208,7 @@
// $this->use_yui_editor();
phpgwapi_jquery::load_widget('autocomplete');
+ phpgwapi_jquery::init_ckeditor('field_description');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
Edit'), 'link' => '#building_form');
@@ -251,11 +253,11 @@
));
self::add_javascript('booking', 'booking',
'schedule.js');
- $tabs = array();
+ $tabs = array();
$tabs['generic'] = array('label' =>
lang('Building Schedule'), 'link' => '#building_schedule');
$active_tab = 'generic';
- $building['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $building['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('building_schedule',
array('building' => $building));
}
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -131,6 +131,7 @@
'name' =>
'season',
'ui' =>
'season',
'text' =>
lang('Season').':',
+ 'depends' =>
'building',
'requestGenerator' => 'requestWithBuildingFilter',
),
array(
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-24
00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-24
00:03:32 UTC (rev 14002)
@@ -318,6 +318,7 @@
$activities = $activities['results'];
phpgwapi_jquery::load_widget('autocomplete');
+ phpgwapi_jquery::init_ckeditor('field_description');
$tabs = array();
$tabs['generic'] = array('label' => lang('Group
Edit'), 'link' => '#group_edit');
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -219,8 +219,9 @@
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
- $this->install_customer_identifier_ui($organization);
+ $this->install_customer_identifier_ui($organization);
// $this->use_yui_editor();
+ phpgwapi_jquery::init_ckeditor('field_description');
$this->add_template_helpers();
@@ -279,9 +280,10 @@
$activities = $activities['results'];
$this->install_customer_identifier_ui($organization);
- $this->use_yui_editor();
+// $this->use_yui_editor();
+ phpgwapi_jquery::init_ckeditor('field_description');
- $this->rich_text_editor('field-description');
+// $this->rich_text_editor('field-description');
$this->add_template_helpers();
self::render_template_xsl('organization_edit',
array('organization' => $organization, "save_or_create_text" => "Save",
"module" => $this->module, "contact_form_link" => $contact_form_link,
'activities' => $activities, 'currentapp' =>
$GLOBALS['phpgw_info']['flags']['currentapp']));
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -151,8 +151,9 @@
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'resource_new.js');
phpgwapi_jquery::load_widget('autocomplete');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('autocomplete');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('autocomplete');
+ phpgwapi_jquery::init_ckeditor('field_description');
$activity_data = $this->activity_bo->fetch_activities();
$resource['types'] = $this->resource_types();
$resource['cancel_link'] =
self::link(array('menuaction' => 'booking.uiresource.index'));
@@ -198,6 +199,7 @@
self::add_javascript('booking', 'booking',
'resource_new.js');
// phpgwapi_yui::load_widget('datatable');
phpgwapi_jquery::load_widget('autocomplete');
+ phpgwapi_jquery::init_ckeditor('field_description');
$activity_data = $this->activity_bo->fetch_activities();
foreach($activity_data['results'] as $acKey => $acValue)
{
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-24 00:03:32 UTC (rev 14002)
@@ -368,7 +368,10 @@
}
$this->flash_form_errors($errors);
- $this->use_yui_editor();
+// $this->use_yui_editor();
+
+ phpgwapi_jquery::init_ckeditor('field_description');
+
self::render_template('system_message_edit',
array('system_message' => $system_message, 'module' => $this->module));
}
Modified: branches/dev-syncromind/booking/templates/base/activities.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activities.xsl
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/templates/base/activities.xsl
2015-09-24 00:03:32 UTC (rev 14002)
@@ -3,30 +3,197 @@
<!--xsl:call-template name="yui_booking_i18n"/-->
+<style id='toggle-box-css' type='text/css' scoped='scoped'>
+ .toggle-box {
+ display: none;
+ }
+ .toggle-box + label {
+ cursor: pointer;
+ display: block;
+ font-weight: bold;
+ line-height: 21px;
+ margin-bottom: 5px;
+ }
+
+ .toggle-box + label + div {
+ display: none;
+ margin-bottom: 10px;
+ }
+
+ .toggle-box:checked + label + div {
+ display: block;
+ }
+
+ .toggle-box + label:before {
+ background-color: #4F5150;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+ color: #FFFFFF;
+ content: "+";
+ display: block;
+ float: left;
+ font-weight: bold;
+ height: 20px;
+ line-height: 20px;
+ margin-right: 5px;
+ text-align: center;
+ width: 20px;
+ }
+
+ .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>
+
+
<form id="queryForm" method="GET" action="">
- <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>
+ <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>
+
+ </div>
+
</form>
-<div style="padding: 0 2em">
+<div id="tree_container">
+ <legend>
+ <h3><xsl:value-of select="php:function('lang', 'Current Activities')"
/></h3>
+ </legend>
-<h3><xsl:value-of select="php:function('lang', 'Current Activities')" /></h3>
-<script type="text/javascript">
+<!--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>
+ <div id="treeDiv"></div>
+ <script type="text/javascript">
+
+ $("#treeDiv").jstree({
+ "core" : {
+ "multiple" : false,
+ "themes" : { "stripes" : true },
+ "data" : activities,
+ },
+ "plugins" : [ "themes","html_data","ui","state" ]
+ });
+
+ var count1 = 0;
+ $("#treeDiv").bind("select_node.jstree", function (event, data) {
+ count1 += 1;
+ var divd =
data.instance.get_node(data.selected[0]).original['href'];
+ if(count1 > 1)
+ {
+ window.location.href = divd;
+ }
+ });
+
+ $('#collapse').on('click',function(){
+ $(this).attr('href','javascript:;');
+ $('#treeDiv').jstree('close_all');
+ })
+ $('#expand').on('click',function(){
+ $(this).attr('href','javascript:;');
+ $('#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)
@@ -48,7 +215,7 @@
</xsl:if>
tree.render();
});
-</script>
- <div id="tree_container"></div>
-</div>
+</script-->
+
+<!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/building_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building_form.xsl
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/templates/base/building_form.xsl
2015-09-24 00:03:32 UTC (rev 14002)
@@ -22,31 +22,31 @@
<xsl:value-of disable-output-escaping="yes"
select="building/tabs"/>
<div id="building_form">
<div class="pure-control-group">
- <label>
+ <label for="field_building_name">
<h4><xsl:value-of
select="php:function('lang', 'Building Name')" /></h4>
</label>
- <input name="name" type="text"
value="{building/name}"/>
+ <input id="field_building_name" name="name"
type="text" value="{building/name}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_phone">
<h4><xsl:value-of
select="php:function('lang', 'Telephone')" /></h4>
</label>
<input id="field_phone" name="phone"
type="text" value="{building/phone}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_email">
<h4><xsl:value-of
select="php:function('lang', 'Email')" /></h4>
</label>
<input id="field_email" name="email"
type="text" value="{building/email}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_homepage">
<h4><xsl:value-of
select="php:function('lang', 'Homepage')" /></h4>
</label>
- <input name="homepage" type="text"
value="{building/homepage}"/>
+ <input id="field_homepage" name="homepage"
type="text" value="{building/homepage}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_location_code_name">
<h4><xsl:value-of
select="php:function('lang', 'Location Code')" /></h4>
</label>
<!--div class="autocomplete"-->
@@ -55,32 +55,32 @@
<div id="location_code_container"></div>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_street">
<h4><xsl:value-of
select="php:function('lang', 'Street')"/></h4>
</label>
<input id="field_street" name="street"
type="text" value="{building/street}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_zip_code">
<h4><xsl:value-of
select="php:function('lang', 'Zip code')"/></h4>
</label>
<input type="text" name="zip_code"
id="field_zip_code" value="{building/zip_code}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_city">
<h4><xsl:value-of
select="php:function('lang', 'Postal City')"/></h4>
</label>
<input type="text" name="city" id="field_city"
value="{building/city}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_district">
<h4><xsl:value-of
select="php:function('lang', 'District')"/></h4>
</label>
<input type="text" name="district"
id="field_district" value="{building/district}"/>
</div>
<div class="pure-control-group">
<xsl:if test="not(new_form)">
- <label>
+ <label for="field_active">
<h4><xsl:value-of
select="php:function('lang', 'Active')"/></h4>
</label>
<select id="field_active" name="active">
@@ -100,44 +100,44 @@
</xsl:if>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_tilsyn_name">
<h4><xsl:value-of
select="php:function('lang', 'Tilsynsvakt name')" /></h4>
</label>
- <input name="tilsyn_name" type="text"
value="{building/tilsyn_name}"/>
+ <input id="field_tilsyn_name"
name="tilsyn_name" type="text" value="{building/tilsyn_name}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_tilsyn_phone">
<h4><xsl:value-of
select="php:function('lang', 'Tilsynsvakt telephone')" /></h4>
</label>
<input id="field_tilsyn_phone"
name="tilsyn_phone" type="text" value="{building/tilsyn_phone}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_tilsyn_email">
<h4><xsl:value-of
select="php:function('lang', 'Tilsynsvakt email')" /></h4>
</label>
<input id="field_tilsyn_email"
name="tilsyn_email" type="text" value="{building/tilsyn_email}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_tilsyn_name2">
<h4><xsl:value-of
select="php:function('lang', 'Tilsynsvakt name')" /></h4>
</label>
- <input name="tilsyn_name2" type="text"
value="{building/tilsyn_name2}"/>
+ <input id="field_tilsyn_name2"
name="tilsyn_name2" type="text" value="{building/tilsyn_name2}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_tilsyn_phone2">
<h4><xsl:value-of
select="php:function('lang', 'Tilsynsvakt telephone')" /></h4>
</label>
<input id="field_tilsyn_phone2"
name="tilsyn_phone2" type="text" value="{building/tilsyn_phone2}"/>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_tilsyn_email2">
<h4><xsl:value-of
select="php:function('lang', 'Tilsynsvakt email')" /></h4>
</label>
<input id="field_tilsyn_email2"
name="tilsyn_email2" type="text" value="{building/tilsyn_email2}"/>
</div>
<div class="pure-control-group">
<xsl:if test="not(new_form)">
- <label>
+ <label
for="for_field_deactivate_application">
<h4><xsl:value-of
select="php:function('lang', 'Deactivate application')"/></h4>
</label>
<select
id="for_field_deactivate_application" name="deactivate_application">
@@ -158,7 +158,7 @@
</div>
<div class="pure-control-group">
<xsl:if test="not(new_form)">
- <label>
+ <label for="for_deactivate_calendar">
<h4><xsl:value-of
select="php:function('lang', 'Deactivate calendar')"/></h4>
</label>
<select id="for_deactivate_calendar"
name="deactivate_calendar">
@@ -179,7 +179,7 @@
</div>
<div class="pure-control-group">
<xsl:if test="not(new_form)">
- <label>
+ <label for="for_deactivate_sendmessage">
<h4><xsl:value-of
select="php:function('lang', 'Deactivate send message')"/></h4>
</label>
<select id="for_deactivate_sendmessage"
name="deactivate_sendmessage">
@@ -200,7 +200,7 @@
</div>
<div class="pure-control-group">
<xsl:if test="not(new_form) and
building/extra=1">
- <label>
+ <label for="for_extra_kalendar">
<h4><xsl:value-of
select="php:function('lang', 'Extra kalendar for public opening times')"/></h4>
</label>
<select id="for_extra_kalendar"
name="extra_kalendar">
@@ -220,16 +220,18 @@
</xsl:if>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_calendar_text">
<h4><xsl:value-of
select="php:function('lang', 'Calendar text')" /></h4>
</label>
<textarea id="field_calendar_text"
name="calendar_text" type="text"><xsl:value-of
select="building/calendar_text"/></textarea>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_description"
style="vertical-align:top;">
<h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
</label>
- <textarea id="field_description"
name="description" type="text"><xsl:value-of
select="building/description"/></textarea>
+ <div
style="display:inline-block;max-width:80%;">
+ <textarea id="field_description"
name="description" type="text"><xsl:value-of
select="building/description"/></textarea>
+ </div>
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/group_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/group_edit.xsl
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/templates/base/group_edit.xsl
2015-09-24 00:03:32 UTC (rev 14002)
@@ -74,10 +74,12 @@
</select>
</div>
<div class="pure-control-group">
- <label for="field-description">
+ <label for="field_description"
style="vertical-align:top;">
<h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
</label>
- <textarea id="field-description" name="description"
type="text"><xsl:value-of select="group/description"/></textarea>
+ <div style="display:inline-block;max-width:80%;">
+ <textarea id="field_description"
name="description" type="text"><xsl:value-of
select="group/description"/></textarea>
+ </div>
</div>
<div class="pure-control-group">
<xsl:if test="group/id">
Modified: branches/dev-syncromind/booking/templates/base/organization_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/organization_edit.xsl
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/templates/base/organization_edit.xsl
2015-09-24 00:03:32 UTC (rev 14002)
@@ -216,30 +216,36 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-sm-11 pure-u-md-2-3
pure-u-lg-1-2">
- <div class="pure-control-group">
- <label for="field_activity">
- <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
- </label>
- <select name="activity_id" id="field_activity"
class="pure-u-2-3">
- <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>
+ <div class="pure-u-1">
+ <div class="pure-g">
+ <div class="pure-control-group pure-u-sm-1-1
pure-u-md-2-3 pure-u-lg-1-2">
+ <label for="field_activity">
+ <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
+ </label>
+ <select name="activity_id"
id="field_activity" class="pure-u-2-3">
+ <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>
+ </div>
+ <div class="pure-control-group pure-u-1">
+ <label for="field_description">
+ <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
+ </label>
+ <div style="max-width:650px;">
+ <textarea rows="4"
id="field_description" name="description" type="text"
class="pure-u-2-3"><xsl:value-of select="organization/description"/></textarea>
+ </div>
+ </div>
</div>
- <div class="pure-control-group">
- <label for="field_description">
- <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
- </label>
- <textarea rows="4" id="field-description"
name="description" type="text" class="pure-u-2-3"><xsl:value-of
select="organization/description"/></textarea>
- </div>
+
+
</div>
</div>
<xsl:if test='new_form or organization/permission/write'>
@@ -316,6 +322,7 @@
<script type="text/javascript">
var endpoint = '<xsl:value-of select="module" />';
+ /*
<![CDATA[
var descEdit = new YAHOO.widget.SimpleEditor('field-description', {
height: '300px',
@@ -339,6 +346,7 @@
descEdit.render();
]]>
+ */
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/resource_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource_form.xsl
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/templates/base/resource_form.xsl
2015-09-24 00:03:32 UTC (rev 14002)
@@ -103,10 +103,12 @@
</xsl:if>
</div>
<div class="pure-control-group">
- <label for="field_description">
+ <label for="field_description" style="vertical-align:top;">
<h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
</label>
- <textarea id="field_description" name="description"
type="text"><xsl:value-of select="resource/description"/></textarea>
+ <div style="display:inline-block;max-width:80%;">
+ <textarea id="field_description" name="description"
type="text"><xsl:value-of select="resource/description"/></textarea>
+ </div>
</div>
<div class="pure-control-group">
<label>
Modified: branches/dev-syncromind/booking/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/system_message.xsl
2015-09-24 00:02:29 UTC (rev 14001)
+++ branches/dev-syncromind/booking/templates/base/system_message.xsl
2015-09-24 00:03:32 UTC (rev 14002)
@@ -37,10 +37,10 @@
<xsl:value-of select="system_message/created"/>
</div>
<div class="pure-control-group">
- <label>
+ <label style="vertical-align:top;">
<h4><xsl:value-of select="php:function('lang',
'Message')" /></h4>
</label>
- <xsl:value-of select="system_message/message"
disable-output-escaping="yes"/>
+ <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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14002] fixing forms toolbars,
Saul <=