fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [8142]


From: Erik Holm-Larsen
Subject: [Fmsystem-commits] [8142]
Date: Mon, 21 Nov 2011 08:33:21 +0000

Revision: 8142
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8142
Author:   erikhl
Date:     2011-11-21 08:33:21 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/setup/phpgw_no.lang

Added Paths:
-----------
    trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
    trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-11-21 
08:32:51 UTC (rev 8141)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-11-21 
08:33:21 UTC (rev 8142)
@@ -348,214 +348,283 @@
                        $organizations = 
activitycalendar_soorganization::get_instance()->get(null, null, 'org.name', 
true, null, null, null);
                        $groups = 
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null, 
null, null);
                        
-                       // Retrieve the activity object or create a new one
-                       if(isset($id) && $id > 0)
-                       {       
-                               $activity = $so_activity->get_single($id); 
+                       if(isset($_POST['step_1'])) //change_request
+                       {
+                               $activity_id = phpgw::get_var('activity_id');
+                               $activity = 
$this->so_activity->get_single($activity_id);
+                               
+                               //store update-request
+                               $activity->set_state(2);
+                               if($so_activity->store($activity))
+                               {
+                                       $message = lang('update_request_sent', 
$activity->get_title());
+                                       return 
$this->render('activity_edit_step_1.php', array
+                                               (
+                                                       'activities' => 
$activities,
+                                                       'message' => $message
+                                               )       
+                                       );
+                               }
                        }
                        else
                        {
-                               $this->redirect(array('menuaction' => 
'bookingfrontend.uisearch.index'));
-                       }
-                       
-                       if($activity->get_secret() != phpgw::get_var('secret', 
'GET'))
-                       {
-                               $this->redirect(array('menuaction' => 
'bookingfrontend.uisearch.index'));
-                       }
-                       
-                       $g_id = phpgw::get_var('group_id');
-                       $o_id = phpgw::get_var('organization_id');
-                       if(isset($g_id) && is_numeric($g_id) && $g_id > 0)
-                       {
-                               $persons = 
activitycalendar_sogroup::get_instance()->get_contacts($g_id);
-                               $desc = 
activitycalendar_sogroup::get_instance()->get_description($g_id);
-                       }
-                       else if(isset($o_id))
-                       {
-                               if($o_id == "new_org")
+                               $secret_param = phpgw::get_var('secret', 'GET');
+                               if(!isset($id) || $id == '')
                                {
-                                       $activity->set_new_org(true);
-                                       //add new organization to internal 
activitycalendar organization register
-                                       $org_info['name'] = 
phpgw::get_var('orgname');
-                                       $org_info['orgnr'] = 
phpgw::get_var('orgno');
-                                       $org_info['homepage'] = 
phpgw::get_var('homepage');
-                                       $org_info['phone'] = 
phpgw::get_var('phone');
-                                       $org_info['email'] = 
phpgw::get_var('email');
-                                       $org_info['description'] = 
phpgw::get_var('org_description');
-                                       $org_info['street'] = 
phpgw::get_var('address') . ' ' . phpgw::get_var('number') . ', ' . 
phpgw::get_var('postaddress');
-                                       //$org_info['zip'] = 
phpgw::get_var('postaddress');
-                                       $org_info['district'] = 
phpgw::get_var('org_district'); 
-                                       $org_info['status'] = "new";
-                                       $o_id = 
$so_activity->add_organization_local($org_info);
-                                       
-                                       //add contact persons
-                                       $contact1 = array();
-                                       $contact1['name'] = 
phpgw::get_var('contact1_name');
-                                       $contact1['phone'] = 
phpgw::get_var('contact1_phone');
-                                       $contact1['mail'] = 
phpgw::get_var('contact1_email');
-                                       $contact1['org_id'] = $o_id;
-                                       $contact1['group_id'] = 0;
-                                       
$so_activity->add_contact_person_local($contact1);
-                                       
-                                       $contact2 = array();
-                                       $contact2['name'] = 
phpgw::get_var('contact2_name');
-                                       $contact2['phone'] = 
phpgw::get_var('contact2_phone');
-                                       $contact2['mail'] = 
phpgw::get_var('contact2_email');
-                                       $contact2['org_id'] = $o_id;
-                                       $contact2['group_id'] = 0;
-                                       
$so_activity->add_contact_person_local($contact2);
-                                       
-                                       $persons = 
activitycalendar_soorganization::get_instance()->get_contacts_local($o_id);
-                                       $desc = 
phpgw::get_var('org_description');
-
+                                       //select activity to edit
+                                       $activities = 
$this->so_activity->get(null, null, 'title', true, null, null, 
array('activity_state' => 3));
+                                       return 
$this->render('activity_edit_step_1.php', array
+                                               (
+                                                       'activities' => 
$activities
+                                               )       
+                                       );
                                }
-                               else if($o_id == "change_org")
-                               {
-                                       $change_org_id = 
phpgw::get_var('change_organization_id');
-                                       $organization = 
activitycalendar_soorganization::get_instance()->get_single($change_org_id);
-                               
-                                       $org_info['name'] = 
$organization->get_name();
-                                       $org_info['orgnr'] = 
$organization->get_organization_number();
-                                       $org_info['homepage'] = 
$organization->get_homepage();
-                                       $org_info['phone'] = 
$organization->get_phone();
-                                       $org_info['email'] = 
$organization->get_email();
-                                       $org_info['description'] = 
$organization->get_description();
-                                       $org_info['street'] = 
$organization->get_address();
-                                       $org_info['district'] = 
$organization->get_district(); 
-                                       $org_info['status'] = "change";
-                                       $o_id = 
$so_activity->add_organization_local($org_info);
-                                       
-                                       //add contact persons
-                                       $contact1 = array();
-                                       $contact1['name'] = 
phpgw::get_var('contact1_name');
-                                       $contact1['phone'] = 
phpgw::get_var('contact1_phone');
-                                       $contact1['mail'] = 
phpgw::get_var('contact1_email');
-                                       $contact1['org_id'] = $o_id;
-                                       $contact1['group_id'] = 0;
-                                       
$so_activity->add_contact_person_local($contact1);
-                                       
-                                       $contact2 = array();
-                                       $contact2['name'] = 
phpgw::get_var('contact2_name');
-                                       $contact2['phone'] = 
phpgw::get_var('contact2_phone');
-                                       $contact2['mail'] = 
phpgw::get_var('contact2_email');
-                                       $contact2['org_id'] = $o_id;
-                                       $contact2['group_id'] = 0;
-                                       
$so_activity->add_contact_person_local($contact2);
-                                       
-                                       $message = lang('change_request_ok', 
$organization->get_name());
-                                       
-                                       
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
-
-                                       $this->render('activity_edit.php', array
+                               if(isset($secret_param) && $secret_param != ''){
+                                       //select activity to edit
+                                       $activities = 
$this->so_activity->get(null, null, 'title', true, null, null, 
array('activity_state' => 3));
+                                       return 
$this->render('activity_edit_step_1.php', array
                                                (
-                                                       'activity'      => 
$activity,
-                                                       'organizations' => 
$organizations,
-                                                       'groups' => $groups,
-                                                       'arenas' => $arenas,
-                                                       'buildings' => 
$buildings,
-                                                       'categories' => 
$categories,
-                                                       'targets' => $targets,
-                                                       'districts' => 
$districts,
-                                                       'offices' => $offices,
-                                                       'editable' => true,
-                                                       'message' => 
isset($message) ? $message : phpgw::get_var('message'),
-                                                       'error' => 
isset($error) ? $error : phpgw::get_var('error')
-                                               )
-                       );
+                                                       'activities' => 
$activities
+                                               )       
+                                       );
                                }
-                               else if(is_numeric($o_id) && $o_id > 0)
+                               else
                                {
-                                       if(isset($g_id) && $g_id == "new_group")
-                                       {
-                                               $group_info['name'] = 
phpgw::get_var('groupname');
-                                               $group_info['organization_id'] 
= $o_id;
-                                               $group_info['description'] = 
phpgw::get_var('group_description');
-                                               $group_info['status'] = "new";
-                                               $g_id = 
$so_activity->add_group_local($group_info);
-                                               
-                                               //add contact persons
-                                               $contact1 = array();
-                                               $contact1['name'] = 
phpgw::get_var('contact1_name');
-                                               $contact1['phone'] = 
phpgw::get_var('contact1_phone');
-                                               $contact1['mail'] = 
phpgw::get_var('contact1_email');
-                                               $contact1['org_id'] = 0;
-                                               $contact1['group_id'] = $g_id;
-                                               
$so_activity->add_contact_person_local($contact1);
-                                               
-                                               $contact2 = array();
-                                               $contact2['name'] = 
phpgw::get_var('contact2_name');
-                                               $contact2['phone'] = 
phpgw::get_var('contact2_phone');
-                                               $contact2['mail'] = 
phpgw::get_var('contact2_email');
-                                               $contact2['org_id'] = 0;
-                                               $contact2['group_id'] = $g_id;
-                                               
$so_activity->add_contact_person_local($contact2);
-                                               
-                                               $activity_persons = 
activitycalendar_sogroup::get_instance()->get_contacts_local($g_id);
-                                               $desc = 
phpgw::get_var('group_description');
+                                       // Retrieve the activity object or 
create a new one
+                                       if(isset($id) && $id > 0)
+                                       {       
+                                               $activity = 
$so_activity->get_single($id); 
                                        }
                                        else
                                        {
-                                               $persons = 
activitycalendar_soorganization::get_instance()->get_contacts($o_id);
-                                               $desc = 
activitycalendar_soorganization::get_instance()->get_description($o_id);
+                                               
$this->redirect(array('menuaction' => 'bookingfrontend.uisearch.index'));
                                        }
-                               }
-                       }
-                       
-                       if(isset($_POST['save_activity'])) // The user has 
pressed the save button
-                       {
-                               if(isset($activity)) // If an activity object 
is created
-                               {
-
-                                       $old_state = $activity->get_state();
-                                       $new_state = phpgw::get_var('state');
-                                       // ... set all parameters
-                                       
$activity->set_title(phpgw::get_var('title'));
-                                       $activity->set_organization_id($o_id);
-                                       $activity->set_group_id($g_id);
-                                       
$activity->set_arena(phpgw::get_var('arena_id'));
-                                       
$activity->set_internal_arena(phpgw::get_var('internal_arena_id'));
-                                       $district_array = 
phpgw::get_var('district');
-                                       $activity->set_district(implode(",", 
$district_array));
-                                       
$activity->set_office(phpgw::get_var('office'));
-                                       $activity->set_state(2);
-                                       
$activity->set_category(phpgw::get_var('category'));
-                                       $target_array = 
phpgw::get_var('target');
-                                       $activity->set_target(implode(",", 
$target_array));
-                                       $activity->set_description($desc);
-                                       
$activity->set_time(phpgw::get_var('time'));
-                                       
$activity->set_contact_persons($persons);
-                                       
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
-                                       $activity->set_frontend(true);
-
-                                       $target_ok = false;
-                                       $district_ok = false;
-                                       if($activity->get_target() && 
$activity->get_target() != '')
+                                       
+                                       if($activity->get_secret() != 
phpgw::get_var('secret', 'GET'))
                                        {
-                                               $target_ok = true;
+                                               
$this->redirect(array('menuaction' => 'bookingfrontend.uisearch.index'));
                                        }
-                                       if($activity->get_district() && 
$activity->get_district() != '')
+                                       
+                                       $g_id = phpgw::get_var('group_id');
+                                       $o_id = 
phpgw::get_var('organization_id');
+                                       if(isset($g_id) && is_numeric($g_id) && 
$g_id > 0)
                                        {
-                                               $district_ok = true;
+                                               $persons = 
activitycalendar_sogroup::get_instance()->get_contacts($g_id);
+                                               $desc = 
activitycalendar_sogroup::get_instance()->get_description($g_id);
                                        }
-                                       
-                                       if($target_ok && $district_ok)
+                                       else if(isset($o_id))
                                        {
+                                               if($o_id == "new_org")
+                                               {
+                                                       
$activity->set_new_org(true);
+                                                       //add new organization 
to internal activitycalendar organization register
+                                                       $org_info['name'] = 
phpgw::get_var('orgname');
+                                                       $org_info['orgnr'] = 
phpgw::get_var('orgno');
+                                                       $org_info['homepage'] = 
phpgw::get_var('homepage');
+                                                       $org_info['phone'] = 
phpgw::get_var('phone');
+                                                       $org_info['email'] = 
phpgw::get_var('email');
+                                                       
$org_info['description'] = phpgw::get_var('org_description');
+                                                       $org_info['street'] = 
phpgw::get_var('address') . ' ' . phpgw::get_var('number') . ', ' . 
phpgw::get_var('postaddress');
+                                                       //$org_info['zip'] = 
phpgw::get_var('postaddress');
+                                                       $org_info['district'] = 
phpgw::get_var('org_district'); 
+                                                       $org_info['status'] = 
"new";
+                                                       $o_id = 
$so_activity->add_organization_local($org_info);
+                                                       
+                                                       //add contact persons
+                                                       $contact1 = array();
+                                                       $contact1['name'] = 
phpgw::get_var('contact1_name');
+                                                       $contact1['phone'] = 
phpgw::get_var('contact1_phone');
+                                                       $contact1['mail'] = 
phpgw::get_var('contact1_email');
+                                                       $contact1['org_id'] = 
$o_id;
+                                                       $contact1['group_id'] = 
0;
+                                                       
$so_activity->add_contact_person_local($contact1);
+                                                       
+                                                       $contact2 = array();
+                                                       $contact2['name'] = 
phpgw::get_var('contact2_name');
+                                                       $contact2['phone'] = 
phpgw::get_var('contact2_phone');
+                                                       $contact2['mail'] = 
phpgw::get_var('contact2_email');
+                                                       $contact2['org_id'] = 
$o_id;
+                                                       $contact2['group_id'] = 
0;
+                                                       
$so_activity->add_contact_person_local($contact2);
+                                                       
+                                                       $persons = 
activitycalendar_soorganization::get_instance()->get_contacts_local($o_id);
+                                                       $desc = 
phpgw::get_var('org_description');
+               
+                                               }
+                                               else if($o_id == "change_org")
+                                               {
+                                                       $change_org_id = 
phpgw::get_var('change_organization_id');
+                                                       $organization = 
activitycalendar_soorganization::get_instance()->get_single($change_org_id);
                                                
-                                               
if($so_activity->store($activity)) // ... and then try to store the object
+                                                       $org_info['name'] = 
$organization->get_name();
+                                                       $org_info['orgnr'] = 
$organization->get_organization_number();
+                                                       $org_info['homepage'] = 
$organization->get_homepage();
+                                                       $org_info['phone'] = 
$organization->get_phone();
+                                                       $org_info['email'] = 
$organization->get_email();
+                                                       
$org_info['description'] = $organization->get_description();
+                                                       $org_info['street'] = 
$organization->get_address();
+                                                       $org_info['district'] = 
$organization->get_district(); 
+                                                       $org_info['status'] = 
"change";
+                                                       $o_id = 
$so_activity->add_organization_local($org_info);
+                                                       
+                                                       //add contact persons
+                                                       $contact1 = array();
+                                                       $contact1['name'] = 
phpgw::get_var('contact1_name');
+                                                       $contact1['phone'] = 
phpgw::get_var('contact1_phone');
+                                                       $contact1['mail'] = 
phpgw::get_var('contact1_email');
+                                                       $contact1['org_id'] = 
$o_id;
+                                                       $contact1['group_id'] = 
0;
+                                                       
$so_activity->add_contact_person_local($contact1);
+                                                       
+                                                       $contact2 = array();
+                                                       $contact2['name'] = 
phpgw::get_var('contact2_name');
+                                                       $contact2['phone'] = 
phpgw::get_var('contact2_phone');
+                                                       $contact2['mail'] = 
phpgw::get_var('contact2_email');
+                                                       $contact2['org_id'] = 
$o_id;
+                                                       $contact2['group_id'] = 
0;
+                                                       
$so_activity->add_contact_person_local($contact2);
+                                                       
+                                                       $message = 
lang('change_request_ok', $organization->get_name());
+                                                       
+                                                       
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
+               
+                                                       
$this->render('activity_edit.php', array
+                                                               (
+                                                                       
'activity'      => $activity,
+                                                                       
'organizations' => $organizations,
+                                                                       
'groups' => $groups,
+                                                                       
'arenas' => $arenas,
+                                                                       
'buildings' => $buildings,
+                                                                       
'categories' => $categories,
+                                                                       
'targets' => $targets,
+                                                                       
'districts' => $districts,
+                                                                       
'offices' => $offices,
+                                                                       
'editable' => true,
+                                                                       
'message' => isset($message) ? $message : phpgw::get_var('message'),
+                                                                       'error' 
=> isset($error) ? $error : phpgw::get_var('error')
+                                                               )
+                                       );
+                                               }
+                                               else if(is_numeric($o_id) && 
$o_id > 0)
                                                {
-                                                       $message = 
lang('messages_saved_form'); 
+                                                       if(isset($g_id) && 
$g_id == "new_group")
+                                                       {
+                                                               
$group_info['name'] = phpgw::get_var('groupname');
+                                                               
$group_info['organization_id'] = $o_id;
+                                                               
$group_info['description'] = phpgw::get_var('group_description');
+                                                               
$group_info['status'] = "new";
+                                                               $g_id = 
$so_activity->add_group_local($group_info);
+                                                               
+                                                               //add contact 
persons
+                                                               $contact1 = 
array();
+                                                               
$contact1['name'] = phpgw::get_var('contact1_name');
+                                                               
$contact1['phone'] = phpgw::get_var('contact1_phone');
+                                                               
$contact1['mail'] = phpgw::get_var('contact1_email');
+                                                               
$contact1['org_id'] = 0;
+                                                               
$contact1['group_id'] = $g_id;
+                                                               
$so_activity->add_contact_person_local($contact1);
+                                                               
+                                                               $contact2 = 
array();
+                                                               
$contact2['name'] = phpgw::get_var('contact2_name');
+                                                               
$contact2['phone'] = phpgw::get_var('contact2_phone');
+                                                               
$contact2['mail'] = phpgw::get_var('contact2_email');
+                                                               
$contact2['org_id'] = 0;
+                                                               
$contact2['group_id'] = $g_id;
+                                                               
$so_activity->add_contact_person_local($contact2);
+                                                               
+                                                               
$activity_persons = 
activitycalendar_sogroup::get_instance()->get_contacts_local($g_id);
+                                                               $desc = 
phpgw::get_var('group_description');
+                                                       }
+                                                       else
+                                                       {
+                                                               $persons = 
activitycalendar_soorganization::get_instance()->get_contacts($o_id);
+                                                               $desc = 
activitycalendar_soorganization::get_instance()->get_description($o_id);
+                                                       }
                                                }
-                                               else
+                                       }
+                                       
+                                       if(isset($_POST['save_activity'])) // 
The user has pressed the save button
+                                       {
+                                               if(isset($activity)) // If an 
activity object is created
                                                {
-                                                       $error = 
lang('messages_form_error');
-                                               }
                
-                                               
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
-       
-                                               $this->render('activity.php', 
array
+                                                       $old_state = 
$activity->get_state();
+                                                       $new_state = 
phpgw::get_var('state');
+                                                       // ... set all 
parameters
+                                                       
$activity->set_title(phpgw::get_var('title'));
+                                                       
$activity->set_organization_id($o_id);
+                                                       
$activity->set_group_id($g_id);
+                                                       
$activity->set_arena(phpgw::get_var('arena_id'));
+                                                       
$activity->set_internal_arena(phpgw::get_var('internal_arena_id'));
+                                                       $district_array = 
phpgw::get_var('district');
+                                                       
$activity->set_district(implode(",", $district_array));
+                                                       
$activity->set_office(phpgw::get_var('office'));
+                                                       $activity->set_state(2);
+                                                       
$activity->set_category(phpgw::get_var('category'));
+                                                       $target_array = 
phpgw::get_var('target');
+                                                       
$activity->set_target(implode(",", $target_array));
+                                                       
$activity->set_description($desc);
+                                                       
$activity->set_time(phpgw::get_var('time'));
+                                                       
$activity->set_contact_persons($persons);
+                                                       
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
+                                                       
$activity->set_frontend(true);
+               
+                                                       $target_ok = false;
+                                                       $district_ok = false;
+                                                       
if($activity->get_target() && $activity->get_target() != '')
+                                                       {
+                                                               $target_ok = 
true;
+                                                       }
+                                                       
if($activity->get_district() && $activity->get_district() != '')
+                                                       {
+                                                               $district_ok = 
true;
+                                                       }
+                                                       
+                                                       if($target_ok && 
$district_ok)
+                                                       {
+                                                               
+                                                               
if($so_activity->store($activity)) // ... and then try to store the object
+                                                               {
+                                                                       
$message = lang('messages_saved_form'); 
+                                                               }
+                                                               else
+                                                               {
+                                                                       $error 
= lang('messages_form_error');
+                                                               }
+                               
+                                                               
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
+                       
+                                                               
$this->render('activity.php', array
+                                                                               
        (
+                                                                               
                'activity'      => $activity,
+                                                                               
                'organizations' => $organizations,
+                                                                               
                'groups' => $groups,
+                                                                               
                'arenas' => $arenas,
+                                                                               
                'buildings' => $buildings,
+                                                                               
                'categories' => $categories,
+                                                                               
                'targets' => $targets,
+                                                                               
                'districts' => $districts,
+                                                                               
                'offices' => $offices,
+                                                                               
                'message' => isset($message) ? $message : 
phpgw::get_var('message'),
+                                                                               
                'error' => isset($error) ? $error : phpgw::get_var('error')
+                                                                               
        )
+                                                               );
+                                                       }
+                                                       else
+                                                       {
+                                                               if(!$target_ok)
+                                                               {
+                                                                       $error 
.= "<br/>" . lang('target_not_selected');
+                                                               }
+                                                               
if(!$district_ok)
+                                                               {
+                                                                       $error 
.= "<br/>" . lang('district_not_selected');
+                                                               }
+                                                               return 
$this->render('activity_edit.php', array
                                                                        (
                                                                                
'activity'      => $activity,
                                                                                
'organizations' => $organizations,
+                                                                               
'org_name' => $org_name,
                                                                                
'groups' => $groups,
                                                                                
'arenas' => $arenas,
                                                                                
'buildings' => $buildings,
@@ -563,61 +632,36 @@
                                                                                
'targets' => $targets,
                                                                                
'districts' => $districts,
                                                                                
'offices' => $offices,
+                                                                               
'editable' => true,
+                                                                               
'cancel_link' => $cancel_link,
                                                                                
'message' => isset($message) ? $message : phpgw::get_var('message'),
                                                                                
'error' => isset($error) ? $error : phpgw::get_var('error')
-                                                                       )
-                                               );
-                                       }
-                                       else
-                                       {
-                                               if(!$target_ok)
-                                               {
-                                                       $error .= "<br/>" . 
lang('target_not_selected');
+                                                                       )       
+                                                               );
+                                                       }
                                                }
-                                               if(!$district_ok)
-                                               {
-                                                       $error .= "<br/>" . 
lang('district_not_selected');
-                                               }
-                                               return 
$this->render('activity_edit.php', array
-                                                       (
-                                                               'activity'      
=> $activity,
-                                                               'organizations' 
=> $organizations,
-                                                               'org_name' => 
$org_name,
-                                                               'groups' => 
$groups,
-                                                               'arenas' => 
$arenas,
-                                                               'buildings' => 
$buildings,
-                                                               'categories' => 
$categories,
-                                                               'targets' => 
$targets,
-                                                               'districts' => 
$districts,
-                                                               'offices' => 
$offices,
-                                                               'editable' => 
true,
-                                                               'cancel_link' 
=> $cancel_link,
-                                                               'message' => 
isset($message) ? $message : phpgw::get_var('message'),
-                                                               'error' => 
isset($error) ? $error : phpgw::get_var('error')
-                                                       )       
-                                               );
                                        }
+                                       
+                                       
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
+               
+                                       $this->render('activity_edit.php', array
+                                                               (
+                                                                       
'activity'      => $activity,
+                                                                       
'organizations' => $organizations,
+                                                                       
'groups' => $groups,
+                                                                       
'arenas' => $arenas,
+                                                                       
'buildings' => $buildings,
+                                                                       
'categories' => $categories,
+                                                                       
'targets' => $targets,
+                                                                       
'districts' => $districts,
+                                                                       
'offices' => $offices,
+                                                                       
'editable' => true,
+                                                                       
'message' => isset($message) ? $message : phpgw::get_var('message'),
+                                                                       'error' 
=> isset($error) ? $error : phpgw::get_var('error')
+                                                               )
+                                       );
                                }
                        }
-                       
-                       $GLOBALS['phpgw_info']['flags']['noframework'] = true;
-
-                       $this->render('activity_edit.php', array
-                                               (
-                                                       'activity'      => 
$activity,
-                                                       'organizations' => 
$organizations,
-                                                       'groups' => $groups,
-                                                       'arenas' => $arenas,
-                                                       'buildings' => 
$buildings,
-                                                       'categories' => 
$categories,
-                                                       'targets' => $targets,
-                                                       'districts' => 
$districts,
-                                                       'offices' => $offices,
-                                                       'editable' => true,
-                                                       'message' => 
isset($message) ? $message : phpgw::get_var('message'),
-                                                       'error' => 
isset($error) ? $error : phpgw::get_var('error')
-                                               )
-                       );
                }
                
                function index()

Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang  2011-11-21 08:32:51 UTC 
(rev 8141)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang  2011-11-21 08:33:21 UTC 
(rev 8142)
@@ -83,4 +83,8 @@
 save_activity  activitycalendarfrontend        no      Send
 org_helptext_step1     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"<br/>Klikk deretter på "Neste" for å registrere aktivitet.
 next   activitycalendarfrontend        no      Neste
