[Fmsystem-commits] [12304] add helper for popup

[Sigurd Nes]

Revision: 12304
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12304
Author:   sigurdne
Date:     2014-11-13 11:26:33 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
add helper for popup

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
    branches/dev-syncromind/phpgwapi/js/jquery/common.js

Modified: branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php  
2014-11-12 23:22:01 UTC (rev 12303)
+++ branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php  
2014-11-13 11:26:33 UTC (rev 12304)
@@ -94,22 +94,20 @@
                        phpgwapi_jquery::load_widget('core');
                        self::add_javascript('phpgwapi', 'DataTables', 
'media/js/jquery.dataTables.min.js');
                        self::add_javascript('phpgwapi', 'DataTables', 
'extensions/Responsive/js/dataTables.responsive.js');
-                       //self::add_javascript('phpgwapi', 'DataTables', 
'extensions/Responsive/js/dataTables.responsive.min.js');
                        self::add_javascript('phpgwapi', 'DataTables', 
'extensions/ColVis/js/dataTables.colVis.min.js');
                        self::add_javascript('phpgwapi', 'DataTables', 
'extensions/TableTools/js/dataTables.tableTools.js');
 
-//                     self::add_javascript('phpgwapi', 'jquery-mobile', 
'jquery.mobile-1.4.3.min.js');
 
-                       //FIXME: working?
-//                     self::add_javascript('phpgwapi', 'DataTables', 
'media/js/jquery.dataTables.columnFilter.js');
-
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/media/css/jquery.dataTables.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colVis.min.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colvis.jqueryui.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.css');
-//                     
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/jquery-mobile/jquery.mobile-1.4.3.min.css');
 
+                       //pop up script
+                       self::add_javascript('phpgwapi', 'tinybox2', 
'packed.js');
+                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+
                }
 
                private function get_ui_session_key()

Modified: branches/dev-syncromind/phpgwapi/js/jquery/common.js
===================================================================
--- branches/dev-syncromind/phpgwapi/js/jquery/common.js        2014-11-12 
23:22:01 UTC (rev 12303)
+++ branches/dev-syncromind/phpgwapi/js/jquery/common.js        2014-11-13 
11:26:33 UTC (rev 12304)
@@ -47,9 +47,9 @@
 };
 
 JqueryPortico.formatRadio = function(key, oData){
-        var checked = '';
+       var checked = '';
        var hidden = '';
-        return hidden + "<center><input type=\"radio\" name=\"rad_template\" 
class=\"myValuesForPHP\" value=\""+oData['template_id']+"\" /></center>";
+       return hidden + "<center><input type=\"radio\" name=\"rad_template\" 
class=\"myValuesForPHP\" value=\""+oData['template_id']+"\" /></center>";
 };
 
 JqueryPortico.FormatterAmount0 = function(key, oData) {
@@ -147,3 +147,23 @@
 
 
 };     
+
+       JqueryPortico.openPopup = function(oArgs,options)
+       {
+               options = options || {};
+               var width = options['width'] || 750;
+               var height = options['height'] || 450;
+               var closeAction = options['closeAction'] || false;
+
+
+               var requestUrl = phpGWLink('index.php', oArgs);
+               TINY.box.show({iframe:requestUrl, 
boxid:'frameless',width:width,height:height,fixed:false,maskid:'darkmask',maskopacity:40,
 mask:true, animate:true, close: 
true,closejs:function(){JqueryPortico.onPopupClose(closeAction);}});
+       };
+
+       JqueryPortico.onPopupClose =function(closeAction)
+       {
+               if(closeAction=='reload')
+               {
+                       location.reload();
+               }
+       }