[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9351]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9351] |
|
Date: |
Thu, 10 May 2012 06:42:27 +0000 |
Revision: 9351
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9351
Author: erikhl
Date: 2012-05-10 06:42:24 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity_new.php
trunk/activitycalendarfrontend/templates/base/activity_new_org.php
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2012-05-10 05:43:47 UTC
(rev 9350)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2012-05-10 06:42:24 UTC
(rev 9351)
@@ -97,4 +97,5 @@
mail_subject_update activitycalendarfrontend no Melding fra
AktivBy - Aktivitetsoversikt
save_organization_next activitycalendarfrontend no Lagre
organisasjon og gå videre til Ny aktivitet
new_organization activitycalendarfrontend no Ny organisasjon
-organization_saved_form activitycalendarfrontend no
Organisasjonen er opprettet i aktivitetsoversikten.<br/>Du kan nå registrere en
aktivitet tilknyttet den nye organisasjonen.
\ No newline at end of file
+organization_saved_form activitycalendarfrontend no
Organisasjonen er opprettet i aktivitetsoversikten.<br/>Du kan nå registrere en
aktivitet tilknyttet den nye organisasjonen.
+required_fields activitycalendarfrontend no Felter merket
med (*) er påkrevde felt.
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-05-10 05:43:47 UTC (rev 9350)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-05-10 06:42:24 UTC (rev 9351)
@@ -188,19 +188,22 @@
<?php }?>
</div>
<h1><?php echo lang('new_activity') ?></h1>
+ <div>
+ <?php echo lang('required_fields')?>
+ </div>
<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" style="width: 200%">
<h2><?php echo lang('what')?></h2>
<dt>
- <label for="title"><?php echo
lang('title') ?></label>
+ <label for="title"><?php echo
lang('title') ?> (*)</label>
</dt>
<dd>
<?php echo lang('title_helptext')?><br/>
<input type="text" name="title"
id="title" value="<?php echo $activity->get_title() ?>" size="60"/>
</dd>
<dt>
- <label for="category"><?php echo
lang('category') ?></label>
+ <label for="category"><?php echo
lang('category') ?> (*)</label>
</dt>
<dd>
<?php
@@ -217,7 +220,7 @@
</select>
</dd>
<dt>
- <label for="target"><?php echo
lang('target') ?></label>
+ <label for="target"><?php echo
lang('target') ?> (*)</label>
</dt>
<dd>
<?php
@@ -232,7 +235,7 @@
?>
</dd>
<dt>
- <label for="district"><?php echo
lang('district') ?></label>
+ <label for="district"><?php echo
lang('district') ?> (*)</label>
</dt>
<dd>
<?php
@@ -255,7 +258,7 @@
<hr />
<h2><?php echo lang('where_when')?></h2>
<dt>
- <label for="arena"><?php echo
lang('arena') ?></label>
+ <label for="arena"><?php echo
lang('arena') ?> (*)</label>
<br/><?php echo lang('arena_helptext')?>
</dt>
<dt>
@@ -308,13 +311,13 @@
<input type="text"
name="arena_postaddress"/></dd>
</span>
<dt>
- <label for="time"><?php echo
lang('time') ?></label>
+ <label for="time"><?php echo
lang('time') ?> (*)</label>
</dt>
<dd>
<input type="text" name="time"
id="time" value="<?php echo $activity->get_time() ?>" />
</dd>
<dt>
- <label for="office"><?php echo
lang('office') ?></label>
+ <label for="office"><?php echo
lang('office') ?> (*)</label>
</dt>
<dd>
<?php
@@ -330,7 +333,7 @@
?>
</select>
</dd>
- <dt>Kontaktinformasjon for kulturkontoret</dt>
+ <dt>Kontaktinformasjon for kulturkontoret
(*)</dt>
<dt><label
for="contact2_address">Adresse</label>
<dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
<div id="contact2_address_container"></div></dd>
@@ -341,7 +344,7 @@
<hr />
<h2><?php echo lang('who')?></h2>
<dt>
- <label for="organization_id"><?php echo
lang('organization') ?></label>
+ <label for="organization_id"><?php echo
lang('organization') ?> (*)</label>
</dt>
<?php if($new_organization){?>
<input type="hidden" name="new_org"
id="new_org" value="yes" />
@@ -392,17 +395,17 @@
</select>
</dd>
<span id="new_group_fields" style="display:
none;">
- <dt><label
for="groupname">Navn</label></dt>
+ <dt><label for="groupname">Navn
(*)</label></dt>
<dd><input type="text" name="groupname"
size="100"/><br/></dd>
- <dt><label
for="group_description">Beskrivelse av aktiviteten</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>
+ <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>
+ <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>
+ <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>
Modified: trunk/activitycalendarfrontend/templates/base/activity_new_org.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new_org.php
2012-05-10 05:43:47 UTC (rev 9350)
+++ trunk/activitycalendarfrontend/templates/base/activity_new_org.php
2012-05-10 06:42:24 UTC (rev 9351)
@@ -108,15 +108,18 @@
<?php }?>
</div>
<h1><?php echo lang('new_organization') ?></h1>
+ <div>
+ <?php echo lang('required_fields')?>
+ </div>
<form action="#" method="post">
<input type="hidden" name="activity" value="<?php
if($activity->get_id()){ echo $activity->get_id(); } else { echo '0'; } ?>"/>
<dl class="proplist-col" style="width: 200%">
<input type="hidden" name="organization_id"
id="organization_id" value="new_org" />
- <dt><label
for="orgname">Organisasjonsnavn</label></dt>
+ <dt><label for="orgname">Organisasjonsnavn
(*)</label></dt>
<dd><input type="text" name="orgname"
size="100"/></dd>
<dt><label
for="orgno">Organisasjonsnummer</label></dt>
<dd><input type="text" name="orgno"/></dd>
- <dt><label for="district">Bydel</label></dt>
+ <dt><label for="district">Bydel (*)</label></dt>
<dd><select name="org_district">
<option value="0">Ingen bydel
valgt</option>
<?php
@@ -129,26 +132,26 @@
</select></dd>
<dt><label
for="homepage">Hjemmeside</label></dt>
<dd><input type="text" name="homepage"
size="100"/></dd>
- <dt><label for="email">E-post</label></dt>
+ <dt><label for="email">E-post (*)</label></dt>
<dd><input type="text" name="email"/></dd>
- <dt><label for="phone">Telefon</label></dt>
+ <dt><label for="phone">Telefon (*)</label></dt>
<dd><input type="text" name="phone"/></dd>
- <dt><label for="street">Gate</label></dt>
+ <dt><label for="street">Gate (*)</label></dt>
<dd><input type="text" name="address_txt"
id="address_txt" onkeyup="javascript:get_address_search()"/>
<div id="address_container"></div></dd>
<dt><label for="number">Husnummer</label></dt>
<dd><input type="text" name="number"/><br/></dd>
- <dt><label for="postaddress">Postnummer og
Sted</label></dt>
+ <dt><label for="postaddress">Postnummer og Sted
(*)</label></dt>
<dd><input type="text" name="postaddress"
size="100"/></dd>
- <dt><label
for="org_description">Beskrivelse</label></dt>
+ <dt><label for="org_description">Beskrivelse
(*)</label></dt>
<dd><textarea rows="10" cols="100"
name="org_description"></textarea></dd>
<hr/>
<b>Kontaktperson 1</b><br/>
- <dt><label for="contact1_name">Navn</label>
+ <dt><label for="contact1_name">Navn (*)</label>
<input type="text" name="org_contact1_name"
size="100"/></dt>
- <dt><label for="contact1_phone">Telefon</label>
+ <dt><label for="contact1_phone">Telefon
(*)</label>
<input type="text"
name="org_contact1_phone"/></dt>
- <dt><label for="contact1_mail">E-post</label>
+ <dt><label for="contact1_mail">E-post
(*)</label>
<input type="text"
name="org_contact1_mail"/></dt><br/><br/><br/>
<b>Kontaktperson 2</b><br/>
<dt><label for="contact2_name">Navn</label>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9351],
Erik Holm-Larsen <=