[Fmsystem-commits] [8177]

[Erik Holm-Larsen]

Revision: 8177
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8177
Author:   erikhl
Date:     2011-11-23 13:48:52 +0000 (Wed, 23 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-23 13:35:02 UTC (rev 
8176)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2011-11-23 13:48:52 UTC (rev 
8177)
@@ -424,4 +424,7 @@
 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.
-update_org     activitycalendar        no      Oppdater organisasjonsregister
\ No newline at end of file
+update_org     activitycalendar        no      Oppdater organisasjonsregister
+edit_contact_info      activitycalendar        no      For å redigere 
kontaktopplysninger:
+edit_contact_info_org  activitycalendar        no      Gå til 
organisasjonsopplysninger
+edit_contact_info_group        activitycalendar        no      Gå til 
gruppeopplysninger
\ No newline at end of file

Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php  2011-11-23 13:35:02 UTC 
(rev 8176)
+++ trunk/activitycalendar/templates/base/activity.php  2011-11-23 13:48:52 UTC 
(rev 8177)
@@ -432,6 +432,9 @@
                                                                }
                                                                ?>
                                                </select>
+                                               <?php 
if($current_organization_id){?>
+                                                       <br/><?php echo 
lang('edit_contact_info')?> <a 
href="index.php?menuaction=booking.uiorganization.show&id=<?php echo 
$current_organization_id ?>"><?php echo lang('edit_contact_info_org')?></a>
+                                               <?php }?>
                                                <?php
                                                }
                                        ?>
@@ -462,6 +465,9 @@
                                                                <option 
value="0">Ingen gruppe valgt</option>
                                                        </select>
                                                </div>
+                                               <?php if($current_group_id){?>
+                                                       <br/><?php echo 
lang('edit_contact_info')?> <a 
href="index.php?menuaction=booking.uigroup.show&id=<?php echo $current_group_id 
?>"><?php echo lang('edit_contact_info_group')?></a>
+                                               <?php }?>
                                                <?php
                                        ?>
                                        <?php