|
| From: | Erik Holm-Larsen |
| Subject: | [Fmsystem-commits] [8112] |
| Date: | Tue, 15 Nov 2011 19:05:34 +0000 |
Revision: 8112
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8112
Author: erikhl
Date: 2011-11-15 19:05:34 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/activity.php
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-11-15 15:31:40 UTC (rev
8111)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-11-15 19:05:34 UTC (rev
8112)
@@ -332,8 +332,8 @@
date_end activitycalendar no Sluttdato
special_adaptation activitycalendar no Spesielt tilpasset for
utviklingshemmede
target activitycalendar no Målgruppe
-contact_person_1 activitycalendar no Kontaktperson 1
-contact_person_2 activitycalendar no Kontaktperson 2
+contact_person_1 activitycalendar no Kontaktperson 1 (Navn,
e-post)
+contact_person_2 activitycalendar no Kontaktperson 2 (Navn,
e-post)
Activities activitycalendar no Aktiviteter
activities activitycalendar no Aktiviteter
Arena activitycalendar no Arena
@@ -372,7 +372,7 @@
state_5 activitycalendar no Avvist
activity_import activitycalendar no Importer aktiviteter
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.
+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
@@ -401,7 +401,26 @@
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).
+description_helptext activitycalendar no Hentes fra
booking/organisasjonsregister ved lagring/oppdatering.
back_to_list activitycalendar no Tilbake til oversikt
target_not_selected activitycalendar no Målgruppe må velges!
-district_not_selected activitycalendar no Distrikt må velges!
\ No newline at end of file
+district_not_selected activitycalendar no Distrikt må velges!
+title_helptext activitycalendar no Oppgi tittelen for aktiviteten.
Kort og beskrivende.
+state_helptext activitycalendar no Status for aktiviteten. For at
den skal vises i portalen må status settes til publisert.
+organization_helptext activitycalendar no Velg organisasjon eller
registrer inn ny.<br/>Stå i feltet og skriv inn første bokstav for å få opp
oversikt.
+group_helptext activitycalendar no Velg gruppe/lag, eller
ingen.<br/>Feltet vis i portal må være satt til JA om lag/gruppe skal komme opp
i listen.
+criteria_label activitycalendar no Valgkriterier/søkeord i portalen
+criteria_helptext activitycalendar no Feltene må fylles ut
for at aktiviteten skal komme frem i søk i portalen, koder for kategori og
målgruppe hentes fra booking.
+what activitycalendar no HVA
+where_when activitycalendar no HVOR/NÅR
+who activitycalendar no HVEM
+arena_helptext activitycalendar no Oppgi arena ved å velge
kommunalt bygg eller eksterne bygg.
+external_arena activitycalendar no Eksterne bygg
+category_helptext activitycalendar no Velg kategori
+target_helptext activitycalendar no Velg målgruppe(r)
+district_helptext activitycalendar no Velg bydel(er) hvor
aktiviteten foregår
+adaptation_helptext activitycalendar no Kryss av om aktiviteten
er spesielt tilpasset
+time_helptext activitycalendar no Oppgi tidspunkt for
aktiviteten, f.eks. onsdag kl. 20-21
+office_helptext activitycalendar no Oppgi kontor som
saksbehandler aktiviteten
+contact_info activitycalendar no Kontaktinformasjon for
kulturkontoret
+contact_info_helptext activitycalendar no Hentes fra
booking/organisasjonsregister ved lagring.
Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php 2011-11-15 15:31:40 UTC
(rev 8111)
+++ trunk/activitycalendar/templates/base/activity.php 2011-11-15 19:05:34 UTC
(rev 8112)
@@ -38,6 +38,34 @@
get_available_groups();
});
+function check_internal()
+{
+ if(document.getElementById('internal_arena_id').value != null &&
document.getElementById('internal_arena_id').value > 0)
+ {
+ //disable external arena drop-down
+ document.getElementById('arena_id').disabled="disabled";
+ }
+ else
+ {
+ //enable external arena drop-down
+ document.getElementById('arena_id').disabled="";
+ }
+}
+
+function check_external()
+{
+ if(document.getElementById('arena_id').value != null &&
document.getElementById('arena_id').value > 0)
+ {
+ //disable internal arena drop-down
+
document.getElementById('internal_arena_id').disabled="disabled";
+ }
+ else
+ {
+ //enable internal arena drop-down
+ document.getElementById('internal_arena_id').disabled="";
+ }
+}
+
function allOK()
{
if(document.getElementById('title').value == null ||
document.getElementById('title').value == '')
@@ -86,9 +114,11 @@
<form action="#" method="post">
<input type="hidden" name="id" value="<?php
if($activity->get_id()){ echo $activity->get_id(); } else { echo '0'; } ?>"/>
<dl class="proplist-col">
+ <h2><?php echo lang('what')?></h2>
<dt>
<?php if($activity->get_title() ||
$editable) { ?>
<label for="title"><?php echo
lang('title') ?></label>
+ <br/><?php echo lang('title_helptext')?>
<?php } ?>
</dt>
<dd>
@@ -105,9 +135,34 @@
}
?>
</dd>
- <dt>
+ <dt>
+ <label for="description"><?php echo
lang('description') ?></label>
+ <br/><?php echo
lang('description_helptext')?>
+ </dt>
+ <dd>
+ <?php
+ if($activity->get_group_id())
+ {
+ $group =
$act_so->get_group_info($activity->get_group_id());
+ if($group)
+ {
+ echo
$group['description'];
+ }
+ }
+ else
if($activity->get_organization_id())
+ {
+ $org =
$act_so->get_org_info($activity->get_organization_id());
+ if($org)
+ {
+ echo
$org['description'];
+ }
+ }
+ ?>
+ </dd>
+ <dt>
<?php if($activity->get_state() ||
$editable) { ?>
<label for="state"><?php echo
lang('state') ?></label>
+ <br/><?php echo lang('state_helptext')?>
<?php } ?>
</dt>
<dd>
@@ -133,126 +188,133 @@
?>
</dd>
<dt>
- <?php
if($activity->get_organization_id() || $editable) { ?>
- <label for="organization_id"><?php echo
lang('organization') ?></label>
- <?php } ?>
+ <?php if($editable) {?>
+ <label for="criteria"><?php
echo lang('criteria_label') ?></label>
+ <br/><?php echo
lang('criteria_helptext')?>
+ <?php }?>
</dt>
+ <dt>
+ <?php if($activity->get_category() ||
$editable) { ?>
+ <label for="category"><?php echo
lang('category') ?></label>
+ <br/><?php echo
lang('category_helptext') ?>
+ <?php } ?>
+ </dt>
<dd>
<?php
- $current_organization_id =
$activity->get_organization_id();
+ $current_category_id =
$activity->get_category();
if ($editable)
{
- if($activity->get_new_org())
- {
- echo $org_name;
- }
- else
- {
?>
- <select name="organization_id"
id="organization_id" onchange="javascript:get_available_groups();">
- <option value="">Ingen
organisasjon valgt</option>
+ <select name="category"
id="category">
+ <option value="0">Ingen
kategori valgt</option>
<?php
-
foreach($organizations as $organization)
- {
- echo
"<option ".($current_organization_id == $organization->get_id() ?
'selected="selected"' : "")."
value=\"{$organization->get_id()}\">".$organization->get_name()."</option>";
- }
- ?>
+ foreach($categories as
$category)
+ {
+ echo "<option
".($current_category_id == $category->get_id() ? 'selected="selected"' : "")."
value=\"{$category->get_id()}\">".$category->get_name()."</option>";
+ }
+ ?>
</select>
<?php
- }
- ?>
- <?php
}
else
{
-
if($activity->get_organization_id()){
- echo
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
+ if($activity->get_category()){
+ echo
$act_so->get_category_name($activity->get_category());
}
}
?>
</dd>
<dt>
- <?php if($activity->get_group_id() ||
$editable) { ?>
- <label for="group_id"><?php echo
lang('group') ?></label>
- <?php } ?>
+ <?php if($activity->get_target() ||
$editable) { ?>
+ <label for="target"><?php echo
lang('target') ?></label>
+ <br/><?php echo lang('target_helptext')
?>
+ <?php } ?>
</dt>
<dd>
<?php
- $current_group_id =
$activity->get_group_id();
+ $current_target_ids =
$activity->get_target();
+ $current_target_id_array=explode(",",
$current_target_ids);
+ //echo
$current_target_id_array[0]."*".$current_target_id_array[1];
if ($editable)
{
+ foreach($targets as $t)
+ {
?>
- <div id="group_select">
- <select name="group_id"
id="group_id">
- <option
value="0">Ingen gruppe valgt</option>
- </select>
- </div>
+ <input name="target[]"
id="target[]" type="checkbox" value="<?php echo $t->get_id()?>" <?php echo
(in_array($t->get_id(), $current_target_id_array) ? 'checked' : "")?>/><?php
echo $t->get_name()?><br/>
<?php
- ?>
- <?php
+ }
}
else
{
- if($activity->get_group_id()){
- echo
activitycalendar_sogroup::get_instance()->get_group_name($activity->get_group_id());
+ if($activity->get_target()){
+ $current_target_ids =
$activity->get_target();
+
$current_target_id_array=explode(",", $current_target_ids);
+
foreach($current_target_id_array as $curr_target)
+ {
+ echo
$act_so->get_target_name($curr_target).'<br/>';
+ }
}
}
?>
</dd>
- <?php if($activity->get_contact_person_1() ||
$editable) { ?>
<dt>
- <label for="contact_person_1"><?php
echo lang('contact_person_1') ?></label>
+ <?php if($activity->get_district() ||
$editable) { ?>
+ <label for="district"><?php echo
lang('district') ?></label>
+ <br/><?php echo
lang('district_helptext') ?>
+ <?php } ?>
</dt>
<dd>
<?php
- if($activity->get_group_id())
+ $current_district_ids =
$activity->get_district();
+ $current_district_id_array=explode(",",
$current_district_ids);
+ //echo
$current_target_id_array[0]."*".$current_target_id_array[1];
+ if ($editable)
+ {
+ foreach($districts as $d)
{
- echo
$contpers_so->get_group_contact_name($activity->get_contact_person_1());
+ ?>
+ <input
name="district[]" type="checkbox" value="<?php echo $d['part_of_town_id']?>"
<?php echo (in_array($d['part_of_town_id'], $current_district_id_array) ?
'checked' : "")?>/><?php echo $d['name']?><br/>
+ <?php
}
- else
if($activity->get_organization_id())
- {
- echo
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+ }
+ else
+ {
+ if($activity->get_district()){
+ $current_district_ids =
$activity->get_district();
+// echo
$current_district_ids;
+
$current_district_id_array=explode(",", $current_district_ids);
+
foreach($current_district_id_array as $curr_district)
+ {
+ echo
$act_so->get_district_name($curr_district).'<br/>';
+ }
}
- 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>
+ <label for="special_adaptation"><?php
echo lang('special_adaptation') ?></label>
+ <br/><?php echo
lang('adaptation_helptext') ?>
</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');
- }
- ?>
+ <input type="checkbox"
name="special_adaptation" id="special_adaptation"<?php echo
$activity->get_special_adaptation() ? ' checked="checked"' : '' ?> <?php echo
!$editable ? ' disabled="disabled"' : '' ?>/>
</dd>
- <?php } ?>
+ <h2><?php echo lang('where_when')?></h2>
<dt>
- <?php
if($activity->get_internal_arena() || $editable) { ?>
- <label for="arena"><?php echo
lang('building') ?></label>
+ <?php if($activity->get_arena() ||
$editable) { ?>
+ <label for="arena"><?php echo
lang('arena') ?></label>
+ <br/><?php echo lang('arena_helptext')?>
<?php } ?>
</dt>
+ <dt>
+ <label for="internal_arena_id"><?php
echo lang('building') ?></label>
+ </dt>
<dd>
<?php
$current_internal_arena_id =
$activity->get_internal_arena();
if ($editable)
{
?>
- <select
name="internal_arena_id" id="internal_arena_id">
+ <select
name="internal_arena_id" id="internal_arena_id" onchange="javascript:
check_internal();">
<option value="0">Ingen
kommunale bygg valgt</option>
<?php
foreach($buildings as
$building_id => $building_name)
@@ -272,9 +334,7 @@
?>
</dd>
<dt>
- <?php if($activity->get_arena() ||
$editable) { ?>
- <label for="arena"><?php echo
lang('arena') ?></label>
- <?php } ?>
+ <label for="arena_id"><?php echo
lang('external_arena') ?></label>
</dt>
<dd>
<?php
@@ -282,7 +342,7 @@
if ($editable)
{
?>
- <select name="arena_id"
id="arena_id">
+ <select name="arena_id"
id="arena_id" onchange="javascript: check_external();">
<option value="0">Ingen
arena valgt</option>
<?php
foreach($arenas as
$arena)
@@ -304,6 +364,7 @@
<dt>
<?php if($activity->get_time() ||
$editable) { ?>
<label for="time"><?php echo
lang('time') ?></label>
+ <br/><?php echo lang('time_helptext') ?>
<?php } ?>
</dt>
<dd>
@@ -321,157 +382,144 @@
?>
</dd>
<dt>
- <?php if($activity->get_category() ||
$editable) { ?>
- <label for="category"><?php echo
lang('category') ?></label>
+ <?php if($activity->get_office() ||
$editable) { ?>
+ <label for="office"><?php echo
lang('office') ?></label>
+ <br/><?php echo lang('office_helptext')
?>
<?php } ?>
</dt>
<dd>
<?php
- $current_category_id =
$activity->get_category();
if ($editable)
{
- ?>
- <select name="category"
id="category">
- <option value="0">Ingen
kategori valgt</option>
+ $selected_office =
$activity->get_office();
+ ?>
+ <select name="office"
id="office">
+ <option value="0">Ingen
kontor valgt</option>
<?php
- foreach($categories as
$category)
+ foreach($offices as
$office)
{
- echo "<option
".($current_category_id == $category->get_id() ? 'selected="selected"' : "")."
value=\"{$category->get_id()}\">".$category->get_name()."</option>";
+ echo "<option
".($selected_office == $office['id'] ? 'selected="selected"' : "")."
value=\"{$office['id']}\">".$office['name']."</option>";
}
?>
</select>
- <?php
+ <?php
}
else
{
- if($activity->get_category()){
- echo
$act_so->get_category_name($activity->get_category());
+ if($activity->get_office()){
+ echo
$act_so->get_office_name($activity->get_office());
}
}
?>
</dd>
+ <h2><?php echo lang('who')?></h2>
<dt>
- <?php if($activity->get_target() ||
$editable) { ?>
- <label for="target"><?php echo
lang('target') ?></label>
- <?php } ?>
+ <?php
if($activity->get_organization_id() || $editable) { ?>
+ <label for="organization_id"><?php echo
lang('organization') ?></label>
+ <br/><?php echo
lang('organization_helptext') ?>
+ <?php } ?>
</dt>
<dd>
<?php
- $current_target_ids =
$activity->get_target();
- $current_target_id_array=explode(",",
$current_target_ids);
- //echo
$current_target_id_array[0]."*".$current_target_id_array[1];
+ $current_organization_id =
$activity->get_organization_id();
if ($editable)
{
- foreach($targets as $t)
+ if($activity->get_new_org())
{
+ echo $org_name;
+ }
+ else
+ {
?>
- <input name="target[]"
id="target[]" type="checkbox" value="<?php echo $t->get_id()?>" <?php echo
(in_array($t->get_id(), $current_target_id_array) ? 'checked' : "")?>/><?php
echo $t->get_name()?><br/>
+ <select name="organization_id"
id="organization_id" onchange="javascript:get_available_groups();">
+ <option value="">Ingen
organisasjon valgt</option>
+ <?php
+
foreach($organizations as $organization)
+ {
+ echo
"<option ".($current_organization_id == $organization->get_id() ?
'selected="selected"' : "")."
value=\"{$organization->get_id()}\">".$organization->get_name()."</option>";
+ }
+ ?>
+ </select>
<?php
}
+ ?>
+ <?php
}
else
{
- if($activity->get_target()){
- $current_target_ids =
$activity->get_target();
-
$current_target_id_array=explode(",", $current_target_ids);
-
foreach($current_target_id_array as $curr_target)
- {
- echo
$act_so->get_target_name($curr_target).'<br/>';
- }
+
if($activity->get_organization_id()){
+ echo
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
}
}
?>
</dd>
<dt>
- <?php if($activity->get_district() ||
$editable) { ?>
- <label for="district"><?php echo
lang('district') ?></label>
- <?php } ?>
+ <?php if($activity->get_group_id() ||
$editable) { ?>
+ <label for="group_id"><?php echo
lang('group') ?></label>
+ <br/><?php echo lang('group_helptext')
?>
+ <?php } ?>
</dt>
<dd>
<?php
- $current_district_ids =
$activity->get_district();
- $current_district_id_array=explode(",",
$current_district_ids);
- //echo
$current_target_id_array[0]."*".$current_target_id_array[1];
+ $current_group_id =
$activity->get_group_id();
if ($editable)
{
- foreach($districts as $d)
- {
?>
- <input
name="district[]" type="checkbox" value="<?php echo $d['part_of_town_id']?>"
<?php echo (in_array($d['part_of_town_id'], $current_district_id_array) ?
'checked' : "")?>/><?php echo $d['name']?><br/>
+ <div id="group_select">
+ <select name="group_id"
id="group_id">
+ <option
value="0">Ingen gruppe valgt</option>
+ </select>
+ </div>
<?php
- }
+ ?>
+ <?php
}
else
{
- if($activity->get_district()){
- $current_district_ids =
$activity->get_district();
-// echo
$current_district_ids;
-
$current_district_id_array=explode(",", $current_district_ids);
-
foreach($current_district_id_array as $curr_district)
- {
- echo
$act_so->get_district_name($curr_district).'<br/>';
- }
+ if($activity->get_group_id()){
+ echo
activitycalendar_sogroup::get_instance()->get_group_name($activity->get_group_id());
}
}
?>
</dd>
<dt>
- <?php if($activity->get_office() ||
$editable) { ?>
- <label for="office"><?php echo
lang('office') ?></label>
- <?php } ?>
+ <label><?php echo lang('contact_info')
?></label>
+ <br/><?php echo
lang('contact_info_helptext') ?>
</dt>
+ <?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 ($editable)
- {
- $selected_office =
$activity->get_office();
- ?>
- <select name="office"
id="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());
+ 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());
+ }
?>
</dd>
+ <?php } ?>
+ <?php if($activity->get_contact_person_2() ||
$editable) { ?>
<dt>
- <label for="description"><?php echo
lang('description') ?></label>
+ <label for="contact_person_2"><?php
echo lang('contact_person_2') ?></label>
</dt>
<dd>
<?php
if($activity->get_group_id())
{
- $group =
$act_so->get_group_info($activity->get_group_id());
- if($group)
- {
- echo
$group['description'];
- }
+ echo
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
}
else
if($activity->get_organization_id())
{
- $org =
$act_so->get_org_info($activity->get_organization_id());
- if($org)
- {
- echo
$org['description'];
- }
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
}
- else
- {
- echo
lang('description_not_set');
- }
- ?>
+ ?>
</dd>
+ <?php } ?>
<dt>
<?php
if($activity->get_contact_person_2_address() || $editable) { ?>
<label
for="contact_person_2_address"><?php echo lang('contact_person_2_address')
?></label>
@@ -510,12 +558,6 @@
}
?>
</dd>
- <dt>
- <label for="special_adaptation"><?php
echo lang('special_adaptation') ?></label>
- </dt>
- <dd>
- <input type="checkbox"
name="special_adaptation" id="special_adaptation"<?php echo
$activity->get_special_adaptation() ? ' checked="checked"' : '' ?> <?php echo
!$editable ? ' disabled="disabled"' : '' ?>/>
- </dd>
</dl>
<div class="form-buttons">
<?php
| [Prev in Thread] | Current Thread | [Next in Thread] |