fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [14498] php templates to xsl


From: Saul
Subject: [Fmsystem-commits] [14498] php templates to xsl
Date: Sat, 28 Nov 2015 00:31:25 +0000

Revision: 14498
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14498
Author:   psaul
Date:     2015-11-28 00:31:24 +0000 (Sat, 28 Nov 2015)
Log Message:
-----------
php templates to xsl

Modified Paths:
--------------
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_step_1.js
    branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl

Added Paths:
-----------
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_org.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_reciept.js
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.xsl
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
    
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.xsl

Removed Paths:
-------------
    branches/dev-syncromind/activitycalendarfrontend/templates/activity_edit.xsl

Added: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit.js
                               (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit.js
       2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,251 @@
+var current_org_id = "";
+function get_available_groups()
+{
+//    var org_id = document.getElementById('organization_id').value;
+//    var div_select = document.getElementById('group_select');
+    
+    var org_id = $('#organization_id').val();
+    var div_select = $('#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 attr = [{name: 'name', value: 'group_id'},{name: 'id', value: 
'group_id'}, {name: 'onchange', value: 'javascript:checkNewGroup()'}];
+        
+        div_select.hide();
+        
+        if (org_id && org_id != current_org_id) {
+            div_select.show();
+            populateSelect_activityCalendar(availableGroupsURL, div_select, 
attr);
+            current_org_id = org_id;
+        }
+
+//        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();
+//});
+
+$(document).ready(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";
+    }
+}
+
+var current_address = "";
+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 url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
+
+//    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);
+    
+    div_address.hide();
+
+    if (address && address != current_address) {
+        div_address.show();
+        populateSelect_activityCalendar(url, div_address, attr);
+        current_address = address;
+    }
+
+}
+
+var current_address_search_cp2 = "";
+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";
+    
+    var address = $('#contact2_address');
+    var div_address = $('#contact2_address_container');
+
+    //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 url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
+    var attr = [{name: 'name', value: 'contact2_address_select'}, {name: 'id', 
value: 'address_cp2'}, {name: 'size', value: '5'}, {name: 'onChange', value: 
'setAddressValue(this)'}];
+
+//    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);
+    
+    div_address.hide();
+    
+    if (address && address != current_address_search_cp2) {
+        div_address.show();
+        populateSelect_activityCalendar(url, div_address, attr);
+        current_address_search_cp2 = address;
+    }
+}
+
+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;
+        address.value = (field.value && field.value != 0) ? field.value : "";
+        div_address.style.display="none";
+    }
+    else
+    {
+        var address = document.getElementById('address');
+        var div_address = document.getElementById('address_container');
+
+//        address.value=field.value;
+        address.value = (field.value && field.value != 0) ? 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;
+}
\ No newline at end of file

Added: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
                                (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
        2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,59 @@
+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;
+    }
+}
+
+var current_org_id_get_activities = "";
+function get_activities()
+{
+//    var org_id = document.getElementById('organization_id').value;
+//    var div_select = document.getElementById('activity_select');
+    
+    var org_id = $('#organization_id').val();
+    var div_select = $('#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 url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_organization_activities', orgid: 
'org_id'}, true);
+    var attr = [{name: 'name', value: 'activity_id'}, {name: 'id', value: 
'activity_id'}];
+    
+
+//    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);
+    
+    div_select.hide();
+
+    if (org_id && org_id != current_org_id_get_activities) {
+        div_select.show();
+        populateSelect_activityCalendar(url, div_select, attr);
+        current_org_id_get_activities = org_id;
+    }
+
+}
+
+//YAHOO.util.Event.onDOMReady(function()
+//{
+//    get_activities();
+//});
+
+$(document).ready(function(){
+    get_activities();
+});
\ No newline at end of file

Modified: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new.js
        2015-11-28 00:28:48 UTC (rev 14497)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new.js
        2015-11-28 00:31:24 UTC (rev 14498)
@@ -142,7 +142,7 @@
 var current_address_search_cp2 = "";
 function get_address_search_cp2()
 {
-    var address = $('contact2_address');
+    var address = $('#contact2_address');
     var div_address = $('#address_container');
     
     var url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
@@ -164,7 +164,8 @@
         var address = document.getElementById('contact2_address');
         var div_address = 
document.getElementById('contact2_address_container');
 
-        address.value=field.value;
+//        address.value=field.value;
+        address.value = (field.value && field.value != 0) ? field.value : "";
         div_address.style.display="none";
     }
     else if(field.name == 'arena_address_select')
