[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8206]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [8206] |
Date: |
Tue, 29 Nov 2011 06:40:54 +0000 |
Revision: 8206
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8206
Author: erikhl
Date: 2011-11-29 06:40:52 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
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-29
06:09:53 UTC (rev 8205)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-11-29
06:40:52 UTC (rev 8206)
@@ -146,7 +146,7 @@
{
$desc = substr($desc,0,254);
}
- $arenas = $so_arena->get(null, null, null, null, null, null,
null);
+ $arenas = $so_arena->get(null, null, 'arena.arena_name', true,
null, null, null);
if($activity->get_new_org())
{
$org_name =
$so_org->get_organization_name_local($activity->get_organization_id());
@@ -218,7 +218,7 @@
if($new_state == 3 || $new_state == 5 )
{
$kontor =
$so_activity->get_office_name($activity->get_office());
- $subject = "Melding fra
AktivBy";
+ $subject =
lang('mail_subject_update');
$body = lang('mail_body_state_'
. $new_state, $kontor);
if(isset($g_id) && $g_id > 0)
@@ -392,7 +392,7 @@
$value['ajax'][] = false;
$value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiactivities.view', 'id' => $value['id'])));
$value['labels'][] = lang('show');
- $value['ajax'][] = false;
+ $value['ajax'][] = true;
$value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiactivities.send_mail', 'activity_id' =>
$value['id'],'message_type' => 'update')));
$value['labels'][] = lang('send_mail');
break;
@@ -415,7 +415,9 @@
//$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
$subject = lang('mail_subject_update');
- $body = lang('mail_body_update', $activity->get_id() . ', ' .
$activity->get_title());
+ $link_text =
"http://www.bergen.kommune.no/portico/activitycalendarfrontend/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ $office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
+ $body = lang('mail_body_update', $activity->get_id() . ', ' .
$activity->get_title(), $link_text, $office_name);
//var_dump($subject);
//var_dump($body);
@@ -450,7 +452,8 @@
//$subject = lang('mail_subject_update', $avtivity->get_id() .
'-' . $activity->get_title(), $activity->get_link());
$subject = lang('mail_subject_update');
$link_text =
"http://www.bergen.kommune.no/portico/activitycalendarfrontend/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
- $body = lang('mail_body_update', $activity->get_id() . ', ' .
$activity->get_title(), $link_text);
+ $office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
+ $body = lang('mail_body_update', $activity->get_id() . ', ' .
$activity->get_title(), $link_text, $office_name);
}
else
{
@@ -458,9 +461,9 @@
$body = "testmelding fra Aktivitetsoversikt";
}
- //var_dump($subject);
- //var_dump($body);
- //var_dump($activity->get_organization_id() . " ; " .
$activity->get_group_id());
+ var_dump($subject);
+ var_dump($body);
+ var_dump($activity->get_organization_id() . " ; " .
$activity->get_group_id());
if($activity->get_group_id() && $activity->get_group_id() > 0)
{
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-11-29 06:09:53 UTC (rev
8205)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-11-29 06:40:52 UTC (rev
8206)
@@ -373,9 +373,9 @@
activity_import activitycalendar no Importer aktiviteter
office activitycalendar no Hovedansvarlig kulturkontor
activity_helptext activitycalendar no Aktivitetsoversikten
henter kontaktinformasjon og beskrivelse fra bookingmodulen.<br/>Før ny
aktivitet kan registreres må du sjekke at organisasjon/gruppe finnes og er
oppdatert,<br/>og at arena finnes og er oppdatert. Feltet vis i portal skal
være satt til JA, i organisasjonsregisteret og evt. lag/gruppe. For nye
aktiviteter vil dette bli satt automatisk.
-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
-mail_body_state_3 activitycalendar no Ditt tips er publisert
i kommuneportalen. Mvh %1 kulturkontor
+mail_subject_update activitycalendar no Melding fra AktivBy -
aktivitetsoversikt
+mail_body_update activitycalendar no Dette er en melding fra
Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger i kommuneportalen
på internett, står du registrert som kontaktperson for %1.<br/>Ber om at du
kontrollerer at data er korrekt, og eventuelt endrer.<br/>%2<br/><br/><br/> Mvh
%3 kulturkontor
+mail_body_state_3 activitycalendar no Informasjon om din
aktivitet er publisert i kommuneportalen.<br/>De som er registrert som
kontaktpersoner får endre informasjonen, dette gjøres via nettsiden.
https://www.bergen.kommune.no/tjenestetilbud/aktivitetsoversikt/<br/><br/><br/>
Mvh %1 kulturkontor
mail_body_state_4 activitycalendar no Ditt tips er behandlet
og publisert i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
send_mail activitycalendar no Send e-post
Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php
2011-11-29 06:09:53 UTC (rev 8205)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php
2011-11-29 06:40:52 UTC (rev 8206)
@@ -151,24 +151,28 @@
function activity_email(ptype) {
- var query = document.getElementById('<?php echo $list_id
?>_ctrl_search_query').value;
- var office = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_activity_district').value;
- var state = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_activity_state').value;
- var category = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_activity_category').value;
- <?php
- /* FIXME Search queries will affect ALL data tables listed on one page
(of that type) when exporting
- * even though the search only affects one of the data tables.
- * F.ex on /index.php?menuaction=rental.uicontract.edit&id=1 -> Parties
- */
- ?>
-
- window.location =
'index.php?menuaction=activitycalendar.uiactivities.query'+
- '<?php echo $url_add_on; ?>'+
- '&query='+query+
- '&activity_district='+office+
- '&activity_state='+state+
- '&activity_category='+category+
- '&email=true';
+ var confirm_res = confirm("Du er i ferd med å sende e-post til flere
mottakere.\n\nVil du gjøre dette?");
+ if(confirm_res==true)
+ {
+ var query = document.getElementById('<?php echo $list_id
?>_ctrl_search_query').value;
+ var office = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_activity_district').value;
+ var state = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_activity_state').value;
+ var category = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_activity_category').value;
+ <?php
+ /* FIXME Search queries will affect ALL data tables listed on
one page (of that type) when exporting
+ * even though the search only affects one of the data tables.
+ * F.ex on /index.php?menuaction=rental.uicontract.edit&id=1 ->
Parties
+ */
+ ?>
+
+ window.location =
'index.php?menuaction=activitycalendar.uiactivities.query'+
+ '<?php echo $url_add_on; ?>'+
+ '&query='+query+
+ '&activity_district='+office+
+ '&activity_state='+state+
+ '&activity_category='+category+
+ '&email=true';
+ }
}
</script>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8206],
Erik Holm-Larsen <=