fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [9844]


From: Erik Holm-Larsen
Subject: [Fmsystem-commits] [9844]
Date: Tue, 14 Aug 2012 07:14:56 +0000

Revision: 9844
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9844
Author:   erikhl
Date:     2012-08-14 07:14:55 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soorganization.inc.php
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/templates/base/organization_edit.php

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2012-08-13 
13:18:36 UTC (rev 9843)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2012-08-14 
07:14:55 UTC (rev 9844)
@@ -125,18 +125,6 @@
                        $filter_clauses[] = "org.id IN (SELECT organization_id 
from activity_activity where state = 3 OR state = 4)";
                }
 
-/*
-               // All parties with contracts of type X
-               if(isset($filters['party_type']))
-               {
-                       $party_type = 
$this->marshal($filters['party_type'],'int');
-                       if(isset($party_type) && $party_type > 0)
-                       {
-                               $filter_clauses[] = "contract.location_id = 
{$party_type}";
-                       }
-               }
-*/             
-               
                if(count($filter_clauses))
                {
                        $clauses[] = join(' AND ', $filter_clauses);
@@ -159,6 +147,8 @@
                                $columns[] = 'org.email';
                                $columns[] = 'org.description';
                                $columns[] = 'org.address';
+                               $columns[] = 'org.zip_code';
+                               $columns[] = 'org.city';
                                $columns[] = 'org.district';
                                $columns[] = 'org.change_type';
                                $columns[] = 'org.transferred';
@@ -204,9 +194,6 @@
        
                        $tables = "bb_organization org";                        
                }
-
-               //$join_contracts = "   {$this->left_join} 
rental_contract_party c_p ON (c_p.party_id = party.id)
-               //{$this->left_join} rental_contract contract ON (contract.id = 
c_p.contract_id)";
                
                //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}");
                return "SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}";
@@ -595,14 +582,10 @@
                $name = $organization->get_name();
                $orgnr = $organization->get_organization_number();
                $homepage = $organization->get_homepage();
-               $phone = $organization->get_phone();
-               $email = $organization->get_email();
-               $description = $organization->get_description();
                $street = $organization->get_address();
                $streetnumber = $organization->get_address_number();
                $zip_code = $organization->get_zip_code();
                $city = $organization->get_city();
-               $district = $organization->get_district();
                if($organization->get_original_org_id() && 
$organization->get_original_org_id() != '')
                {
                        $original_org_id = 
$organization->get_original_org_id(); 
@@ -615,15 +598,11 @@
                
                $values[] = "NAME='{$name}'";
                $values[] = "HOMEPAGE='{$homepage}'";
-               $values[] = "PHONE='{$phone}'";
-               $values[] = "EMAIL='{$email}'";
-               $values[] = "DESCRIPTION='{$description}'";
                $values[] = "ADDRESS='{$street}'";
                $values[] = "ADDRESSNUMBER='{$streetnumber}'";
                $values[] = "ZIP_CODE='{$zip_code}'";
                $values[] = "CITY='{$city}'";
                $values[] = "ORGNO='{$orgnr}'";
-               $values[] = "DISTRICT='{$district}'";
                $values[] = "ORIGINAL_ORG_ID={$original_org_id}";
                $vals = implode(',',$values);
                
@@ -645,15 +624,11 @@
                $name = $org_info['name'];
                $orgnr = $org_info['orgnr'];
                $homepage = $org_info['homepage'];
-               $phone = $org_info['phone'];
-               $email = $org_info['email'];
-               $description = $org_info['description'];
                $street_1 = $org_info['street'];
                $street_2 = $org_info['streetnumber'];
                $street = $street_1 . ' ' . $street_2;
                $zip_code = $org_info['zip'];
                $city = $org_info['postaddress'];
-               $district = $org_info['district'];
                $activity_id = 1;
                $show_in_portal = 1; 
                
@@ -673,13 +648,13 @@
                
                $values[] = "'{$name}'";
                $values[] = "'{$homepage}'";
-               $values[] = "'{$phone}'";
-               $values[] = "'{$email}'";
-               $values[] = "'{$description}'";
+               $values[] = "''";
+               $values[] = "''";
+               $values[] = "''";
                $values[] = "'{$street}'";
                $values[] = "'{$zip_code}'";
                $values[] = "'{$city}'";
-               $values[] = "'{$district}'";
+               $values[] = "''";
                $values[] = "'{$orgnr}'";
                $values[] = $this->marshal($activity_id, 'int');
                $values[] = $show_in_portal;

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-13 
13:18:36 UTC (rev 9843)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-14 
07:14:55 UTC (rev 9844)
@@ -537,17 +537,19 @@
                if($activity->get_group_id() && $activity->get_group_id() > 0)
                {
                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
-                       if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+/*                     if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
                                
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
-                       else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                       else*/ 
+                       if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
                                
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
                }
                else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                {
                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
-                       if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+/*                     if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
                                
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
-                       else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                       else*/ 
+                       if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
                                
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
                }
            }
