[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14612] clean up from yui
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14612] clean up from yui |
|
Date: |
Fri, 18 Dec 2015 10:24:21 +0000 |
Revision: 14612
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14612
Author: sigurdne
Date: 2015-12-18 10:24:20 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/building_schedule.xsl
branches/dev-syncromind/booking/templates/base/resource_schedule.xsl
branches/dev-syncromind/controller/inc/class.uicheck_list_for_component.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol_group_component.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol_register_to_component.inc.php
branches/dev-syncromind/controller/templates/base/add_component_to_control_group.xsl
Removed Paths:
-------------
branches/dev-syncromind/frontend/js/yahoo/
Modified: branches/dev-syncromind/booking/templates/base/building_schedule.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building_schedule.xsl
2015-12-18 09:54:56 UTC (rev 14611)
+++ branches/dev-syncromind/booking/templates/base/building_schedule.xsl
2015-12-18 10:24:20 UTC (rev 14612)
@@ -6,8 +6,6 @@
#cal_container #datepicker {width: 2px;opacity: 0;position:
absolute;display:none;}
#cal_container #numberWeek {width: 20px;display: inline-block;}
</style>
- <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
- <input id="yui-history-field" type="hidden"/>
<xsl:call-template name="msgbox"/>
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
Modified: branches/dev-syncromind/booking/templates/base/resource_schedule.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource_schedule.xsl
2015-12-18 09:54:56 UTC (rev 14611)
+++ branches/dev-syncromind/booking/templates/base/resource_schedule.xsl
2015-12-18 10:24:20 UTC (rev 14612)
@@ -6,8 +6,6 @@
#cal_container #datepicker {width: 2px;opacity: 0;position:
absolute;display:none;}
#cal_container #numberWeek {width: 20px;display: inline-block;}
</style>
- <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
- <input id="yui-history-field" type="hidden"/>
<xsl:call-template name="msgbox"/>
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
Modified:
branches/dev-syncromind/controller/inc/class.uicheck_list_for_component.inc.php
===================================================================
---
branches/dev-syncromind/controller/inc/class.uicheck_list_for_component.inc.php
2015-12-18 09:54:56 UTC (rev 14611)
+++
branches/dev-syncromind/controller/inc/class.uicheck_list_for_component.inc.php
2015-12-18 10:24:20 UTC (rev 14612)
@@ -216,7 +216,7 @@
'key'
=> 'id',
'label'
=> lang('ID'),
'sortable'
=> true,
- 'formatter'
=> 'YAHOO.portico.formatLink'
+ 'formatter'
=> 'JqueryPortico.formatLink'
),
array(
'key'
=> 'guid',
@@ -232,7 +232,6 @@
'key'
=> 'checked',
'label'
=> 'Velg',
'sortable'
=> false,
- 'formatter'
=> 'YAHOO.widget.DataTable.formatCheckbox',
'className'
=> 'mychecks'
),
array(
@@ -254,7 +253,6 @@
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::render_template_xsl(array('control_component_tabs', 'common',
'add_component_to_control'), $data);
Modified: branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
2015-12-18 09:54:56 UTC (rev 14611)
+++ branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
2015-12-18 10:24:20 UTC (rev 14612)
@@ -318,7 +318,6 @@
'repeat_type_array' =>
$repeat_type_array
);
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'ajax.js');
$this->use_yui_editor(array('description'));
@@ -445,7 +444,6 @@
);
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control/control_tabs',
'control_group/control_groups'), $data);
}
@@ -576,7 +574,6 @@
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control/control_tabs',
'control_item/choose_control_items'), $data);
@@ -685,7 +682,6 @@
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'custom_drag_drop.js');
self::add_javascript('controller', 'controller',
'ajax.js');
Modified: branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
2015-12-18 09:54:56 UTC (rev 14611)
+++ branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
2015-12-18 10:24:20 UTC (rev 14612)
@@ -394,7 +394,6 @@
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::render_template_xsl(array('control_group/control_group_tabs',
'control_group/control_group',
'control_group/control_group_items'),
$data);
@@ -618,12 +617,8 @@
$GLOBALS['phpgw']->richtext->generate_script();
*/
- //
$GLOBALS['phpgw']->js->validate_file( 'yahoo', 'controller.item', 'controller'
);
-
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller',
'controller', 'ajax.js');
self::add_javascript('controller',
'controller', 'control_group_to_component.js');
self::render_template_xsl(array('control_group/control_group_tabs',
'control_group/control_group',
'control_group/control_group_items'),
$data);
@@ -927,7 +922,6 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control group');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::render_template_xsl(array('control_group/control_group_tabs',
'control_group/control_group',
'control_group/control_group_items'),
$data);
}
Modified:
branches/dev-syncromind/controller/inc/class.uicontrol_group_component.inc.php
===================================================================
---
branches/dev-syncromind/controller/inc/class.uicontrol_group_component.inc.php
2015-12-18 09:54:56 UTC (rev 14611)
+++
branches/dev-syncromind/controller/inc/class.uicontrol_group_component.inc.php
2015-12-18 10:24:20 UTC (rev 14612)
@@ -27,17 +27,9 @@
* @subpackage controller
* @version $Id$
*/
- /**
- * Import the jQuery class
- */
- phpgw::import_class('phpgwapi.jquery');
+ phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.yui');
- phpgw::import_class('phpgwapi.uicommon');
-
- //phpgw::import_class('bim.sobimitem');
-
- class controller_uicontrol_group_component extends phpgwapi_uicommon
+ class controller_uicontrol_group_component extends
phpgwapi_uicommon_jquery
{
var $cat_id;
@@ -160,7 +152,7 @@
'key'
=> 'location_id',
'label'
=> lang('ID'),
'sortable'
=> true,
- 'formatter'
=> 'YAHOO.portico.formatLink'
+ 'formatter'
=> 'JqueryPortico.formatLink'
),
array(
'key'
=> 'name',
@@ -171,20 +163,17 @@
'key'
=> 'checked',
'label'
=> 'Velg',
'sortable'
=> false,
- 'formatter'
=> 'YAHOO.widget.DataTable.formatCheckbox',
'className'
=> 'mychecks'
)
)
)
);
- phpgwapi_yui::load_widget('paginator');
phpgwapi_jquery::load_widget('core');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller',
'controller', 'ajax.js');
-
self::render_template_xsl(array('control_group_component_tabs', 'common',
'add_component_to_control_group'), $data);
+
self::render_template_xsl(array('control_group_component_tabs',
'add_component_to_control_group'), $data);
}
}
Modified:
branches/dev-syncromind/controller/inc/class.uicontrol_register_to_component.inc.php
===================================================================
---
branches/dev-syncromind/controller/inc/class.uicontrol_register_to_component.inc.php
2015-12-18 09:54:56 UTC (rev 14611)
+++
branches/dev-syncromind/controller/inc/class.uicontrol_register_to_component.inc.php
2015-12-18 10:24:20 UTC (rev 14612)
@@ -158,10 +158,7 @@
'update_action' =>
self::link(array('menuaction' =>
'controller.uicontrol_register_to_component.edit_component'))
);
-
self::add_javascript('controller', 'controller',
'ajax_control_to_component.js');
-// self::add_javascript('controller', 'yahoo',
'register_control.js');
-
self::render_template_xsl(array('control_location/register_control_to_component'),
$data);
}
/*
Modified:
branches/dev-syncromind/controller/templates/base/add_component_to_control_group.xsl
===================================================================
---
branches/dev-syncromind/controller/templates/base/add_component_to_control_group.xsl
2015-12-18 09:54:56 UTC (rev 14611)
+++
branches/dev-syncromind/controller/templates/base/add_component_to_control_group.xsl
2015-12-18 10:24:20 UTC (rev 14612)
@@ -17,12 +17,9 @@
</func:function>
<xsl:template name="add_component_to_control_group"
xmlns:php="http://php.net/xsl";>
- <!-- IMPORTANT!!! Loads YUI javascript -->
- <xsl:call-template name="common"/>
<div class="yui-content">
<div id="control_group_details">
- <xsl:call-template name="yui_phpgw_i18n"/>
<xsl:apply-templates select="control_group_filters" />
<xsl:apply-templates select="filter_form" />
<xsl:apply-templates select="paging"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14612] clean up from yui,
Sigurd Nes <=