fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [14554] activitycalendarfrontend: remove obsolete cod


From: Sigurd Nes
Subject: [Fmsystem-commits] [14554] activitycalendarfrontend: remove obsolete code
Date: Thu, 10 Dec 2015 09:58:22 +0000

Revision: 14554
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14554
Author:   sigurdne
Date:     2015-12-10 09:58:21 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
activitycalendarfrontend: remove obsolete code

Removed Paths:
-------------
    branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.php
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.php

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.php    
    2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.php    
    2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,175 +0,0 @@
-<?php
-//include common logic for all templates
-//     include("common.php");
-       $act_so = activitycalendar_soactivity::get_instance();
-       $contpers_so = activitycalendar_socontactperson::get_instance();
-?>
-<div class="yui-content">
-       <div id="details">
-               <?php if ($message) { ?>
-                       <div class="success">
-                               <?php echo $message; ?>
-                       </div>
-               <?php } else if ($error) { ?>
-                       <div class="error">
-                               <?php echo $error; ?>
-                       </div>
-               <?php } ?>
-       </div>
-       <DIV class="pageTop">
-               <h1><?php echo lang('activity') ?></h1>
-       </DIV>
-       <form action="#" method="post">
-               <input type="hidden" name="id" value="<?php
-               if ($activity->get_id()) {
-                       echo $activity->get_id();
-               } else {
-                       echo '0';
-               }
-               ?>"/>
-               <dl class="proplist-col">
-                       <div class="form-buttons">
-                               <?php if ($change_request) { ?>
-                                       <input type="submit" name="activity_ok" 
value="<?php echo lang('activity_ok') ?>" />
-                                       <input type="submit" 
name="change_request" value="<?php echo lang('change_activity') ?>" />
-<?php }
-?>
-                       </div>
-                       <FIELDSET title="Hva">
-                               <LEGEND>Hva</LEGEND>
-                               <dt>
-                                       <label for="title"><?php echo 
lang('activity_title') ?></label>
-                               </dt>
-                               <dd>
-                                       <?php echo $activity->get_title(); ?>
-                               </dd>
-                               <dt>
-                                       <label for="description"><?php echo 
lang('description') ?></label>
-                               </dt>
-                               <dd>
-                                       <?php echo 
$activity->get_description(); ?>
-                               </dd>
-
-                               <dt>
-                                       <label for="category"><?php echo 
lang('category') ?></label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       if ($activity->get_category()) {
-                                               echo 
$act_so->get_category_name($activity->get_category());
-                                       }
-                                       ?>
-                               </dd>
-                       </FIELDSET>
-                       <FIELDSET id="hvem"><legend>For hvem</legend>
-                               <dt>
-                                       <label for="target"><?php echo 
lang('target') ?></label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       if ($activity->get_target()) {
-                                               $current_target_ids = 
$activity->get_target();
-                                               $current_target_id_array = 
explode(",", $current_target_ids);
-                                               foreach 
($current_target_id_array as $curr_target) {
-                                                       echo 
$act_so->get_target_name($curr_target) . '<br/>';
-                                               }
-                                       }
-                                       ?>
-                               </dd>
-                               <dt>
-                               <input type="checkbox" 
name="special_adaptation" id="special_adaptation"<?php echo 
$activity->get_special_adaptation() ? ' checked="checked"' : '' ?> 
disabled="disabled" /><label for="special_adaptation"><?php echo 
lang('special_adaptation') ?></label>
-                               </dt>
-                       </FIELDSET>
-                       <FIELDSET title="hvor">
-                               <LEGEND>Hvor og når</LEGEND>
-<?php if ($activity->get_internal_arena()) { ?>
-                                       <dt>
-                                               <label for="arena"><?php echo 
lang('building') ?></label>
-                                       </dt>
-                                       <dd>
-                                               <?php echo 
activitycalendar_soarena::get_instance()->get_building_name($activity->get_internal_arena());
 ?>
-                                       </dd>
-<?php } ?>
-<?php if ($activity->get_arena()) { ?>
-                                       <dt>
-                                               <label for="arena"><?php echo 
lang('arena') ?></label>
-                                       </dt>
-                                       <dd>
-                                               <?php echo 
activitycalendar_soarena::get_instance()->get_arena_name($activity->get_arena());
 ?>
-                                       </dd>
-<?php } ?>
-                               <dt>
-                                       <label for="district"><?php echo 
lang('district') ?></label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       if ($activity->get_district()) {
-                                               $current_district_ids = 
$activity->get_district();
-                                               $current_district_id_array = 
explode(",", $current_district_ids);
-                                               foreach 
($current_district_id_array as $curr_district) {
-                                                       echo 
$act_so->get_district_name($curr_district) . '<br/>';
-                                               }
-                                       }
-                                       ?>
-                               </dd>
-                               <dt>
-                                       <label for="time"><?php echo 
lang('time') ?></label>
-                               </dt>
-                               <dd>
-<?php echo $activity->get_time(); ?>
-                               </dd>
-                       </FIELDSET>
-                       <FIELDSET id="arr">
-                               <legend>Arrangør</legend>
-                               <dd>
-                                       <?php echo $organization->get_name(); ?>
-                                       <?php
-                                       if (!$change_request) {
-                                               if (!$activity->get_new_org()) {
-                                                       ?>
-                                                       <a 
href="index.php?menuaction=activitycalendarfrontend.uiactivity.edit_organization_values&amp;organization_id=<?php
 echo $organization->get_id(); ?>" target="_blank"><?php echo 
lang('edit_organization'); ?></a>
-                                               <?php
-                                               }
-                                       }
-                                       ?>
-                               </dd>
-                               <br/>
-                               <LEGEND>Kontaktperson</LEGEND>
-                               <dt>
-<?php if ($activity->get_contact_person_1()) { ?>
-                                       <label for="contact_person_1"><?php 
echo lang('contact_person') ?></label>
-                                       <?php } ?>
-                               </dt>
-                               <dd>
-                                       <label for="contact1_name">Navn</label>
-                                       <?php echo isset($contact1) ? 
$contact1->get_name() : '' ?><br/>
-                                       <label 
for="contact1_phone">Telefon</label>
-<?php echo isset($contact1) ? $contact1->get_phone() : '' ?><br/>
-                                       <label 
for="contact1_mail">E-post</label>
-<?php echo isset($contact1) ? $contact1->get_email() : '' ?>
-                               </dd>
-                       </FIELDSET>
-                       <FIELDSET>
-                               <BR>
-                               <dt>
-                                       <LABEL for="office">Kulturkontor</LABEL>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       if ($activity->get_office()) {
-                                               echo 
$act_so->get_office_name($activity->get_office());
-                                       }
-                                       ?>
-                               </dd>
-                       </FIELDSET>
-                       <br/><br/>
-                       <div class="form-buttons">
-                               <?php if ($change_request) { ?>
-                                       <input type="submit" name="activity_ok" 
value="<?php echo lang('activity_ok') ?>" />
-                                       <input type="submit" 
name="change_request" value="<?php echo lang('change_activity') ?>" />
-<?php }
-?>
-                       </div>
-               </dl>
-       </form>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.php
   2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.php
   2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,399 +0,0 @@
