[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14521] php templates to xsl
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14521] php templates to xsl |
|
Date: |
Thu, 03 Dec 2015 00:22:50 +0000 |
Revision: 14521
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14521
Author: psaul
Date: 2015-12-03 00:22:49 +0000 (Thu, 03 Dec 2015)
Log Message:
-----------
php templates to xsl
Modified Paths:
--------------
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
Modified:
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
2015-12-03 00:11:51 UTC (rev 14520)
+++
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
2015-12-03 00:22:49 UTC (rev 14521)
@@ -181,7 +181,7 @@
);
}
- $this->render_template_xsl('activity_new', array
+ return self::render_template_xsl('activity_new', array
(
'activity' => $activity_options,
'new_organization' => $new_org,
@@ -392,7 +392,7 @@
$organization_options['edit_link'] =
self::link(array('menuaction' =>
'activitycalendarfrontend.uiactivity.edit_organization_values','organization_id'
=> $organization_options['id']));
- $this->render_template_xsl('activity', array
+ return self::render_template_xsl('activity', array
(
'activity' => $activity_options,
'organization' =>
$organization_options,
@@ -409,25 +409,6 @@
'ajaxURL' => $ajaxUrl
)
);
-
-// $this->render('activity.php', array
-// (
-// 'activity' => $activity,
-// 'organization' => $organization,
-// 'organization_id' => $organization_id,
-// 'group' => $group,
-// 'contact1' => $persons[0],
-// 'arenas' => $arenas,
-// 'buildings' => $buildings,
-// 'categories' => $categories,
-// 'targets' => $targets,
-// 'districts' => $districts,
-// 'offices' => $offices,
-// 'message' => isset($message) ?
$message : phpgw::get_var('message'),
-// 'error' => isset($error) ?
$error : phpgw::get_var('error'),
-// 'ajaxURL' => $ajaxUrl
-// )
-// );
} else {
if (!$target_ok) {
$error .= "<br/>" .
lang('target_not_selected');
@@ -457,7 +438,7 @@
);
}
- return
$this->render_template_xsl('activity_new', array (
+ return
self::render_template_xsl('activity_new', array (
'activity' => $activity_options,
'organization_id' => $organization_id,
'contact1' => $persons[0],
@@ -520,6 +501,22 @@
$activity_options['contact1_mail'] = (isset($persons[0])) ?
$persons[0]->get_email() : "";
$activity_options['office'] = ($activity->get_office()) ?
$this->so_activity->get_office_name($activity->get_office()) : "";
+ $activity_options['organization_id'] =
$activity->get_organization_id();
+
+ $organization =
$this->so_organization->get_single($activity_options['organization_id']);
+ $organization_options = Array();
+ $organization_options['id'] = $organization->get_id();
+ $organization_options['name'] = $organization->get_name();
+
+ $activity_options['contact_person_1_id'] =
$activity->get_contact_person_1();
+ $activity_options['group_id'] = $activity->get_group_id();
+
+ $persons =
$this->so_contact->get_local_contact_persons($activity_options['group_id'],
true);
+ $person = $persons[0];
+ $activity_options['contact1_name'] = $person->get_name();
+ $activity_options['contact1_phone'] = $person->get_phone();
+ $activity_options['contact1_mail'] = $person->get_email();
+
if ($activity->get_target()) {
$current_target_ids = $activity->get_target();
$current_target_id_array = explode(",", $current_target_ids);
@@ -536,11 +533,11 @@
}
}
- $data = array
- (
- 'activity' => $activity_options,
- 'errorMsgs' => $errorMsgs,
- 'infoMsgs' => $infoMsgs
+ $data = array (
+ 'activity' => $activity_options,
+ 'organization' => $organization_options,
+ 'errorMsgs' => $errorMsgs,
+ 'infoMsgs' => $infoMsgs
);
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
@@ -557,6 +554,7 @@
$config = $c->config_data;
$ajaxUrl = $c->config_data['AJAXURL'];
+ $helpImg =
$GLOBALS['phpgw']->common->image('activitycalendarfrontend', 'hjelp.gif');
$id = intval(phpgw::get_var('id', 'GET'));
@@ -567,6 +565,46 @@
$buildings = $this->so_arena->get_buildings();
$arenas = $this->so_arena->get(null, null, 'arena.arena_name',
true, null, null, null);
+ $category_options = Array();
+ foreach ($categories as $c) {
+ $category_options['list'][] = array(
+ 'id' => $c->get_id(),
+ 'name' => $c->get_name()
+ );
+ }
+
+ $building_options = Array();
+ foreach ($buildings as $building_id => $building_name) {
+ $building_options['list'][] = array(
+ 'id' => $building_id,
+ 'name' => $building_name
+ );
+ }
+
+ $arena_options = Array();
+ foreach ($arenas as $a) {
+ $arena_options['list'][] = array(
+ 'id' => $a->get_id(),
+ 'name' => $a->get_arena_name()
+ );
+ }
+
+ $district_options = Array();
+ foreach ($districts as $d) {
+ $district_options['list'][] = array(
+ 'part_of_town_id' => $d['part_of_town_id'],
+ 'name' => $d['name']
+ );
+ }
+
+ $office_options = Array();
+ foreach ($offices as $o) {
+ $office_options['list'][] = array(
+ 'id' => $o['id'],
+ 'name' => $o['name']
+ );
+ }
+
if (isset($_POST['step_1'])) { //change_request
$activity_id = phpgw::get_var('activity_id');
$activity =
$this->so_activity->get_single($activity_id);
@@ -579,12 +617,12 @@
//{
$this->send_email_to_selection(array($activity));
$message = lang('update_request_sent',
$activity->get_title(), $org->get_name());
- return $this->render('activity_edit_step_1.php', array
- (
-
'activities' => $activities,
-
'message' => $message,
-
'ajaxURL' => $ajaxUrl
-
)
+ return
self::render_template_xsl('activity_edit_step_1', array
+ (
+ 'activities' => $activities,
+ 'message' => $message,
+ 'ajaxURL' => $ajaxUrl
+ )
);
//}
} else {
@@ -593,22 +631,34 @@
//select activity to edit
$activities = $this->so_activity->get(null,
null, 'title', true, null, null, array('activity_state' => 3));
$organizations =
$this->so_organization->get(null, null, 'org.name', true, null, null,
array('edit_from_frontend' => 'yes'));
- return
$this->render('activity_edit_step_1.php', array
-
(
-
'activities' => $activities,
-
'organizations' => $organizations,
-
'ajaxURL' => $ajaxUrl
-
)
- );
+ $organization_options = Array();
+ foreach ($organizations as $o) {
+ $organization_options[] = array(
+ 'id' => $o->get_id(),
+ 'name' => $o->get_name()
+ );
+ }
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_edit_step_1.js');
+
+ return self::render_template_xsl('activity_edit_step_1', array(
+ 'activities' => $activities,
+ 'organizations' => $organization_options,
+ 'ajaxURL' => $ajaxUrl
+ )
+ );
}
if (!isset($secret_param) || $secret_param == '') {
//select activity to edit
$activities = $this->so_activity->get(null,
null, 'title', true, null, null, array('activity_state' => 3));
- return
$this->render('activity_edit_step_1.php', array
-
(
-
'activities' => $activities,
-
'ajaxURL' => $ajaxUrl
-
)
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_edit_step_1.js');
+
+ return
self::render_template_xsl('activity_edit_step_1', array
+ (
+ 'activities' => $activities,
+ 'ajaxURL' => $ajaxUrl
+ )
);
} else {
// Retrieve the activity object or create a new
one
@@ -616,22 +666,28 @@
$activity =
$this->so_activity->get_single($id);
} else {
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
- return
$this->render('activity_edit_step_1.php', array
-
(
-
'activities' => $activities,
-
'ajaxURL' => $ajaxUrl
-
)
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_edit_step_1.js');
+
+ return
self::render_template_xsl('activity_edit_step_1', array
+ (
+ 'activities' => $activities,
+ 'ajaxURL' => $ajaxUrl
+ )
);
}
if ($activity->get_secret() !=
phpgw::get_var('secret', 'GET')) {
//select activity to edit
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
- return
$this->render('activity_edit_step_1.php', array
-
(
-
'activities' => $activities,
-
'ajaxURL' => $ajaxUrl
-
)
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_edit_step_1.js');
+
+ return
self::render_template_xsl('activity_edit_step_1', array
+ (
+ 'activities' => $activities,
+ 'ajaxURL' => $ajaxUrl
+ )
);
}
@@ -654,8 +710,66 @@
if (strlen($desc) > 254) {
$desc = substr($desc, 0, 254);
}
+
+ $activity_options = Array();
+ $activity_options['id'] = ($activity->get_id()) ?
$activity->get_id() : "0";
+ $activity_options['title'] = $activity->get_title();
+ $activity_options['description'] =
$activity->get_description();
+ $activity_options['category'] = ($activity->get_category()) ?
$this->so_activity->get_category_name($activity->get_category()) : "";
+ $activity_options['targets'] = "";
+ $activity_options['special_adaptation'] =
($activity->get_special_adaptation()) ? true : false;
+ $activity_options['internal_arena'] =
($activity->get_internal_arena()) ? true : false;
+ $activity_options['building_name'] =
$this->so_arena->get_building_name($activity->get_internal_arena());
+ $activity_options['arena'] = ($activity->get_arena()) ? true :
false;
+ $activity_options['arena_name'] =
$this->so_arena->get_arena_name($activity->get_arena());
+ $activity_options['districts'] = "";
+ $activity_options['time'] = $activity->get_time();
+ $activity_options['contact_person_1'] =
($activity->get_contact_person_1()) ? true : false;
+ $activity_options['contact1_name'] =
(isset($persons_array[0])) ? $persons_array[0]->get_name() : "";
+ $activity_options['contact1_phone'] =
(isset($persons_array[0])) ? $persons_array[0]->get_phone() : "";
+ $activity_options['contact1_mail'] =
(isset($persons_array[0])) ? $persons_array[0]->get_email() : "";
+ $activity_options['office'] = ($activity->get_office()) ?
$this->so_activity->get_office_name($activity->get_office()) : "";
+ $activity_options['group_id'] = $activity->get_group_id();
+
+ $category_options['current_category_id'] =
($activity->get_category()) ? $activity->get_category() : "";
+ $district_options['current_district_id'] =
($activity->get_district()) ? $activity->get_district() : "";
+ $office_options['selected_office'] = ($activity->get_office())
? $activity->get_office() : "";
+ $building_options['selected_internal_arena'] =
($activity->get_internal_arena()) ? $activity->get_internal_arena() : "";
+ $arena_options['selected_arena'] = ($activity->get_arena()) ?
$activity->get_arena() : "";
+
+ $current_target_ids = $activity->get_target();
+ $current_target_id_array = explode(",", $current_target_ids);
+ $target_options = Array();
+ foreach ($targets as $t) {
+ $checked = (in_array($t->get_id(),
$current_target_id_array)) ? "checked" : "";
+ $target_options[] = array(
+ 'id' => $t->get_id(),
+ 'name' => $t->get_name(),
+ 'checked' => $checked
+ );
+ }
+
+ if ($activity->get_target()) {
+ $current_target_ids = $activity->get_target();
+ $current_target_id_array = explode(",",
$current_target_ids);
+ foreach ($current_target_id_array as $ct) {
+ $activity_options['targets'] .=
$this->so_activity->get_target_name($ct) . "<br />";
+ }
+ }
+
+ if ($activity->get_district()) {
+ $current_district_ids = $activity->get_district();
+ $current_district_id_array = explode(",",
$current_district_ids);
+ foreach ($current_district_id_array as $cd) {
+ $activity_options['districts'] .=
$this->so_activity->get_district_name($cd) . "<br />";
+ }
+ }
+
$organization =
$this->so_organization->get_single($activity->get_organization_id());
-
+ $organization_options = Array();
+ $organization_options['id'] = $organization->get_id();
+ $organization_options['name'] = $organization->get_name();
+
$change_activity_request = FALSE;
if (isset($_POST['save_activity'])) { // The
user has pressed the save button
if (isset($activity)) { // If an
activity object is created
@@ -705,6 +819,65 @@
$district_ok = true;
}
+ $activity_options = Array();
+ $activity_options['id'] = ($activity->get_id()) ?
$activity->get_id() : "0";
+ $activity_options['title'] = $activity->get_title();
+ $activity_options['description'] =
$activity->get_description();
+ $activity_options['category'] =
($activity->get_category()) ?
$this->so_activity->get_category_name($activity->get_category()) : "";
+ $activity_options['targets'] = "";
+ $activity_options['special_adaptation'] =
($activity->get_special_adaptation()) ? true : false;
+ $activity_options['internal_arena'] =
($activity->get_internal_arena()) ? true : false;
+ $activity_options['building_name'] =
$this->so_arena->get_building_name($activity->get_internal_arena());
+ $activity_options['arena'] = ($activity->get_arena())
? true : false;
+ $activity_options['arena_name'] =
$this->so_arena->get_arena_name($activity->get_arena());
+ $activity_options['districts'] = "";
+ $activity_options['time'] = $activity->get_time();
+ $activity_options['contact_person_1'] =
($activity->get_contact_person_1()) ? true : false;
+ $activity_options['contact1_name'] =
(isset($persons_array[0])) ? $persons_array[0]->get_name() : "";
+ $activity_options['contact1_phone'] =
(isset($persons_array[0])) ? $persons_array[0]->get_phone() : "";
+ $activity_options['contact1_mail'] =
(isset($persons_array[0])) ? $persons_array[0]->get_email() : "";
+ $activity_options['office'] =
($activity->get_office()) ?
$this->so_activity->get_office_name($activity->get_office()) : "";
+ $activity_options['group_id'] =
$activity->get_group_id();
+
+ $category_options['current_category_id'] =
($activity->get_category()) ? $activity->get_category() : "";
+ $district_options['current_district_id'] =
($activity->get_district()) ? $activity->get_district() : "";
+ $office_options['selected_office'] =
($activity->get_office()) ? $activity->get_office() : "";
+ $building_options['selected_internal_arena'] =
($activity->get_internal_arena()) ? $activity->get_internal_arena() : "";
+ $arena_options['selected_arena'] =
($activity->get_arena()) ? $activity->get_arena() : "";
+
+ $current_target_ids = $activity->get_target();
+ $current_target_id_array = explode(",",
$current_target_ids);
+ $target_options = Array();
+ foreach ($targets as $t) {
+ $checked = (in_array($t->get_id(),
$current_target_id_array)) ? "checked" : "";
+ $target_options[] = array(
+ 'id' => $t->get_id(),
+ 'name' => $t->get_name(),
+ 'checked' => $checked
+ );
+ }
+
+ if ($activity->get_target()) {
+ $current_target_ids = $activity->get_target();
+ $current_target_id_array = explode(",",
$current_target_ids);
+ foreach ($current_target_id_array as $ct) {
+ $activity_options['targets'] .=
$this->so_activity->get_target_name($ct) . "<br />";
+ }
+ }
+
+ if ($activity->get_district()) {
+ $current_district_ids = $activity->get_district();
+ $current_district_id_array = explode(",",
$current_district_ids);
+ foreach ($current_district_id_array as $cd) {
+ $activity_options['districts'] .=
$this->so_activity->get_district_name($cd) . "<br />";
+ }
+ }
+
+ $organization =
$this->so_organization->get_single($activity->get_organization_id());
+ $organization_options = Array();
+ $organization_options['id'] = $organization->get_id();
+ $organization_options['name'] =
$organization->get_name();
+
if ($target_ok && $district_ok)
{
if
($this->so_activity->store($activity)) { // ... and then try to store the object
@@ -725,10 +898,10 @@
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
-
$this->render('activity.php', array
- (
-
'activity' => $activity,
-
'organization' => $organization,
+ return
self::render_template_xsl('activity', array
+ (
+
'activity' => $activity_options,
+
'organization' => $organization_options,
'group'
=> $group,
'contact1' => $persons_array_tmp[0],
'arenas' => $arenas,
@@ -739,8 +912,9 @@
'offices' => $offices,
'message' => isset($message) ? $message : phpgw::get_var('message'),
'error'
=> isset($error) ? $error : phpgw::get_var('error'),
+ 'helpImg' => $helpImg,
'ajaxURL' => $ajaxUrl
-
)
+ )
);
} else {
if (!$target_ok) {
@@ -749,48 +923,55 @@
if (!$district_ok) {
$error .=
"<br/>" . lang('district_not_selected');
}
- return
$this->render('activity_edit.php', array
-
(
-
'activity' => $activity,
-
'organization' => $organization,
-
'contact1' => $persons_array[0],
-
'org_name' => $org_name,
-
'group' => $group,
-
'arenas' => $arenas,
-
'buildings' => $buildings,
-
'categories' => $categories,
-
'targets' => $targets,
-
'districts' => $districts,
-
'offices' => $offices,
-
'editable' => true,
-
'cancel_link' => $cancel_link,
-
'message' => isset($message) ? $message :
phpgw::get_var('message'),
-
'error' => isset($error) ? $error :
phpgw::get_var('error'),
-
'ajaxURL' => $ajaxUrl
-
)
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_edit.js');
+
+ return
self::render('activity_edit', array
+ (
+ 'activity' => $activity_options,
+ 'organization' => $organization_options,
+ 'contact1' => $persons_array[0],
+ 'org_name' => $org_name,
+ 'group' => $group,
+ 'arenas' => $arena_options,
+ 'buildings' => $building_options,
+ 'categories' => $category_options,
+ 'targets' => $target_options,
+ 'districts' => $district_options,
+ 'offices' => $office_options,
+ 'editable' => true,
+ 'cancel_link' => $cancel_link,
+ 'message' => isset($message) ? $message :
phpgw::get_var('message'),
+ 'error' => isset($error) ? $error :
phpgw::get_var('error'),
+ 'helpImg' => $helpImg,
+ 'ajaxURL' => $ajaxUrl
+ )
);
}
}
} else if (isset($_POST['change_request'])) {
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_edit.js');
- $this->render('activity_edit.php', array
- (
- 'activity' => $activity,
- 'organization' =>
$organization,
+ return
self::render_template_xsl('activity_edit', array
+ (
+ 'activity' =>
$activity_options,
+ 'organization' =>
$organization_options,
'group' => $group,
'contact1' =>
$persons_array[0],
- 'arenas' => $arenas,
- 'buildings' =>
$buildings,
- 'categories' =>
$categories,
- 'targets' => $targets,
- 'districts' =>
$districts,
- 'offices' => $offices,
+ 'arenas' =>
$arena_options,
+ 'buildings' =>
$building_options,
+ 'categories' =>
$category_options,
+ 'targets' =>
$target_options,
+ 'districts' =>
$district_options,
+ 'offices' =>
$office_options,
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'helpImg' => $helpImg,
'ajaxURL' => $ajaxUrl
- )
+ )
);
} else if (isset($_POST['activity_ok'])) { //
The user has pressed the save button
if (isset($activity)) { // If an
activity object is created
@@ -801,10 +982,10 @@
}
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
- $this->render('activity.php',
array
- (
- 'activity' =>
$activity,
- 'organization'
=> $organization,
+ return
self::render_template_xsl('activity', array
+ (
+ 'activity' =>
$activity_options,
+ 'organization'
=> $organization_options,
'group' =>
$group,
'contact1' =>
$persons_array[0],
'arenas' =>
$arenas,
@@ -815,17 +996,18 @@
'offices' =>
$offices,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'helpImg' => $helpImg,
'ajaxURL' =>
$ajaxUrl
-
)
+ )
);
}
} else {
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
- $this->render('activity.php', array
- (
- 'activity' => $activity,
- 'organization' =>
$organization,
+ return
self::render_template_xsl('activity', array
+ (
+ 'activity' =>
$activity_options,
+ 'organization' =>
$organization_options,
'group' => $group,
'contact1' =>
$persons_array[0],
'arenas' => $arenas,
@@ -838,8 +1020,9 @@
'change_request' =>
true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'helpImg' => $helpImg,
'ajaxURL' => $ajaxUrl
- )
+ )
);
}
}
@@ -895,6 +1078,9 @@
function edit_organization_values() {
$org_id = phpgw::get_var('organization_id');
if (isset($org_id)) {
+
+ $helpImg =
$GLOBALS['phpgw']->common->image('activitycalendarfrontend', 'hjelp.gif');
+
if (isset($_POST['save_org'])) { //save updated
organization info
$organization =
$this->so_organization->get_single($org_id);
@@ -926,10 +1112,11 @@
$message = lang('change_request_ok',
$org_info['name']);
$this->render('organization_reciept.php', array
- (
+ (
'message' => isset($message) ?
$message : phpgw::get_var('message'),
- 'error' => isset($error) ?
$error : phpgw::get_var('error')
- )
+ 'error' => isset($error) ?
$error : phpgw::get_var('error'),
+ 'helpImg' => $helpImg
+ )
);
} else {
$c = createobject('phpgwapi.config',
'activitycalendarfrontend');
@@ -942,14 +1129,30 @@
foreach ($person_arr as $p) {
$persons[] = $p;
}
+
+ $organization_options = Array();
+ $organization_options['id'] = $organization->get_id();
+ $organization_options['name'] = $organization->get_name();
+ $organization_options['number'] =
$organization->get_organization_number();
+ $organization_options['address'] =
$organization->get_address();
+ $organization_options['zip_code'] =
$organization->get_zip_code();
+ $organization_options['city'] = $organization->get_city();
+ $organization_options['homepage'] =
$organization->get_homepage();
+
+ $organization_options['contact1_name'] =
$persons[0]->get_name();
+ $organization_options['contact1_phone'] =
$persons[0]->get_phone();
+ $organization_options['contact1_mail'] =
$persons[0]->get_email();
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'organization_edit.js');
- $this->render('organization_edit.php', array
+ return
self::render_template_xsl('organization_edit', array
(
- 'organization' => $organization,
+ 'organization' =>
$organization_options,
'contact1' => $persons[0],
'editable' => true,
'message' => isset($message) ?
$message : phpgw::get_var('message'),
'error' => isset($error) ?
$error : phpgw::get_var('error'),
+ 'helpImg' => $helpImg,
'ajaxURL' => $ajaxUrl
)
);
Modified:
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
2015-12-03 00:11:51 UTC (rev 14520)
+++
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
2015-12-03 00:22:49 UTC (rev 14521)
@@ -25,7 +25,7 @@
// var divcontent_start = "<select name=\"activity_id\"
id=\"activity_id\">";
// var divcontent_end = "</select>";
- var url = phpGWLink('activitycalendarfrontend/', {menuaction:
'activitycalendarfrontend.uiactivity.get_organization_activities', orgid:
'org_id'}, true);
+ var url = phpGWLink('activitycalendarfrontend/', {menuaction:
'activitycalendarfrontend.uiactivity.get_organization_activities', orgid:
org_id}, true);
var attr = [{name: 'name', value: 'activity_id'}, {name: 'id', value:
'activity_id'}];
@@ -39,10 +39,10 @@
// }
// var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
- div_select.hide();
+// div_select.hide();
if (org_id && org_id != current_org_id_get_activities) {
- div_select.show();
+// div_select.show();
populateSelect_activityCalendar(url, div_select, attr);
current_org_id_get_activities = org_id;
}
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
2015-12-03 00:11:51 UTC (rev 14520)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
2015-12-03 00:22:49 UTC (rev 14521)
@@ -17,9 +17,9 @@
</div>
<form action="" method="post" name="form" id="form">
<input type="hidden" name="id">
- <xsl:attributed name="value">
+ <xsl:attribute name="value">
<xsl:value-of select="activity/id" />
- </xsl:attributed>
+ </xsl:attribute>
</input>
<dl class="proplist-col">
<div class="form-buttons">
@@ -117,7 +117,7 @@
<xsl:attribute name="href">
<xsl:value-of
select="organization/edit_link" />
</xsl:attribute>
- <xsl:value-of select="php:function('lang',
'edit_organization')" />
+ <xsl:value-of select="concat(' ',
php:function('lang', 'edit_organization'))" />
</a>
</xsl:if>
</xsl:if>
@@ -155,9 +155,9 @@
</xsl:attribute>
</input>
<input type="submit" name="change_request">
- <xsl:attributed name="value">
+ <xsl:attribute name="value">
<xsl:value-of select="php:function('lang',
'change_activity')" />
- </xsl:attributed>
+ </xsl:attribute>
</input>
</xsl:if>
</div>
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
2015-12-03 00:11:51 UTC (rev 14520)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
2015-12-03 00:22:49 UTC (rev 14521)
@@ -1,18 +1,16 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div>
<div id="details">
- <xsl:choose>
- <xsl:when test="message">
- <div class="success">
- <xsl:value-of select="message" />
- </div>
- </xsl:when>
- <xsl:when test="error">
- <div class="error">
- <xsl:value-of select="error" />
- </div>
- </xsl:when>
- </xsl:choose>
+ <xsl:if test="message != ''">
+ <div class="success">
+ <xsl:value-of select="message"
disable-output-escaping="yes" />
+ </div>
+ </xsl:if>
+ <xsl:if test="error != ''">
+ <div class="error">
+ <xsl:value-of select="error" disable-output-escaping="yes"
/>
+ </div>
+ </xsl:if>
</div>
<div class="pageTop">
<h1><xsl:value-of select="php:function('lang', 'activity')" /></h1>
@@ -23,14 +21,14 @@
<form action="" method="post" name="form" id="form">
<input type="hidden" name="id">
<xsl:attribute name="value">
-
+ <xsl:value-of select="activity/id" />
</xsl:attribute>
</input>
<dl class="proplist-col">
<fieldset>
- <xsl:attributed name="title">
+ <xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'what')" />
- </xsl:attributed>
+ </xsl:attribute>
<legend>Hva</legend>
<dt>
<label for="title">
@@ -46,7 +44,7 @@
<dd>
<input type="text" name="title" id="title" size="83"
maxlength="254">
<xsl:attribute name="value">
-
+ <xsl:value-of select="activity/title" />
</xsl:attribute>
</input>
</dd>
@@ -63,7 +61,7 @@
</dt>
<dd>
<textarea cols="80" rows="4" name="description"
id="description">
-
+ <xsl:value-of select="activity/description" />
</textarea>
</dd>
<dt>
@@ -79,9 +77,19 @@
</dt>
<dd>
<select name="category" id="category">
- <option value="0">Ingen kategori valgt</option>
- <xsl:for-each select="categories">
- <option value=""></option>
+ <option value="">Ingen kategori valgt</option>
+ <xsl:for-each select="categories/list">
+ <option>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id" />
+ </xsl:attribute>
+ <xsl:if test="../current_category_id = id">
+ <xsl:attribute name="selected">
+ <xsl:value-of select="selected" />
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="name" />
+ </option>
</xsl:for-each>
</select>
</dd>
@@ -102,21 +110,34 @@
<dd>
<xsl:for-each select="targets">
<input name="target[]" type="checkbox">
+ <xsl:if test="checked != ''">
+ <xsl:attribute name="checked">
+ <xsl:value-of select="checked" />
+ </xsl:attribute>
+ </xsl:if>
<xsl:attribute name="value">
-
+ <xsl:value-of select="id" />
</xsl:attribute>
</input>
+ <xsl:value-of select="name" />
<br />
</xsl:for-each>
</dd>
<dt>
- <input type="checkbox" name="special_adaptation"
id="special_adaptation" />
+ <input type="checkbox" name="special_adaptation"
id="special_adaptation">
+ <xsl:if test="activity/special_adaptation = 1">
+ <xsl:attribute name="checked">
+ checked
+ </xsl:attribute>
+ </xsl:if>
+ </input>
<label for="special_adaptation">
<xsl:value-of select="php:function('lang',
'special_adaptation')" />
<a href="javascript:void(0);">
<xsl:attribute name="onclick">
alert('<xsl:value-of
select="php:function('lang', 'help_new_activity_spec_adapt')" />');return false;
</xsl:attribute>
+ <img alt="Hjelp" src="{helpImg}" />
</a>
</label>
</dt>
@@ -138,19 +159,45 @@
</dt>
<dd>
<select name="internal_arena_id"
id="internal_arena_id" style="width:200px">
- <option value="0">Lokale ikke valgt</option>
+ <option value="">Lokale ikke valgt</option>
<optgroup>
<xsl:attribute name="label">
- <xsl:value-of select="php:function('lang',
'buildings')" />
+ <xsl:value-of select="php:function('lang',
'building')" />
</xsl:attribute>
- <xsl:for-each select="buildings">
-
+ <xsl:for-each select="buildings/list">
+ <option>
+ <xsl:if
test="../selected_internal_arena = id">
+ <xsl:attribute name="selected">
+ selected
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of select="concat('i_',
id)" />
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
</xsl:for-each>
</optgroup>
<optgroup>
<xsl:attribute name="label">
- <xsl:value-fo select="php.function('lang',
'external_arena')" />
+ <xsl:value-of select="php:function('lang',
'external_arena')" />
</xsl:attribute>
+ <xsl:for-each select="arenas/list">
+ <option>
+ <xsl:if test="../selected_arena = id">
+ <xsl:attribute name="selected">
+ selected
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id" />
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:value-of select="name" />
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
+ </xsl:for-each>
</optgroup>
</select>
<br />
@@ -167,13 +214,19 @@
</label>
</dt>
<dd>
- <xsl:value-of select="districts">
- <input name="district" type="radio">
+ <xsl:for-each select="districts/list">
+ <input type="radio" name="district">
<xsl:attribute name="value">
-
+ <xsl:value-of select="part_of_town_id" />
</xsl:attribute>
+ <xsl:if test="../current_district_id =
part_of_town_id">
+ <xsl:attribute name="checked">
+ <xsl:value-of select="checked" />
+ </xsl:attribute>
+ </xsl:if>
</input>
- </xsl:value-of>
+ <xsl:value-of select="name" /><br />
+ </xsl:for-each>
</dd>
<dt>
<label for="time">
@@ -189,7 +242,7 @@
<dd>
<input type="text" name="time" id="time" size="80"
maxlength="254">
<xsl:attribute name="value">
-
+ <xsl:value-of select="activity/time" />
</xsl:attribute>
</input>
</dd>
@@ -208,25 +261,33 @@
<dt><label for="contact_name">Navn (*)</label></dt>
<dd>
<input type="text" name="contact_name"
id="contact_name" size="80">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="activity/contact1_name"
/>
+ </xsl:attribute>
</input>
</dd>
<dt><label for="contact_phone">Telefon (*)</label></dt>
<dd>
- <input type="text" name="contact_phone"
id="contact_name">
- <xsl:attibute name="value"></xsl:attibute>
+ <input type="text" name="contact_phone"
id="contact_phone">
+ <xsl:attribute name="value">
+ <xsl:value-of select="activity/contact1_phone"
/>
+ </xsl:attribute>
</input>
</dd>
<dt><label for="contact_mail">E-post (*)</label></dt>
<dd>
<input type="text" name="contact_mail"
id="contact_mail" size="50">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="activity/contact1_mail"
/>
+ </xsl:attribute>
</input>
</dd>
<dt><label for="contact_mail2">Gjenta e-post
(*)</label></dt>
<dd>
<input type="text" name="contact_mail2"
id="contact_mail2" size="50">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="activity/contact1_mail"
/>
+ </xsl:attribute>
</input>
</dd>
</fieldset>
@@ -243,17 +304,44 @@
</a>
</label>
</dt>
+ <dd>
+ <select name="office" id="office">
+ <option value="0">Ingen kontor valgt</option>
+ <xsl:for-each select="offices/list">
+ <option>
+ <xsl:if test="../selected_office = id">
+ <xsl:attribute name="selected">
+ selected
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id" />
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
+ </xsl:for-each>
+ </select>
+ </dd>
</fieldset>
+ <div class="form-buttons">
+ <xsl:if test="editable">
+ <input type="submit" name="save_activity"
onclick="return allOK();">
+ <xsl:attribute name="value">
+ <xsl:value-of select="php:function('lang',
'save')" />
+ </xsl:attribute>
+ </input>
+ </xsl:if>
+ </div>
</dl>
</form>
</div>
<script type="text/javascript">
- var org_id = "";
- <xsl:if test="">
- var group_id = "";
+ var org_id = $('#organization_id').val();
+ <xsl:if test="activity/group_id">
+ var group_id = '<xsl:value-of select="activity/group_id" />';
var availableGroupsURL = phpGWLink('activitycalendarfrontend/',
{menuaction: 'activitycalendarfrontend.uiactivity.get_organization_groups',
orgid: org_id, groupid: group_id}, true);
</xsl:if>
- <xsl:if test="">
+ <xsl:if test="not(activity/group_id)">
var availableGroupsURL = phpGWLink('activitycalendarfrontend/',
{menuaction: 'activitycalendarfrontend.uiactivity.get_organization_groups',
orgid: org_id}, true);
</xsl:if>
</script>
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
2015-12-03 00:11:51 UTC (rev 14520)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
2015-12-03 00:22:49 UTC (rev 14521)
@@ -3,18 +3,27 @@
<div class="pageTop">
<h1><xsl:value-of select="php:function('lang', 'edit_activity')"
/></h1>
<form action="" method="post" name="form" id="form">
- <dl class="porplist-col" style="width:200%">
+ <dl class="proplist-col" style="width:200%">
<dt>
<xsl:if test="message">
-
+ <xsl:value-of select="message" />
</xsl:if>
+ <xsl:if test="not(message)">
+ <xsl:value-of select="php:function('lang',
'activity_edit_helptext_step1')" disable-output-escaping="yes" />
+ <br/><br/>
+ </xsl:if>
</dt>
- <xsl:if test="message">
+ <xsl:if test="not(message)">
<dd>
<select name="organization_id"
id="organization_id" onchange="javascript:get_activities();">
<option value="">Ingen organisasjon
valgt</option>
<xsl:for-each select="organizations">
- <option value=""></option>
+ <option>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id" />
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
</xsl:for-each>
</select>
</dd>
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
2015-12-03 00:11:51 UTC (rev 14520)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
2015-12-03 00:22:49 UTC (rev 14521)
@@ -1,25 +1,25 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div>
<div id="details">
- <xsl:choose>
- <xsl:when test="message">
- <div class="success">
- <xsl:value-of select="message" />
- </div>
- </xsl:when>
- <xsl:when test="error">
- <div class="error">
- <xsl:value-of select="error" />
- </div>
- </xsl:when>
- </xsl:choose>
+ <xsl:if test="message != ''">
+ <div class="success">
+ <xsl:value-of select="message"
disable-output-escaping="yes" />
+ </div>
+ </xsl:if>
+ <xsl:if test="error != ''">
+ <div class="error">
+ <xsl:value-of select="error" disable-output-escaping="yes"
/>
+ </div>
+ </xsl:if>
</div>
<div class="pageTop">
<h1><xsl:value-of select="php:function('lang',
'edit_organization')" /></h1>
<form action="" method="post" name="form" id="form">
<dl class="proplist-col">
<input type="hidden" name="organization_id"
id="organization_id">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="organization/id" />
+ </xsl:attribute>
</input>
<div style="overflow:auto;">
<p>
@@ -44,13 +44,17 @@
</dt>
<dd>
<input type="text" name="orgname" id="orgname"
size="80" maxlength="254">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="organization/name" />
+ </xsl:attribute>
</input>
</dd>
<dt><label for="orgno">Organisasjonsnummer</label></dt>
<dd>
<input type="text" name="orgno" maxlength="254">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="organization/number"
/>
+ </xsl:attribute>
</input>
</dd>
<dt style="margin-right:20px;float:left;">
@@ -63,7 +67,9 @@
</a>
<br />
<input type="text" name="address" id="address"
onkeyup="javascript:get_address_search()" size="50">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="organization/address" />
+ </xsl:attribute>
</input>
<br />
<div id="address_container" />
@@ -75,13 +81,17 @@
<dt style="clear:left;margin-right:20px;float:left;">
<label for="postzip">Postnummer</label><br />
<input type="text" name="postzip" size="5">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="organization/zip_code" />
+ </xsl:attribute>
</input>
</dt>
<dt style="float:left;">
<label for="postaddress">Poststed</label><br />
<input type="text" name="postaddress" size="40">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="organization/city" />
+ </xsl:attribute>
</input>
</dt><br /><br />
</div>
@@ -98,7 +108,9 @@
</dt>
<dd>
<input type="text" name="homepage" size="80">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="organization/homepage" />
+ </xsl:attribute>
</input>
</dd><br /><br />
<div style="overflow:auto;">
@@ -112,25 +124,33 @@
<dt><label for="contact1_name">Navn (*)</label></dt>
<dd>
<input name="org_contact1_name"
id="org_contact1_name" size="80" type="text">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="organization/contact1_name" />
+ </xsl:attribute>
</input>
</dd>
<dt><label for="contact1_phone">Telefon
(*)</label></dt>
<dd>
<input name="org_contact1_phone"
id="org_contact1_phone" type="text">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="organization/contact1_phone" />
+ </xsl:attribute>
</input>
</dd>
<dt><label for="contact1_mail">E-post (*)</label></dt>
<dd>
<input name="org_contact1_mail"
id="org_contact1_mail" size="50" type="text">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="organization/contact1_mail" />
+ </xsl:attribute>
</input>
</dd>
<dt><label for="contact2_mail">Gjenta e-post
(*)</label></dt>
<dd>
<input name="org_contact2_mail"
id="org_contact2_mail" size="50" type="text">
- <xsl:attribute name="value"></xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="organization/contact1_mail" />
+ </xsl:attribute>
</input>
</dd>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14521] php templates to xsl,
Saul <=