[Fmsystem-commits] [10442] property: test formvalidator

[Sigurd Nes]

Revision: 10442
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10442
Author:   sigurdne
Date:     2012-11-03 21:36:57 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
property: test formvalidator

Modified Paths:
--------------
    trunk/property/inc/class.uicondition_survey.inc.php
    trunk/property/js/portico/condition_survey_edit.js
    trunk/property/templates/base/condition_survey.xsl

Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2012-11-03 21:36:19 UTC 
(rev 10441)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2012-11-03 21:36:57 UTC 
(rev 10442)
@@ -286,8 +286,8 @@
                        phpgwapi_jquery::load_widget('core');
                        self::add_javascript('property', 'portico', 
'condition_survey_edit.js');
                        self::add_javascript('phpgwapi', 'yui3', 
'yui/yui-min.js');
-                       self::add_javascript('phpgwapi', 'yui3', 
'gallery-formvalidator.js/gallery-formvalidator-min.js');
-
+                       self::add_javascript('phpgwapi', 'yui3', 
'gallery-formvalidator/gallery-formvalidator-min.js');
+                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
                        self::render_template_xsl(array('condition_survey'), 
$data);
                }
                

Modified: trunk/property/js/portico/condition_survey_edit.js
===================================================================
--- trunk/property/js/portico/condition_survey_edit.js  2012-11-03 21:36:19 UTC 
(rev 10441)
+++ trunk/property/js/portico/condition_survey_edit.js  2012-11-03 21:36:57 UTC 
(rev 10442)
@@ -1,26 +1,22 @@
-            YUI().use(
-            'gallery-formvalidator',
-            function(Y){
 
-var loader = new Y.Loader({
+var arURLParts = strBaseURL.split('?');
+var comboBase = arURLParts[0] + 'phpgwapi/inc/yui-combo-master/combo.php?';
+
+YUI({
     //Don't combine the files
     combine: true,
     //Ignore things that are already loaded (in this process)
-    ignoreRegistered: true,
+    ignoreRegistered: false,
     //Set the base path
-    base: 'http://localhost/~sn5607/savannah_trunk/phpgwapi/js/yui3/',
+       comboBase: 
comboBase,//'http://localhost/~sn5607/savannah_trunk/phpgwapi/inc/yui-combo-master/combo.php?',
+    base: '',
     //And the root
-    root: '.',
+    root: '',
     //Require your deps
-    require: [ 'node', 'yql' ]
-});
-
-var out = loader.resolve(true);
-
-//This will be an object of js and css files needed to complete this request.
-//console.log(out);
-
-
+    require: [ 'node', 'yql', 'dom']
+}).use(
+       'gallery-formvalidator', 
+               function(Y) {   
                 Y.on("domready", function () {
 
                     var form = new Y.Validator(
@@ -48,9 +44,9 @@
                     
Y.Event.attach('click',function(){form.clear();},'#clearButton');
                     
Y.Event.attach('click',function(){form2.clear();},'#clearButton2');
                 });
-            });
+ 
+});
 
-
 $(document).ready(function(){
 
        $("#form").submit(function(e){

Modified: trunk/property/templates/base/condition_survey.xsl
===================================================================
--- trunk/property/templates/base/condition_survey.xsl  2012-11-03 21:36:19 UTC 
(rev 10441)
+++ trunk/property/templates/base/condition_survey.xsl  2012-11-03 21:36:57 UTC 
(rev 10442)
@@ -1,6 +1,6 @@
 <!-- $Id:$ -->
 
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/"; 
xmlns:php="http://php.net/xsl";>
 
 <!--<xsl:call-template name="yui_phpgw_i18n"/>-->
 <div class="yui-navset yui-navset-top">