-new_activity   activitycalendarfrontend        no      Ny aktivitet
\ No newline at end of file
+new_activity   activitycalendarfrontend        no      Ny aktivitet
+change_activity        activitycalendarfrontend        no      Endre aktivitet
+change_request activitycalendarfrontend        no      Send endringsønske
+edit_helptext  activitycalendarfrontend        no      Velg aktivitet du 
ønsker å endre fra listen under og klikk på "Send endringsønske"      
+update_request_sent    activitycalendarfrontend        no      
Oppdateringsforespørsel er sendt for aktiviteten "%1"
\ No newline at end of file

Added: trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php      
                        (rev 0)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php      
2011-11-21 08:33:21 UTC (rev 8142)
@@ -0,0 +1,33 @@
+<?php ?>
+<div class="yui-content" style="width: 100%;">
+       <h1><?php echo lang('change_activity');?></h1>
+       <form action="#" method="post">
+               <dl class="proplist-col" style="width: 200%">
+                       <dt>
+                               <?php echo lang('edit_helptext');?><br/><br/>
+                       </dt>
+                       <dd>
+                       <?php if($message){?>
+                       <?php echo $message;?>
+                       <?php }else{?>
+                               <select name="activity_id" id="activity_id">
+                                       <option value="">Ingen aktivitet 
valgt</option>
+                                       <?php
+                                       foreach($activities as $activity)
+                                       {
+                                               echo "<option 
value=\"{$activity->get_id()}\">".$activity->get_title()."</option>";
+                                       }
+                                       ?>
+                               </select>
+                               <br/><br/>
+                       <?php }?>
+                       </dd>
+                       <?php if(!$message){?>
+                       <div class="form-buttons">
+                               <input type="submit" name="step_1" value="<?php 
echo lang('change_request') ?>" />
+                       </div>
+                       <?php }?>
+               </dl>
+               
+       </form>
+</div>
\ No newline at end of file