@@ -592,18 +594,20 @@
        {
                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact2($activity>get_group_id());
                
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
-               if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+/*             if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
                        
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
-               else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+               else */
+               if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
                        
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
        }
        else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
        {
                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_oup_contact2($activity>get_group_id());
                
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
-               if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+/*             if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
                                
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
-               else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+               else */
+               if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
                        
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
        }
        

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-13 
13:18:36 UTC (rev 9843)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-14 
07:14:55 UTC (rev 9844)
@@ -457,7 +457,6 @@
                                $secret_param = phpgw::get_var('secret', 'GET');
                                if(!isset($id) || $id == '')
                                {
-                                   var_dump(3);
                                        //select activity to edit
                                        $activities = 
$this->so_activity->get(null, null, 'title', true, null, null, 
array('activity_state' => 3));
                                        $organizations = 
$this->so_organization->get(null, null, 'org.name', true, null, null, 
array('edit_from_frontend' => 'yes'));
@@ -743,12 +742,9 @@
                                        $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');
-                                       //$org_info['zip'] = 
phpgw::get_var('postaddress');
-                                       $org_info['district'] = 
$organization->get_district();
+                                       $org_info['zip'] = 
phpgw::get_var('postzip');
+                                       $org_info['postaddress'] = 
phpgw::get_var('postaddress');
                                        $org_info['status'] = "change";
                                        $org_info['original_org_id'] = $org_id;
                                        $o_id = 
$this->so_activity->add_organization_local($org_info);
@@ -757,19 +753,11 @@
                                        $contact1 = array();
                                        $contact1['name'] = 
phpgw::get_var('org_contact1_name');
                                        $contact1['phone'] = 
phpgw::get_var('org_contact1_phone');
-                                       $contact1['mail'] = 
phpgw::get_var('org_contact1_email');
+                                       $contact1['mail'] = 
phpgw::get_var('org_contact1_mail');
                                        $contact1['org_id'] = $o_id;
                                        $contact1['group_id'] = 0;
                                        
$this->so_activity->add_contact_person_local($contact1);
                                        
-                                       $contact2 = array();
-                                       $contact2['name'] = 
phpgw::get_var('org_contact2_name');
-                                       $contact2['phone'] = 
phpgw::get_var('org_contact2_phone');
-                                       $contact2['mail'] = 
phpgw::get_var('org_contact2_email');
-                                       $contact2['org_id'] = $o_id;
-                                       $contact2['group_id'] = 0;
-                                       
$this->so_activity->add_contact_person_local($contact2);
-                                       
                                        $message = lang('change_request_ok', 
$org_info['name']);
                                        
                                        
$this->render('organization_reciept.php', array
@@ -793,8 +781,6 @@
                                                (
                                                        'organization' => 
$organization,
                                                        'contact1' => 
$persons[0],
-                                                       'contact2' => 
$persons[1],
-                                                       'districts' => 
$districts,
                                                        'editable' => true,
                                                        'message' => 
isset($message) ? $message : phpgw::get_var('message'),
                                                        'error' => 
isset($error) ? $error : phpgw::get_var('error')

Modified: trunk/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_edit.php 
2012-08-13 13:18:36 UTC (rev 9843)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php 
2012-08-14 07:14:55 UTC (rev 9844)
@@ -37,306 +37,46 @@
        div_address.style.display="none";
 }
 
-function allOK()
+function isOK()
 {
-       if(document.getElementById('title').value == null || 
document.getElementById('title').value == '')
+       if(document.getElementById('orgname').value == null || 
document.getElementById('orgname').value == '')
        {
-               alert("Tittel må fylles ut!");
+               alert("Organisasjonsnavn må fylles ut!");
                return false;
-       } 
-       if(document.getElementById('internal_arena_id').value == null || 
document.getElementById('internal_arena_id').value == 0)
+       }
+       if(document.getElementById('org_contact1_name').value == null || 
document.getElementById('org_contact1_name').value == '')
        {
-               if(document.getElementById('arena_id').value == null || 
document.getElementById('arena_id').value == 0)
-               {
-                       alert("Arena må fylles ut!");
-                       return false;
-               }
+               alert("Navn på kontaktperson må fylles ut!");
+               return false;
        }
-       if(document.getElementById('time').value == null || 
document.getElementById('time').value == '')
+       if(document.getElementById('org_contact1_phone').value == null || 
document.getElementById('org_contact1_phone').value == '')
        {
-               alert("Tid må fylles ut!");
+               alert("Telefonnummer til kontaktperson må fylles ut!");
                return false;
        }
-       if(document.getElementById('category').value == null || 
document.getElementById('category').value == 0)
+       if(document.getElementById('org_contact1_mail').value == null || 
document.getElementById('org_contact1_mail').value == '')
        {
-               alert("Kategori må fylles ut!");
+               alert("E-post for kontaktperson må fylles ut!");
                return false;
        }
-       if(document.getElementById('office').value == null || 
document.getElementById('office').value == 0)
+       if(document.getElementById('org_contact2_mail').value == null || 
document.getElementById('org_contact2_mail').value == '')
        {
-               alert("Hovedansvarlig kulturkontor må fylles ut!");
+               alert("Begge felter for E-post må fylles ut!");
                return false;
        }
+       if(document.getElementById('org_contact1_mail').value != 
document.getElementById('org_contact2_mail').value)
+       {
+               alert("E-post må være den samme i begge felt!");
+               return false;
+       }
        else
+       {
                return true;
+       }
 }
 
 </script>
-<style>
-dl.proplist,
-dl.proplist-col {
-    margin: 1em 0;
-    padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt { 
-    font-style: italic; 
-    font-weight: bolder; 
-    font-size: 90%; 
-    margin: .8em 0 .1em 0;
-}
 
-dl.proplist-col,
-dl.form-col {
-    width: 18em;
-    float: left;
-    text-align: left;
-}
-
-#frontend dl.proplist-col {
-    width: 600px; !important
-}
-
-table#header {
-       margin: 2em;
-       
-       }
-
-div#unit_selector {
-       
-}
-
-div#all_units_key_data {
-       padding-left: 2em;
-       }
-
-div#unit_image {
-       margin-left: 2em;
-       }
-
-div#unit_image img {
-       height:170px;
-}
-
-div.yui-navset {
-       padding-left: 2em;
-       padding-right: 2em;
-       }
-       
-div#contract_selector {
-       padding-left: 1em;
-       padding-top: 1em;
-       }
-       
-img.list_image {
-       margin-right: 5px;
-       float:left;
-       }
-
-a.list_image {
-       float:left;
-       display:inline;
-       }
-
-ol.list_image {
-       float: left;
-       }
-       
-ol.list_image li {
-       padding: 1px;
-}
-       
-dl#key_data  {
-       padding: 2px;
-       }
-       
-       
-dl#key_data dd {
-       padding-bottom: 1em;
-}
-
-table#key_data td {
-       padding-right: 1em;
-       padding: 5px;
-       }
-
-
-.user_menu {
-       list-style:none;
-       height: 100%;
-       padding: 2px;
-       border-style: none none none solid;
-       border-width: 1px;
-       border-color: grey;
-       padding-left: 5px;
-}
-
-.user_menu li {
-       margin: 13px;
-       }
-       
-#area_and_price {
-       list-style:none;
-       height: 100%;
-       padding: 2px;
-       padding-left: 5px;
-       float:right;
-       padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
-       margin: 13px;
-       }
-       
-#org_units {
-       list-style: none;
-       height: 100%;
-       padding: 2px;
-       padding-left: 5px;
-       float:right;
-       padding:0.5em 1em 0 0;
-}
-
-#org_units li {
-       margin: 13px;
-       }
-       
-#information {
-       list-style:none;
-       height: 100%;
-       padding: 2px;
-       padding-left: 5px;
-       float:right;
-       padding:0.5em 1em 0 0;
-}
-
-#information li {
-       margin: 13px;
-       }
-
-a.header_link {
-       text-decoration: none;
-       float: none;
-       }
-       
-#logo_holder {
-       border: 0 none;
-       font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
-       font-weight: bold;
-       }
-
-div#header a {
-       float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top 
.yui-nav {
-       border-color: #BF0005;
-       border-width:0 0 2px;
-       }
-       
-.yui-skin-sam .yui-navset .yui-content {
-       background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset 
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected 
a:hover {
-       background:url("../../../../assets/skins/sam/sprite.png") repeat-x 
scroll left -1400px #2647A0;
-       }
-       
-div.tickets {
-       margin-top: 1em;
-       }
-
-em.select_header {
-       font-size: larger;
-       padding-top: 10px;
-       }
-
-#contract_price_and_area {
-       float: left;
-       margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
-               margin-bottom: 1em;
-       }
-
-#contract_essentials {
-       float: left;
-       margin: 1em 2em 0 2em;
-       }
-       
-#composites {
-       float: left;
-       margin: 1em 2em 0 2em;
-       }
-       
-       
-#comment {
-       float: left;
-       margin: 1em 2em 0 2em;
-       }
-       
-       #contract_essentials li {
-               margin-bottom: 1em;
-       }
-       
-#contract_parts {
-       float: left;
-       margin: 1em 2em 0 2em;
-       }
-       
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
-       white-space: normal;
-       }
-       
-li.ticket_detail {
-       padding: 5px;
-       margin-left: 5px;
-       }
-
-div.success {
-       font-weight: normal;
-       margin:10px;
-       padding:5px;
-       font-size:1.1em;
-       text-align: left;
-       background-color: green;
-       border:1px solid #9F6000;
-       color: white;
-}
-
-div.error {
-       font-weight: normal;
-       margin:10px;
-       padding:5px;
-       font-size:1.1em;
-       text-align: left;
-       background-color: red;
-       border:1px solid #9F6000;
-       color: white;
-}
-</style>
 <div class="yui-content" style="width: 100%;">
        <div id="details">
        