-<?php
-//include common logic for all templates
-//     include("common.php");
-       $act_so = activitycalendar_soactivity::get_instance();
-       $contpers_so = activitycalendar_socontactperson::get_instance();
-?>
-
-<script type="text/javascript">
-
-       function get_available_groups()
-       {
-               var org_id = document.getElementById('organization_id').value;
-               var div_select = document.getElementById('group_select');
-
-<?php if ($activity->get_group_id()) { ?>
-                       //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&amp;phpgw_return_as=json&amp;orgid="
 + org_id + "&amp;groupid=" + <?php echo $activity->get_group_id(); ?>;
-                       url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&amp;phpgw_return_as=json&amp;orgid="
 + org_id + "&amp;groupid=" + <?php echo $activity->get_group_id(); ?>;
-<?php } else { ?>
-                       //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&amp;phpgw_return_as=json&amp;orgid="
 + org_id;
-                       url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&amp;phpgw_return_as=json&amp;orgid="
 + org_id;
-<?php } ?>
-
-               if(org_id != null && org_id == 'new_org')
-               {
-                       //alert('new_org');
-                       document.getElementById('new_org').style.display = 
"block";
-                       document.getElementById('new_org_fields').style.display 
= "block";
-                       document.getElementById('group_label').style.display = 
"none";
-                       document.getElementById('group_select').style.display = 
"none";
-               }
-               else if(org_id != null && org_id == 'change_org')
-               {
-                       document.getElementById('new_org').style.display = 
"block";
-                       document.getElementById('new_org_fields').style.display 
= "none";
-                       
document.getElementById('change_org_fields').style.display = "block";
-                       document.getElementById('group_label').style.display = 
"none";
-                       document.getElementById('group_select').style.display = 
"none";
-               }
-               else
-               {
-                       document.getElementById('new_org').style.display = 
"none";
-                       document.getElementById('new_org_fields').style.display 
= "none";
-                       
document.getElementById('change_org_fields').style.display = "none";
-                       var divcontent_start = "<select name=\"group_id\" 
id=\"group_id\" onchange=\"javascript:checkNewGroup()\">";
-                       var divcontent_end = "</select>";
-               
-                       var callback = {
-                               success: function(response){
-                                       div_select.innerHTML = divcontent_start 
+ JSON.parse(response.responseText) + divcontent_end; 
-                               },
-                               failure: function(o) {
-                                       alert("AJAX doesn't work"); //FAILURE
-                               }
-                       }
-                       var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-               }
-       }
-
-       YAHOO.util.Event.onDOMReady(function()
-       {
-               get_available_groups();
-       });
-
-       function checkNewGroup()
-       {
-               var group_selected = document.getElementById('group_id').value;
-               if(group_selected == 'new_group')
-               {
-                       document.getElementById('new_group').style.display = 
"block";
-                       
document.getElementById('new_group_fields').style.display = "block";
-               }
-               else
-               {
-                       document.getElementById('new_group').style.display = 
"none";
-                       
document.getElementById('new_group_fields').style.display = "none";
-               }
-       }
-
-       function get_address_search()
-       {
-               var address = document.getElementById('address').value;
-               var div_address = document.getElementById('address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"address_select\" 
id=\"address\" size=\"5\" onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function get_address_search_cp2()
-       {
-               var address = document.getElementById('contact2_address').value;
-               var div_address = 
document.getElementById('contact2_address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select 
name=\"contact2_address_select\" id=\"address_cp2\" size=\"5\" 
onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function setAddressValue(field)
-       {
-               if(field.name == 'contact2_address_select')
-               {
-                       var address = 
document.getElementById('contact2_address');
-                       var div_address = 
document.getElementById('contact2_address_container');
-    
-                       address.value=field.value;
-                       div_address.style.display="none";
-               }
-               else
-               {
-                       var address = document.getElementById('address');
-                       var div_address = 
document.getElementById('address_container');
-    
-                       address.value=field.value;
-                       div_address.style.display="none";
-               }
-       }
-
-       function allOK()
-       {
-               if(document.getElementById('title').value == null || 
document.getElementById('title').value == '')
-               {
-                       alert("Tittel må fylles ut!");
-                       return false;
-               }
-               if(document.getElementsByTagName('textarea')[0].value == null 
|| document.getElementsByTagName('textarea')[0].value == '')
-               {
-                       alert("Beskrivelse må fylles ut!");
-                       return false;
-               }
-               if(document.getElementsByTagName('textarea')[0].value.length > 
254)
-               {
-                       alert("Beskrivelse kan maksimalt være 255 tegn!");
-                       return false;
-               }
-               if(document.getElementById('category').value == null || 
document.getElementById('category').value == 0)
-               {
-                       alert("Kategori må fylles ut!");
-                       return false;
-               } 
-               if((document.getElementById('internal_arena_id').value == null 
|| document.getElementById('internal_arena_id').value == 0))
-               {
-                       alert("Lokale må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('time').value == null || 
document.getElementById('time').value == '')
-               {
-                       alert("Dag og tid må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_name').value == null || 
document.getElementById('contact_name').value == '')
-               {
-                       alert("Navn på kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_phone').value == null || 
document.getElementById('contact_phone').value == '')
-               {
-                       alert("Telefonnummer til kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_phone').value != null && 
document.getElementById('contact_phone').value.length < 8)
-               {
-                       alert("Telefonnummer må inneholde minst 8 siffer!");
-                       return false;
-               }
-               if(document.getElementById('contact_mail').value == null || 
document.getElementById('contact_mail').value == '')
-               {
-                       alert("E-postadresse til kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_mail2').value == null || 
document.getElementById('contact_mail2').value == '')
-               {
-                       alert("Begge felter for E-post må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_mail').value != 
document.getElementById('contact_mail2').value)
-               {
-                       alert("E-post må være den samme i begge felt!");
-                       return false;
-               }
-               if(document.getElementById('office').value == null || 
document.getElementById('office').value == 0)
-               {
-                       alert("Hovedansvarlig kulturkontor må fylles ut!");
-                       return false;
-               }
-               else
-                       return true;
-       }
-
-</script>
-
-<div class="yui-content">
-       <div id="details">
-
-               <?php if ($message) { ?>
-                       <div class="success">
-                               <?php echo $message; ?>
-                       </div>
-               <?php } else if ($error) { ?>
-                       <div class="error">
-                               <?php echo $error; ?>
-                       </div>
-               <?php } ?>
-       </div>
-       <div class="pageTop">
-               <h1><?php echo lang('activity') ?></h1>
-               <div>
-                       <?php echo lang('required_fields') ?>
-               </div>
-       </div>
-       <form action="#" method="post">
-               <input type="hidden" name="id" value="<?php
-                       if ($activity->get_id()) {
-                               echo $activity->get_id();
-                       } else {
-                               echo '0';
-                       }
-                       ?>"/>
-               <dl class="proplist-col">
-                       <fieldset title="<?php echo lang('what') ?>">
-                               <legend>Hva</legend>
-                               <dt>
-                                       <label for="title"><?php echo 
lang('activity_title') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_title') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
-                               </dt>
-                               <dd>
-                                       <input type="text" name="title" 
id="title" value="<?php echo $activity->get_title() ?>" size="83" 
maxlength="254"/>
-                               </dd>
-                               <DT>
-                                       <LABEL for="org_description"><?php echo 
lang('description') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_description') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
-                               <DD><TEXTAREA cols="80" rows="4" 
name="description" id="description"><?php echo $activity->get_description() 
?></TEXTAREA></DD>
-                               <dt>
-                                       <label for="category"><?php echo 
lang('category') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_category') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       $current_category_id = 
$activity->get_category();
-                                       ?>
-                                       <select name="category" id="category">
-                                               <option value="0">Ingen 
kategori valgt</option>
-                                               <?php
-                                               foreach ($categories as 
$category) {
-                                                       echo "<option " . 
($current_category_id == $category->get_id() ? 'selected="selected"' : "") . " 
value=\"{$category->get_id()}\">" . $category->get_name() . "</option>";
-                                               }
-                                               ?>
-                                       </select>
-                               </dd>
-                       </fieldset>
-                       <fieldset id="hvem"><legend>For hvem</legend>
-                               <dt>
-                                       <label for="target"><?php echo 
lang('target') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_target') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       $current_target_ids = 
$activity->get_target();
-                                       $current_target_id_array = explode(",", 
$current_target_ids);
-                                       foreach ($targets as $t) {
-                                               ?>
-                                               <input name="target[]" 
type="checkbox" value="<?php echo $t->get_id() ?>" <?php echo 
(in_array($t->get_id(), $current_target_id_array) ? 'checked' : "") ?>/><?php 
echo $t->get_name() ?><br/>
-                                               <?php
-                                       }
-                                       ?>
-                               </dd>
-                               <dt>
-                                       <input type="checkbox" 
name="special_adaptation" id="special_adaptation" <?php echo 
$activity->get_special_adaptation() ? ' checked="checked"' : '' ?>/>
-                                       <label for="special_adaptation"><?php 
echo lang('special_adaptation') ?></label>
-                                       <a onclick="alert('<?php echo 
lang('help_new_activity_spec_adapt') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                               </dt>
-                       </fieldset>
-                       <fieldset title="hvor">
-                               <LEGEND>Hvor og når</LEGEND>
-                               <dt>
-                                       <br/>
-                                       <label for="arena"><?php echo 
lang('location') ?> (*) <a onclick="alert('<?php echo 
lang('help_edit_activity_location') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                                       <br/>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       $internal_arena_id = 
$activity->get_internal_arena();
-                                       $arena_id = $activity->get_arena();
-                                       ?>
-                                       <select name="internal_arena_id" 
id="internal_arena_id" style="width: 200px;">
-                                               <option value="0">Lokale ikke 
valgt</option>
-                                               <optgroup label="<?php echo 
lang('building') ?>">
-                                                       <?php
-                                                       foreach ($buildings as 
$building_id => $building_name) {
-                                                               if 
($internal_arena_id && $internal_arena_id == $building_id)
-                                                                       
$selected = "selected";
-                                                               else
-                                                                       
$selected = "";
-                                                               echo "<option 
value=\"i_{$building_id}\" {$selected}>" . $building_name . "</option>";
-                                                       }
-                                                       ?>
-                                               </optgroup>
-                                               <optgroup label="<?php echo 
lang('external_arena') ?>">
-                                                       <?php
-                                                       foreach ($arenas as 
$arena) {
-                                                               if ($arena_id 
&& $arena_id == $arena->get_id())
-                                                                       
$selected = "selected";
-                                                               else
-                                                                       
$selected = "";
-                                                               echo "<option 
value=\"e_{$arena->get_id()}\" title=\"{$arena->get_arena_name()}\" 
{$selected}>" . $arena->get_arena_name() . "</option>";
-                                                       }
-                                                       ?>
-                                               </optgroup>
-                                       </select>
-                                       <BR>
-                               </dd>
-                               <dt>
-                                       <label for="district"><?php echo 
lang('district') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_district') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       $current_district_id = 
$activity->get_district();
-                                       
//$current_district_id_array=explode(",", $current_district_ids);
-                                       foreach ($districts as $d) {
-                                               ?>
-                                               <input name="district" 
type="radio" value="<?php echo $d['part_of_town_id'] ?>" <?php echo 
($d['part_of_town_id'] == $current_district_id) ? 'checked' : "" ?>/><?php echo 
$d['name'] ?><br/>
-                                               <?php
-                                       }
-                                       ?>
-                               </dd>
-                               <dt>
-                                       <label for="time"><?php echo 
lang('time') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_time') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                               </dt>
-                               <dd>
-                                       <input type="text" name="time" 
id="time" value="<?php echo $activity->get_time() ?>" size="80" maxlength="254" 
/>
-                               </dd>
-                       </fieldset>
-                       <FIELDSET id="arr">
-                               <LEGEND>Kontaktperson</LEGEND><BR>
-                               Kontaktperson for aktiviteten <a 
onclick="alert('<?php echo lang('help_new_activity_contact_person') ?>'); 
return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a><BR>
-                               <DT><LABEL for="contact_name">Navn 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_name" 
id="contact_name" size="80" type="text" value="<?php echo $contact1->get_name() 
?>"></DD>
-                               <DT><LABEL for="contact_phone">Telefon 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_phone" 
id="contact_phone" type="text" value="<?php echo $contact1->get_phone() 
?>"></DD>
-                               <DT><LABEL for="contact_mail">E-post 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_mail" 
id="contact_mail" size="50" type="text" value="<?php echo 
$contact1->get_email() ?>"></DD>
-                               <DT><LABEL for="contact2_mail2">Gjenta e-post 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_mail2" 
id="contact_mail2" size="50" type="text" value="<?php echo 
$contact1->get_email() ?>"></DD>
-                       </FIELDSET>
-                       <FIELDSET>
-                               <BR>
-                               <DT><LABEL for="office">Hvilket kulturkontor 
skal motta registreringen (*) <a onclick="alert('<?php echo 
lang('help_new_activity_office') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
-                               <dd>
-                                       <?php
-                                       $selected_office = 
$activity->get_office();
-                                       ?>
-                                       <select name="office" id="office">
-                                               <option value="0">Ingen kontor 
valgt</option>
-                                               <?php
-                                               foreach ($offices as $office) {
-                                                       echo "<option " . 
($selected_office == $office['id'] ? 'selected="selected"' : "") . " 
value=\"{$office['id']}\">" . $office['name'] . "</option>";
-                                               }
-                                               ?>
-                                       </select>
-                               </dd>
-                       </FIELDSET>
-                       <div class="form-buttons">
-                               <?php if ($editable) { ?>
-                                       <input type="submit" 
name="save_activity" value="<?php echo lang('save') ?>" onclick="return 
allOK();"/>
-<?php }
-?>
-                       </div>
-               </dl>
-       </form>
-</div>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.php
    2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.php
    2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,85 +0,0 @@
-<?php ?>
-<script type="text/javascript">
-       function isOK()
-       {
-               if(document.getElementById('activity_id').value == null || 
document.getElementById('activity_id').value == '' || 
document.getElementById('activity_id').value == 0)
-               {
-                       alert("Du må velge en aktivitet som skal endres!");
-                       return false;
-               }
-               else
-               {
-                       return true;
-               }
-       }
-       function get_activities()
-       {
-               var org_id = document.getElementById('organization_id').value;
-               var div_select = document.getElementById('activity_select');
-
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&amp;phpgw_return_as=json&amp;orgid="
 + org_id;
-
-               var divcontent_start = "<select name=\"activity_id\" 
id=\"activity_id\">";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_select.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       YAHOO.util.Event.onDOMReady(function()
-       {
-               get_activities();
-       });
-</script>
-
-<div class="yui-content" style="width: 100%;">
-       <div class="pageTop">
-               <h1><?php echo lang('edit_activity'); ?></h1>
-               <form action="#" method="post">
-                       <dl class="proplist-col" style="width: 200%">
-                               <dt>
-                               <?php if ($message) { ?>
-                                       <?php echo $message; ?>
-                               <?php } else { ?>
-                                       <?php echo 
lang('activity_edit_helptext_step1') ?><br/><br/>
-                               <?php } ?>
-                               </dt>
-                               <?php if (!$message) { ?>
-                                       <dd>
-                                               <select name="organization_id" 
id="organization_id" onchange="javascript: get_activities();">
-                                                       <option value="">Ingen 
organisasjon valgt</option>
-                                                       <?php
-                                                       foreach ($organizations 
as $organization) {
-                                                               echo "<option 
value=\"{$organization->get_id()}\">" . $organization->get_name() . "</option>";
-                                                       }
-                                                       ?>
-                                               </select>
-                                       </dd>
-                                       <dt>
-                                               &nbsp;
-                                       </dt>
-                                       <dd>
-                                               <div id="activity_select">
-                                                       <select 
name="activity_id" id="activity_id">
-                                                               <option 
value="0">Ingen aktivitet valgt</option>
-                                                       </select>
-                                               </div>
-                                               <br/><br/>
-                                       </dd>
-                                       <div class="form-buttons">
-                                               <input type="submit" 
name="step_1" value="<?php echo lang('send_change_request') ?>" onclick="return 
isOK();"/>
-                                       </div>
-                               <?php } ?>
-                       </dl>
-
-               </form>
-       </div>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.php
    2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.php
    2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,454 +0,0 @@
-<?php
-//include common logic for all templates
-//     include("common.php");
-       $act_so = activitycalendar_soactivity::get_instance();
-       $contpers_so = activitycalendar_socontactperson::get_instance();
-?>
-
-<script type="text/javascript">
-
-       $(document).ready(function(){
-               var text = document.getElementById("displayText");
-               //ele.hide();
-               $("#toggleText").hide();
-               text.innerHTML = "Ikke i listen? Registrer nytt lokale";
-       });
- 
-       function toggle() {
-               var ele = document.getElementById("toggleText");
-               var text = document.getElementById("displayText");
-               var arenahidden = document.getElementById("new_arena_hidden");
-               if(ele.style.display == "block") {
-                       ele.style.display = "none";
-                       text.innerHTML = "Registrer nytt lokale";
-               }
-               else {
-                       ele.style.display = "block";
-                       text.innerHTML = "";
-                       arenahidden.value="new_arena";
-               }
-       }
-
-       function showhide(id)
-       {
-               if(id == "org")
-               {
-                       document.getElementById('orgf').style.display = "block";
-                       document.getElementById('no_orgf').style.display = 
"none";
-               }
-               else
-               {
-                       document.getElementById('orgf').style.display = "none";
-                       document.getElementById('no_orgf').style.display = 
"block";
-               }
-       }
-
-       function get_address_search()
-       {
-               var address = document.getElementById('address').value;
-               var div_address = document.getElementById('address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"address\" id=\"address\" 
size=\"5\" onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function get_address_search_arena()
-       {
-               var address = document.getElementById('arena_address').value;
-               var div_address = 
document.getElementById('arena_address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"arena_address_select\" 
id=\"arena_address\" size=\"5\" onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function get_address_search_cp2()
-       {
-               var address = document.getElementById('contact2_address').value;
-               var div_address = 
document.getElementById('contact2_address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select 
name=\"contact2_address_select\" id=\"address_cp2\" size=\"5\" 
onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function setAddressValue(field)
-       {
-               if(field.name == 'contact2_address_select')
-               {
-                       var address = 
document.getElementById('contact2_address');
-                       var div_address = 
document.getElementById('contact2_address_container');
-    
-                       address.value=field.value;
-                       div_address.style.display="none";
-               }
-               else if(field.name == 'arena_address_select')
-               {
-                       var address = document.getElementById('arena_address');
-                       var div_address = 
document.getElementById('arena_address_container');
-    
-                       address.value=field.value;
-                       div_address.style.display="none";
-               }
-               else
-               {
-                       var address = document.getElementById('address');
-                       var div_address = 
document.getElementById('address_container');
-
-                       address.value=field.value;
-                       div_address.style.display="none";
-               }
-       }
-
-       function allOK()
-       {
-               if(document.getElementById('title').value == null || 
document.getElementById('title').value == '')
-               {
-                       alert("Navn på aktivitet må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('description').value == null || 
document.getElementById('description').value == '')
-               {
-                       alert("Beskrivelse må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('description').value.length > 254)
-               {
-                       alert("Beskrivelse kan maksimalt være 255 tegn!");
-                       return false;
-               }
-               if(document.getElementById('category').value == null || 
document.getElementById('category').value == 0)
-               {
-                       alert("Kategori må fylles ut!");
-                       return false;
-               }
-               var malgrupper = document.getElementsByName('target[]');
-               var malgruppe_ok = false;
-               for(i=0;i<malgrupper.length;i++)
-               {
-                       if(!malgruppe_ok)
-                       {
-                               if(malgrupper[i].checked)
-                               {malgruppe_ok = true;}
-                       }
-               }
-               if(!malgruppe_ok)
-               {
-                       alert("Målgruppe må fylles ut!");
-                       return false;
-               }
-               if((document.getElementById('internal_arena_id').value == null 
|| document.getElementById('internal_arena_id').value == 0) && 
(document.getElementById('new_arena_hidden').value==null || 
document.getElementById('new_arena_hidden').value==''))
-               {
-                       alert("Lokale må fylles ut!");
-                       return false;
-               }
-               var distrikter = document.getElementsByName('district');
-               var distrikt_ok = false;
-               for(i=0;i<distrikter.length;i++)
-               {
-                       if(!distrikt_ok)
-                       {
-                               if(distrikter[i].checked)
-                               {distrikt_ok = true;}
-                       }
-               }
-               if(!distrikt_ok)
-               {
-                       alert("Bydel må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('time').value == null || 
document.getElementById('time').value == '')
-               {
-                       alert("Dag og tid må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_name').value == null || 
document.getElementById('contact_name').value == '')
-               {
-                       alert("Navn på kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_phone').value == null || 
document.getElementById('contact_phone').value == '')
-               {
-                       alert("Telefonnummer til kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_phone').value != null && 
document.getElementById('contact_phone').value.length < 8)
-               {
-                       alert("Telefonnummer må inneholde minst 8 siffer!");
-                       return false;
-               }
-               if(document.getElementById('contact_mail').value == null || 
document.getElementById('contact_mail').value == '')
-               {
-                       alert("E-postadresse til kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_mail2').value == null || 
document.getElementById('contact_mail2').value == '')
-               {
-                       alert("Begge felter for E-post må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('contact_mail').value != 
document.getElementById('contact_mail2').value)
-               {
-                       alert("E-post må være den samme i begge felt!");
-                       return false;
-               }
-               if(document.getElementById('office').value == null || 
document.getElementById('office').value == 0)
-               {
-                       alert("Hovedansvarlig kulturkontor må fylles ut!");
-                       return false;
-               }
-               else
-                       return true;
-       }
-
-</script>
-
-<div class="yui-content">
-       <div id="details">
-
-               <?php if ($message) { ?>
-                       <div class="success">
-                               <?php echo $message; ?>
-                       </div>
-               <?php } else if ($error) { ?>
-                       <div class="error">
-                               <?php echo $error; ?>
-                       </div>
-               <?php } ?>
-       </div>
-       <div class="pageTop">
-               <h1><?php echo lang('new_activity') ?></h1>
-               <div>
-                       <?php echo lang('required_fields') ?>
-               </div>
-       </div>
-       <form action="#" method="post">
-               <input type="hidden" name="id" value="<?php
-                       if ($activity->get_id()) {
-                               echo $activity->get_id();
-                       } else {
-                               echo '0';
-                       }
-                       ?>"/>
-               <input type="hidden" name="organization_id" value="<?php echo 
$organization->get_id() ?>"/>
-               <?php if ($new_organization) { ?>
-                       <input type="hidden" name="new_organization" 
value="yes"/>
-<?php } ?>
-               <input type="hidden" name="new_arena_hidden" 
id="new_arena_hidden" value=""/>
-               <dl class="proplist-col">
-                       <fieldset title="<?php echo lang('what') ?>">
-                               <legend>Hva</legend>
-                               <dt>
-                                       <label for="title"><?php echo 
lang('activity_title') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_title') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
-                               </dt>
-                               <dd>
-                                       <input type="text" name="title" 
id="title" value="<?php echo $activity->get_title() ?>" size="83" 
maxlength="254"/>
-                               </dd>
-                               <DT><LABEL for="org_description"><?php echo 
lang('description') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_description') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
-                               <DD><TEXTAREA cols="80" rows="4" 
name="description" id="description"></TEXTAREA></DD>
-                               <dt>
-                                       <label for="category"><?php echo 
lang('category') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_category') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       $current_category_id = 
$activity->get_category();
-                                       ?>
-                                       <select name="category" id="category">
-                                               <option value="0">Ingen 
kategori valgt</option>
-                                               <?php
-                                               foreach ($categories as 
$category) {
-                                                       echo "<option " . 
($current_category_id == $category->get_id() ? 'selected="selected"' : "") . " 
value=\"{$category->get_id()}\">" . $category->get_name() . "</option>";
-                                               }
-                                               ?>
-                                       </select>
-                               </dd>
-                       </fieldset>
-                       <fieldset id="hvem"><legend>For hvem</legend>
-                               <dt>
-                                       <label for="target"><?php echo 
lang('target') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_target') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       $current_target_ids = 
$activity->get_target();
-                                       $current_target_id_array = explode(",", 
$current_target_ids);
-                                       foreach ($targets as $t) {
-                                               ?>
-                                               <input name="target[]" 
type="checkbox" value="<?php echo $t->get_id() ?>" <?php echo 
(in_array($t->get_id(), $current_target_id_array) ? 'checked' : "") ?>/><?php 
echo $t->get_name() ?><br/>
-                                               <?php
-                                       }
-                                       ?>
-                               </dd>
-                               <dt>
-                                       <input type="checkbox" 
name="special_adaptation" id="special_adaptation" />
-                                       <label for="special_adaptation"><?php 
echo lang('special_adaptation') ?></label>
-                                       <a onclick="alert('<?php echo 
lang('help_new_activity_spec_adapt') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                               </dt>
-                       </fieldset>
-                       <fieldset title="hvor">
-                               <LEGEND>Hvor og når</LEGEND>
-                               <dt>
-                                       <br/>
-                                       <label for="arena"><?php echo 
lang('location') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_location') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                               </dt>
-                               <dd>
-                                       <select name="internal_arena_id" 
id="internal_arena_id" style="width: 200px;">
-                                               <option value="0">Lokale ikke 
valgt</option>
-                                               <optgroup label="<?php echo 
lang('building') ?>">
-                                                       <?php
-                                                       foreach ($buildings as 
$building_id => $building_name) {
-                                                               echo "<option 
value=\"i_{$building_id}\">" . $building_name . "</option>";
-                                                       }
-                                                       ?>
-                                               </optgroup>
-                                               <optgroup label="<?php echo 
lang('external_arena') ?>">
-                                                       <?php
-                                                       foreach ($arenas as 
$arena) {
-                                                               echo "<option 
value=\"e_{$arena->get_id()}\" title=\"{$arena->get_arena_name()}\">" . 
$arena->get_arena_name() . "</option>";
-                                                       }
-                                                       ?>
-                                               </optgroup>
-                                       </select>
-                                       <BR/>
-                                       <A id="displayText" 
href="javascript:toggle();">Ikke i listen? Registrer nytt lokale</A>
-                               </dd>
-                                       <DIV style="overflow: auto;" 
id="toggleText">
-                                               <dl>
-                                                       <DT>
-                                                               <label 
for="new_arena"><?php echo lang('register_new_arena') ?></label>
-                                                               <a 
onclick="alert('<?php echo lang('help_new_arena') ?>'); return false;" 
href="#"><img alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                                       </DT>
-                                                       <DT><LABEL 
for="arena_name"><?php echo lang('name') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_arena_name') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
-                                                       <DD><INPUT 
id="arena_name" name="arena_name" size="50" type="text"></DD>
-                                                       <DT 
style="margin-right: 20px; float: left;">
-                                                               <LABEL 
-                                                                       
for="arena_address">Gateadresse (*) <a onclick="alert('<?php echo 
lang('help_new_arena_address') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                                               </LABEL>
-                                                       <BR/>
-                                                               <INPUT 
id="arena_address" 
-                                                                  
onkeyup="javascript:get_address_search_arena()" name="arena_address" size="50" 
-                                                                  type="text" 
autocomplete="off">
-                                                               <BR/>
-                                                               <DIV 
id="arena_address_container"></DIV>
-                                                       </DT>
-                                                       <DT style="clear: 
right; float: left;">
-                                                       <LABEL 
-                                                               
for="arena_number">Husnummer</LABEL>
-                                                               <BR/>
-                                                               <INPUT 
name="arena_number" size="5" type="text">
-                                                       </DT>
-                                                       <BR/>
-                                                       <DT style="clear: left; 
margin-right: 20px; float: left;">
-                                                               <LABEL 
for="postaddress">Postnummer(*)</LABEL><BR>
-                                                               <INPUT 
name="postaddress" size="5" type="text">
-                                                       </DT>
-                                                       <DT style="float: 
left;">
-                                                               <LABEL 
for="arena_postaddress">Poststed (*)</LABEL><BR>
-                                                               <INPUT 
name="arena_postaddress" size="40" type="text">
-                                                       </DT>
-                                                       <BR>
-                                               </dl>
-                                       </DIV>
-                               <dt>
-                               <br/>
-                                       <label for="district"><?php echo 
lang('district') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_district') ?>'); return false;" href="#"><img 
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </label>
-                               </dt>
-                               <dd>
-                                       <?php
-                                       foreach ($districts as $d) {
-                                               ?>
-                                               <input name="district" 
type="radio" value="<?php echo $d['part_of_town_id'] ?>" /><?php echo 
$d['name'] ?><br/>
-                                               <?php
-                                       }
-                                       ?>
-                               </dd>
-                               <dt>
-                                       <br/>
-                                       <label for="time"><?php echo 
lang('time') ?> (*) <a onclick="alert('<?php echo 
lang('help_new_activity_time') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
-                               </dt>
-                               <dd>
-                                       <input type="text" name="time" 
id="time" value="<?php echo $activity->get_time() ?>" size="80" maxlength="254" 
/>
-                               </dd>
-                       </fieldset>
-                       <FIELDSET id="arr"><LEGEND>Kontaktperson</LEGEND><BR>
-                               Kontaktperson for aktiviteten <a 
onclick="alert('<?php echo lang('help_new_activity_contact_person') ?>'); 
return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a><BR>
-                               <DT><LABEL for="contact_name">Navn 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_name" 
id="contact_name" size="80" type="text"></DD>
-                               <DT><LABEL for="contact_phone">Telefon 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_phone" 
id="contact_phone" type="text"></DD>
-                               <DT><LABEL for="contact_mail">E-post 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_mail" 
id="contact_mail" size="50" type="text"></DD>
-                               <DT><LABEL for="contact2_mail2">Gjenta e-post 
(*)</LABEL></DT>
-                               <DD><INPUT name="contact_mail2" 
id="contact_mail2" size="50" type="text"></DD>
-                       </FIELDSET>
-                       <FIELDSET>
-                               <BR>
-                               <DT><LABEL for="office">Hvilket kulturkontor 
skal motta registreringen (*) <a onclick="alert('<?php echo 
lang('help_new_activity_office') ?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
-                               <dd>
-                                       <?php
-                                       $selected_office = 
$activity->get_office();
-                                       ?>
-                                       <select name="office" id="office">
-                                               <option value="0">Ingen kontor 
valgt</option>
-                                               <?php
-                                               foreach ($offices as $office) {
-                                                       echo "<option " . 
($selected_office == $office['id'] ? 'selected="selected"' : "") . " 
value=\"{$office['id']}\">" . $office['name'] . "</option>";
-                                               }
-                                               ?>
-                                       </select>
-                               </dd>
-                       </FIELDSET>
-                       <br/>
-                       <div class="form-buttons">
-                               <input type="submit" name="save_activity" 
value="<?php echo lang('save_activity') ?>" onclick="return allOK();"/>
-                       </div>
-               </dl>
-
-       </form>
-</div>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.php
        2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.php
        2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,187 +0,0 @@
-<?php
-//include common logic for all templates
-//     include("common.php");
-       $act_so = activitycalendar_soactivity::get_instance();
-       $contpers_so = activitycalendar_socontactperson::get_instance();
-?>
-
-<script type="text/javascript">
-
-       function checkNewGroup()
-       {
-               var group_selected = document.getElementById('group_id').value;
-               if(group_selected == 'new_group')
-               {
-                       
document.getElementById('new_group_fields').style.display = "block";
-               }
-               else
-               {
-                       
document.getElementById('new_group_fields').style.display = "none";
-               }
-       }
-
-       function get_address_search()
-       {
-               var address = document.getElementById('address').value;
-               var div_address = document.getElementById('address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"address_select\" 
id=\"address_select\" size=\"5\" onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end;
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function setAddressValue(field)
-       {
-               var address = document.getElementById('address');
-               var div_address = document.getElementById('address_container');
-
-               address.value=field.value;
-               div_address.style.display="none";
-       }
-
-       function allOK()
-       {
-               if(document.getElementById('orgname').value == null || 
document.getElementById('orgname').value == '')
-               {
-                       alert("Organisasjonsnavn må fylles ut!");
-                       return false;
-               } 
-               if(document.getElementById('org_district').value == null || 
document.getElementById('org_district').value == 0)
-               {
-                       alert("Bydel må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('phone').value == null || 
document.getElementById('phone').value == '')
-               {
-                       alert("Telefonnummer for organisasjonen må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('address').value == null || 
document.getElementById('address').value == 0)
-               {
-                       alert("Gateadresse må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('postaddress').value == null || 
document.getElementById('postaddress').value == '')
-               {
-                       alert("Postnummer og sted må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_description').value == null || 
document.getElementById('org_description').value == '')
-               {
-                       alert("Beskrivelse for organisasjonen må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_name').value == null 
|| document.getElementById('org_contact1_name').value == '')
-               {
-                       alert("Navn på kontaktperson 1 må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_mail').value == null 
|| document.getElementById('org_contact1_mail').value == '')
-               {
-                       if(document.getElementById('org_contact1_phone').value 
== null || document.getElementById('org_contact1_phone').value == '')
-                       {
-                               alert("E-post eller telefon for kontaktperson 1 
må fylles ut!");
-                               return false;
-                       }
-               }
-               else 
-                       return true;
-       }
-
-</script>
-
-<div class="yui-content" style="width: 100%;">
-       <div id="details">
-
-               <?php if ($message) { ?>
-                       <div class="success">
-                               <?php echo $message; ?>
-                       </div>
-               <?php } else if ($error) { ?>
-                       <div class="error">
-                               <?php echo $error; ?>
-                       </div>
-               <?php } ?>
-       </div>
-       <h1><?php echo lang('new_organization') ?></h1>
-       <div>
-               <?php echo lang('required_fields') ?>
-       </div>
-       <form action="#" method="post">
-               <input type="hidden" name="activity" value="<?php
-               if ($activity->get_id()) {
-                       echo $activity->get_id();
-               } else {
-                       echo '0';
-               }
-               ?>"/>
-               <dl class="proplist-col" style="width: 200%">
-                       <input type="hidden" name="organization_id" 
id="organization_id" value="new_org" />
-                       <dt><label for="orgname">Organisasjonsnavn 
(*)</label></dt>
-                       <dd><input type="text" name="orgname" size="100"/></dd>
-                       <dt><label for="orgno">Organisasjonsnummer</label></dt>
-                       <dd><input type="text" name="orgno"/></dd>
-                       <dt><label for="district">Bydel (*)</label></dt>
-                       <dd><select name="org_district">
-                                       <option value="0">Ingen bydel 
valgt</option>
-                                       <?php
-                                       foreach ($districts as $d) {
-                                               ?>
-                                               <option value="<?php echo 
$d['part_of_town_id'] ?>"><?php echo $d['name'] ?></option>
-<?php }
-?>
-                               </select></dd>
-                       <dt><label for="homepage">Hjemmeside</label></dt>
-                       <dd><input type="text" name="homepage" size="100"/></dd>
-                       <dt><label for="email">E-post (*)</label></dt>
-                       <dd><input type="text" name="email"/></dd>
-                       <dt><label for="phone">Telefon (*)</label></dt>
-                       <dd><input type="text" name="phone"/></dd>
-                       <dt><label for="street">Gate (*)</label></dt>
-                       <dd><input type="text" name="address" id="address" 
onkeyup="javascript:get_address_search()"/>
-                               <div id="address_container"></div></dd>
-                       <dt><label for="number">Husnummer</label></dt>
-                       <dd><input type="text" name="number"/><br/></dd>
-                       <dt><label for="postaddress">Postnummer og Sted 
(*)</label></dt>
-                       <dd><input type="text" name="postaddress" 
size="100"/></dd>
-                       <dt><label for="org_description">Beskrivelse 
(*)</label></dt>
-                       <dd><textarea rows="10" cols="100" 
name="org_description"></textarea></dd>
-                       <hr/>
-                       <b>Kontaktperson 1</b><br/>
-                       <dt><label for="contact1_name">Navn (*)</label>
-                               <input type="text" name="org_contact1_name" 
size="100"/></dt>
-                       <dt><label for="contact1_phone">Telefon (*)</label>
-                               <input type="text" 
name="org_contact1_phone"/></dt>
-                       <dt><label for="contact1_mail">E-post (*)</label>
-                               <input type="text" 
name="org_contact1_mail"/></dt><br/><br/><br/>
-                       <b>Kontaktperson 2</b><br/>
-                       <dt><label for="contact2_name">Navn</label>
-                               <input type="text" name="org_contact2_name" 
size="100"/></dt>
-                       <dt><label for="contact2_phone">Telefon</label>
-                               <input type="text" 
name="org_contact2_phone"/></dt>
-                       <dt><label for="contact2_mail">E-post</label>
-                               <input type="text" 
name="org_contact2_mail"/></dt>
-                       <hr/>
-                       <div class="form-buttons">
-                               <input type="submit" name="save_organization" 
value="<?php echo lang('save_organization_next') ?>" onclick="return allOK();"/>
-                       </div>
-               </dl>
-
-       </form>
-
-</div>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.php
     2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.php
     2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,261 +0,0 @@
-<?php ?>
-<script type="text/javascript">
-       $(document).ready(function(){
-               var ele = document.getElementById("toggleText3");
-               var text = document.getElementById("displayText3");
-               //ele.hide();
-               $("#toggleText3").hide();
-               text.innerHTML = "Ikke i listen? Registrer ny organisasjon";
-       });
-     
-       $(function(){
-               $("#displayText3").click(function(){
-                       var ele = document.getElementById("toggleText3");
-                       var org_id = 
document.getElementById("organization_id_hidden");
-                       var text = document.getElementById("displayText3");
-                       $("#toggleText3").show();
-                       text.innerHTML = "";
-                       org_id.value = "new_org";
-               })
-       });
-       function toggle() {
-               var ele = document.getElementById("toggleText");
-               var text = document.getElementById("displayText");
-               if(ele.style.display == "block") {
-                       ele.style.display = "none";
-                       text.innerHTML = "Registrer nytt lokale";
-               }
-               else {
-                       ele.style.display = "block";
-                       text.innerHTML = "(X)";
-               }
-       }
-       function toggle2() {
-               var ele = document.getElementById("toggleText2");
-               var text = document.getElementById("displayText2");
-               if(ele.style.display == "block") {
-                       ele.style.display = "none";
-                       text.innerHTML = "Legg til alternativ kontaktperson";
-               }
-               else {
-                       ele.style.display = "block";
-                       text.innerHTML = "(X)";
-               }
-       }
-       function toggle3() {
-               var ele = document.getElementById("toggleText3");
-               var org_id = document.getElementById("organization_id_hidden");
-               var text = document.getElementById("displayText3");
-               if(ele.style.display == "block") {
-                       ele.style.display = "none";
-                       text.innerHTML = "Registrer ny organisasjon";
-               }
-               else {
-                       ele.style.display = "block";
-                       ele.style.visibility = "visible";
-                       text.innerHTML = "";
-                       org_id.value = "new_org";
-               }
-       }
-
-       function toggle4() {
-               var ele = document.getElementById("toggleText3");
-               var org_id = document.getElementById("organization_id_hidden");
-               var text = document.getElementById("displayText3");
-               if(ele.style.display == "block") {
-                       document.getElementById("toggleText3").style.display = 
"none";
-                       text.innerHTML = "Registrer ny organisasjon";
-               }
-               else {
-                       document.getElementById("toggleText3").style.display = 
"block";
-                       document.getElementById("toggleText3").style.visibility 
= "visible";
-                       text.innerHTML = "";
-                       org_id.value = "new_org";
-               }
-       }
-       function showhide(id)
-       {
-               if(id == "org")
-               {
-                       document.getElementById('orgf').style.display = "block";
-                       document.getElementById('no_orgf').style.display = 
"none";
-               }
-               else
-               {
-                       document.getElementById('orgf').style.display = "none";
-                       document.getElementById('no_orgf').style.display = 
"block";
-               }
-       }
-
-       function get_address_search()
-       {
-               var address = document.getElementById('address').value;
-               var div_address = document.getElementById('address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"address_select\" 
id=\"address_select\" size=\"5\" onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end;
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function setAddressValue(field)
-       {
-               var address = document.getElementById('address');
-               var div_address = document.getElementById('address_container');
-
-               address.value=field.value;
-               div_address.style.display="none";
-       }
-
-
-       function isOK()
-       {
-               if(document.getElementById('organization_id_hidden').value == 
null || document.getElementById('organization_id_hidden').value == ''){
-                       if(document.getElementById('organization_id').value == 
null || document.getElementById('organization_id').value == '')
-                       {
-                               alert("Du må velge om aktiviteten skal knyttes 
mot en eksisterende\norganisasjon, eller om det skal registreres en ny 
organisasjon!");
-                               return false;
-                       }
-                       else
-                       {
-                               return true;
-                       }
-               }
-               if(document.getElementById('orgname').value == null || 
document.getElementById('orgname').value == '')
-               {
-                       alert("Organisasjonsnavn må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_name').value == null 
|| document.getElementById('org_contact1_name').value == '')
-               {
-                       alert("Navn på kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_phone').value == null 
|| document.getElementById('org_contact1_phone').value == '')
-               {
-                       alert("Telefonnummer til kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_phone').value != null 
&& document.getElementById('org_contact1_phone').value.length < 8)
-               {
-                       alert("Telefonnummer må inneholde minst 8 siffer!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_mail').value == null 
|| document.getElementById('org_contact1_mail').value == '')
-               {
-                       alert("E-post for kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact2_mail').value == null 
|| document.getElementById('org_contact2_mail').value == '')
-               {
-                       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>
-
-<div class="yui-content" style="width: 100%;">
-       <div class="pageTop">
-               <h1><?php echo lang('new_activity_helptext') ?></h1>
-               <form action="#" method="post">
-                       <input type="hidden" name="organization_id_hidden" 
id="organization_id_hidden" value="" />
-                       <fieldset>
-                               <dl class="proplist-col">
-                                       <legend><?php echo lang('responsible') 
?></legend>
-
-                                       <dt>
-                                       <label for="organization_id">
-                                               <?php echo lang('choose_org') ?>
-                                       </label>
-                                       <a onclick='alert("<?php echo 
lang('help_choose_activity_org') ?>"); return false;' href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                       </dt>
-                                       <dd>
-                                               <select name="organization_id" 
id="organization_id">
-                                                       <option value="">Ingen 
organisasjon valgt</option>
-                                                       <?php
-                                                       foreach ($organizations 
as $organization) {
-                                                               echo "<option 
value=\"{$organization->get_id()}\">" . $organization->get_name() . "</option>";
-                                                       }
-                                                       ?>
-                                               </select>
-                                               <br/>
-                                       </dd>
-
-                                       <a id="displayText3" href="#">Ikke i 
listen? Registrer ny organisasjon</a><br/>
-                                       <dt>
-                                               <DIV style="overflow: hidden" 
id="toggleText3">
-                                                       <dl>
-                                                               <DIV 
style="overflow: hidden;">
-                                                                       
<P>Registrer ny organisasjon <a onclick='alert("<?php echo 
lang('help_new_activity_org') ?>"); return false;' href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                                                       </P> 
-                                                                       Felt 
merket med (*) er påkrevde felt <BR/><BR/>
-
-                                                                       
<dt><label for="orgname">Organisasjonsnavn (*)</label>
-                                                                               
<a onclick="alert('<?php echo lang('help_organization_name') ?>'); return 
false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a>
-                                                                       </dt>
-                                                                       
<dd><input type="text" name="orgname" id="orgname" size="80" 
maxlength="254"/></dd>
-                                                                       
<dt><label for="orgno">Organisasjonsnummer</label></dt>
-                                                                       
<dd><input type="text" name="orgno" maxlength="254"/></dd>
-                                                                       <DT 
style="margin-right: 20px; float: left;"><label for="street">Gateadresse
-                                                                               
<a onclick="alert('<?php echo lang('help_streetaddress') ?>'); return false;" 
href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></label><br/>
-                                                                               
<INPUT id="address" onkeyup="javascript:get_address_search()" name="address" 
size="50" type="text" autocomplete="off"><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">
-                                                                       </DT>
-                                                                       <DT 
style="float: left;"><LABEL for="postaddress">Poststed</LABEL><BR/>
-                                                                               
<INPUT name="postaddress" size="40" type="text">
-                                                                       
</DT><BR><BR>
-                                                               </DIV>
-                                                               <DT><LABEL 
for="homepage">Hjemmeside <a onclick="alert('<?php echo lang('help_homepage') 
?>'); return false;" href="#"><img alt="Hjelp" 
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL>
-                                                               </DT>
-                                                               <DD><INPUT 
name="homepage" value="http://"; size="80" type="text" 
maxlength="254"></DD><BR/><BR/>
-                                                               <DIV 
style="overflow: hidden;">
-                                                                       
Kontaktperson for organisasjonen <a onclick="alert('<?php echo 
lang('help_contact_person') ?>'); return false;" href="#"><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" maxlength="254"></DD>
-                                                                       
<DT><LABEL for="contact1_phone">Telefon (*)</LABEL></DT>
-                                                                       
<DD><INPUT name="org_contact1_phone" id="org_contact1_phone" type="text"></DD>
-                                                                       
<DT><LABEL for="contact1_mail">E-post (*)</LABEL></DT>
-                                                                       
<DD><INPUT name="org_contact1_mail" id="org_contact1_mail" size="50" 
type="text"></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"></DD>
-                                                               </DIV>
-                                                       </dl>
-                                               </DIV>
-                                       </dt>
-                                       <br/><br/>
-                                       <div class="form-buttons">
-                                               <input type="submit" 
name="step_1" value="<?php echo lang('next') ?>" onclick="return isOK();"/>
-                                       </div>
-                               </dl>
-                       </fieldset>
-               </form>
-       </div>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.php
       2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.php
       2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,150 +0,0 @@
-<?php
-//include common logic for all templates
-//     include("common.php");
-?>
-
-<script type="text/javascript">
-       function get_address_search()
-       {
-               var address = document.getElementById('address').value;
-               var div_address = document.getElementById('address_container');
-               div_address.style.display="block";
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = "<?php echo $ajaxURL 
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"address_select\" 
id=\"address_select\" size=\"5\" onChange='setAddressValue(this)'>";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function setAddressValue(field)
-       {
-               var address = document.getElementById('address');
-               var div_address = document.getElementById('address_container');
-
-               address.value=field.value;
-               div_address.style.display="none";
-       }
-
-       function isOK()
-       {
-               if(document.getElementById('orgname').value == null || 
document.getElementById('orgname').value == '')
-               {
-                       alert("Organisasjonsnavn må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_name').value == null 
|| document.getElementById('org_contact1_name').value == '')
-               {
-                       alert("Navn på kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_phone').value == null 
|| document.getElementById('org_contact1_phone').value == '')
-               {
-                       alert("Telefonnummer til kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_phone').value != null 
&& document.getElementById('org_contact1_phone').value.length < 8)
-               {
-                       alert("Telefonnummer må inneholde minst 8 siffer!");
-                       return false;
-               }
-               if(document.getElementById('org_contact1_mail').value == null 
|| document.getElementById('org_contact1_mail').value == '')
-               {
-                       alert("E-post for kontaktperson må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('org_contact2_mail').value == null 
|| document.getElementById('org_contact2_mail').value == '')
-               {
-                       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>
-
-<div class="yui-content" style="width: 100%;">
-       <div id="details">
-
-               <?php if ($message) { ?>
-                       <div class="success">
-                               <?php echo $message; ?>
-                       </div>
-               <?php } else if ($error) { ?>
-                       <div class="error">
-                               <?php echo $error; ?>
-                       </div>
-               <?php } ?>
-       </div>
-       <div class="pageTop">
-               <h1><?php echo lang('edit_organization') ?></h1>
-               <form action="#" method="post">
-                       <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="alert('<?php echo lang('help_edit_activity_org') ?>'); return false;" 
href="#"><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="alert('<?php echo 
lang('help_organization_name') ?>'); return false;" href="#"><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() ?>" 
maxlength="254"/></dd>
-                                       <dt><label 
for="orgno">Organisasjonsnummer</label></dt>
-                                       <dd><input type="text" name="orgno" 
value="<?php echo $organization->get_organization_number() ?>" 
maxlength="254"/></dd>
-                                       <DT style="margin-right: 20px; float: 
left;"><label for="street">Gateadresse</label>
-                                               <a onclick="alert('<?php echo 
lang('help_streetaddress') ?>'); return false;" href="#"><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() ?>" autocomplete="off"><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="alert('<?php echo lang('help_homepage') ?>'); return false;" 
href="#"><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="alert('<?php echo lang('help_contact_person') ?>'); return false;" 
href="#"><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') ?>" onclick="return isOK();"/>
-                               </div>
-                       </dl>
-               </form>
-       </div>
-</div>
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.php
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.php
    2015-12-09 19:44:21 UTC (rev 14553)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.php
    2015-12-10 09:58:21 UTC (rev 14554)
@@ -1,81 +0,0 @@
-<?php
-//include common logic for all templates
-//     include("common.php");
-?>
-
-<script type="text/javascript">
-       function get_address_search()
-       {
-               var address = document.getElementById('address_txt').value;
-               var div_address = document.getElementById('address_container');
-
-               //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-               url = 
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&amp;phpgw_return_as=json&amp;search="
 + address;
-
-               var divcontent_start = "<select name=\"address\" id=\"address\" 
size\"5\">";
-               var divcontent_end = "</select>";
-       
-               var callback = {
-                       success: function(response){
-                               div_address.innerHTML = divcontent_start + 
JSON.parse(response.responseText) + divcontent_end; 
-                       },
-                       failure: function(o) {
-                               alert("AJAX doesn't work"); //FAILURE
-                       }
-               }
-               var trans = YAHOO.util.Connect.asyncRequest('GET', url, 
callback, null);
-       
-       }
-
-       function allOK()
-       {
-               if(document.getElementById('title').value == null || 
document.getElementById('title').value == '')
-               {
-                       alert("Tittel må fylles ut!");
-                       return false;
-               } 
-               if(document.getElementById('internal_arena_id').value == null 
|| document.getElementById('internal_arena_id').value == 0)
-               {
-                       if(document.getElementById('arena_id').value == null || 
document.getElementById('arena_id').value == 0)
-                       {
-                               alert("Arena må fylles ut!");
-                               return false;
-                       }
-               }
-               if(document.getElementById('time').value == null || 
document.getElementById('time').value == '')
-               {
-                       alert("Tid må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('category').value == null || 
document.getElementById('category').value == 0)
-               {
-                       alert("Kategori må fylles ut!");
-                       return false;
-               }
-               if(document.getElementById('office').value == null || 
document.getElementById('office').value == 0)
-               {
-                       alert("Hovedansvarlig kulturkontor må fylles ut!");
-                       return false;
-               }
-               else
-                       return true;
-       }
-
-</script>
-
-<div class="yui-content" style="width: 100%;">
-       <h1><?php echo lang('edit_organization') ?></h1>
-       <div id="details">
-
-               <?php if ($message) { ?>
-                       <div class="success">
-                               <?php echo $message; ?>
-                       </div>
-               <?php } else if ($error) { ?>
-                       <div class="error">
-                               <?php echo $error; ?>
-                       </div>
-               <?php } ?>
-       </div>
-</div>
-</div>
\ No newline at end of file




reply via email to

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