[Fmsystem-commits] [8059]

[Erik Holm-Larsen]

Revision: 8059
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8059
Author:   erikhl
Date:     2011-11-09 06:55:28 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiarena.inc.php
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/arena.php

Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php    2011-11-09 06:47:34 UTC 
(rev 8058)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php    2011-11-09 06:55:28 UTC 
(rev 8059)
@@ -63,6 +63,11 @@
 
                $errorMsgs = array();
                $infoMsgs = array();
+               $saved_OK = phpgw::get_var('saved_ok');
+               if($saved_OK)
+               {
+                       $message = lang('arena_saved_form');
+               }
                $arena = 
activitycalendar_soarena::get_instance()->get_single((int)phpgw::get_var('id'));
                $cancel_link = self::link(array('menuaction' => 
'activitycalendar.uiarena.index'));
                
@@ -74,6 +79,7 @@
                (
                        'arena' => $arena,
                        'cancel_link' => $cancel_link,
+                       'message' => $message,
                        'errorMsgs' => $errorMsgs,
                        'infoMsgs' => $infoMsgs
                );
@@ -119,7 +125,7 @@
                                        $error = lang('messages_form_error');
                                }
                        }
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiarena.view', 'id' => 
$arena->get_id()));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiarena.view', 'id' => 
$arena->get_id(), 'saved_ok' => 'yes'));
                }
 
                return $this->render('arena.php', array

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2011-11-09 06:47:34 UTC (rev 
8058)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2011-11-09 06:55:28 UTC (rev 
8059)
@@ -394,4 +394,8 @@
 change_type    activitycalendar        no      Endringstype
 added  activitycalendar        no      Lagt til i organisasjonsregisteret
 store  activitycalendar        no      Overfør til organisasjonsregister
-back   activitycalendar        no      Tilbake
\ No newline at end of file
+back   activitycalendar        no      Tilbake
+arena_saved_form       activitycalendar        no      Arena ble lagret
+activity_saved_form    activitycalendar        no      Aktiviteten ble lagret
+organization_saved_form        activitycalendar        no      Organisasjonen 
ble lagret
+group_saved_form       activitycalendar        no      Gruppen ble lagret
\ No newline at end of file

Modified: trunk/activitycalendar/templates/base/arena.php
===================================================================
--- trunk/activitycalendar/templates/base/arena.php     2011-11-09 06:47:34 UTC 
(rev 8058)
+++ trunk/activitycalendar/templates/base/arena.php     2011-11-09 06:55:28 UTC 
(rev 8059)
@@ -28,7 +28,7 @@
        
 }
 </script>
-
+<?php echo activitycalendar_uicommon::get_page_message($message) ?>
 <div class="identifier-header">
        <h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH 
?>images/32x32/custom/contact.png" /><?php echo lang('arena') ?></h1>
        <div>