@@ -172,7 +173,8 @@
         var address = document.getElementById('arena_address');
         var div_address = document.getElementById('arena_address_container');
 
-        address.value=field.value;
+//        address.value=field.value;
+        address.value = (field.value && field.value != 0) ? field.value : "";
         div_address.style.display="none";
     }
     else
@@ -180,7 +182,8 @@
         var address = document.getElementById('address');
         var div_address = document.getElementById('address_container');
 
-        address.value=field.value;
+//        address.value=field.value;
+        address.value = (field.value && field.value != 0) ? field.value : "";
         div_address.style.display="none";
     }
 }

Added: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_org.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_org.js
                            (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_org.js
    2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,112 @@
+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";
+    }
+}
+
+var current_address = "";
+function get_address_search()
+{
+//    var address = document.getElementById('address').value;
+//    var div_address = document.getElementById('address_container');
+//    div_address.style.display="block";
+    
+    var address = $('#address').val();
+    var div_address = $('#div_address');
+
+    //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 url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
+    var attr = [{name: 'name', value: 'address_select'}, {name: 'id', value: 
'address_select'}, {name: 'size', value: '5'}, {name: 'onChange', value: 
'setAddressValue(this)'}];
+
+//    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);
+    
+    div_address.hide();
+
+    if (address && address != current_address) {
+        div_address.show();
+        populateSelect_activityCalendar(url, div_address, attr);
+        current_address = address;
+    }
+
+}
+
+function setAddressValue(field)
+{
+    var address = document.getElementById('address');
+    var div_address = document.getElementById('address_container');
+    if (field.value && field.value != 0) {
+        address.value = field.value;
+    } else {
+        address.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;
+}
\ No newline at end of file

Modified: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_step_1.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_step_1.js
 2015-11-28 00:28:48 UTC (rev 14497)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_step_1.js
 2015-11-28 00:31:24 UTC (rev 14498)
@@ -1,171 +1,171 @@
-       $(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";
-       });
+$(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(){
+    $("#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";
-               }
-       }
-    
-    var current_address = "";
-       function get_address_search()
-       {
-        var address = $('#address').val();
-        var div_address = $('#address_container');
-        
-        var url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
-        var attr = [{name: 'name', value: 'address_select'}, {name: 'id', 
value: 'address_select'}, {name: 'size', value: '5'}, {name: 'onChange', value: 
'setAddressValue(this)'}];   
-        
-        div_address.hide();
-        
-        if (address && address != current_address) {
-            div_address.show();
-            populateSelect_activityCalendar(url, div_address, attr);
-            current_address = address;
-        }
-       }
+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 setAddressValue(field)
-       {
-               var address = document.getElementById('address');
-               var div_address = document.getElementById('address_container');
-        if (field.value && field.value != 0) {
-            address.value = field.value;
-        } else {
-            address.value = "";
-        }
-               div_address.style.display="none";
-       }
+var current_address = "";
+function get_address_search()
+{
+    var address = $('#address').val();
+    var div_address = $('#address_container');
 
+    var url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
+    var attr = [{name: 'name', value: 'address_select'}, {name: 'id', value: 
'address_select'}, {name: 'size', value: '5'}, {name: 'onChange', value: 
'setAddressValue(this)'}];   
 
-       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;
-               }
-       }
\ No newline at end of file
+    div_address.hide();
+
+    if (address && address != current_address) {
+        div_address.show();
+        populateSelect_activityCalendar(url, div_address, attr);
+        current_address = address;
+    }
+}
+
+function setAddressValue(field)
+{
+    var address = document.getElementById('address');
+    var div_address = document.getElementById('address_container');
+    if (field.value && field.value != 0) {
+        address.value = field.value;
+    } else {
+        address.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;
+    }
+}
\ No newline at end of file

