[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14504] php templates to xsl
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14504] php templates to xsl |
|
Date: |
Mon, 30 Nov 2015 23:53:30 +0000 |
Revision: 14504
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14504
Author: psaul
Date: 2015-11-30 23:53:29 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
php templates to xsl
Modified Paths:
--------------
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
branches/dev-syncromind/activitycalendarfrontend/templates/base/css/base.css
Modified:
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
2015-11-29 14:52:40 UTC (rev 14503)
+++
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
2015-11-30 23:53:29 UTC (rev 14504)
@@ -43,6 +43,7 @@
$config = $c->config_data;
$ajaxUrl = $c->config_data['AJAXURL'];
+ $helpImg =
$GLOBALS['phpgw']->common->image('activitycalendarfrontend', 'hjelp.gif');
$categories = $this->so_activity->get_categories();
$targets = $this->so_activity->get_targets();
@@ -51,13 +52,79 @@
$buildings = $this->so_arena->get_buildings();
$arenas = $this->so_arena->get(null, null, 'arena.arena_name',
true, null, null, null);
$organizations = $this->so_organization->get(null, null,
'org.name', true, null, null, null);
+
+ $activity = new activitycalendar_activity();
- $activity = new activitycalendar_activity();
+ $organization_options = Array();
+ foreach ($organizations as $organization) {
+ $organization_options[] = array(
+ 'id' => $organization->get_id(),
+ 'name' => $organization->get_name()
+ );
+ }
+ $category_options = Array();
+ $category_options['current_category_id'] = ($activity->get_category())
? $activity->get_category() : "";
+ foreach ($categories as $category) {
+ $category_options['list'][] = array(
+ 'id' => $category->get_id(),
+ 'name' => $category->get_name()
+ );
+ }
+
+ $current_target_ids = $activity->get_target();
+ $current_target_id_array = explode(",", $current_target_ids);
+ $target_options = Array();
+ foreach ($targets as $target) {
+ $checked = (in_array($target->get_id(), $current_target_id_array))
? "checked" : "";
+ $target_options[] = array(
+ 'id' => $target->get_id(),
+ 'name' => $target->get_name(),
+ 'checked' => $checked
+ );
+ }
+
+ $arena_options = Array();
+ foreach ($arenas as $arena) {
+ $arena_options[] = array(
+ 'id' => $arena->get_id(),
+ 'name' => $arena->get_arena_name()
+ );
+ }
+
+ $building_options = Array();
+ foreach ($buildings as $building_id => $building_name) {
+ $building_options[] = array(
+ 'id' => $building_id,
+ 'name' => $building_name
+ );
+ }
+
+ $office_options = Array();
+ $office_options['selected_office'] = ($activity->get_office()) ?
$activity->get_office() : "";
+ foreach ($offices as $office) {
+ $office_options['list'][] = array(
+ 'id' => $office['id'],
+ 'name' => $office['name']
+ );
+ }
+
+ $activity_options = Array();
+ $activity_options['id'] = ($activity->get_id()) ? $activity->get_id()
: 0;
+ $activity_options['time'] = $activity->get_time();
+ $activity_options['title'] = $activity->get_title();
+
$o_id = phpgw::get_var('organization_id');
$o_id_new = phpgw::get_var('organization_id_hidden');
+
+ $o_id = 1098;
+ $_POST['step_1'] = 'Neste';
- if (isset($_POST['step_1'])) { //activity shall be registred on
a new organization
+ if (isset($_POST['step_1']))
+ { //activity shall be registred on a new organization
+
+ self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_new.js');
+
if ($o_id_new == "new_org") {
//add new organization to internal
activitycalendar organization register
$org_homepage = phpgw::get_var('homepage');
@@ -96,86 +163,44 @@
$organization =
$this->so_organization->get_organization_local($o_id);
$person_arr =
$this->so_organization->get_contacts_local_as_objects($o_id);
foreach ($person_arr as $p) {
- //var_dump($p);
$persons[] = $p;
}
$message = lang('organization_saved_form');
-
- $this->render('activity_new.php', array
- (
- 'activity' => $activity,
- 'new_organization' => true,
- 'organization' => $organization,
- 'contact1' => $persons[0],
- 'arenas' => $arenas,
- 'buildings' => $buildings,
- 'categories' => $categories,
- 'targets' => $targets,
- 'districts' => $districts,
- 'offices' => $offices,
- 'editable' => true,
- 'message' => isset($message) ?
$message : phpgw::get_var('message'),
- 'error' => isset($error) ?
$error : phpgw::get_var('error'),
- 'ajaxURL' => $ajaxUrl
- )
- );
} else {
$new_org = false;
$organization =
$this->so_organization->get_single($o_id);
$person_arr = $this->so_contact->get(null,
null, null, null, null, null, array('organization_id' => $o_id));
foreach ($person_arr as $p) {
- //var_dump($p);
$persons[] = $p;
}
-
$activity->set_organization_id($o_id);
$activity->set_description($organization->get_description());
- $activity->set_contact_persons($pers);
-
- self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_new.js');
+ $activity->set_contact_persons($pers);
+ }
+
+ $organization_id = $organization->get_id();
-// self::render_template_xsl(
-// 'activity_new',
-// array(
-// 'activity' => $activity,
-// 'new_organization' => false,
-// 'organization' => $organization,
-// 'contact1' => $persons[0],
-// 'arenas' => $arenas,
-// 'buildings' => $buildings,
-// 'categories' => $categories,
-// 'targets' => $targets,
-// 'districts' => $districts,
-// 'offices' => $offices,
-// 'editable' => true,
-// 'message' => isset($message) ? $message :
phpgw::get_var('message'),
-// 'error' => isset($error) ? $error :
phpgw::get_var('error'),
-// 'helpImg' =>
$GLOBALS['phpgw']->common->image('activitycalendarfrontend', 'hjelp.gif'),
-// 'ajaxURL' => $ajaxUrl
-// )
-// );
-
- $this->render('activity_new.php', array
- (
- 'activity' => $activity,
- 'new_organization' => false,
- 'organization' => $organization,
- 'contact1' => $persons[0],
- 'arenas' => $arenas,
- 'buildings' => $buildings,
- 'categories' => $categories,
- 'targets' => $targets,
- 'districts' => $districts,
- 'offices' => $offices,
- 'editable' => true,
- 'message' => isset($message) ?
$message : phpgw::get_var('message'),
- 'error' => isset($error) ?
$error : phpgw::get_var('error'),
- 'ajaxURL' => $ajaxUrl
- )
- );
- }
+ $this->render_template_xsl('activity_new', array
+ (
+ 'activity' => $activity_options,
+ 'new_organization' => $new_org,
+ 'organization_id' => $organization_id,
+ 'contact1' => $persons[0],
+ 'arenas' => $arena_options,
+ 'buildings' => $building_options,
+ 'categories' => $category_options,
+ 'targets' => $target_options,
+ 'districts' => $districts,
+ '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['save_activity'])) {
$get_org_from_local = false;
$new_org_group = false;
@@ -316,6 +341,8 @@
$district_ok = true;
}
+ $organization_id = $organization->get_id();
+
if ($target_ok && $district_ok) {
if ($this->so_activity->store($activity)) { //
... and then try to store the object
$message = lang('messages_saved_form');
@@ -323,6 +350,8 @@
$error = lang('messages_form_error');
}
//$org_info_edit_url = self::link('/index.php'
,array('menuaction' =>
'activitycalendarfrontend.uiactivity.edit_organization_values'));
+
+
$GLOBALS['phpgw_info']['flags']['noframework']
= true;
@@ -330,6 +359,7 @@
(
'activity' => $activity,
'organization' => $organization,
+ 'organization_id' => $organization_id,
'group' => $group,
'contact1' => $persons[0],
'arenas' => $arenas,
@@ -350,48 +380,41 @@
if (!$district_ok) {
$error .= "<br/>" .
lang('district_not_selected');
}
- return $this->render('activity_new.php', array
-
(
-
'activity' => $activity,
-
'organizations' => $organizations,
-
'organization' => $organization,
-
'contact1' => $persons[0],
-
'contact2' => $persons[1],
-
'org_name' => $org_name,
-
'new_org' => $new_org,
-
'groups' => $groups,
-
'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
-
)
+ return $this->render('activity_new.php', array (
+ 'activity' => $activity,
+ 'organizations' => $organizations,
+ 'organization' => $organization,
+ 'organization_id' => $organization_id,
+ 'contact1' => $persons[0],
+ 'contact2' => $persons[1],
+ 'org_name' => $org_name,
+ 'new_org' => $new_org,
+ 'groups' => $groups,
+ '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
+ )
);
}
} else {
self::add_javascript('activitycalendarfrontend',
'activitycalendarfrontend', 'activity_new_step_1.js');
-
-// self::render_template_xsl(
-// 'activity_new_step_1',
-// array(
-// 'ajaxURL' => $ajaxUrl,
-// 'helpImg' =>
$GLOBALS['phpgw']->common->image('activitycalendarfrontend', 'hjelp.gif'),
-// 'organizations' => (array)$organizations
-// )
-// );
-
- return $this->render('activity_new_step_1.php', array
- (
-
'organizations' => $organizations,
-
'ajaxURL' => $ajaxUrl
-
)
- );
+
+ self::render_template_xsl(
+ 'activity_new_step_1',
+ array(
+ 'ajaxURL' => $ajaxUrl,
+ 'helpImg' => $helpImg,
+ 'organizations' => $organization_options
+ )
+ );
}
}
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
2015-11-29 14:52:40 UTC (rev 14503)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
2015-11-30 23:53:29 UTC (rev 14504)
@@ -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" />
+ </div>
+ </xsl:if>
+ <xsl:if test="error != ''">
+ <div class="error">
+ <xsl:value-of select="error" />
+ </div>
+ </xsl:if>
</div>
<div class="pageTop">
<h1><xsl:value-of select="php:function('lang', 'activity')" /></h1>
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
2015-11-29 14:52:40 UTC (rev 14503)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
2015-11-30 23:53:29 UTC (rev 14504)
@@ -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" />
+ </div>
+ </xsl:if>
+ <xsl:if test="error != ''">
+ <div class="error">
+ <xsl:value-of select="error" />
+ </div>
+ </xsl:if>
</div>
<div class="pageTop">
<h1><xsl:value-of select="php:function('lang', 'new_activity')"
/></h1>
@@ -21,12 +19,12 @@
<form method="POST" name="form" id="form">
<input type="hidden" name="id">
<xsl:attribute name="value">
-
+ <xsl:value-of select="activity/id" />
</xsl:attribute>
</input>
<input type="hidden" name="organization_id">
<xsl:attribute name="value">
-
+ <xsl:value-of select="organization_id" />
</xsl:attribute>
</input>
<xsl:if test="new_organization">
@@ -51,7 +49,11 @@
</label>
</dt>
<dd>
- <input type="text" name="title" id="title" value=""
size="83" maxlength="254" />
+ <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>
<dt>
<label for="org_description">
@@ -80,7 +82,21 @@
</dt>
<dd>
<select name="category" id="category">
- <option value="0">Ingen Kategori valgt</option>
+ <option value="">Ingen Kategori valgt</option>
+ <xsl:variable name="current_category_id"
select="categories/current_category_id" />
+ <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>
</fieldset>
@@ -99,12 +115,23 @@
</dt>
<dd>
<xsl:for-each select="targets">
- <input name="target[]" type="checkbox"
value=""></input>
+ <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="id">
+ <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" />
- <label for="special_adaptation"><xsl:value-of
select="php:function('lang', 'special_adaptation')" /></label>
+ <xsl:value-of select="concat(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;
@@ -129,13 +156,18 @@
</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="value">
+ <xsl:attribute name="label">
<xsl:value-of select="php:function('lang',
'building')" />
</xsl:attribute>
<xsl:for-each select="buildings">
- <option value=""></option>
+ <option>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id" />
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
</xsl:for-each>
</optgroup>
<optgroup>
@@ -143,7 +175,15 @@
<xsl:value-of select="php:function('lang',
'external_arena')" />
</xsl:attribute>
<xsl:for-each select="arenas">
- <option value=""></option>
+ <option>
+ <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>
@@ -154,7 +194,7 @@
<dl>
<dt>
<label for="new_arena">
- <xsl:value-of select="php:function('lang',
'register_new_arena')" />
+ <xsl:value-of
select="concat(php:function('lang', 'register_new_arena'),' ')" />
<a href="javascript:void(0);">
<xsl:attribute name="onclick">
alert('<xsl:value-of
select="php:function('lang', 'help_new_arena')" />');return false;
@@ -194,10 +234,15 @@
<label for="arena_number">Husnummer</label><br
/>
<input type="text" name="arena_number"
size="5" />
</dt><br />
- <dt
style="clear:left;margin-roght:20px;float:left;">
+ <dt
style="clear:left;margin-right:20px;float:left;">
<label for="postaddress">Postnummer
(*)</label><br />
<input type="text" name="postaddress" size="5"
/>
- </dt><br />
+ </dt>
+ <dt style="float:left;">
+ <label for="arena_postaddress">Poststed
(*)</label><br />
+ <input type="text" name="arena_postaddress"
size="40" />
+ </dt>
+ <br />
</dl>
</div>
<dt>
@@ -214,7 +259,13 @@
</dt>
<dd>
<xsl:for-each select="districts">
- <input name="district" type="radio"
value=""></input><br />
+ <input name="district" type="radio">
+ <xsl:attribute name="value">
+ <xsl:value-of select="part_of_town_id" />
+ </xsl:attribute>
+ </input>
+ <xsl:value-of select="name" />
+ <br />
</xsl:for-each>
</dd>
<dt>
@@ -230,7 +281,11 @@
</label>
</dt>
<dd>
- <input type="text" name="time" id="time" value=""
size="80" maxlength="254" />
+ <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>
</fieldset>
<fieldset id="arr">
@@ -267,8 +322,18 @@
<dd>
<select name="office" id="office">
<option value="0">Ingen kontor valgt</option>
- <xsl:for-each select="offices">
- <option value=""></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>
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
2015-11-29 14:52:40 UTC (rev 14503)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
2015-11-30 23:53:29 UTC (rev 14504)
@@ -19,14 +19,14 @@
<dd>
<select name="organization_id"
id="organization_id">
<option value="">Ingen organisasjon
valgt</option>
- <!--xsl:for-each select="organizations">
+ <xsl:for-each select="organizations">
<option>
<xsl:attribute name="value">
<xsl:value-of select="id" />
</xsl:attribute>
<xsl:value-of select="name" />
</option>
- </xsl:for-each-->
+ </xsl:for-each>
</select>
</dd>
<a id="displayText3" href="javascript:void(0);">Ikke i
listen? Registrer ny organisasjon</a><br />
Modified:
branches/dev-syncromind/activitycalendarfrontend/templates/base/css/base.css
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/templates/base/css/base.css
2015-11-29 14:52:40 UTC (rev 14503)
+++
branches/dev-syncromind/activitycalendarfrontend/templates/base/css/base.css
2015-11-30 23:53:29 UTC (rev 14504)
@@ -262,4 +262,7 @@
background-color: red;
border:1px solid #9F6000;
color: white;
-}
\ No newline at end of file
+}
+
+h1 {font-size: 2em;letter-spacing: 0;}
+a {text-decoration: underline;}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14504] php templates to xsl,
Saul <=