@@ -350,50 +90,64 @@
        </div>
        <?php }?>
        </div>
+       <div class="pageTop">
                <h1><?php echo lang('edit_organization') ?></h1>
                <form action="#" method="post">
-                       <input type="hidden" name="organization_id" 
id="organization_id" value="<?php echo $organization->get_id()?>" />
-                       <dl class="proplist-col" style="width: 200%">
-                               <dt>
-                                       <label for="organization_id"><?php echo 
lang('organization') ?></label>
-                               </dt>
-                                               <dt><label 
for="orgname">Organisasjonsnavn</label></dt>
-                                               <dd><input type="text" 
name="orgname" value="<?php echo $organization->get_name()?>"/></dd>
-                                               <dt><label 
for="orgno">Organisasjonsnummer</label></dt>
-                                               <dd><input type="text" 
name="orgno" value="<?php echo 
$organization->get_organization_number()?>"/></dd>
-                                               <dt><label 
for="homepage">Hjemmeside</label></dt>
-                                               <dd><input type="text" 
name="homepage" value="<?php echo $organization->get_homepage()?>"/></dd>
-                                               <dt><label 
for="email">E-post</label></dt>
-                                               <dd><input type="text" 
name="email" value="<?php echo $organization->get_email()?>"/></dd>
-                                               <dt><label 
for="phone">Telefon</label></dt>
-                                               <dd><input type="text" 
name="phone" value="<?php echo $organization->get_phone()?>"/></dd>
-                                               <dt><label 
for="street">Gate</label></dt>
-                                               <dd><input type="text" 
name="address" id="address" value="<?php echo $organization->get_address()?>"/>
-                                               <div 
id="address_container"></div></dd>
-                                               <dt><label 
for="org_description">Beskrivelse</label></dt>
-                                               <dd><textarea rows="10" 
cols="100" name="org_description"><?php echo 
$organization->get_description()?></textarea></dd>
-                                       <hr/>
-                                       <b>Kontaktperson 1</b><br/>
-                                       <dt><label 
for="contact1_name">Navn</label>
-                                       <input type="text" 
name="org_contact1_name" value="<?php echo 
isset($contact1)?$contact1->get_name():''?>"/><br/>
-                                       <dt><label 
for="contact1_phone">Telefon</label>
-                                       <input type="text" 
name="org_contact1_phone" value="<?php echo 
isset($contact1)?$contact1->get_phone():''?>"/><br/>
-                                       <dt><label 
for="contact1_mail">E-post</label>
-                                       <input type="text" 
name="org_contact1_email" value="<?php echo 
isset($contact1)?$contact1->get_email():''?>"/><br/>
-                                       <b>Kontaktperson 2</b><br/>
-                                       <dt><label 
for="contact2_name">Navn</label>
-                                       <input type="text" 
name="org_contact2_name" value="<?php echo 
isset($contact2)?$contact2->get_name():''?>"/><br/>
-                                       <dt><label 
for="contact2_phone">Telefon</label>
-                                       <input type="text" 
name="org_contact2_phone" value="<?php echo 
isset($contact2)?$contact2->get_phone():''?>"/><br/>
-                                       <dt><label 
for="contact2_mail">E-post</label>
-                                       <input type="text" 
name="org_contact2_email" value="<?php echo 
isset($contact2)?$contact2->get_email():''?>"/><br/>
-                               </dt>
+                       <dl class="proplist-col">
+                       <input type="hidden" name="organization_id" 
id="organization_id" value="<?php echo $organization->get_id()?>" />
+                       <DIV style="overflow: auto;">
+                                       <P>Endre organisasjon <A 
onclick="window.open('hjelp.html','name','height=255, 
width=350,toolbar=no,directories=no,status=no, 
menubar=no,scrollbars=no,resizable=no'); return false;" 
+                                               
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html"; 
+                                               target="name"><IMG alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></A>
+                                       </P> 
+                                       Felt merket med (*) er påkrevde felt 
<BR/><BR/>
+                                       <P></P>
+                                       
+                                       <dt><label 
for="orgname">Organisasjonsnavn (*)</label>
+                                               <A 
onclick="window.open('hjelp.html','name','height=255, 
width=350,toolbar=no,directories=no,status=no, 
menubar=no,scrollbars=no,resizable=no'); return false;" 
+                                                       
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html"; 
+                                                       target="name"><IMG 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A>
+                                       </dt>
+                                       <dd><input type="text" name="orgname" 
id="orgname" size="80" value="<?php echo $organization->get_name()?>"/></dd>
+                                       <dt><label 
for="orgno">Organisasjonsnummer</label></dt>
+                                       <dd><input type="text" name="orgno" 
value="<?php echo $organization->get_organization_number()?>"/></dd>
+                                       <DT style="margin-right: 20px; float: 
left;"><label for="street">Gateadresse</label>
+                                               <A 
onclick="window.open('hjelp.html','name','height=255, 
width=350,toolbar=no,directories=no,status=no, 
menubar=no,scrollbars=no,resizable=no'); return false;" 
+                                                       
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html"; 
+                                                       target="name"><IMG 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
+                                               <INPUT id="address" 
onkeyup="javascript:get_address_search()" name="address" size="50" type="text" 
value="<?php echo $organization->get_address()?>"><BR/>
+                                               <DIV 
id="address_container"></DIV>
+                                       </DT>
+                                       <DT style="clear: right; float: 
left;"><LABEL for="number">Husnummer</LABEL><BR/>
+                                               <INPUT name="number" size="5" 
type="text"/>
+                                       </DT><BR/>
+                                       <DT style="clear: left; margin-right: 
20px; float: left;"><LABEL for="postzip">Postnummer</LABEL><BR/>
+                                               <INPUT name="postzip" size="5" 
type="text" value="<?php echo $organization->get_zip_code()?>"/>
+                                       </DT>
+                    <DT style="float: left;"><LABEL 
for="postaddress">Poststed</LABEL><BR/>
+                       <INPUT name="postaddress" size="40" type="text" 
value="<?php echo $organization->get_city()?>"/>
+                    </DT><BR><BR>
+                               </DIV>
+                               <DT><LABEL for="homepage">Hjemmeside <A 
onclick="window.open('hjelp.html','name','height=255, 
width=350,toolbar=no,directories=no,status=no, 
menubar=no,scrollbars=no,resizable=no'); return false;" 
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html"; 
target="name">
+                                       <IMG alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL>
+                               </DT>
+               <DD><INPUT name="homepage" value="<?php echo 
$organization->get_homepage()?>" size="80" type="text"></DD><BR/><BR/>
+               <DIV style="overflow: auto;">
+                       Kontaktperson for organisasjonen <A 
onclick="window.open('hjelp.html','name','height=255, 
width=350,toolbar=no,directories=no,status=no, 
menubar=no,scrollbars=no,resizable=no'); return false;" 
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html"; 
target="name">
+                       <IMG alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
+                    <DT><LABEL for="contact1_name">Navn (*)</LABEL></DT>
+                    <DD><INPUT name="org_contact1_name" id="org_contact1_name" 
size="80" type="text" value="<?php echo 
isset($contact1)?$contact1->get_name():''?>"></DD>
+                    <DT><LABEL for="contact1_phone">Telefon (*)</LABEL></DT>
+                    <DD><INPUT name="org_contact1_phone" 
id="org_contact1_phone" type="text" value="<?php echo 
isset($contact1)?$contact1->get_phone():''?>"></DD>
+                    <DT><LABEL for="contact1_mail">E-post (*)</LABEL></DT>
+                    <DD><INPUT name="org_contact1_mail" id="org_contact1_mail" 
size="50" type="text" value="<?php echo 
isset($contact1)?$contact1->get_email():''?>"></DD>
+                    <DT><LABEL for="contact2_mail">Gjenta e-post 
(*)</LABEL></DT>
+                    <DD><INPUT name="org_contact2_mail" id="org_contact2_mail" 
size="50" type="text" value="<?php echo 
isset($contact1)?$contact1->get_email():''?>"></DD>
+                               </DIV>
                                <div class="form-buttons">
                                        <input type="submit" name="save_org" 
value="<?php echo lang('send_change_request') ?>"/>
                                </div>
                        </dl>
-                       
                </form>
-               
        </div>
 </div>
\ No newline at end of file




reply via email to

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