Added: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
                           (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
   2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,93 @@
+var current_address = "";
+function get_address_search()
+{
+//    var address = document.getElementById('address').value;
+//    var div_address = document.getElementById('address_container');
+//    div_address.style.display="block";
+    
+    var address = $('#address').val();
+    var div_address = $('#address_container');
+
+    //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 url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
+    var attr = [{name: 'name', value: 'address_select'}, {name: 'id', value: 
'address_select'}, {name: 'size', value: '5'}, {name: 'onChange', value: 
'setAddressValue(this)'}];   
+
+//    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);
+
+    div_address.hide();
+
+    if (address && address != current_address) {
+        div_address.show();
+        populateSelect_activityCalendar(url, div_address, attr);
+        current_address = address;
+    }
+
+}
+
+function setAddressValue(field)
+{
+    var address = document.getElementById('address');
+    var div_address = document.getElementById('address_container');
+    if (field.value && field.value != 0) {
+        address.value = field.value;
+    } else {
+        address.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;
+    }
+}
\ No newline at end of file

Added: 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_reciept.js
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_reciept.js
                                (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_reciept.js
        2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,71 @@
+var current_address = "";
+function get_address_search()
+{
+//    var address = document.getElementById('address_txt').value;
+//    var div_address = document.getElementById('address_container');
+    
+    var address = $('#address_txt').val();
+    var div_address = $('#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 url = phpGWLink('activitycalendarfrontend/', {menuaction: 
'activitycalendarfrontend.uiactivity.get_address_search', search: address}, 
true);
+    var attr = [{name: 'name', value: 'address'}, {name: 'id', value: 
'address'}, {name: 'size', value: '5'}]; 
+
+//    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);
+
+    div_address.hide();
+
+    if (address && address != current_address) {
+        div_address.show();
+        populateSelect_activityCalendar(url, div_address, attr);
+        current_address = address;
+    }
+
+}
+
+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;
+}
\ No newline at end of file

Deleted: 
branches/dev-syncromind/activitycalendarfrontend/templates/activity_edit.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/activity_edit.xsl    
    2015-11-28 00:28:48 UTC (rev 14497)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/activity_edit.xsl    
    2015-11-28 00:31:24 UTC (rev 14498)
@@ -1,53 +0,0 @@
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-    <div>
-        <div id="details">
-            <xsl:choose>
-                <xsl:when test="message">
-                    <div class="success">
-                        <xsl:value-of select="message" />
-                    </div>
-                </xsl:when>
-                <xsl:when test="error">
-                    <div class="error">
-                        <xsl:value-of select="error" />
-                    </div>
-                </xsl:when>
-            </xsl:choose>
-        </div>
-        <div class="pageTop">
-            <h1><xsl:value-of select="php:function('lang', 'activity')" /></h1>
-            <div>
-                <xsl:value-of select="php:function('lang', 'required_fields')" 
/>
-            </div>
-        </div>
-        <form action="" method="post" name="form" id="form">
-            <input type="hidden" name="id">
-                <xsl:attribute name="value">
-                    
-                </xsl:attribute>
-            </input>
-            <dl class="proplist-col">
-                <fieldset>
-                    <xsl:attributed name="title">
-                        <xsl:value-of select="php:function('lang', 'what')" />
-                    </xsl:attributed>
-                    <legend>Hva</legend>
-                    <dt>
-                        <label for="title">
-                            <xsl:value-of select="php:function('lang', 
'activity_title')" /> (*)
-                            <a href="javascript:void(0)">
-                                <xsl:attribute name="onclick">
-                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_title')" />');return false;
-                                </xsl:attribute>
-                                <img alt="Hjelp" src="{helpImg}">
-                            </a>
-                        </label>
-                    </dt>
-                    <dd>
-                        
-                    </dd>
-                </fieldset>
-            </dl>
-        </form>
-    </div>
-</xsl:template>
\ No newline at end of file

Modified: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl    
    2015-11-28 00:28:48 UTC (rev 14497)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity.xsl    
    2015-11-28 00:31:24 UTC (rev 14498)
@@ -151,4 +151,4 @@
             </dl>
         </form>
     </div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>

