[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8152]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8152] |
|
Date: |
Mon, 21 Nov 2011 13:14:44 +0000 |
Revision: 8152
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8152
Author: erikhl
Date: 2011-11-21 13:14:43 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity_new.php
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-11-21 13:11:35 UTC
(rev 8151)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-11-21 13:14:43 UTC
(rev 8152)
@@ -63,7 +63,7 @@
target_not_selected activitycalendarfrontend no Målgruppe må
velges!
district_not_selected activitycalendarfrontend no Distrikt må
velges!
org_helptext activitycalendarfrontend no Velg organisasjon
aktiviteten skal knyttes til i nedtrekksmenyen, du kan søke ved å skrive inn
navnet.<br/>Dersom din organisasjon ikke finnes, velg "Ny organisasjon" og fyll
ut feltene som vises under.
-group_helptext activitycalendarfrontend no Om aktiviteten skal
knyttes til en spesiell gruppe/lag velger du det her.<br/>Dersom gruppen/laget
ikke finnes, velg "Ny gruppe" og fyll ut feltene som vises under. Du trenger
ikke velge en gruppe.
+group_helptext activitycalendarfrontend no Dersom aktiviteten skal
registreres med andre kontaktpersoner og beskrivelse, kan du gjøre det ved å
velge «Ny gruppe» og fylle ut feltene under.<br/>Du kan også velge en
eksisterende gruppe/lag fra listen, eller ikke velge en gruppe/lag.<br/>Ønsker
du å redigere/endre eksisterende informasjonen om organisasjon eller
beskrivelse,<br/>vil du etter at du har valgt Lagre-knappen få opp et nytt
bilde hvor du du kan velge Rediger.
criteria_label activitycalendarfrontend no Valgkriterier/søkeord i
portalen
criteria_helptext activitycalendarfrontend 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 activitycalendarfrontend no HVA
Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php
2011-11-21 13:11:35 UTC (rev 8151)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2011-11-21 13:14:43 UTC (rev 8152)
@@ -276,7 +276,6 @@
</dt>
<?php if($new_organization){?>
<input type="hidden"
name="organization_id" id="organization_id" value="new_org" />
- <div id="new_org_fields">
<dt><label
for="orgname">Organisasjonsnavn</label></dt>
<dd><input type="text"
name="orgname"/></dd>
<dt><label
for="orgno">Organisasjonsnummer</label></dt>
@@ -307,7 +306,6 @@
<input type="text"
name="postaddress"/></dd>
<dt><label
for="org_description">Beskrivelse</label></dt>
<dd><textarea rows="10"
cols="100" name="org_description"></textarea></dd>
- </div>
<hr/>
<b>Kontaktperson 1</b><br/>
<dt><label
for="contact1_name">Navn</label>
@@ -362,13 +360,6 @@
<dd><?php echo
isset($contact2)?$contact2->get_phone():''?></dd>
<dt><label
for="contact2_mail">E-post</label></dt>
<dd><?php echo
isset($contact2)?$contact2->get_email():''?></dd>
- <dt><label
for="contact2_address">Adresse</label></dt>
- <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
- <div
id="contact2_address_container"></div><br/>
- <label
for="contact2_number">Nummer</label>
- <input type="text"
name="org_contact2_number"/><br/>
- <label
for="contact2_postaddress">Postnummer og Sted</label>
- <input type="text"
name="org_contact2_postaddress"/></dd>
<hr/>
<?php }?>
<?php if(!$new_organization){?>
@@ -385,35 +376,35 @@
<?php }?>
</select>
</dd>
- <div id="new_group_fields" style="display:
none;">
- <dt><label
for="groupname">Gruppenavn</label></dt>
+ <span id="new_group_fields" style="display:
none;">
+ <dt><label
for="groupname">Navn</label></dt>
<dd><input type="text"
name="groupname"/><br/></dd>
- <dt><label
for="group_description">Beskrivelse</label></dt>
+ <dt><label
for="group_description">Beskrivelse av aktiviteten</label></dt>
<dd><textarea rows="10" cols="100"
name="group_description"></textarea></dd>
- <hr/>
- <dt>Kontaktperson 1</dt>
- <dt><label for="contact1_name">Navn</label></dt>
- <dd><input type="text"
name="group_contact1_name" value="<?php echo
isset($contact1)?$contact1->get_name():''?>"/></dd>
- <dt><label
for="contact1_phone">Telefon</label></dt>
- <dd><input type="text"
name="group_contact1_phone" value="<?php echo
isset($contact1)?$contact1->get_phone():''?>"/></dd>
- <dt><label
for="contact1_mail">E-post</label></dt>
- <dd><input type="text"
name="group_contact1_mail" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"/></dd>
- <dt>Kontaktperson 2</dt>
- <dt><label for="contact2_name">Navn</label></dt>
- <dd><input type="text"
name="group_contact2_name" value="<?php echo
isset($contact2)?$contact2->get_name():''?>"/></dd>
- <dt><label
for="contact2_phone">Telefon</label></dt>
- <dd><input type="text"
name="group_contact2_phone" value="<?php echo
isset($contact2)?$contact2->get_phone():''?>"/></dd>
- <dt><label
for="contact2_mail">E-post</label></dt>
- <dd><input type="text"
name="group_contact2_mail" value="<?php echo
isset($contact2)?$contact2->get_email():''?>"/></dd>
- <dt><label
for="contact2_address">Adresse</label></dt>
- <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()" />
- <div id="contact2_address_container"></div><br/>
- <label for="contact2_number">Nummer</label>
- <input type="text"
name="group_contact2_number"/><br/>
- <label for="contact2_postaddress">Postnummer og
Sted</label>
- <input type="text"
name="group_contact2_postaddress"/></dd>
- <hr/>
- </div>
+ <hr/>
+ <dt>Kontaktperson 1</dt>
+ <dt><label
for="contact1_name">Navn</label></dt>
+ <dd><input type="text"
name="group_contact1_name" value="<?php echo
isset($contact1)?$contact1->get_name():''?>"/></dd>
+ <dt><label
for="contact1_phone">Telefon</label></dt>
+ <dd><input type="text"
name="group_contact1_phone" value="<?php echo
isset($contact1)?$contact1->get_phone():''?>"/></dd>
+ <dt><label
for="contact1_mail">E-post</label></dt>
+ <dd><input type="text"
name="group_contact1_mail" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"/></dd>
+ <dt>Kontaktperson 2</dt>
+ <dt><label
for="contact2_name">Navn</label></dt>
+ <dd><input type="text"
name="group_contact2_name" value="<?php echo
isset($contact2)?$contact2->get_name():''?>"/></dd>
+ <dt><label
for="contact2_phone">Telefon</label></dt>
+ <dd><input type="text"
name="group_contact2_phone" value="<?php echo
isset($contact2)?$contact2->get_phone():''?>"/></dd>
+ <dt><label
for="contact2_mail">E-post</label></dt>
+ <dd><input type="text"
name="group_contact2_mail" value="<?php echo
isset($contact2)?$contact2->get_email():''?>"/></dd>
+ <dt><label
for="contact2_address">Adresse</label></dt>
+ <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()" />
+ <div
id="contact2_address_container"></div><br/>
+ <label
for="contact2_number">Nummer</label>
+ <input type="text"
name="group_contact2_number"/><br/>
+ <label
for="contact2_postaddress">Postnummer og Sted</label>
+ <input type="text"
name="group_contact2_postaddress"/></dd>
+ <hr/>
+ </span>
<?php }?>
<div class="form-buttons">
<input type="submit"
name="save_activity" value="<?php echo lang('save_activity') ?>"
onclick="return allOK();"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8152],
Erik Holm-Larsen <=