Added: trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php       
                        (rev 0)
+++ trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php       
2011-11-21 08:33:21 UTC (rev 8142)
@@ -0,0 +1,28 @@
+<?php ?>
+<div class="yui-content" style="width: 100%;">
+       <h1><?php echo lang('new_activity') ?></h1>
+       <form action="#" method="post">
+               <dl class="proplist-col" style="width: 200%">
+                       <dt>
+                               <?php echo 
lang('org_helptext_step1')?><br/><br/>
+                       </dt>
+                       <dd>
+                               <select name="organization_id" 
id="organization_id">
+                                       <option value="">Ingen organisasjon 
valgt</option>
+                                       <option value="new_org">Ny 
organisasjon</option>
+                                       <?php
+                                       foreach($organizations as $organization)
+                                       {
+                                               echo "<option 
value=\"{$organization->get_id()}\">".$organization->get_name()."</option>";
+                                       }
+                                       ?>
+                               </select>
+                               <br/><br/>
+                       </dd>
+                       <div class="form-buttons">
+                               <input type="submit" name="step_1" value="<?php 
echo lang('next') ?>" />
+                       </div>
+               </dl>
+               
+       </form>
+</div>
\ No newline at end of file




reply via email to

[Prev in Thread] Current Thread [Next in Thread]