Copied: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
 (from rev 14495, 
branches/dev-syncromind/activitycalendarfrontend/templates/activity_edit.xsl)
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
                           (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit.xsl
   2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,260 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div>
+        <div id="details">
+            <xsl:choose>
+                <xsl:when test="message">
+                    <div class="success">
+                        <xsl:value-of select="message" />
+                    </div>
+                </xsl:when>
+                <xsl:when test="error">
+                    <div class="error">
+                        <xsl:value-of select="error" />
+                    </div>
+                </xsl:when>
+            </xsl:choose>
+        </div>
+        <div class="pageTop">
+            <h1><xsl:value-of select="php:function('lang', 'activity')" /></h1>
+            <div>
+                <xsl:value-of select="php:function('lang', 'required_fields')" 
/>
+            </div>
+        </div>
+        <form action="" method="post" name="form" id="form">
+            <input type="hidden" name="id">
+                <xsl:attribute name="value">
+                    
+                </xsl:attribute>
+            </input>
+            <dl class="proplist-col">
+                <fieldset>
+                    <xsl:attributed name="title">
+                        <xsl:value-of select="php:function('lang', 'what')" />
+                    </xsl:attributed>
+                    <legend>Hva</legend>
+                    <dt>
+                        <label for="title">
+                            <xsl:value-of select="php:function('lang', 
'activity_title')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_title')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <input type="text" name="title" id="title" size="83" 
maxlength="254">
+                            <xsl:attribute name="value">
+                                
+                            </xsl:attribute>
+                        </input>
+                    </dd>
+                    <dt>
+                        <label for="org_description">
+                            <xsl:value-of select="php:function('lang', 
'description')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_description')" />');return 
false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <textarea cols="80" rows="4" name="description" 
id="description">
+                            
+                        </textarea>
+                    </dd>
+                    <dt>
+                        <label for="category">
+                            <xsl:value-of select="php:function('lang', 
'category')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_category')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <select name="category" id="category">
+                            <option value="0">Ingen kategori valgt</option>
+                            <xsl:for-each select="categories">
+                                <option value=""></option>
+                            </xsl:for-each>
+                        </select>
+                    </dd>
+                </fieldset>
+                <fieldset id="hvem">
+                    <legend>For hvem</legend>
+                    <dt>
+                        <label for="target">
+                            <xsl:value-of select="php:function('lang', 
'target')" /> (*) 
+                            <a href="javascript:void">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_target')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <xsl:for-each select="targets">
+                            <input name="target[]" type="checkbox">
+                                <xsl:attribute name="value">
+                                    
+                                </xsl:attribute>
+                            </input>
+                            <br />
+                        </xsl:for-each>
+                    </dd>
+                    <dt>
+                        <input type="checkbox" name="special_adaptation" 
id="special_adaptation" />
+                        <label for="special_adaptation">
+                            <xsl:value-of select="php:function('lang', 
'special_adaptation')" />
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_spec_adapt')" />');return false;
+                                </xsl:attribute>
+                            </a>
+                        </label>
+                    </dt>
+                </fieldset>
+                <fieldset title="hvor">
+                    <legend>Hvor og når</legend>
+                    <dt>
+                        <br />
+                        <label for="arena">
+                            <xsl:value-of select="php:function('lang', 
'location')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_edit_activity_location')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                        <br />
+                    </dt>
+                    <dd>
+                        <select name="internal_arena_id" 
id="internal_arena_id" style="width:200px">
+                            <option value="0">Lokale ikke valgt</option>
+                            <optgroup>
+                                <xsl:attribute name="label">
+                                    <xsl:value-of select="php:function('lang', 
'buildings')" />
+                                </xsl:attribute>
+                                <xsl:for-each select="buildings">
+                                    
+                                </xsl:for-each>
+                            </optgroup>
+                            <optgroup>
+                                <xsl:attribute name="label">
+                                    <xsl:value-fo select="php.function('lang', 
'external_arena')" />
+                                </xsl:attribute>
+                            </optgroup>
+                        </select>
+                        <br />
+                    </dd>
+                    <dt>
+                        <label for="district">
+                            <xsl:value-of select="php:function('lang', 
'district')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_district')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <xsl:value-of select="districts">
+                            <input name="district" type="radio">
+                                <xsl:attribute name="value">
+                                    
+                                </xsl:attribute>
+                            </input>
+                        </xsl:value-of>
+                    </dd>
+                    <dt>
+                        <label for="time">
+                            <xsl:value-of select="php:function('lang', 
'time')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_time')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <input type="text" name="time" id="time" size="80" 
maxlength="254">
+                            <xsl:attribute name="value">
+                                
+                            </xsl:attribute>
+                        </input>
+                    </dd>
+                </fieldset>
+                <fieldset id="arr">
+                    <legend>Kontaktperson</legend>
+                    <br />
+                    Kontaktperson for aktiviteten 
+                    <a href="javascript:void(0);">
+                        <xsl:attribute name="onclick">
+                            alert('<xsl:value-of select="php:function('lang', 
'help_new_activity_contact_person')" />');return false;
+                        </xsl:attribute>
+                        <img alt="Hjelp" src="{helpImg}" />
+                    </a>
+                    <br />
+                    <dt><label for="contact_name">Navn (*)</label></dt>
+                    <dd>
+                        <input type="text" name="contact_name" 
id="contact_name" size="80">
+                            <xsl:attribute name="value"></xsl:attribute>
+                        </input>
+                    </dd>
+                    <dt><label for="contact_phone">Telefon (*)</label></dt>
+                    <dd>
+                        <input type="text" name="contact_phone" 
id="contact_name">
+                            <xsl:attibute name="value"></xsl:attibute>
+                        </input>
+                    </dd>
+                    <dt><label for="contact_mail">E-post (*)</label></dt>
+                    <dd>
+                        <input type="text" name="contact_mail" 
id="contact_mail" size="50">
+                            <xsl:attribute name="value"></xsl:attribute>
+                        </input>
+                    </dd>
+                    <dt><label for="contact_mail2">Gjenta e-post 
(*)</label></dt>
+                    <dd>
+                        <input type="text" name="contact_mail2" 
id="contact_mail2" size="50">
+                            <xsl:attribute name="value"></xsl:attribute>
+                        </input>
+                    </dd>                    
+                </fieldset>
+                <fieldset>
+                    <br />
+                    <dt>
+                        <label for="office">
+                            Hvilket kulturkontor skal motta registreringen (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_office')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                </fieldset>
+            </dl>
+        </form>
+    </div>
+    <script type="text/javascript">
+        var org_id = "";
+        <xsl:if test="">
+            var group_id = "";
+            var availableGroupsURL = phpGWLink('activitycalendarfrontend/', 
{menuaction: 'activitycalendarfrontend.uiactivity.get_organization_groups', 
orgid: org_id, groupid: group_id}, true);
+        </xsl:if>
+        <xsl:if test="">
+            var availableGroupsURL = phpGWLink('activitycalendarfrontend/', 
{menuaction: 'activitycalendarfrontend.uiactivity.get_organization_groups', 
orgid: org_id}, true);
+        </xsl:if>
+    </script>
+</xsl:template>

Added: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
                            (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
    2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,44 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div>
+        <div class="pageTop">
+            <h1><xsl:value-of select="php:function('lang', 'edit_activity')" 
/></h1>
+            <form action="" method="post" name="form" id="form">
+                <dl class="porplist-col" style="width:200%">
+                    <dt>
+                        <xsl:if test="message">
+                            
+                        </xsl:if>
+                    </dt>
+                    <xsl:if test="message">
+                        <dd>
+                            <select name="organization_id" 
id="organization_id" onchange="javascript:get_activities();">
+                                <option value="">Ingen organisasjon 
valgt</option>
+                                <xsl:for-each select="organizations">
+                                    <option value=""></option>
+                                </xsl:for-each>
+                            </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" onclick="return 
isOK();">
+                                <xsl:attribute name="value">
+                                    <xsl:value-of select="php:function('lang', 
'send_change_request')" />
+                                </xsl:attribute>
+                            </input>
+                        </div>
+                    </xsl:if>
+                </dl>
+            </form>
+        </div>
+    </div>
+</xsl:template>
\ No newline at end of file

Modified: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
    2015-11-28 00:28:48 UTC (rev 14497)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new.xsl
    2015-11-28 00:31:24 UTC (rev 14498)
@@ -41,7 +41,7 @@
                     <legend>Hva</legend>
                     <dt>
                         <label for="title">
-                            <xsl:value-of select="php:function('lang', 
'activity_title')" /> (*)
+                            <xsl:value-of select="php:function('lang', 
'activity_title')" /> (*) 
                             <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_title')" />');return false;
