[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13885] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13885] fixing forms |
|
Date: |
Sat, 12 Sep 2015 00:03:16 +0000 |
Revision: 13885
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13885
Author: psaul
Date: 2015-09-12 00:03:16 +0000 (Sat, 12 Sep 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
branches/dev-syncromind/booking/inc/class.uireports.inc.php
branches/dev-syncromind/booking/inc/class.uiseason.inc.php
branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
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/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/completed_reservation.xsl
branches/dev-syncromind/booking/templates/base/completed_reservation_edit.xsl
branches/dev-syncromind/booking/templates/base/completed_reservation_export.xsl
branches/dev-syncromind/booking/templates/base/completed_reservation_export_file.xsl
branches/dev-syncromind/booking/templates/base/customer_identifier.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/group.xsl
branches/dev-syncromind/booking/templates/base/group_edit.xsl
branches/dev-syncromind/booking/templates/base/mail_settings.xsl
branches/dev-syncromind/booking/templates/base/organization.xsl
branches/dev-syncromind/booking/templates/base/organization_edit.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_participants.xsl
branches/dev-syncromind/booking/templates/base/resource_form.xsl
branches/dev-syncromind/booking/templates/base/season.xsl
branches/dev-syncromind/booking/templates/base/season_boundaries.xsl
branches/dev-syncromind/booking/templates/base/season_edit.xsl
branches/dev-syncromind/booking/templates/base/season_new.xsl
branches/dev-syncromind/booking/templates/base/season_wtemplate.xsl
Modified: branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -140,12 +140,12 @@
$config->read();
$this->add_default_display_data($account_code_set);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Account set code'),
'link' => '#account');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Account set
code'), 'link' => '#account');
+ $active_tab = 'generic';
+
+ $account_code_set['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $account_code_set['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-
self::render_template_xsl('account_code_set',
array('account_code_set' => $account_code_set, 'config_data' =>
$config->config_data));
}
@@ -219,12 +219,12 @@
$account_code_set['cancel_link'] =
$this->link_to('index');
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Account New'), 'link' =>
'#account');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Account
New'), 'link' => '#account');
+ $active_tab = 'generic';
+
+ $account_code_set['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $account_code_set['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-
self::render_template_xsl('account_code_set_form',
array('new_form' => true, 'account_code_set' => $account_code_set ,
'config_data' => $config->config_data));
}
}
Modified: branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -110,12 +110,12 @@
$activities = $activities['results'];
$activity['cancel_link'] =
self::link(array('menuaction' => 'booking.uiactivity.index'));
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Activity New'), 'link'
=> '#activity_add');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Activity
New'), 'link' => '#activity_add');
+ $active_tab = 'generic';
+
+ $activity['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $activity['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('activity_new',
array('activity' => $activity, 'activities' => $activities));
}
@@ -148,13 +148,13 @@
}
$this->flash_form_errors($errors);
$activity['cancel_link'] =
self::link(array('menuaction' => 'booking.uiactivity.index'));
+
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Activity
Edit'), 'link' => '#activity_edit');
+ $active_tab = 'generic';
+
+ $activity['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Activity Edit'), 'link'
=> '#activity_edit');
- $active_tab = 'generic';
-
- $activity['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('activity_edit',
array('activity' => $activity, 'parent' => $parent_activity, 'activities' =>
$activities));
}
}
Modified: branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -158,11 +158,11 @@
$agegroup['cancel_link'] =
self::link(array('menuaction' => 'booking.uiagegroup.index'));
array_set_default($agegroup, 'sort', '0');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Agegroup New'), 'link'
=> '#agegroup_add');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Agegroup
New'), 'link' => '#agegroup_add');
+ $active_tab = 'generic';
- $agegroup['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $agegroup['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('agegroup_new',
array('agegroup' => $agegroup));
}
@@ -189,12 +189,12 @@
}
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Age Group Edit'), 'link'
=> '#agegroup_edit');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Age Group
Edit'), 'link' => '#agegroup_edit');
+ $active_tab = 'generic';
+
+ $resource['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $resource['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
$resource['cancel_link'] =
self::link(array('menuaction' => 'booking.uiagegroup.index'));
self::render_template_xsl('agegroup_edit',
array('resource' => $resource, 'lang' => $lang));
}
Modified: branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -178,12 +178,12 @@
$this->flash_form_errors($errors);
$audience['cancel_link'] =
self::link(array('menuaction' => 'booking.uiaudience.index'));
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Audience Add'), 'link'
=> '#audience_add');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Audience
Add'), 'link' => '#audience_add');
+ $active_tab = 'generic';
-// $data = array();
- $audience['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+// $data = array();
+ $audience['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('audience_new',
array('audience' => $audience));
}
@@ -210,12 +210,12 @@
}
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Audience Edit'), 'link'
=> '#audience_edit');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Audience
Edit'), 'link' => '#audience_edit');
+ $active_tab = 'generic';
+
+ $audience['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $audience['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
$audience['cancel_link'] =
self::link(array('menuaction' => 'booking.uiaudience.index'));
self::render_template_xsl('audience_edit',
array('audience' => $audience));
}
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -682,6 +682,12 @@
{
$show_edit_button = true;
}
+
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Group'),
'link' => '#completed_reservation');
+ $active_tab = 'generic';
+
+ $reservation['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template('completed_reservation',
array('reservation' => $reservation, 'show_edit_button' => $show_edit_button));
}
@@ -718,7 +724,8 @@
return array($entity, $errors);
}
- public function edit() {
+ public function edit()
+ {
//TODO: Display hint to user about primary type of
customer identifier
$building_role =
$this->bo->accessable_buildings($GLOBALS['phpgw_info']['user']['id']);
@@ -750,6 +757,11 @@
}
}
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Group'),
'link' => '#completed_reservation_edit');
+ $active_tab = 'generic';
+ $reservation['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+
$this->add_default_display_data($reservation);
$this->flash_form_errors($errors);
$this->install_customer_identifier_ui($reservation);
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -363,12 +363,12 @@
$this->add_default_display_data($export);
$this->add_template_file('helpers');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Export'), 'link' =>
'#export');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Export'),
'link' => '#export');
+ $active_tab = 'generic';
+
+ $export['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $export['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('completed_reservation_export', array('export' =>
$export));
}
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -251,6 +251,10 @@
$export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
$export_file['type'] = lang($export_file['type']);
$this->add_default_display_data($export_file);
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Export
File'), 'link' => '#export_file');
+ $active_tab = 'generic';
+ $export_file['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template('completed_reservation_export_file', array('export_file'
=> $export_file));
}
Modified: branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -196,12 +196,12 @@
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Documentation'), 'link'
=> '#documentation');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' =>
lang('Documentation'), 'link' => '#documentation');
+ $active_tab = 'generic';
+
+ $document['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $document['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('documentation_form',
array('document' => $document));
}
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-11
23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-12
00:03:16 UTC (rev 13885)
@@ -317,10 +317,10 @@
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Group Edit'), 'link' =>
'#group_edit');
- $active_tab = 'generic';
- $group['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Group
Edit'), 'link' => '#group_edit');
+ $active_tab = 'generic';
+ $group['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('group_edit', array('group'
=> $group, 'module' => $this->module, 'activities' => $activities));
}
@@ -338,12 +338,12 @@
$loggedin = (int) true; // FIXME: Some sort of
authentication!
$edit_self_link = self::link(array('menuaction' =>
'bookingfrontend.uigroup.edit', 'id' => $group['id']));
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Group'), 'link' =>
'#group');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Group'),
'link' => '#group');
+ $active_tab = 'generic';
+
+ $group['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $group['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('group', array('group' =>
$group, 'loggedin' => $loggedin, 'edit_self_link' => $edit_self_link));
}
}
Modified: branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -38,13 +38,13 @@
$config->save_repository();
}
// $this->use_yui_editor();
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Mail Settings'), 'link'
=> '#mail_settings');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Mail
Settings'), 'link' => '#mail_settings');
+ $active_tab = 'generic';
+
+ $mail = array();
+ $mail['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $mail = array();
- $mail['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('mail_settings',
array('config_data' =>$config->config_data, 'data' => $mail));
}
}
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -224,12 +224,12 @@
$this->add_template_helpers();
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Organization New'),
'link' => '#generic');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Organization
New'), 'link' => '#organization_edit');
+ $active_tab = 'generic';
+
+ $organization['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $organization['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('organization_edit',
array('organization' => $organization, "new_form"=> "1", 'module' =>
$this->module, 'activities' => $activities, 'currentapp' =>
$GLOBALS['phpgw_info']['flags']['currentapp']));
}
@@ -241,7 +241,7 @@
$organization['organizations_link'] =
self::link(array('menuaction' => 'booking.uiorganization.index'));
$tabs = array();
- $tabs['generic'] = array('label' =>
lang('Generic'), 'link' => '#generic');
+ $tabs['generic'] = array('label' =>
lang('Generic'), 'link' => '#organization_edit');
$active_tab = 'generic';
$organization['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
@@ -270,7 +270,7 @@
}
}
}
- $this->flash_form_errors($errors);
+ $this->flash_form_errors($errors);
$organization['cancel_link'] =
self::link(array('menuaction' => $this->module . '.uiorganization.show', 'id'
=> $id));
$contact_form_link = self::link(array('menuaction' =>
$this->module . '.uicontactperson.edit', ));
Modified: branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -203,12 +203,12 @@
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Permission Add'), 'link'
=> '#permission_add');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Permission
Add'), 'link' => '#permission_add');
+ $active_tab = 'generic';
-// $data = array();
- $permission['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ // $data = array();
+ $permission['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('permission_root_form',
array('permission' => $permission));
}
Modified: branches/dev-syncromind/booking/inc/class.uireports.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uireports.inc.php 2015-09-11
23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uireports.inc.php 2015-09-12
00:03:16 UTC (rev 13885)
@@ -83,16 +83,16 @@
$this->flash_form_errors($errors);
- $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date', 'datetime');
-
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Report Participants'),
'link' => '#report_part');
- $active_tab = 'generic';
-
- $data = array();
- $data['tabs'] = phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'date');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date', 'date');
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Report
Participants'), 'link' => '#report_part');
+ $active_tab = 'generic';
+
+ $data = array();
+ $data['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+
self::render_template_xsl('report_participants',array('data' =>
$data,'from' => $from, 'to' => $to, 'buildings' => $buildings['results']));
}
@@ -145,16 +145,16 @@
$this->flash_form_errors($errors);
- $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date', 'datetime');
-
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Report FreeTime'), 'link' =>
'#report_freetime');
- $active_tab = 'generic';
-
- $data = array();
- $data['tabs'] = phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'date');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date', 'date');
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Report FreeTime'),
'link' => '#report_freetime');
+ $active_tab = 'generic';
+
+ $data = array();
+ $data['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+
self::render_template_xsl('report_freetime',
array('data'=>$data, 'show' => $show, 'from' =>
$from, 'to' => $to, 'buildings' => $buildings['results'], 'allocations' =>
$allocations['results']));
}
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-11
23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-12
00:03:16 UTC (rev 13885)
@@ -214,15 +214,15 @@
$season['resources_json'] =
json_encode(array_map('intval', $season['resources']));
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.index'));
- $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
$GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Season New'), 'link' =>
'#season_new');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Season
New'), 'link' => '#season_new');
+ $active_tab = 'generic';
+
+ $season['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $season['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('season_new', array('season'
=> $season, 'lang' => $lang));
}
@@ -258,12 +258,13 @@
phpgwapi_yui::load_widget('autocomplete');
$season['resources_json'] =
json_encode(array_map('intval', $season['resources']));
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.show', 'id' => $season['id']));
-
- $tabs = array();
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'date');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'date');
+ $tabs = array();
$tabs['generic'] = array('label' => lang('Season
Edit'), 'link' => '#season_edit');
$active_tab = 'generic';
- $season['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $season['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('season_edit', array('season'
=> $season, 'lang' => $lang));
}
@@ -290,11 +291,11 @@
$season['resource_ids'] = $resource_ids;
$season['status'] = $season['status'] ?
lang($season['status']) : $season['status'];
- $tabs = array();
+ $tabs = array();
$tabs['generic'] = array('label' => lang('Season
Show'), 'link' => '#season_show');
$active_tab = 'generic';
- $season['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $season['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('season', array('season' =>
$season, 'lang' => $lang));
}
@@ -330,6 +331,13 @@
}
$this->flash_form_errors($errors);
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.show', 'id' => $season_id));
+
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Season
Boundaries'), 'link' => '#season_boundaries');
+ $active_tab = 'generic';
+
+ $season['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+
self::render_template('season_boundaries',
array('boundary' => $boundary, 'boundaries' => $boundaries, 'season' =>
$season));
}
Modified: branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2015-09-12 00:03:16 UTC (rev 13885)
@@ -74,12 +74,12 @@
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'email_send.js');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Building Send'), 'link'
=> '#building');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Building
Send'), 'link' => '#building');
+ $active_tab = 'generic';
+
+ $building['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $building['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
if ($step == 1)
self::render_template_xsl('email_index',
array('building' => $building,
Modified: branches/dev-syncromind/booking/templates/base/account_code_set.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/account_code_set.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,134 +1,129 @@
<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-->
+ <!--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">
<xsl:value-of disable-output-escaping="yes"
select="account_code_set/tabs"/>
- <div id="account">
-
+ <div id="account">
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang', 'Name')" />
+ <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
</label>
- <xsl:value-of select="account_code_set/name"/>
+ <xsl:value-of select="account_code_set/name"/>
</div>
-
<div class="pure-control-group">
- <xsl:if test="config_data/dim_3">
- <label>
- <xsl:value-of select="config_data/dim_3" />
- </label>
- <xsl:value-of
select="account_code_set/object_number"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_3">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_3"
/></h4>
+ </label>
+ <xsl:value-of select="account_code_set/object_number"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/article">
- <label>
- <xsl:value-of select="php:function('lang',
'Article')" />
- </label>
- <xsl:value-of
select="account_code_set/article"/>
- </xsl:if>
+ <xsl:if test="config_data/article">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Article')" /></h4>
+ </label>
+ <xsl:value-of select="account_code_set/article"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_value_1">
- <label>
- <xsl:value-of select="config_data/dim_value_1"
/>
- </label>
- <xsl:value-of
select="account_code_set/unit_number"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_value_1">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_value_1"
/></h4>
+ </label>
+ <xsl:value-of select="account_code_set/unit_number"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_value_4">
- <label>
- <xsl:value-of select="config_data/dim_value_4"
/>
- </label>
- <xsl:value-of
select="account_code_set/dim_value_4"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_value_4">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_value_4"
/></h4>
+ </label>
+ <xsl:value-of select="account_code_set/dim_value_4"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_value_5">
- <label>
- <xsl:value-of select="config_data/dim_value_5"
/>
- </label>
- <xsl:value-of
select="account_code_set/dim_value_5"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_value_5">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_value_5"
/></h4>
+ </label>
+ <xsl:value-of select="account_code_set/dim_value_5"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/external_format !=
'KOMMFAKT'">
- <label>
- <xsl:value-of select="php:function('lang',
'Unit Prefix')" />
- </label>
- <xsl:value-of
select="account_code_set/unit_prefix"/>
- </xsl:if>
- </div>
-
+ <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>
+ </div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_1">
- <label>
- <xsl:value-of select="config_data/dim_1" />
- </label>
- <xsl:value-of
select="account_code_set/responsible_code"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_1">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_1"
/></h4>
+ </label>
+ <xsl:value-of
select="account_code_set/responsible_code"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_2">
- <label>
- <xsl:value-of select="config_data/dim_2" />
- </label>
- <xsl:value-of
select="account_code_set/service"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_2">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_2"
/></h4>
+ </label>
+ <xsl:value-of select="account_code_set/service"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_4">
- <label>
- <xsl:value-of select="config_data/dim_4" />
- </label>
- <xsl:value-of select="account_code_set/dim_4"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_4">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_4"
/></h4>
+ </label>
+ <xsl:value-of select="account_code_set/dim_4"/>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_5">
- <label>
- <xsl:value-of select="config_data/dim_5" />
- </label>
- <xsl:value-of
select="account_code_set/project_number"/>
- </xsl:if>
+ <xsl:if test="config_data/dim_5">
+ <label>
+ <h4><xsl:value-of select="config_data/dim_5"
/></h4>
+ </label>
+ <xsl:value-of
select="account_code_set/project_number"/>
+ </xsl:if>
</div>
-
- <div class="pure-control-group">
- <xsl:if test="config_data/external_format !=
'KOMMFAKT'">
- <xsl:value-of
select="php:function('lang', 'Invoice instruction')" />
- </xsl:if>
- </div>
- <div class="pure-control-group">
- <xsl:if test="config_data/external_format =
'KOMMFAKT'">
- <xsl:value-of
select="php:function('lang', 'Reference')" />
- </xsl:if>
- <div class="description"><xsl:value-of
select="account_code_set/invoice_instruction"/></div>
- </div>
-
+ <div class="pure-control-group">
+ <xsl:if test="config_data/external_format != 'KOMMFAKT'">
+ <xsl:value-of select="php:function('lang',
'Reference')" />
+ </xsl:if>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Invoice instruction')" /> </h4>
+ </label>
+ <div class="description"
style="display:inline-block;max-width:80%;"><xsl:value-of
select="account_code_set/invoice_instruction"/></div>
+ </div>
</div>
</div>
</form>
<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}'">
- <xsl:value-of select="php:function('lang',
'Edit')" />
- </button>
- </div>
+ <div class="form-buttons">
+ <button
onclick="window.location.href='{account_code_set/edit_link}'">
+ <xsl:value-of select="php:function('lang', 'Edit')" />
+ </button>
+ </div>
</xsl:if>
</div>
<!--/div-->
Modified:
branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,165 +1,180 @@
<func:function name="phpgw:conditional">
- <xsl:param name="test"/>
- <xsl:param name="true"/>
- <xsl:param name="false"/>
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
- <func:result>
- <xsl:choose>
- <xsl:when test="$test">
- <xsl:value-of select="$true"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$false"/>
- </xsl:otherwise>
- </xsl:choose>
- </func:result>
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
</func:function>
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--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-->
+ <!--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"/-->
+ <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="account_code_set/tabs"/>
- <div id="account">
- <fieldset>
+ <form action="" method="POST" id='form' class="pure-form
pure-form-stacked" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="account_code_set/tabs"/>
+ <div id="account">
+ <fieldset>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-sm-1 pure-u-md-2-3
pure-u-lg-1-2">
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Name')" />
+ <label for="field_name">
+ <h4><xsl:value-of
select="php:function('lang', 'Name')" /></h4>
</label>
- <input name="name" type="text" id="field_name"
value="{account_code_set/name}"/>
+ <input name="name" type="text" id="field_name"
value="{account_code_set/name}" class="pure-u-1" />
</div>
+ </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
<div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Active')"/></label>
- <select id="field_active"
name="active">
- <xsl:if test="new_form">
- <xsl:attribute
name="disabled">disabled</xsl:attribute>
- </xsl:if>
-
- <option value="1">
- <xsl:if
test="account_code_set/active=1">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Active')"/>
- </option>
- <option value="0">
- <xsl:if
test="account_code_set/active=0">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Inactive')"/>
- </option>
- </select>
+ <xsl:if test="config_data/dim_3">
+ <label for="field_object_number">
+ <h4><xsl:value-of
select="config_data/dim_3" /></h4>
+ </label>
+ <input name="object_number" type="text"
id="field_object_number" value="{account_code_set/object_number}" maxlength='8'
class="pure-u-1" />
+ </xsl:if>
</div>
-
- <div class="clr"/>
-
<div class="pure-control-group">
- <xsl:if test="config_data/dim_3">
- <label>
- <xsl:value-of
select="config_data/dim_3" />
- </label>
- <input name="object_number"
type="text" id="field_object_number" value="{account_code_set/object_number}"
maxlength='8'/>
- </xsl:if>
+ <xsl:if test="config_data/article">
+ <label for="field_article">
+ <h4><xsl:value-of
select="config_data/article" /></h4>
+ </label>
+ <input name="article" type="text"
id="field_article" value="{account_code_set/article}" maxlength='15'
class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/article">
- <label>
- <xsl:value-of
select="config_data/article" />
- </label>
- <input name="article" type="text"
id="field_article" value="{account_code_set/article}" maxlength='15'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_value_1">
+ <label for="field_unit_number">
+ <h4><xsl:value-of
select="config_data/dim_value_1" /></h4>
+ </label>
+ <input name="unit_number" type="text"
id="field_unit_number" value="{account_code_set/unit_number}" maxlength='12'
class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_value_1">
- <label>
- <xsl:value-of
select="config_data/dim_value_1" />
- </label>
- <input name="unit_number"
type="text" id="field_unit_number" value="{account_code_set/unit_number}"
maxlength='12'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_value_4">
+ <label for="field_dim_value_4">
+ <h4><xsl:value-of
select="config_data/dim_value_4" /></h4>
+ </label>
+ <input name="dim_value_4" type="text"
id="field_dim_value_4" value="{account_code_set/dim_value_4}" maxlength='12'
class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_value_4">
- <label>
- <xsl:value-of
select="config_data/dim_value_4" />
- </label>
- <input name="dim_value_4"
type="text" id="field_dim_value_4" value="{account_code_set/dim_value_4}"
maxlength='12'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_value_5">
+ <label for="field_dim_value_5">
+ <h4><xsl:value-of
select="config_data/dim_value_5" /></h4>
+ </label>
+ <input name="dim_value_5" type="text"
id="field_dim_value_5" value="{account_code_set/dim_value_5}" maxlength='12'
class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_value_5">
- <label><xsl:value-of
select="config_data/dim_value_5" /></label>
- <input name="dim_value_5"
type="text" id="field_dim_value_5" value="{account_code_set/dim_value_5}"
maxlength='12'/>
- </xsl:if>
+ <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>
</div>
+ </div>
+ <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
<div class="pure-control-group">
- <xsl:if
test="config_data/external_format!= 'KOMMFAKT'">
- <label>
- <xsl:value-of
select="php:function('lang', 'Unit Prefix')" />
- </label>
- <input name="unit_prefix"
type="text" id="field_unit_prefix" value="{account_code_set/unit_prefix}"
maxlength='1'/>
+ <label for="field_active">
+ <h4><xsl:value-of
select="php:function('lang', 'Active')"/></h4>
+ </label>
+ <select id="field_active" name="active"
class="pure-u-1">
+ <xsl:if test="new_form">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
+ <option value="1">
+ <xsl:if
test="account_code_set/active=1">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Active')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="account_code_set/active=0">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Inactive')"/>
+ </option>
+ </select>
</div>
-
<div class="pure-control-group">
- <xsl:if test="config_data/dim_1">
- <label><xsl:value-of
select="config_data/dim_1" /></label>
- <input name="responsible_code"
type="text" id="field_responsible_code"
value="{account_code_set/responsible_code}" maxlength='6'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_1">
+ <label for="field_responsible_code">
+ <h4><xsl:value-of
select="config_data/dim_1" /></h4>
+ </label>
+ <input name="responsible_code" type="text"
id="field_responsible_code" value="{account_code_set/responsible_code}"
maxlength='6' class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_2">
- <label><xsl:value-of
select="config_data/dim_2" /></label>
- <input name="service" type="text"
id="field_service" value="{account_code_set/service}" maxlength='8'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_2">
+ <label for="field_service">
+ <h4><xsl:value-of
select="config_data/dim_2" /></h4>
+ </label>
+ <input name="service" type="text"
id="field_service" value="{account_code_set/service}" maxlength='8'
class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_4">
- <label><xsl:value-of
select="config_data/dim_4" /></label>
- <input name="dim_4" type="text"
id="field_dim_4" value="{account_code_set/dim_4}" maxlength='8'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_4">
+ <label for="field_dim_4">
+ <h4><xsl:value-of
select="config_data/dim_4" /></h4>
+ </label>
+ <input name="dim_4" type="text"
id="field_dim_4" value="{account_code_set/dim_4}" maxlength='8'
class="pure-u-1" />
+ </xsl:if>
</div>
<div class="pure-control-group">
- <xsl:if test="config_data/dim_5">
- <label><xsl:value-of
select="config_data/dim_5" /></label>
- <input name="project_number"
type="text" id="field_project_number" value="{account_code_set/project_number}"
maxlength='12'/>
- </xsl:if>
+ <xsl:if test="config_data/dim_5">
+ <label for="field_project_number">
+ <h4><xsl:value-of
select="config_data/dim_5" /></h4>
+ </label>
+ <input name="project_number" type="text"
id="field_project_number" value="{account_code_set/project_number}"
maxlength='12' class="pure-u-1" />
+ </xsl:if>
</div>
-
- <div class="clr"/>
-
+ </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-sm-1 pure-u-md-2-3
pure-u-lg-1-2">
<div class="pure-control-group">
- <xsl:if test="config_data/external_format!=
'KOMMFAKT'">
- <label>
- <xsl:value-of
select="php:function('lang', 'Invoice instruction')" />
- </label>
- </xsl:if>
+ <label for="field_invoice_instruction">
+ <h4><xsl:value-of
select="php:function('lang', 'Invoice instruction')" /></h4>
+ </label>
+ <input id="field_invoice_instruction"
name="invoice_instruction" value="{account_code_set/invoice_instruction}"
class="pure-u-1" />
</div>
- <div class="pure-control-group">
+ <!--div class="pure-control-group">
<xsl:if test="config_data/external_format =
'KOMMFAKT'">
- <label><xsl:value-of
select="php:function('lang', 'Reference')" /></label>
+ <label><xsl:value-of
select="php:function('lang', 'Reference')" /></label>
</xsl:if>
- <input size="120"
id="field_invoice_instruction" name="invoice_instruction"
value="{account_code_set/invoice_instruction}" />
- </div>
-
- <div class="clr"/>
- </fieldset>
+ <input size="120"
id="field_invoice_instruction" name="invoice_instruction"
value="{account_code_set/invoice_instruction}" />
+ </div-->
</div>
</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}">
- <xsl:value-of select="php:function('lang',
'Cancel')" />
- </a>
- </div>
- </form>
- <!--/div-->
+ </fieldset>
+ </div>
+ </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}">
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ </div>
+ </form>
+ <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/activity_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -10,66 +10,68 @@
<div id="activity_edit">
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Activity')"/>
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang',
'Activity')"/></h4>
</label>
- <input id="field_name" name="name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="activity/name"/></xsl:attribute>
- </input>
+ <input id="field_name" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="activity/name"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_active">
<xsl:value-of select="php:function('lang', 'Active')"
/>
</label>
- <select id="field_active" name="active">
- <option value="1">
- <xsl:if test="activity/active=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Active')" />
- </option>
- <option value="0">
- <xsl:if test="activity/active=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Inactive')" />
- </option>
- </select>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="activity/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Active')" />
+ </option>
+ <option value="0">
+ <xsl:if test="activity/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Inactive')" />
+ </option>
+ </select>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_description">
<xsl:value-of select="php:function('lang',
'Description')"/>
</label>
- <textarea cols="5" rows="5" id="field_description"
name="description">
- <xsl:value-of select="activity/description"/>
- </textarea>
+ <textarea rows="5" id="field_description"
name="description">
+ <xsl:value-of select="activity/description"/>
+ </textarea>
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang', 'Parent
activity')"/></label>
- <!--div class="autocomplete"-->
- <select name="parent_id" id="field_parent_id">
- <option value="0"><xsl:value-of
select="php:function('lang', 'No parent')"/></option>
- <xsl:for-each select="activities">
- <option>
-
<xsl:if test="../activity/parent_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 id="parent_container"/>
- <!--/div-->
+ <label for="field_parent_id">
+ <h4><xsl:value-of select="php:function('lang', 'Parent
activity')"/></h4>
+ </label>
+ <!--div class="autocomplete"-->
+ <select name="parent_id" id="field_parent_id">
+ <option value="0"><xsl:value-of
select="php:function('lang', 'No parent')"/></option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if test="../activity/parent_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 id="parent_container"></div>
+ <!--/div-->
</div>
</div>
</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', 'Save')"/></xsl:attribute>
- </input>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
+ </input>
<a class="cancel">
<xsl:attribute name="href"><xsl:value-of
select="activity/cancel_link"></xsl:value-of></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
Modified: branches/dev-syncromind/booking/templates/base/activity_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,57 +1,58 @@
<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 class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Activity')" />
- </label>
- <input id="field_name" name="name"
type="text">
- <xsl:attribute
name="value"><xsl:value-of select="activity/name"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Description')" />
- </label>
- <textarea cols="5" rows="5"
id="field_description" name="description"><xsl:value-of
select="activity/description"/></textarea>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Parent activity')" /></label>
- <!--div class="autocomplete"-->
- <select name="parent_id"
id="field_parent_id">
- <option value="0"><xsl:value-of
select="php:function('lang', 'No Parent')" /></option>
- <xsl:for-each select="activities">
- <option>
- <xsl:if
test="../activity/parent_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 id="parent_container"/>
- <!--/div-->
- </div>
+ <!--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 class="pure-control-group">
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4>
+ </label>
+ <input id="field_name" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="activity/name"/></xsl:attribute>
+ </input>
</div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
+ </label>
+ <textarea rows="5" id="field_description"
name="description"><xsl:value-of select="activity/description"/></textarea>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_parent_id">
+ <h4><xsl:value-of select="php:function('lang', 'Parent
activity')" /></h4>
+ </label>
+ <!--div class="autocomplete"-->
+ <select name="parent_id" id="field_parent_id">
+ <option value="0"><xsl:value-of
select="php:function('lang', 'No Parent')" /></option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if test="../activity/parent_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 id="parent_container"/>
+ <!--/div-->
+ </div>
</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', 'Add')" /></xsl:attribute>
- </input>
- <a class="cancel">
- <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>
+ <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', 'Add')" /></xsl:attribute>
+ </input>
+ <a class="cancel">
+ <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-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -9,41 +9,45 @@
<xsl:value-of disable-output-escaping="yes"
select="resource/tabs"/>
<div id="agegroup_edit">
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Name')" />
- </label>
- <input id="field_name" name="name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="resource/name"/></xsl:attribute>
- </input>
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
+ </label>
+ <input id="field_name" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="resource/name"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Active')" /></label>
- <select id="field_active" name="active">
- <option value="1">
- <xsl:if test="resource/active=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Active')" />
- </option>
- <option value="0">
- <xsl:if test="resource/active=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Inactive')" />
- </option>
- </select>
+ <label for="field_active">
+ <h4><xsl:value-of select="php:function('lang',
'Active')" /></h4>
+ </label>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="resource/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Active')" />
+ </option>
+ <option value="0">
+ <xsl:if test="resource/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Inactive')" />
+ </option>
+ </select>
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang', 'Sort
order')" /></label>
- <input id="field_sort" name="sort" type="text"
value="{resource/sort}"/>
+ <label for="field_sort">
+ <h4><xsl:value-of select="php:function('lang', 'Sort
order')" /></h4>
+ </label>
+ <input id="field_sort" name="sort" type="text"
value="{resource/sort}"/>
</div>
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Description')" />
+ <label for="field_description">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
</label>
- <textarea cols="5" rows="5" id="field_description"
name="description">
- <xsl:value-of select="resource/description"/>
- </textarea>
+ <textarea rows="5" id="field_description"
name="description">
+ <xsl:value-of select="resource/description"/>
+ </textarea>
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -5,39 +5,40 @@
<!--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">
- <xsl:value-of disable-output-escaping="yes"
select="agegroup/tabs"/>
- <div id="agegroup_add">
-
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Name')" /></label>
- <input id="field_name" name="name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="agegroup/name"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Sort order')" /></label>
-
- <input id="field_sort" name="sort" type="text"
value="{agegroup/sort}"/>
-
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Description')" /></label>
-
- <textarea cols="5" rows="5" id="field_description"
name="description"><xsl:value-of select="agegroup/description"/></textarea>
-
- </div>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="agegroup/tabs"/>
+ <div id="agegroup_add">
+ <div class="pure-control-group">
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
+ </label>
+ <input id="field_name" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="agegroup/name"/></xsl:attribute>
+ </input>
</div>
+ <div class="pure-control-group">
+ <label for="field_sort">
+ <h4><xsl:value-of select="php:function('lang', 'Sort
order')" /></h4>
+ </label>
+ <input id="field_sort" name="sort" type="text"
value="{agegroup/sort}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
+ </label>
+ <textarea rows="5" id="field_description"
name="description"><xsl:value-of select="agegroup/description"/></textarea>
+ </div>
</div>
- <div class="form-buttons">
- <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">
- <xsl:attribute name="href"><xsl:value-of
select="agegroup/cancel_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
+ </div>
+ <div class="form-buttons">
+ <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">
+ <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-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/audience_edit.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -5,63 +5,63 @@
<!--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="audience/tabs"/>
- <div id="audience_edit">
- <fieldset>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Target audience')" />
- </label>
- <input id="field_name" name="name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="audience/name"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="audience/tabs"/>
+ <div id="audience_edit">
+ <fieldset>
+ <div class="pure-control-group">
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang',
'Target audience')" /></h4>
+ </label>
+ <input id="field_name" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="audience/name"/></xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_active">
+ <h4><xsl:value-of select="php:function('lang',
'Active')" /></h4>
+ </label>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="audience/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
<xsl:value-of select="php:function('lang',
'Active')" />
- </label>
- <select id="field_active" name="active">
- <option value="1">
- <xsl:if test="audience/active=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Active')" />
- </option>
- <option value="0">
- <xsl:if test="audience/active=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Inactive')" />
- </option>
- </select>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Sort order')" />
- </label>
- <input id="field_sort" name="sort" type="text"
value="{audience/sort}"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Description')" />
- </label>
- <textarea cols="5" rows="5"
id="field_description" name="description">
- <xsl:value-of
select="audience/description"/>
- </textarea>
- </div>
- </fieldset>
- </div>
+ </option>
+ <option value="0">
+ <xsl:if test="audience/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Inactive')" />
+ </option>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_sort">
+ <h4><xsl:value-of select="php:function('lang',
'Sort order')" /></h4>
+ </label>
+ <input id="field_sort" name="sort" type="text"
value="{audience/sort}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
+ </label>
+ <textarea rows="5" id="field_description"
name="description">
+ <xsl:value-of select="audience/description"/>
+ </textarea>
+ </div>
+ </fieldset>
</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>
- </input>
- <a class="cancel">
- <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>
+ </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>
+ </input>
+ <a class="cancel">
+ <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-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/audience_new.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -5,36 +5,40 @@
<!--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">
- <xsl:value-of disable-output-escaping="yes"
select="audience/tabs"/>
- <div id="audience_add">
-
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Target audience')" /></label>
- <input id="field_name" name="name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="audience/name"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Sort order')" /></label>
- <input id="field_sort" name="sort" type="text"
value="{audience/sort}"/>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Description')" /></label>
- <textarea cols="5" rows="5" id="field_description"
name="description"><xsl:value-of select="audience/description"/></textarea>
- </div>
-
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="audience/tabs"/>
+ <div id="audience_add">
+ <div class="pure-control-group">
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang', 'Target
audience')" /></h4>
+ </label>
+ <input id="field_name" name="name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="audience/name"/></xsl:attribute>
+ </input>
</div>
+ <div class="pure-control-group">
+ <label for="field_sort">
+ <h4><xsl:value-of select="php:function('lang', 'Sort
order')" /></h4>
+ </label>
+ <input id="field_sort" name="sort" type="text"
value="{audience/sort}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
+ </label>
+ <textarea rows="5" id="field_description"
name="description"><xsl:value-of select="audience/description"/></textarea>
+ </div>
</div>
- <div class="form-buttons">
- <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">
- <xsl:attribute name="href"><xsl:value-of
select="audience/cancel_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
+ </div>
+ <div class="form-buttons">
+ <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">
+ <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/completed_reservation.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/completed_reservation.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/completed_reservation.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -16,112 +16,145 @@
</func:function>
<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 href="{reservation/reservations_link}">
- <xsl:value-of
select="php:function('lang', 'Completed Reservations')" />
- </a>
- </li>
- <li>
- <xsl:value-of select="php:function('lang',
string(reservation/reservation_type))"/>
- </li>
- <li>
- <xsl:value-of select="reservation/id"/>
- </li>
- </ul>
-
- <dl class="proplist-col">
- <dt><xsl:value-of select="php:function('lang', 'Cost')"
/></dt>
- <dd><xsl:value-of select="reservation/cost"/></dd>
-
- <dt><xsl:value-of select="php:function('lang',
'Customer Type')" /></dt>
- <dd><xsl:value-of select="php:function('lang',
string(reservation/customer_type))"/></dd>
-
- <xsl:copy-of
select="phpgw:booking_customer_identifier_show(reservation, 'Customer ID')"/>
-
- <dt><xsl:value-of select="php:function('lang', 'From')"
/></dt>
- <dd><xsl:value-of select="reservation/from_"/></dd>
- </dl>
-
- <dl class="proplist-col">
- <dt><xsl:value-of select="php:function('lang',
'Exported')" /></dt>
- <dd>
- <xsl:if test="reservation/exported_link">
- <a
href="{reservation/exported_link}"><xsl:value-of
select="reservation/exported"/></a>
- </xsl:if>
- <xsl:if test="not(reservation/exported_link)">
- <xsl:value-of
select="reservation/exported"/>
- </xsl:if>
- </dd>
-
- <dt><xsl:value-of select="php:function('lang', 'Export
File')" /></dt>
- <dd>
- <xsl:if test="reservation/export_file_id/href">
- <a
href="{reservation/export_file_id/href}"><xsl:value-of
select="reservation/export_file_id/label"/></a>
- </xsl:if>
- <xsl:if
test="not(reservation/export_file_id/href)">
- <xsl:value-of
select="reservation/export_file_id/label"/>
- </xsl:if>
- </dd>
-
- <dt><xsl:value-of select="php:function('lang', 'Order
id')" /></dt>
- <dd><xsl:value-of
select="reservation/invoice_file_order_id"/></dd>
-
- <dt><xsl:value-of select="php:function('lang', 'To')"
/></dt>
- <dd><xsl:value-of select="reservation/to_"/></dd>
- </dl>
-
- <dl class="proplist-col">
- <dt><xsl:value-of select="php:function('lang',
'Season')" /></dt>
- <xsl:choose>
- <xsl:when test="reservation/season_name">
- <dd><a
href="{reservation/season_link}"><xsl:value-of
select="reservation/season_name"/></a></dd>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'N/A')" />
- </xsl:otherwise>
+<!--xsl:call-template name="yui_booking_i18n"/>
+<div id="content">
+ <ul class="pathway">
+ <li>
+ <a href="{reservation/reservations_link}">
+ <xsl:value-of select="php:function('lang',
'Completed Reservations')" />
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="php:function('lang',
string(reservation/reservation_type))"/>
+ </li>
+ <li>
+ <xsl:value-of select="reservation/id"/>
+ </li>
+ </ul-->
+
+ <div 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="reservation/tabs"/>
+ <div id="completed_reservation">
+ <field>
+ <h1>
+ <xsl:value-of select="php:function('lang',
string(reservation/reservation_type))"/> #<xsl:value-of
select="reservation/id"/>
+ </h1>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Cost')" /></h4>
+ </label>
+ <span><xsl:value-of select="reservation/cost"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Customer Type')" /></h4>
+ </label>
+ <span><xsl:value-of select="php:function('lang',
string(reservation/customer_type))"/></span>
+ </div>
+ <div class="pure-control-group">
+ <xsl:copy-of
select="phpgw:booking_customer_identifier_show(reservation, 'Customer ID')"/>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
+ </label>
+ <span><xsl:value-of select="reservation/from_"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
+ </label>
+ <span><xsl:value-of select="reservation/to_"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Exported')" /></h4>
+ </label>
+ <xsl:if test="reservation/exported_link">
+ <a
href="{reservation/exported_link}"><xsl:value-of
select="reservation/exported"/></a>
+ </xsl:if>
+ <xsl:if test="not(reservation/exported_link)">
+ <span><xsl:value-of
select="reservation/exported"/></span>
+ </xsl:if>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Export File')" /></h4>
+ </label>
+ <xsl:if test="reservation/export_file_id/href">
+ <a
href="{reservation/export_file_id/href}"><xsl:value-of
select="reservation/export_file_id/label"/></a>
+ </xsl:if>
+ <xsl:if test="not(reservation/export_file_id/href)">
+ <span><xsl:value-of
select="reservation/export_file_id/label"/></span>
+ </xsl:if>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Order id')" /></h4>
+ </label>
+ <span><xsl:value-of
select="reservation/invoice_file_order_id"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
+ </label>
+ <xsl:choose>
+ <xsl:when test="reservation/season_name">
+ <a
href="{reservation/season_link}"><xsl:value-of
select="reservation/season_name"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="php:function('lang', 'N/A')" /></span>
+ </xsl:otherwise>
</xsl:choose>
-
- <dt><xsl:value-of select="php:function('lang',
'Organization')" /></dt>
- <xsl:choose>
- <xsl:when test="reservation/organization_name">
- <dd><a
href="{reservation/organization_link}"><xsl:value-of
select="reservation/organization_name"/></a></dd>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'N/A')" />
- </xsl:otherwise>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
+ </label>
+ <xsl:choose>
+ <xsl:when test="reservation/organization_name">
+ <a
href="{reservation/organization_link}"><xsl:value-of
select="reservation/organization_name"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="php:function('lang', 'N/A')" /></span>
+ </xsl:otherwise>
</xsl:choose>
- </dl>
-
- <dl class="proplist">
- <dt><xsl:value-of select="php:function('lang', 'Article
Description')" /></dt>
- <div class="description"><xsl:value-of
select="reservation/article_description" disable-output-escaping="yes"/></div>
- </dl>
-
- <dl class="proplist">
- <dt><xsl:value-of select="php:function('lang',
'Description')" /></dt>
- <div class="description"><xsl:value-of
select="reservation/description" disable-output-escaping="yes"/></div>
- </dl>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Article Description')" /></h4>
+ </label>
+ <div class="description"
style="display:inline-block;max-width:80%;"><xsl:value-of
select="reservation/article_description" disable-output-escaping="yes"/></div>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
+ </label>
+ <div class="description"
style="display:inline-block;max-width:80%;"><xsl:value-of
select="reservation/description" disable-output-escaping="yes"/></div>
+ </div>
+ </field>
+ </div>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <xsl:if test="reservation/exported=php:function('lang', 'No') or
reservation/exported = ''">
+ <xsl:if test="show_edit_button = 1">
+ <button
onclick="window.location.href='{reservation/edit_link}'">
+ <xsl:value-of select="php:function('lang', 'Edit')" />
+ </button>
+ </xsl:if>
+ </xsl:if>
- <div class="form-buttons">
- <xsl:if test="reservation/exported=php:function('lang',
'No') or reservation/exported = ''">
- <xsl:if test="show_edit_button = 1">
- <button
onclick="window.location.href='{reservation/edit_link}'">
- <xsl:value-of
select="php:function('lang', 'Edit')" />
- </button>
- </xsl:if>
- </xsl:if>
-
- <button
onclick='window.location.href="{reservation/reservation_link}"'>
- <xsl:value-of select="php:function('ucfirst',
php:function('lang', string(reservation/reservation_type)))" />
- </button>
-
- <!-- TODO: Add application_link where necessary -->
- <button
onclick='window.location.href="{reservation/application_link}"' disabled="1">
- <xsl:value-of select="php:function('lang',
'Application')" />
- </button>
- </div>
- </div>
+ <button
onclick='window.location.href="{reservation/reservation_link}"'>
+ <xsl:value-of select="php:function('ucfirst', php:function('lang',
string(reservation/reservation_type)))" />
+ </button>
+
+ <!-- TODO: Add application_link where necessary -->
+ <button
onclick='window.location.href="{reservation/application_link}"' disabled="1">
+ <xsl:value-of select="php:function('lang', 'Application')" />
+ </button>
+ </div>
+ <!--/div-->
</xsl:template>
Modified:
branches/dev-syncromind/booking/templates/base/completed_reservation_edit.xsl
===================================================================
---
branches/dev-syncromind/booking/templates/base/completed_reservation_edit.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++
branches/dev-syncromind/booking/templates/base/completed_reservation_edit.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,56 +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', 'Edit completed reservation')"/></dt>
- </dl>
- <xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
-
- <form action="" method="POST">
- <dl class="form-col">
- <dt><label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label></dt>
- <dd><input id="field_cost" name="cost"
type="text" value="{reservation/cost}"/></dd>
-
- <dt><label
for="field_customer_type"><xsl:value-of select="php:function('lang', 'Customer
Type')" /></label></dt>
- <dd>
- <select name='customer_type'
id='field_customer_type'>
- <option value=''><xsl:value-of
select="php:function('lang', 'Select...')" /></option>
- <xsl:for-each
select="reservation/customer_types/*">
- <option>
- <xsl:if
test="../../customer_type = 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>
- </xsl:for-each>
- </select>
- </dd>
- </dl>
-
- <dl class="form-col">
- <xsl:copy-of
select="phpgw:booking_customer_identifier(reservation, 'Customer ID')"/>
- </dl>
-
- <div style='clear:both'/>
- <dl class="form">
- <dt><label
for="field_article_description"><xsl:value-of select="php:function('lang',
'Article Description')" /></label></dt>
- <dd>
- <dd><input type='text'
id='article_description' name="description"
value='{reservation/article_description}' maxlength='35' style="width:
20em"/></dd>
- </dd>
- <dt><label
for="field_description"><xsl:value-of select="php:function('lang',
'Description')" /></label></dt>
- <dd>
- <dd><input type='text'
id='field_description' name="description" value='{reservation/description}'
maxlength='60' style="width: 28em"/></dd>
- </dd>
- </dl>
-
- <div class="form-buttons">
- <input type="submit"
value="{php:function('lang', 'Save')}"/>
- <a class="cancel"
href="{reservation/cancel_link}">
- <xsl:value-of
select="php:function('lang', 'Cancel')"/>
- </a>
- </div>
- </form>
- </div>
+ <!--div id="content"-->
+ <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=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="reservation/tabs"/>
+ <div id="completed_reservation_edit">
+ <fieldset>
+ <div class="heading">
+ <legend><h3><xsl:value-of select="php:function('lang',
'Edit completed reservation')"/></h3></legend>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
+ <div class="pure-control-group">
+ <label for="field_cost">
+ <h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4>
+ </label>
+ <input id="field_cost" name="cost" type="text"
value="{reservation/cost}" class="pure-u-1"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_customer_type">
+ <h4><xsl:value-of
select="php:function('lang', 'Customer Type')" /></h4>
+ </label>
+ <select name='customer_type'
id='field_customer_type' class="pure-u-1">
+ <option value=''><xsl:value-of
select="php:function('lang', 'Select...')" /></option>
+ <xsl:for-each
select="reservation/customer_types/*">
+ <option>
+ <xsl:if test="../../customer_type
= 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>
+ </xsl:for-each>
+ </select>
+ </div>
+ </div>
+ <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
+ <xsl:copy-of
select="phpgw:booking_customer_identifier(reservation, 'Customer ID')"/>
+ </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
+ <div class="pure-control-group">
+ <label for="field_article_description">
+ <h4><xsl:value-of
select="php:function('lang', 'Article Description')" /></h4>
+ </label>
+ <input type='text' id='article_description'
name="description" value='{reservation/article_description}' maxlength='35'
class="pure-u-1"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
+ </label>
+ <input type='text' id='field_description'
name="description" value='{reservation/description}' maxlength='60'
class="pure-u-1"/>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" value="{php:function('lang', 'Save')}"
class="pure-button pure-button-primary"/>
+ <a class="cancel" href="{reservation/cancel_link}">
+ <xsl:value-of select="php:function('lang', 'Cancel')"/>
+ </a>
+ </div>
+ </form>
+ <!--/div-->
</xsl:template>
\ No newline at end of file
Modified:
branches/dev-syncromind/booking/templates/base/completed_reservation_export.xsl
===================================================================
---
branches/dev-syncromind/booking/templates/base/completed_reservation_export.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++
branches/dev-syncromind/booking/templates/base/completed_reservation_export.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -5,39 +5,51 @@
<li><xsl:value-of select="export/id"/></li>
</ul-->
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
+ <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">
- <xsl:value-of disable-output-escaping="yes"
select="export/tabs"/>
- <div id="export">
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Building')" /></label>
- <xsl:copy-of
select="phpgw:booking_link(export/building_id)"/>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Season')" /></label>
- <xsl:copy-of
select="phpgw:booking_link(export/season_id)"/>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Total Items')" /></label>
- <xsl:value-of select="export/total_items"/>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Total Cost')" /></label>
- <xsl:value-of select="export/total_cost"/>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Created')" /></label>
- <xsl:value-of select="export/created_on"/>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Created by')" /></label>
- <xsl:value-of select="export/created_by_name"/>
- </div>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="export/tabs"/>
+ <div id="export">
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
+ </label>
+ <xsl:copy-of
select="phpgw:booking_link(export/building_id)"/>
</div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
+ </label>
+ <xsl:copy-of
select="phpgw:booking_link(export/season_id)"/>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Total Items')" /></h4>
+ </label>
+ <span><xsl:value-of
select="export/total_items"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Total Cost')" /></h4>
+ </label>
+ <span><xsl:value-of select="export/total_cost"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Created')" /></h4>
+ </label>
+ <span><xsl:value-of select="export/created_on"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Created by')" /></h4>
+ </label>
+ <span><xsl:value-of
select="export/created_by_name"/></span>
+ </div>
</div>
+ </div>
</form>
<!--/div-->
Modified:
branches/dev-syncromind/booking/templates/base/completed_reservation_export_file.xsl
===================================================================
---
branches/dev-syncromind/booking/templates/base/completed_reservation_export_file.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++
branches/dev-syncromind/booking/templates/base/completed_reservation_export_file.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,42 +1,62 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
- <ul class="pathway">
- <li><a href="{export_file/index_link}"><xsl:value-of
select="php:function('lang', 'Generated Files')" /></a></li>
- <li><xsl:value-of select="export_file/id"/>
(<xsl:value-of select="export_file/type"/>)</li>
- </ul>
+ <!--div id="content">
+ <ul class="pathway">
+ <li><a href="{export_file/index_link}"><xsl:value-of
select="php:function('lang', 'Generated Files')" /></a></li>
+ <li><xsl:value-of select="export_file/id"/> (<xsl:value-of
select="export_file/type"/>)</li>
+ </ul-->
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
- <dl class="proplist-col">
- <dt><xsl:value-of select="php:function('lang', 'Type')"
/></dt>
- <dd><xsl:value-of select="export_file/type"/></dd>
-
- <dt><xsl:value-of select="php:function('lang', 'Total
Items')" /></dt>
- <dd><xsl:value-of
select="export_file/total_items"/></dd>
-
- <dt><xsl:value-of select="php:function('lang', 'Total
Cost')" /></dt>
- <dd><xsl:value-of select="export_file/total_cost"/></dd>
-
- <dt><xsl:value-of select="php:function('lang',
'Created')" /></dt>
- <dd><xsl:value-of select="export_file/created_on"/></dd>
-
- <dt><xsl:value-of select="php:function('lang', 'Created
by')" /></dt>
- <dd><xsl:value-of
select="export_file/created_by_name"/></dd>
- </dl>
-
- <div class="form-buttons">
- <button>
- <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="export_file/download_link"/>"</xsl:attribute>
- <xsl:value-of select="php:function('lang',
'Download')" />
- </button>
- </div>
-
+ <xsl:call-template name="msgbox"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
+ <div action="" method="POST" class="pure-form pure-form-aligned"
id="form" name="form" >
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="export_file/tabs"/>
+ <div id="export_file">
+ <h1><xsl:value-of select="export_file/id"/> (<xsl:value-of
select="export_file/type"/>)</h1>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Type')" /></h4>
+ </label>
+ <span><xsl:value-of select="export_file/type"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Total Items')" /></h4>
+ </label>
+ <span><xsl:value-of
select="export_file/total_items"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Total Cost')" /></h4>
+ </label>
+ <span><xsl:value-of
select="export_file/total_cost"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Created')" /></h4>
+ </label>
+ <span><xsl:value-of
select="export_file/created_on"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Created by')" /></h4>
+ </label>
+ <span><xsl:value-of
select="export_file/created_by_name"/></span>
+ </div>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <button>
+ <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="export_file/download_link"/>"</xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Download')" />
+ </button>
+ </div>
+ </div>
<!--h4><xsl:value-of select="php:function('lang', 'Invoice Data
Exports')" /></h4>
<div id="completed_reservation_exports_container"/-->
- </div>
+ <!--/div-->
- <script type="text/javascript">
- var lang = <xsl:value-of select="php:function('js_lang', 'ID',
'Building', 'Season', 'From', 'To')"/>;
- </script>
+ <script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang', 'ID',
'Building', 'Season', 'From', 'To')"/>;
+ </script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,53 +1,42 @@
<func:function name="phpgw:booking_customer_identifier"
xmlns:php="http://php.net/xsl";>
- <xsl:param name="entity"/>
- <xsl:param name="label" select="string('Invoice information')"/>
+ <xsl:param name="entity"/>
+ <xsl:param name="label" select="string('Invoice information')"/>
- <func:result>
- <dl>
- <dt>
- <xsl:if
test="not(normalize-space($label))"><xsl:attribute
name="style">display:none</xsl:attribute></xsl:if>
- <xsl:value-of select="php:function('lang', $label)" />
-
- </dt>
-
- <dd>
- <select name='customer_identifier_type'
id='field_customer_identifier_type' class="pure-input-1">
- <option value=''><xsl:value-of
select="php:function('lang', 'None')" /></option>
- <xsl:for-each
select="$entity/customer_identifier_types/*">
- <option>
- <xsl:if
test="../../customer_identifier_type = 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>
- </xsl:for-each>
- </select>
- <input name="customer_ssn" type="text"
id="field_customer_ssn" class="pure-input-1" value="{$entity/customer_ssn}"/>
- <input name="customer_organization_number" type="text"
id="field_customer_organization_number" class="pure-input-1"
value="{$entity/customer_organization_number}"/>
- </dd>
- </dl>
- </func:result>
+ <func:result>
+ <xsl:if test="not(normalize-space($label))"><xsl:attribute
name="style">display:none</xsl:attribute></xsl:if>
+ <label>
+ <h4><xsl:value-of select="php:function('lang', $label)" /></h4>
+ </label>
+ <select name='customer_identifier_type'
id='field_customer_identifier_type' class="pure-input-1">
+ <option value=''><xsl:value-of select="php:function('lang',
'None')" /></option>
+ <xsl:for-each select="$entity/customer_identifier_types/*">
+ <option>
+ <xsl:if test="../../customer_identifier_type =
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>
+ </xsl:for-each>
+ </select>
+ <input name="customer_ssn" type="text" id="field_customer_ssn"
class="pure-input-1" value="{$entity/customer_ssn}"/>
+ <input name="customer_organization_number" type="text"
id="field_customer_organization_number" class="pure-input-1"
value="{$entity/customer_organization_number}"/>
+ </func:result>
</func:function>
<func:function name="phpgw:booking_customer_identifier_show"
xmlns:php="http://php.net/xsl";>
<xsl:param name="entity"/>
<xsl:param name="label" select="string('Invoice information')"/>
- <func:result>
- <dt>
- <xsl:value-of select="php:function('lang', $label)" />
- </dt>
- <xsl:if test="$entity/customer_identifier_label">
- <dd>
- <xsl:value-of
select="concat(php:function('lang', string($entity/customer_identifier_label)),
': ')"/><xsl:value-of select="$entity/customer_identifier_value"/>
- </dd>
- </xsl:if>
-
- <xsl:if test="not($entity/customer_identifier_label)">
- <dd><xsl:value-of select="php:function('lang',
'None')"/></dd>
- </xsl:if>
-
+ <func:result>
+ <label>
+ <h4><xsl:value-of select="php:function('lang', $label)" /></h4>
+ </label>
+ <xsl:if test="$entity/customer_identifier_label">
+ <span><xsl:value-of select="concat(php:function('lang',
string($entity/customer_identifier_label)), ': ')"/><xsl:value-of
select="$entity/customer_identifier_value"/></span>
+ </xsl:if>
+ <xsl:if test="not($entity/customer_identifier_label)">
+ <span><xsl:value-of select="php:function('lang',
'None')"/></span>
+ </xsl:if>
</func:result>
</func:function>
\ No newline at end of file
Modified: branches/dev-syncromind/booking/templates/base/documentation_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/documentation_form.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/documentation_form.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -13,86 +13,86 @@
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="document/tabs"/>
<div id="documentation">
- <div class="pure-control-group">
- <xsl:if test="document/id">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Edit manual')" /></dt>
- </xsl:if>
- <xsl:if test="not(document/id)">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Upload manual')" /></dt>
- </xsl:if>
- <xsl:if test="document/id">
- <!-- An update, add id column -->
- <input name='field_id' type='hidden'>
- <xsl:attribute
name="value"><xsl:value-of select="document/id"/></xsl:attribute>
- </input>
- </xsl:if>
+ <fieldset>
+ <div class="heading">
+ <legend><h3>
+ <xsl:if test="document/id">
+ <xsl:value-of select="php:function('lang',
'Edit manual')" />
+ </xsl:if>
+ <xsl:if test="not(document/id)">
+ <xsl:value-of select="php:function('lang',
'Upload manual')" />
+ </xsl:if>
+ </h3></legend>
</div>
+ <xsl:if test="document/id">
+ <!-- An update, add id column -->
+ <input name='field_id' type='hidden'>
+ <xsl:attribute name="value"><xsl:value-of
select="document/id"/></xsl:attribute>
+ </input>
+ </xsl:if>
+
+
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Document')" />
- </label>
+ <label for="field_name">
+ <h4><xsl:value-of select="php:function('lang',
'Document')" /></h4>
+ </label>
<input name="name" id='field_name'>
- <xsl:attribute
name="value"><xsl:value-of select="document/name"/></xsl:attribute>
- <xsl:attribute name="type">
- <xsl:choose>
- <xsl:when
test="document/id">text</xsl:when>
-
<xsl:otherwise>file</xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
-
- <xsl:if test="document/id">
- <xsl:attribute
name="disabled" value="disabled"/>
- </xsl:if>
-
- <xsl:attribute
name='title'><xsl:value-of select="document/name"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="document/name"/></xsl:attribute>
+ <xsl:attribute name="type">
+ <xsl:choose>
+ <xsl:when
test="document/id">text</xsl:when>
+ <xsl:otherwise>file</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:if test="document/id">
+ <xsl:attribute name="disabled"
value="disabled"/>
+ </xsl:if>
+ <xsl:attribute name='title'><xsl:value-of
select="document/name"/></xsl:attribute>
</input>
</div>
- <div class="pure-control-group">
-
- <label>
- <xsl:value-of select="php:function('lang',
'Description')" />
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
</label>
- <textarea name="description"
id='field_description'><xsl:value-of select="document/description"/></textarea>
+ <textarea name="description"
id='field_description'><xsl:value-of select="document/description"/></textarea>
</div>
-
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Category')" />
- </label>
+ <div class="pure-control-group">
+ <label for="field_category">
+ <h4><xsl:value-of select="php:function('lang',
'Category')" /></h4>
+ </label>
<select name='category' id='field_category'>
- <option value=''><xsl:value-of
select="php:function('lang', 'Select Category...')" /></option>
- <xsl:for-each
select="document/document_types/*">
- <option>
- <xsl:if
test="../../category = 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>
- </xsl:for-each>
+ <option value=''><xsl:value-of
select="php:function('lang', 'Select Category...')" /></option>
+ <xsl:for-each
select="document/document_types/*">
+ <option>
+ <xsl:if test="../../category =
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>
+ </xsl:for-each>
</select>
- </div>
- <div class="clr"/>
+ </div>
+ </fieldset>
</div>
</div>
<div class="form-buttons">
- <input type="submit" class="button pure-button
pure-button-primary">
- <xsl:attribute name="value">
- <xsl:choose>
- <xsl:when test="document/id">
- <xsl:value-of
select="php:function('lang', 'Update')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'Create')"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="document/cancel_link"/></xsl:attribute>
- <xsl:value-of
select="php:function('lang', 'Cancel')" />
- </a>
+ <input type="submit" class="button pure-button
pure-button-primary">
+ <xsl:attribute name="value">
+ <xsl:choose>
+ <xsl:when test="document/id">
+ <xsl:value-of select="php:function('lang',
'Update')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="php:function('lang',
'Create')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ </input>
+ <a class="cancel">
+ <xsl:attribute name="href"><xsl:value-of
select="document/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
</div>
</form>
<!--/div-->
Modified: branches/dev-syncromind/booking/templates/base/email_index.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -6,45 +6,51 @@
<form action="" method="POST" class="pure-form pure-form-aligned"
id="form" name="form">
<input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="building/tabs"/>
- <div id="building">
- <input type="hidden" name="step" value="0"/>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Building')" /></label>
- <!--div class="autocomplete"-->
- <input id="field_building_id"
name="building_id" type="hidden">
- <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>
- </input>
- <!--div id="building_container"/>
- </div-->
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Season')" /></label>
- <!--div id="season_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
- </div>
- <div class="clr" />
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Mail subject')" /></label>
- <input type="text" id="field_mailsubject"
name="mailsubject" class="full-width">
- <xsl:attribute
name="value"><xsl:value-of select="mailsubject"/></xsl:attribute>
- </input>
- </div>
- <div class="clr" />
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Mail body')" /></label>
- <textarea id="field_mailbody"
name="mailbody" class="full-width"><xsl:value-of select="mailbody"/></textarea>
- </div>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="building/tabs"/>
+ <div id="building">
+ <input type="hidden" name="step" value="0"/>
+ <div class="pure-control-group">
+ <label for="field_building_name">
+ <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
+ </label>
+ <!--div class="autocomplete"-->
+ <input id="field_building_id" name="building_id"
type="hidden">
+ <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>
+ </input>
+ <!--div id="building_container"/>
+ </div-->
</div>
- </div>
- <div class="form-buttons">
- <input type="submit" class="pure-button
pure-button-primary">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'preview')"/></xsl:attribute>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
+ </label>
+ <!--div id="season_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label for="field_mailsubject">
+ <h4><xsl:value-of select="php:function('lang', 'Mail
subject')" /></h4>
+ </label>
+ <input type="text" id="field_mailsubject"
name="mailsubject" class="full-width">
+ <xsl:attribute name="value"><xsl:value-of
select="mailsubject"/></xsl:attribute>
</input>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_mailbody">
+ <h4><xsl:value-of select="php:function('lang', 'Mail
body')" /></h4>
+ </label>
+ <textarea id="field_mailbody" name="mailbody"
class="full-width"><xsl:value-of select="mailbody"/></textarea>
+ </div>
</div>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" class="pure-button pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'preview')"/></xsl:attribute>
+ </input>
+ </div>
</form>
<!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/email_preview.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_preview.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/email_preview.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -1,35 +1,38 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
-
+ <!--div id="content"-->
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
-
- <form action="" method="POST">
- <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="mailbody" value="{mailbody}"/>
- <input type="hidden" name="mailsubject" value="{mailsubject}"/>
-
- <dl class="form-col">
- <dt><label><xsl:value-of select="php:function('lang',
'Recipients')"/> - (<xsl:value-of select="count(contacts)" />)</label></dt>
- <dd>
- <select id="field_contacts" name="contacts"
size="10">
- <xsl:for-each select="contacts">
- <xsl:sort select="name"/>
- <option>
- <xsl:attribute
name="value"><xsl:value-of select="email"/></xsl:attribute>
- <xsl:value-of
select="name"/> <<xsl:value-of select="email"/>>
- </option>
- </xsl:for-each>
- </select>
- </dd>
- </dl>
- <div class="form-buttons">
- <input type="submit" name="sendmail">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Send e-mails')"/></xsl:attribute>
- </input>
- </div>
+ <!--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=""/>
+ <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="mailbody" value="{mailbody}"/>
+ <input type="hidden" name="mailsubject" value="{mailsubject}"/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="building/tabs"/>
+ <div id="building">
+ <div class="pure-control-group">
+ <label for="field_contacts">
+ <h4><xsl:value-of select="php:function('lang',
'Recipients')"/> - (<xsl:value-of select="count(contacts)" />)</h4>
+ </label>
+ <select id="field_contacts" name="contacts" size="10">
+ <xsl:for-each select="contacts">
+ <xsl:sort select="name"/>
+ <option>
+ <xsl:attribute name="value"><xsl:value-of
select="email"/></xsl:attribute>
+ <xsl:value-of select="name"/>
<<xsl:value-of select="email"/>>
+ </option>
+ </xsl:for-each>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" name="sendmail">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Send e-mails')"/></xsl:attribute>
+ </input>
+ </div>
</form>
- </div>
+ <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/group.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/group.xsl 2015-09-11
23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/group.xsl 2015-09-12
00:03:16 UTC (rev 13885)
@@ -18,69 +18,70 @@
<xsl:value-of select="group/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="group/tabs"/>
- <div id="group">
- <fieldset>
+ <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="group/tabs"/>
+ <div id="group">
+ <fieldset>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Organization')" />
+ <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
</label>
- <xsl:value-of select="group/organization_name"/>
+ <xsl:value-of select="group/organization_name"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Name')" />
+ <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
</label>
- <xsl:value-of select="group/name"/>
+ <xsl:value-of select="group/name"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang', 'Group
shortname')" />
+ <h4><xsl:value-of select="php:function('lang',
'Group shortname')" /></h4>
</label>
- <xsl:value-of select="group/shortname"/>
+ <xsl:value-of select="group/shortname"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Activity')" />
+ <h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4>
</label>
- <xsl:value-of select="group/activity_name" />
+ <xsl:value-of select="group/activity_name" />
</div>
<div class="pure-control-group">
- <xsl:if test="count(group/contacts/*) >
0">
- <label>
- <xsl:value-of
select="php:function('lang', 'Team leaders')" />
- </label>
- <ul>
- <xsl:if
test="group/contacts[1]">
-
<li><xsl:value-of select="group/contacts[1]/name"/></li>
- </xsl:if>
-
- <xsl:if
test="group/contacts[2]">
- <li><xsl:value-of
select="group/contacts[2]/name"/></li>
- </xsl:if>
- </ul>
- </xsl:if>
+ <xsl:if test="count(group/contacts/*) > 0">
+ <label style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Team leaders')" /></h4>
+ </label>
+ <ul
style="list-style:none;display:inline-block;padding:0;margin:0;">
+ <xsl:if test="group/contacts[1]">
+ <li><xsl:value-of
select="group/contacts[1]/name"/></li>
+ </xsl:if>
+ <xsl:if test="group/contacts[2]">
+ <li><xsl:value-of
select="group/contacts[2]/name"/></li>
+ </xsl:if>
+ </ul>
+ </xsl:if>
</div>
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Description')" />
+ <label style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
</label>
+ <div style="display:inline-block;max-width:80%;">
<xsl:value-of select="group/description"
disable-output-escaping="yes"/>
+ </div>
</div>
- </fieldset>
- </div>
+ </fieldset>
</div>
- <div class="form-buttons">
- <a class="button pure-button pure-button-primary">
- <xsl:attribute name="href"><xsl:value-of
select="group/edit_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Edit')" />
- </a>
- </div>
- </form>
+ </div>
+ <div class="form-buttons">
+ <a class="button pure-button pure-button-primary">
+ <xsl:attribute name="href"><xsl:value-of
select="group/edit_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Edit')" />
+ </a>
+ </div>
+ </form>
<!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/group_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/group_edit.xsl
2015-09-11 23:15:02 UTC (rev 13884)
+++ branches/dev-syncromind/booking/templates/base/group_edit.xsl
2015-09-12 00:03:16 UTC (rev 13885)
@@ -13,167 +13,167 @@
</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="group/tabs"/>
- <div id="group_edit">
- <fieldset>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Group')" />
- </label>
- <input name="name" type="text"
value="{group/name}" />
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Group shortname')" />
- </label>
-
- <input name="shortname" type="text"
value="{group/shortname}" />
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Organization')" />
- </label>
- <!--div class="autocomplete"-->
- <input id="field_organization_id"
name="organization_id" type="hidden" value="{group/organization_id}"/>
- <input name="organization_name"
type="text" id="field_organization_name" value="{group/organization_name}">
- <xsl:if
test="group/organization_id">
- <xsl:attribute
name='disabled'>disabled</xsl:attribute>
- </xsl:if>
- </input>
- <div id="organization_container"/>
- <!--/div-->
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Activity')" />
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13885] fixing forms,
Saul <=