[Fmsystem-commits] [9926] Javascript-fix

[Erik Holm-Larsen]

Revision: 9926
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9926
Author:   erikhl
Date:     2012-08-29 12:16:54 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Javascript-fix

Modified Paths:
--------------
    trunk/activitycalendarfrontend/templates/base/activity_edit.php
    trunk/activitycalendarfrontend/templates/base/activity_new.php
    trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
    trunk/activitycalendarfrontend/templates/base/organization_edit.php

Modified: trunk/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit.php     
2012-08-29 11:50:54 UTC (rev 9925)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit.php     
2012-08-29 12:16:54 UTC (rev 9926)
@@ -181,9 +181,9 @@
                alert("Telefonnummer til kontaktperson må fylles ut!");
                return false;
        }
-        if(document.getElementById('contact_phone').value != null && 
(document.getElementById('contact_phone').vaule.length < 8 && 
document.getElementById('contact_phone').value.length > 8))
+        if(document.getElementById('contact_phone').value != null && 
document.getElementById('contact_phone').value.length < 8)
        {
-               alert("Telefonnummer må inneholde 8 siffer!");
+               alert("Telefonnummer må inneholde minst 8 siffer!");
                return false;
        }
        if(document.getElementById('contact_mail').value == null || 
document.getElementById('contact_mail').value == '')

Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php      
2012-08-29 11:50:54 UTC (rev 9925)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php      
2012-08-29 12:16:54 UTC (rev 9926)
@@ -210,9 +210,9 @@
                alert("Telefonnummer til kontaktperson må fylles ut!");
                return false;
        }
-        if(document.getElementById('contact_phone').value != null && 
(document.getElementById('contact_phone').value.length < 8 || 
document.getElementById('contact_phone').value.length > 8))
+        if(document.getElementById('contact_phone').value != null && 
document.getElementById('contact_phone').value.length < 8)
        {
-               alert("Telefonnummer må inneholde 8 siffer!");
+               alert("Telefonnummer må inneholde minst 8 siffer!");
                return false;
        }
        if(document.getElementById('contact_mail').value == null || 
document.getElementById('contact_mail').value == '')

Modified: trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php       
2012-08-29 11:50:54 UTC (rev 9925)
+++ trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php       
2012-08-29 12:16:54 UTC (rev 9926)
@@ -149,6 +149,11 @@
                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!");

Modified: trunk/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_edit.php 
2012-08-29 11:50:54 UTC (rev 9925)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php 
2012-08-29 12:16:54 UTC (rev 9926)
@@ -13,7 +13,7 @@
        //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_start = "<select name=\"address_select\" id=\"address_select\" 
size=\"5\" onChange='setAddressValue(this)'>";
 var divcontent_end = "</select>";
        
        var callback = {
@@ -54,6 +54,11 @@
                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!");