@@ -55,7 +55,7 @@
                     </dd>
                     <dt>
                         <label for="org_description">
-                            <xsl:value-of select="php:function('lang', 
'description')" /> (*)
+                            <xsl:value-of select="php:function('lang', 
'description')" /> (*) 
                             <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_description')" />');return 
false;
@@ -69,8 +69,8 @@
                     </dd>
                     <dt>
                         <label for="category">
-                            <xsl:value-of select="php:function('lang', 
'category')" /> (*)
-                            <a href="javascript:void(0)">
+                            <xsl:value-of select="php:function('lang', 
'category')" /> (*) 
+                            <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_category')" />');return false;
                                 </xsl:attribute>
@@ -88,12 +88,12 @@
                     <legend>For hvem</legend>
                     <dt>
                         <label for="target">
-                            <xsl:value-of select="php:function('lang', 
'target')" /> (*)
-                            <a haref="javascript:void(0)">
+                            <xsl:value-of select="php:function('lang', 
'target')" /> (*) 
+                            <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_target')" />');return false;
                                 </xsl:attribute>
-                                <img alt="Hjel" src="{helpImg}" />
+                                <img alt="Hjelp" src="{helpImg}" />
                             </a>
                         </label>
                     </dt>
@@ -105,7 +105,7 @@
                     <dt>
                         <input type="checkbox" name="special_adaptation" 
