[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10019] controller: use jquery from API
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10019] controller: use jquery from API |
|
Date: |
Fri, 21 Sep 2012 13:17:29 +0000 |
Revision: 10019
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10019
Author: sigurdne
Date: 2012-09-21 13:17:28 +0000 (Fri, 21 Sep 2012)
Log Message:
-----------
controller: use jquery from API
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_component.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
trunk/controller/inc/class.uicontrol_group_component.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/inc/class.uicontrol_location.inc.php
trunk/controller/templates/base/check_list/view_control_details.xsl
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-09-21 11:30:40 UTC
(rev 10018)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-09-21 13:17:28 UTC
(rev 10019)
@@ -28,7 +28,12 @@
* @version $Id$
*/
- phpgw::import_class('phpgwapi.uicommon');
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
+ phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('controller.socheck_list');
include_class('controller', 'check_list', 'inc/model/');
@@ -212,10 +217,10 @@
'current_repeat_type' =>
$repeat_type
);
- self::add_javascript('controller', 'controller',
'jquery.js');
+
+ phpgwapi_jquery::load_widget('autocomplete');
+
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
self::add_stylesheet('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
@@ -401,10 +406,9 @@
'calendar/select_buildings_on_property', 'calendar/nav_calendar_year',
'calendar/calendar_filters'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('autocomplete');
+
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
self::add_stylesheet('controller/templates/base/css/jquery-ui.custom.css');
}
public function view_calendar_year_for_locations()
@@ -531,7 +535,8 @@
self::render_template_xsl(
array('calendar/view_calendar_year_for_locations',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/nav_calendar_year'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
@@ -616,7 +621,8 @@
self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/nav_calendar_month'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-09-21 11:30:40 UTC (rev
10018)
+++ trunk/controller/inc/class.uicase.inc.php 2012-09-21 13:17:28 UTC (rev
10019)
@@ -28,6 +28,11 @@
* @version $Id: class.uicheck_list.inc.php 8419 2011-12-23 09:54:15Z
vator $
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('controller.socase');
@@ -255,12 +260,14 @@
$data['building_array'] = $building_array;
}
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('check_list/check_list_tab_menu',
'case/create_case_message'), $data);
}
@@ -456,12 +463,14 @@
),
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('check_list/check_list_tab_menu',
'case/view_case_message'), $data);
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-09-21 11:30:40 UTC
(rev 10018)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-09-21 13:17:28 UTC
(rev 10019)
@@ -501,12 +501,13 @@
'current_month_nr'
=> $month
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
@@ -559,7 +560,7 @@
$component = new controller_component();
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$type = 'component';
@@ -578,20 +579,21 @@
$data = array
(
- 'control'
=> $control->toArray(),
- 'check_list'
=> $check_list->toArray(),
- 'location_array'
=> $location_array,
- 'component_array'
=> $component_array,
- 'date_format'
=> $date_format,
- 'type'
=> $type,
- 'current_year'
=> $year,
- 'current_month_nr'
=> $month,
+ 'control'
=> $control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'location_array' =>
$location_array,
+ 'component_array' =>
$component_array,
+ // 'date_format' =>
$date_format,
+ 'type'
=> $type,
+ 'current_year' =>
$year,
+ 'current_month_nr' =>
$month,
'building_location_code' =>
$building_location_code,
- 'location_level'
=> $level
+ 'location_level' =>
$level
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
@@ -718,7 +720,9 @@
'current_month_nr'
=> $month
);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
Modified: trunk/controller/inc/class.uicheck_list_for_component.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_component.inc.php
2012-09-21 11:30:40 UTC (rev 10018)
+++ trunk/controller/inc/class.uicheck_list_for_component.inc.php
2012-09-21 13:17:28 UTC (rev 10019)
@@ -28,6 +28,10 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
@@ -262,9 +266,10 @@
);
phpgwapi_yui::load_widget('paginator');
+ phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control_component_tabs', 'common',
'view_component_for_control'), $data);
@@ -369,9 +374,10 @@
phpgwapi_yui::load_widget('paginator');
+ phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller',
'controller', 'jquery.js');
+// self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::render_template_xsl(array('control_component_tabs', 'common',
'add_component_to_control'), $data);
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-09-21 11:30:40 UTC
(rev 10018)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-09-21 13:17:28 UTC
(rev 10019)
@@ -28,6 +28,11 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('property.boevent');
phpgw::import_class('controller.socontrol');
@@ -293,19 +298,13 @@
);
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
- //$GLOBALS['phpgw']->jqcal->add_listener('start_date');
- //$GLOBALS['phpgw']->jqcal->add_listener('end_date');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
- self::render_template_xsl(array('control/control_tabs',
'control/control'), $data);
-
+
$this->use_yui_editor(array('description'));
$GLOBALS['phpgw']->jqcal->add_listener('start_date');
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
+
+ self::render_template_xsl(array('control/control_tabs',
'control/control'), $data);
}
/**
@@ -411,8 +410,9 @@
'control_groups' => $control_groups,
);
+ phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control/control_tabs',
'control_group/control_groups'), $data);
}
@@ -527,8 +527,10 @@
'groups_with_control_items' =>
$groups_with_control_items
);
+ phpgwapi_jquery::load_widget('core');
+
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery.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);
@@ -604,8 +606,10 @@
'saved_groups_with_items_array' =>
$saved_groups_with_items_array
);
+ phpgwapi_jquery::load_widget('core');
+
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'yui_min_3_4_3.js');
self::add_javascript('controller', 'controller',
'custom_drag_drop.js');
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2012-09-21 11:30:40 UTC
(rev 10018)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2012-09-21 13:17:28 UTC
(rev 10019)
@@ -28,6 +28,11 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('property.boevent');
phpgw::import_class('controller.socontrol');
@@ -375,10 +380,12 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control_group');
+ phpgwapi_jquery::load_widget('core');
+
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller',
'controller', 'jquery.js');
+ // self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
- self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.js');
+ // self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.js');
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
$data);
}
else if(isset($_POST['save_control_group_items']))
@@ -520,10 +527,12 @@
// $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', 'jquery.js');
+ // self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
- self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.js');
+ // self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.js');
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
$data);
}
}
Modified: trunk/controller/inc/class.uicontrol_group_component.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group_component.inc.php
2012-09-21 11:30:40 UTC (rev 10018)
+++ trunk/controller/inc/class.uicontrol_group_component.inc.php
2012-09-21 13:17:28 UTC (rev 10019)
@@ -28,6 +28,10 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
@@ -172,9 +176,10 @@
);
phpgwapi_yui::load_widget('paginator');
+ phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller',
'controller', 'jquery.js');
+// self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::render_template_xsl(array('control_group_component_tabs', 'common',
'add_component_to_control_group'), $data);
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-09-21 11:30:40 UTC
(rev 10018)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-09-21 13:17:28 UTC
(rev 10019)
@@ -28,6 +28,11 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('property.boevent');
phpgw::import_class('controller.socontrol');
@@ -235,9 +240,10 @@
$this->use_yui_editor(array('what_to_do','how_to_do'));
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::render_template_xsl('control_item/control_item',
$data);
}
Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php 2012-09-21
11:30:40 UTC (rev 10018)
+++ trunk/controller/inc/class.uicontrol_location.inc.php 2012-09-21
13:17:28 UTC (rev 10019)
@@ -254,7 +254,9 @@
phpgwapi_yui::load_widget('paginator');
- self::add_javascript('controller',
'controller', 'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::add_javascript('controller', 'yahoo',
'register_control_to_location.js');
Modified: trunk/controller/templates/base/check_list/view_control_details.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_details.xsl
2012-09-21 11:30:40 UTC (rev 10018)
+++ trunk/controller/templates/base/check_list/view_control_details.xsl
2012-09-21 13:17:28 UTC (rev 10019)
@@ -1,8 +1,6 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<h2>Kontrolldetaljer</h2>
<fieldset id="control_details">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10019] controller: use jquery from API,
Sigurd Nes <=