[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8072]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8072] |
|
Date: |
Thu, 10 Nov 2011 13:45:20 +0000 |
Revision: 8072
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8072
Author: erikhl
Date: 2011-11-10 13:45:19 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/activity.php
trunk/activitycalendar/templates/base/activity_list_partial.php
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-11-09
14:41:14 UTC (rev 8071)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-11-10
13:45:19 UTC (rev 8072)
@@ -74,16 +74,30 @@
{
$errorMsgs = array();
$infoMsgs = array();
+
$activity =
activitycalendar_soactivity::get_instance()->get_single((int)phpgw::get_var('id'));
+ $cancel_link = self::link(array('menuaction' =>
'activitycalendar.uiactivities.index'));
+ $saved_OK = phpgw::get_var('saved_ok');
+ if($saved_OK)
+ {
+ $message = lang('activity_saved_form');
+ }
if($activity == null) // Not found
{
$errorMsgs[] = lang('Could not find specified
activity.');
}
+
+ if(isset($_POST['edit_activity'])) // The user has pressed the
save button
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiactivities.edit','id' =>
phpgw::get_var('id')));
+ }
$data = array
(
'activity' => $activity,
+ 'cancel_link' => $cancel_link,
+ 'message' => $message,
'errorMsgs' => $errorMsgs,
'infoMsgs' => $infoMsgs
);
@@ -99,7 +113,7 @@
$so_arena = activitycalendar_soarena::get_instance();
$so_org = activitycalendar_soorganization::get_instance();
//var_dump($activity_id);
-
+ $cancel_link = self::link(array('menuaction' =>
'activitycalendar.uiactivities.index'));
$categories = $so_activity->get_categories();
$targets = $so_activity->get_targets();
$offices = $so_activity->select_district_list();
@@ -188,7 +202,7 @@
$error = lang('messages_form_error');
}
- if($new_state == 3 || $new_state == 4 ||
$new_state == 5 )
+ if($new_state == 3 || $new_state == 5 )
{
$kontor =
$so_activity->get_office_name($activity->get_office());
$subject = "Melding fra AktivBy";
@@ -203,6 +217,7 @@
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),$subject,$body);
}
}
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiactivities.view', 'id' =>
$activity->get_id(), 'saved_ok' => 'yes'));
}
}
@@ -219,6 +234,7 @@
'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')
)
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-11-09 14:41:14 UTC (rev
8071)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-11-10 13:45:19 UTC (rev
8072)
@@ -371,7 +371,7 @@
state_4 activitycalendar no Behandlet
state_5 activitycalendar no Avvist
activity_import activitycalendar no Importer aktiviteter
-office activitycalendar no Kontor
+office activitycalendar no Hovedansvarlig kulturkontor
activity_helptext activitycalendar no Før ny aktivitet kan
registreres må du sjekke at organisasjon/gruppe finnes og er oppdatert, og at
arena finnes og er oppdatert.
mail_subject_update activitycalendar no Melding om oppdatering
av aktivitet
mail_body_update activitycalendar no Du må oppdatere
informasjonen som er registrert på aktivitet %1 . Bruk følgende lenke for å gå
inn på aktiviteten: %2
@@ -398,4 +398,8 @@
arena_saved_form activitycalendar no Arena ble lagret
activity_saved_form activitycalendar no Aktiviteten ble lagret
organization_saved_form activitycalendar no Organisasjonen
ble lagret
-group_saved_form activitycalendar no Gruppen ble lagret
\ No newline at end of file
+group_saved_form activitycalendar no Gruppen ble lagret
+published activitycalendar no Publisert
+contactperson_not_set activitycalendar no Kontaktpersoner hentes
fra valgt organisasjon/gruppe ved lagring.
+description_not_set activitycalendar no Beskrivelse hentes fra
valgt organisasjon/gruppe ved lagring (Max 255 tegn).
+back_to_list activitycalendar no Tilbake til oversikt
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php 2011-11-09 14:41:14 UTC
(rev 8071)
+++ trunk/activitycalendar/templates/base/activity.php 2011-11-10 13:45:19 UTC
(rev 8072)
@@ -38,7 +38,7 @@
get_available_groups();
});
</script>
-
+<?php echo activitycalendar_uicommon::get_page_message($message) ?>
<div class="yui-content">
<div id="details">
<h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('activity') ?></h1>
@@ -56,7 +56,7 @@
if ($editable)
{
?>
- <input type="text" name="title"
id="title" value="<?php echo $activity->get_title() ?>" />
+ <input type="text" name="title"
id="title" value="<?php echo $activity->get_title() ?>" size="100"/>
<?php
}
else
@@ -65,6 +65,33 @@
}
?>
</dd>
+ <dt>
+ <?php if($activity->get_state() ||
$editable) { ?>
+ <label for="state"><?php echo
lang('state') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ $selected_state =
$activity->get_state();
+ ?>
+ <select name="state">
+ <option value="3" <?php
echo ($selected_state == 3 ? 'selected="selected"' : "")?>><?php echo
lang('published') ?></option>
+ <option value="5" <?php
echo ($selected_state == 5 ? 'selected="selected"' : "")?>><?php echo
lang('rejected') ?></option>
+ <option value="1" <?php
echo ($selected_state == 1 ? 'selected="selected"' : "")?>><?php echo
lang('new') ?></option>
+ <option value="2" <?php
echo ($selected_state == 2 ? 'selected="selected"' : "")?>><?php echo
lang('change') ?></option>
+ </select>
+ <?php
+ }
+ else
+ {
+ if($activity->get_state() &&
$activity->get_state() > 0){
+ echo
lang('state_'.$activity->get_state());
+ }
+ }
+ ?>
+ </dd>
<dt>
<?php
if($activity->get_organization_id() || $editable) { ?>
<label for="organization_id"><?php echo
lang('organization') ?></label>
@@ -132,7 +159,49 @@
}
?>
</dd>
+ <?php if($activity->get_contact_person_1() ||
$editable) { ?>
<dt>
+ <label for="contact_person_1"><?php
echo lang('contact_person_1') ?></label>
+ </dt>
+ <dd>
+ <?php
+ if($activity->get_group_id())
+ {
+ echo
$contpers_so->get_group_contact_name($activity->get_contact_person_1());
+ }
+ else
if($activity->get_organization_id())
+ {
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+ }
+ else
+ {
+ echo
lang('contactperson_not_set');
+ }
+ ?>
+ </dd>
+ <?php } ?>
+ <?php if($activity->get_contact_person_2() ||
$editable) { ?>
+ <dt>
+ <label for="contact_person_2"><?php
echo lang('contact_person_2') ?></label>
+ </dt>
+ <dd>
+ <?php
+ if($activity->get_group_id())
+ {
+ echo
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
+ }
+ else
if($activity->get_organization_id())
+ {
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
+ }
+ else
+ {
+ echo
lang('contactperson_not_set');
+ }
+ ?>
+ </dd>
+ <?php } ?>
+ <dt>
<?php
if($activity->get_internal_arena() || $editable) { ?>
<label for="arena"><?php echo
lang('building') ?></label>
<?php } ?>
@@ -193,31 +262,21 @@
?>
</dd>
<dt>
- <?php if($activity->get_state() ||
$editable) { ?>
- <label for="state"><?php echo
lang('state') ?></label>
+ <?php if($activity->get_time() ||
$editable) { ?>
+ <label for="time"><?php echo
lang('time') ?></label>
<?php } ?>
</dt>
<dd>
<?php
if ($editable)
{
- $selected_state =
$activity->get_state();
?>
- <select name="state">
- <option value="0" <?php
echo ($selected_state == 0 ? 'selected="selected"' : "")?>>Ingen status
valgt</option>
- <option value="1" <?php
echo ($selected_state == 1 ? 'selected="selected"' : "")?>><?php echo
lang('new') ?></option>
- <option value="2" <?php
echo ($selected_state == 2 ? 'selected="selected"' : "")?>><?php echo
lang('change') ?></option>
- <option value="3" <?php
echo ($selected_state == 3 ? 'selected="selected"' : "")?>><?php echo
lang('accepted') ?></option>
- <option value="4" <?php
echo ($selected_state == 4 ? 'selected="selected"' : "")?>><?php echo
lang('processed') ?></option>
- <option value="5" <?php
echo ($selected_state == 5 ? 'selected="selected"' : "")?>><?php echo
lang('rejected') ?></option>
- </select>
+ <input type="text" name="time"
id="time" value="<?php echo $activity->get_time() ?>" />
<?php
}
else
{
- if($activity->get_state() &&
$activity->get_state() > 0){
- echo
lang('state_'.$activity->get_state());
- }
+ echo $activity->get_time();
}
?>
</dd>
@@ -284,36 +343,6 @@
?>
</dd>
<dt>
- <?php if($activity->get_office() ||
$editable) { ?>
- <label for="office"><?php echo
lang('office') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- if ($editable)
- {
- $selected_office =
$activity->get_office();
- ?>
- <select name="office">
- <option value="0">Ingen
kontor valgt</option>
- <?php
- foreach($offices as
$office)
- {
- echo "<option
".($selected_office == $office['id'] ? 'selected="selected"' : "")."
value=\"{$office['id']}\">".$office['name']."</option>";
- }
- ?>
- </select>
- <?php
- }
- else
- {
- if($activity->get_office()){
- echo
$act_so->get_office_name($activity->get_office());
- }
- }
- ?>
- </dd>
- <dt>
<?php if($activity->get_district() ||
$editable) { ?>
<label for="district"><?php echo
lang('district') ?></label>
<?php } ?>
@@ -347,65 +376,61 @@
?>
</dd>
<dt>
- <?php if($activity->get_description())
{ ?>
- <label for="description"><?php echo
lang('description') ?></label>
+ <?php if($activity->get_office() ||
$editable) { ?>
+ <label for="office"><?php echo
lang('office') ?></label>
<?php } ?>
</dt>
<dd>
- <?php echo
$activity->get_description(); ?>
- </dd>
- <dt>
- <?php if($activity->get_time() ||
$editable) { ?>
- <label for="time"><?php echo
lang('time') ?></label>
- <?php } ?>
- </dt>
- <dd>
<?php
if ($editable)
{
+ $selected_office =
$activity->get_office();
?>
- <input type="text" name="time"
id="time" value="<?php echo $activity->get_time() ?>" />
+ <select name="office">
+ <option value="0">Ingen
kontor valgt</option>
+ <?php
+ foreach($offices as
$office)
+ {
+ echo "<option
".($selected_office == $office['id'] ? 'selected="selected"' : "")."
value=\"{$office['id']}\">".$office['name']."</option>";
+ }
+ ?>
+ </select>
<?php
}
else
{
- echo $activity->get_time();
+ if($activity->get_office()){
+ echo
$act_so->get_office_name($activity->get_office());
+ }
}
?>
</dd>
<dt>
- <?php
if($activity->get_contact_person_1() || $editable) { ?>
- <label for="contact_person_1"><?php
echo lang('contact_person_1') ?></label>
- <?php } ?>
+ <label for="description"><?php echo
lang('description') ?></label>
</dt>
<dd>
<?php
if($activity->get_group_id())
{
- echo
$contpers_so->get_group_contact_name($activity->get_contact_person_1());
+ $group =
$act_so->get_group_info($activity->get_group_id());
+ if($group)
+ {
+ echo
$group['description'];
+ }
}
else
if($activity->get_organization_id())
{
- echo
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+ $org =
$act_so->get_org_info($activity->get_organization_id());
+ if($org)
+ {
+ echo
$org['description'];
+ }
}
- ?>
- </dd>
- <dt>
- <?php
if($activity->get_contact_person_2() || $editable) { ?>
- <label for="contact_person_2"><?php
echo lang('contact_person_2') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- if($activity->get_group_id())
+ else
{
- echo
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
+ echo
lang('description_not_set');
}
- else
if($activity->get_organization_id())
- {
- echo
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
- }
- ?>
+ ?>
</dd>
<dt>
<?php
if($activity->get_contact_person_2_address() || $editable) { ?>
@@ -456,7 +481,13 @@
<?php
if ($editable) {
echo '<input type="submit"
name="save_activity" value="' . lang('save') . '"/>';
+ echo '<a href="' . $cancel_link
. '">' . lang('back_to_list') . '</a>';
}
+ else
+ {
+ echo '<input type="submit"
name="edit_activity" value="' . lang('edit') . '"/>';
+ echo '<a href="' . $cancel_link
. '">' . lang('back_to_list') . '</a>';
+ }
?>
</div>
Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php
2011-11-09 14:41:14 UTC (rev 8071)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php
2011-11-10 13:45:19 UTC (rev 8072)
@@ -191,8 +191,7 @@
<option value="all"><?php echo lang('all') ?></option>
<option value="1"><?php echo lang('new') ?></option>
<option value="2" ><?php echo lang('change') ?></option>
- <option value="3" ><?php echo lang('accepted')
?></option>
- <option value="4" ><?php echo lang('processed')
?></option>
+ <option value="3" ><?php echo lang('published')
?></option>
<option value="5" ><?php echo lang('rejected')
?></option>
</select>
<label class="toolbar_element_label"
for="ctrl_toggle_activity_district"><?php echo lang('office') ?></label>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8072],
Erik Holm-Larsen <=