id="special_adaptation" />
                         <label for="special_adaptation"><xsl:value-of 
select="php:function('lang', 'special_adaptation')" /></label>
-                        <a href="javascript:void(0)">
+                        <a href="javascript:void(0);">
                             <xsl:attribute name="onclick">
                                 alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_spec_adapt')" />');return false;
                             </xsl:attribute>
@@ -118,12 +118,12 @@
                     <dt>
                         <br />
                         <label for="arena">
-                            <xsl:value-of select="php:function('lang', 
'location')" /> (*)
-                            <a href="javascript:void(0)">
+                            <xsl:value-of select="php:function('lang', 
'location')" /> (*) 
+                            <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_location')" />');return false;
                                 </xsl:attribute>
-                                <img href="Hjelp" src="{helpImg}" />
+                                <img alt="Hjelp" src="{helpImg}" />
                             </a>
                         </label>
                     </dt>
@@ -155,7 +155,7 @@
                             <dt>
                                 <label for="new_arena">
                                     <xsl:value-of select="php:function('lang', 
'register_new_arena')" />
-                                    <a href="javascript:void(0)">
+                                    <a href="javascript:void(0);">
                                         <xsl:attribute name="onclick">
                                             alert('<xsl:value-of 
select="php:function('lang', 'help_new_arena')" />');return false;
                                         </xsl:attribute>
@@ -165,12 +165,12 @@
                             </dt>
                             <dt>
                                 <label for="arena_name">
-                                    <xsl:value-of select="php:function('lang', 
'name')" /> (*)
-                                    <a href="javascript:void(0)">
+                                    <xsl:value-of select="php:function('lang', 
'name')" /> (*) 
+                                    <a href="javascript:void(0);">
                                         <xsl:attribute name="onclick">
                                             alert('<xsl:value-of 
select="php:function('lang', 'help_new_arena_name')" />');return false;
                                         </xsl:attribute>
-                                        <img href="Hjelp" src="{helpImg}" />
+                                        <img alt="Hjelp" src="{helpImg}" />
                                     </a>
                                 </label>
                             </dt>
@@ -179,8 +179,8 @@
                             </dd>
                             <dt style="margin-right:20px;float:left;">
                                 <label for="arena_address">
-                                    Gateadresse (*)
-                                    <a href="javascript:void(0)">
+                                    Gateadresse (*) 
+                                    <a href="javascript:void(0);">
                                         <xsl:attribute name="onclick">
                                             alert('<xsl:value-of 
select="php:function('lang', 'help_new_arena_address')" />');return false;
                                         </xsl:attribute>
@@ -203,11 +203,11 @@
                     <dt>
                         <br />
                         <label for="district">
-                            <xsl:value-of select="php:function('lang', 
'district')" /> (*)
-                            <a href="javascript:void(0)">
-                                <xsl:attributed name="onclick">
+                            <xsl:value-of select="php:function('lang', 
'district')" /> (*) 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_district')" />');return false;
-                                </xsl:attributed>
+                                </xsl:attribute>
                                 <img alt="Hjelp" src="{helpImg}" />
                             </a>
                         </label>
@@ -220,8 +220,8 @@
                     <dt>
                         <br />
                         <label for="time">
-                            <xsl:value-of select="php:function('lang', 
'time')" /> (*)
-                            <a href="javascript:void(0)">
+                            <xsl:value-of select="php:function('lang', 
'time')" /> (*) 
+                            <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_time')" />');return false;
                                 </xsl:attribute>
@@ -236,7 +236,7 @@
                 <fieldset id="arr">
                     <legend>Kontaktperson</legend><br />
                     Kontaktperson for aktiviteten 
-                    <a href="javascript:void(0)">
+                    <a href="javascript:void(0);">
                         <xsl:attribute name="onclick">
                             alert('<xsl:value-of select="php:function('lang', 
'help_new_activity_contact_person')" />');return false;
                         </xsl:attribute>
