[Fmsystem-commits] [9636] registration: uicommon

[Sigurd Nes]

Revision: 9636
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9636
Author:   sigurdne
Date:     2012-06-20 13:18:57 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
registration: uicommon

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.uicommon.inc.php
    trunk/registration/inc/class.uipending.inc.php
    trunk/registration/js/yahoo/pending.index.js
    trunk/registration/templates/base/pending_users.xsl

Modified: trunk/phpgwapi/inc/class.uicommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon.inc.php   2012-06-20 11:55:10 UTC (rev 
9635)
+++ trunk/phpgwapi/inc/class.uicommon.inc.php   2012-06-20 13:18:57 UTC (rev 
9636)
@@ -32,20 +32,6 @@
        phpgw::import_class('phpgwapi.yui');
 
 
-       /**
-        * Generates a javascript translator object/hash for the specified 
fields.
-        */
-/*     function js_lang()
-       {
-               $keys = func_get_args();
-               $strings = array();
-               foreach($keys as $key)
-               {
-                       $strings[$key] = is_string($key) ? lang($key) : 
call_user_func_array('lang', $key);
-               }
-               return json_encode($strings);
-       }
-*/
        abstract class phpgwapi_uicommon
        {
                const UI_SESSION_FLASH = 'flash_msgs';

Modified: trunk/registration/inc/class.uipending.inc.php
===================================================================
--- trunk/registration/inc/class.uipending.inc.php      2012-06-20 11:55:10 UTC 
(rev 9635)
+++ trunk/registration/inc/class.uipending.inc.php      2012-06-20 13:18:57 UTC 
(rev 9636)
@@ -80,6 +80,10 @@
 
                function index()
                {
+
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('paginator');
+
                        if($values = phpgw::get_var('values'))
                        {
                                $values['pending_users'] = 
isset($values['pending_users']) && $values['pending_users'] ? 
array_unique($values['pending_users']) : array();
@@ -186,7 +190,6 @@
                                phpgwapi_yui::load_widget('paginator');
 
                                self::add_javascript('registration', 'yahoo', 
'pending.index.js');
-//                             
self::render_template_xsl(array('pending_users', 'common'), $data);
                                
self::render_template_xsl(array('pending_users'), $data);
                        }       
                }

Modified: trunk/registration/js/yahoo/pending.index.js
===================================================================
--- trunk/registration/js/yahoo/pending.index.js        2012-06-20 11:55:10 UTC 
(rev 9635)
+++ trunk/registration/js/yahoo/pending.index.js        2012-06-20 13:18:57 UTC 
(rev 9636)
@@ -95,3 +95,6 @@
                mydiv.style.display = "none";
        }
 
+       YAHOO.util.Event.addListener(window, "load", function() {
+           YAHOO.portico.inlineTableHelper('datatable-container', main_source, 
YAHOO.portico.columnDefs);
+       });

Modified: trunk/registration/templates/base/pending_users.xsl
===================================================================
--- trunk/registration/templates/base/pending_users.xsl 2012-06-20 11:55:10 UTC 
(rev 9635)
+++ trunk/registration/templates/base/pending_users.xsl 2012-06-20 13:18:57 UTC 
(rev 9636)
@@ -33,8 +33,6 @@
        <script type="text/javascript">
                var lang = <xsl:value-of select="php:function('js_lang', 
'edit')"/>;
        </script>
-       <!-- IMPORTANT!!! Loads YUI javascript -->
-       <xsl:call-template name="common"/>
 
        <div class="yui-content">
                <div id="control_details">
@@ -136,7 +134,7 @@
                var main_pag = 'data_paginator';
                var related_table = new Array('users_table');
        
-               setDataSource(main_source, main_columnDefs, main_form, 
main_filters, main_container, main_pag, main_table_id, related_table ); 
+//             setDataSource(main_source, main_columnDefs, main_form, 
main_filters, main_container, main_pag, main_table_id, related_table ); 
                
        </script>