[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14579] clean up from yui
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14579] clean up from yui |
|
Date: |
Fri, 11 Dec 2015 14:25:43 +0000 |
Revision: 14579
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14579
Author: sigurdne
Date: 2015-12-11 14:25:41 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
branches/dev-syncromind/property/inc/class.uidebug_json.inc.php
branches/dev-syncromind/property/inc/class.uidocument2.inc.php
branches/dev-syncromind/property/inc/class.uientity.inc.php
branches/dev-syncromind/property/inc/class.uievent.inc.php
Modified: branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php 2015-12-11
13:23:46 UTC (rev 14578)
+++ branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php 2015-12-11
14:25:41 UTC (rev 14579)
@@ -40,7 +40,7 @@
private static $counter = 0;
/**
- * Load all the dependencies for a YUI widget
+ * Load all the dependencies for a jQuery widget
*
* @param string $widget the name of the widget to load, such
as autocomplete
*
Modified: branches/dev-syncromind/property/inc/class.uidebug_json.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uidebug_json.inc.php
2015-12-11 13:23:46 UTC (rev 14578)
+++ branches/dev-syncromind/property/inc/class.uidebug_json.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
@@ -26,7 +26,6 @@
* @subpackage project
* @version $Id$
*/
- //phpgw::import_class('phpgwapi.yui');
/**
* Description
Modified: branches/dev-syncromind/property/inc/class.uidocument2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uidocument2.inc.php
2015-12-11 13:23:46 UTC (rev 14578)
+++ branches/dev-syncromind/property/inc/class.uidocument2.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
@@ -58,7 +58,7 @@
public function __construct()
{
- parent::__construct(); //'', 'yui3');
+ parent::__construct();
$this->bo =
CreateObject('property.bodocument');
$this->bocommon = & $this->bo->bocommon;
@@ -150,35 +150,11 @@
return;
}
- //FIXME:Responsive(js/css) - shows 'hidden' columns...
-// 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.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');
-
-
if(phpgw::get_var('phpgw_return_as') == 'json')
{
return $this->query();
}
-// self::add_javascript('phpgwapi', 'yui3',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-
$categories = $this->_get_categories();
$columns = $this->_get_columns();
@@ -393,7 +369,6 @@
phpgwapi_cache::session_clear('property.request',
'session_data');
- phpgwapi_yui::tabview_setup('survey_edit_tabview');
$tabs = array();
$tabs['generic'] = array('label' =>
lang('generic'), 'link' => '#generic');
$active_tab = 'generic';
@@ -533,7 +508,7 @@
'status_list' => array('options' =>
execMethod('property.bogeneric.get_list', array(
'type' =>
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' =>
true))),
'editable' => $mode ==
'edit',
- 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, $active_tab),
+ 'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'multiple_uploader' => $mode == 'edit' ?
true : '',
);
Modified: branches/dev-syncromind/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uientity.inc.php 2015-12-11
13:23:46 UTC (rev 14578)
+++ branches/dev-syncromind/property/inc/class.uientity.inc.php 2015-12-11
14:25:41 UTC (rev 14579)
@@ -731,7 +731,7 @@
}
/**
- * Function to get related via Ajax-call using api-version of
yui
+ * Function to get related via Ajax-call
*
*/
function get_related()
@@ -790,7 +790,7 @@
}
/**
- * Function to get related via Ajax-call using api-version of
yui
+ * Function to get related via Ajax-call
*
*/
function get_target()
Modified: branches/dev-syncromind/property/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uievent.inc.php 2015-12-11
13:23:46 UTC (rev 14578)
+++ branches/dev-syncromind/property/inc/class.uievent.inc.php 2015-12-11
14:25:41 UTC (rev 14579)
@@ -396,21 +396,6 @@
unset($parameters);
- /* if($this->acl_add)
- {
- $data['datatable']['actions'][] = array
- (
- 'my_name' => 'add',
- 'statustext' => lang('add'),
- 'text' => lang('add'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction' => 'property.uievent.edit',
- 'type' => $type,
- 'type_id' => $type_id
- ))
- );
- } */
self::add_javascript('property', 'portico',
'event.index.js');
self::render_template_xsl('datatable_jquery', $data);
@@ -597,7 +582,6 @@
$tabs = array();
$active_tab = 'general';
- //phpgwapi_yui::tabview_setup('general_edit_tabview');
$tabs['general'] = array('label' => lang('general'),
'link' => '#general');
$tabs['repeat'] = array('label' => lang('repeat'),
'link' => '#repeat');
if($id)
@@ -661,7 +645,6 @@
'lang_delete_statustext' => lang('delete the
record'),
'textareacols' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 60,
'textarearows' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 10,
- //'tabs'
=> phpgwapi_yui::tabview_generate($tabs, 'general'),
'active_tab' => $active_tab,
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab)
);
@@ -808,6 +791,8 @@
function schedule2($id = 0)
{
+ throw new Exception('FIXME: uievent::schedule2()');
+
if(!$id)
{
$id = phpgw::get_var('id', 'int');
@@ -1000,29 +985,16 @@
'value_location_item_id' =>
$event['location_item_id'],
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'edit_url' =>
$GLOBALS['phpgw']->link('/index.php', $link_data),
- 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, $active_tab)
+ 'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab)
);
- //_debug_array($data);die;
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('menu');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('loader');
- phpgwapi_yui::load_widget('tabview');
- phpgwapi_yui::load_widget('paginator');
- phpgwapi_yui::load_widget('animation');
-
-
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('schedule');
$GLOBALS['phpgw']->xslttpl->add_file(array('event'));
- //
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('schedule' => $data));
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
+
+
$GLOBALS['phpgw']->js->validate_file('yahoo',
'event.schedule', 'property');
return $data;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14579] clean up from yui,
Sigurd Nes <=