@@ -255,8 +255,8 @@
                     <br />
                     <dt>
                         <label for="office">
-                            Hvilket kulturkontor skal motta registreringen (*)
-                            <a href="javascript:void(0)">
+                            Hvilket kulturkontor skal motta registreringen (*) 
+                            <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_office')" />');return false;
                                 </xsl:attribute>
@@ -284,4 +284,4 @@
             </dl>
         </form>
     </div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>

Added: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.xsl
                                (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_org.xsl
        2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,96 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div>
+        <div id="details">
+            <xsl:choose>
+                <xsl:when test="message">
+                    <div class="success">
+                        <xsl:value-of select="message" />
+                    </div>
+                </xsl:when>
+                <xsl:when test="error">
+                    <div class="error">
+                        <xsl:value-of select="error" />
+                    </div>
+                </xsl:when>
+            </xsl:choose>
+        </div>
+        <h1><xsl:value-of select="php:function('lang', 'new_organization')" 
/></h1>
+        <div>
+            <xsl:value-of select="php:function('lang', 'required_fields')" />
+        </div>
+        <form action="" method="post" id="form" name="form">
+            <input type="hidden" name="activity">
+                <xsl:attribute name="value">
+                    
+                </xsl:attribute>
+            </input>
+            <dl>
+                <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>
+                        <xsl:for-each select="districts">
+                            <option value=""></option>
+                        </xsl:for-each>
+                    </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" />
+                </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" 
onclick="return allOK();">
+                        <xsl:attribute name="value">
+                        </xsl:attribute>
+                    </input>
+                </div>
+            </dl>
+        </form>
+    </div>
+</xsl:template>
\ No newline at end of file

Modified: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
     2015-11-28 00:28:48 UTC (rev 14497)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
     2015-11-28 00:31:24 UTC (rev 14498)
@@ -9,7 +9,7 @@
                         <legend><xsl:value-of select="php:function('lang', 
'responsible')" /></legend>
                         <dt>
                             <label for="organization_id"><xsl:value-of 
select="php:function('lang', 'choose_org')" /></label>
-                            <a href="javascript:void(0)">
+                            <a href="javascript:void(0);">
                                 <xsl:attribute name="onclick">
                                     alert('<xsl:value-of 
select="php:function('lang', 'help_choose_activity_org')" />');return false;
                                 </xsl:attribute>
@@ -29,14 +29,14 @@
                                 </xsl:for-each-->
                             </select>
                         </dd>
-                        <a id="displayText3" href="javascript:void(0)">Ikke i 
listen? Registrer ny organisasjon</a><br />
+                        <a id="displayText3" href="javascript:void(0);">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 href="javascript:void(0)">
+                                            <a href="javascript:void(0);">
                                                 <xsl:attribute name="onclick">
                                                     alert('<xsl:value-of 
select="php:function('lang', 'help_new_activity_org')" />');return false;
                                                 </xsl:attribute>
@@ -46,7 +46,7 @@
                                         Felt merket med (*) er påkrevde felt 
<br /><br />
                                         <dt>
                                             <label 
for="orgname">Organisasjonsnavn (*)</label>
-                                            <a href="javascript:void(0)">
+                                            <a href="javascript:void(0);">
                                                 <xsl:attribute name="onclick">
                                                     alert('<xsl:value-of 
select="php:function('lang', 'help_organization_name')" />');return false;
                                                 </xsl:attribute>

Added: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
                               (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_edit.xsl
       2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,148 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div>
+        <div id="details">
+            <xsl:choose>
+                <xsl:when test="message">
+                    <div class="success">
+                        <xsl:value-of select="message" />
+                    </div>
+                </xsl:when>
+                <xsl:when test="error">
+                    <div class="error">
+                        <xsl:value-of select="error" />
+                    </div>
+                </xsl:when>
+            </xsl:choose>
+        </div>
+        <div class="pageTop">
+            <h1><xsl:value-of select="php:function('lang', 
'edit_organization')" /></h1>
+            <form action="" method="post" name="form" id="form">
+                <dl class="proplist-col">
+                    <input type="hidden" name="organization_id" 
id="organization_id">
+                        <xsl:attribute name="value"></xsl:attribute>
+                    </input>
+                    <div style="overflow:auto;">
+                        <p>
+                            Endre organisasjon 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_edit_activity_org')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </p>
+                        Felt merket med (*) er påkrevde felt <br /><br />
+                        <p></p>
+                        <dt>
+                            <label for="orgname">Organisasjonsnavn (*)</label>
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang' , 'help_organization_name')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </dt>
+                        <dd>
+                            <input type="text" name="orgname" id="orgname" 
size="80" maxlength="254">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dd>
+                        <dt><label for="orgno">Organisasjonsnummer</label></dt>
+                        <dd>
+                            <input type="text" name="orgno" maxlength="254">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dd>
+                        <dt style="margin-right:20px;float:left;">
+                            <label for="street">Gateadresse</label>
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_streetaddress')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                            <br />
+                            <input type="text" name="address" id="address" 
onkeyup="javascript:get_address_search()" size="50">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                            <br />
+                            <div id="address_container" />
+                        </dt>
+                        <dt style="clear:right;float:left;">
+                            <label for="number">Husnummer</label><br />
+                            <input type="text" name="number" size="5" />
+                        </dt><br />
+                        <dt style="clear:left;margin-right:20px;float:left;">
+                            <label for="postzip">Postnummer</label><br />
+                            <input type="text" name="postzip" size="5">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dt>
+                        <dt style="float:left;">
+                            <label for="postaddress">Poststed</label><br />
+                            <input type="text" name="postaddress" size="40">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dt><br /><br />
+                    </div>
+                    <dt>
+                        <label for="homepage">
+                            Hjemmeside 
+                            <a href="javascript:void(0);">
+                                <xsl:attribute name="onclick">
+                                    alert('<xsl:value-of 
select="php:function('lang', 'help_homepage')" />');return false;
+                                </xsl:attribute>
+                                <img alt="Hjelp" src="{helpImg}" />
+                            </a>
+                        </label>
+                    </dt>
+                    <dd>
+                        <input type="text" name="homepage" size="80">
+                            <xsl:attribute name="value"></xsl:attribute>
+                        </input>
+                    </dd><br /><br />
+                    <div style="overflow:auto;">
+                        Kontaktperson for organisasjonen 
+                        <a href="javascript:void(0);">
+                            <xsl:attribute name="onclick">
+                                alert('<xsl:value-of 
select="php:function('lang', 'help_contact_person')" />');return false;
+                            </xsl:attribute>
+                            <img alt="Hjelp" src="{helpImg}" />
+                        </a>
+                        <dt><label for="contact1_name">Navn (*)</label></dt>
+                        <dd>
+                            <input name="org_contact1_name" 
id="org_contact1_name" size="80" type="text">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dd>
+                        <dt><label for="contact1_phone">Telefon 
(*)</label></dt>
+                        <dd>
+                            <input name="org_contact1_phone" 
id="org_contact1_phone" type="text">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dd>
+                        <dt><label for="contact1_mail">E-post (*)</label></dt>
+                        <dd>
+                            <input name="org_contact1_mail" 
id="org_contact1_mail" size="50" type="text">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </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">
+                                <xsl:attribute name="value"></xsl:attribute>
+                            </input>
+                        </dd>
+                    </div>
+                    <div class="form-buttons">
+                        <input type="submit" name="save_org" onclick="return 
isOK();">
+                            <xsl:attribute name="value">
+                                <xsl:value-of select="php:function('lang', 
'send_change_request')" />
+                            </xsl:attribute>
+                        </input>
+                    </div>
+                </dl>
+            </form>
+        </div>
+    </div>
+</xsl:template>
\ No newline at end of file

Added: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.xsl
===================================================================
--- 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.xsl
                            (rev 0)
+++ 
branches/dev-syncromind/activitycalendarfrontend/templates/base/organization_reciept.xsl
    2015-11-28 00:31:24 UTC (rev 14498)
@@ -0,0 +1,19 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+    <div>
+        <h1><xsl:value-of select="php:function('lang', 'edit_organization')" 
/></h1>
+        <div id="details">
+            <xsl:choose>
+                <xsl:when test="message">
+                    <div class="success">
+                        <xsl:value-of select="message" />
+                    </div>
+                </xsl:when>
+                <xsl:when test="error">
+                    <div class="error">
+                        <xsl:value-of select="error" />
+                    </div>
+                </xsl:when>
+            </xsl:choose>
+        </div>
+    </div>
+</xsl:template>
\ No newline at end of file




reply via email to

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