[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14593] clean up from yui
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14593] clean up from yui |
Date: |
Mon, 14 Dec 2015 11:52:57 +0000 |
Revision: 14593
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14593
Author: sigurdne
Date: 2015-12-14 11:52:57 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
Modified: branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
2015-12-14 11:40:07 UTC (rev 14592)
+++ branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
@@ -29,8 +29,6 @@
* @version $Id: class.uicommon.inc.php 11988 2014-05-23 13:26:30Z
sigurdne $
*/
- //phpgw::import_class('phpgwapi.yui');
-
phpgw::import_class('phpgwapi.jquery');
abstract class phpgwapi_uicommon_jquery
@@ -51,17 +49,6 @@
public function __construct($currentapp ='', $yui = '')
{
- // start: to be removed
-// phpgw::import_class('phpgwapi.yui');
-// phpgwapi_yui::load_widget('dragdrop');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('history');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('menu');
-// phpgwapi_yui::load_widget('calendar');
-// phpgwapi_yui::load_widget('autocomplete');
-// phpgwapi_yui::load_widget('animation');
- //end: to be removed
$yui = isset($yui) && $yui == 'yui3' ? 'yui3' : 'yahoo';
$currentapp = $currentapp ? $currentapp :
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -293,61 +280,6 @@
return $keys;
}
- public function add_yui_translation(&$data)
- {
- $this->add_template_file('yui_phpgw_i18n');
- $previous = lang('prev');
- $next = lang('next');
- $first = lang('first');
- $last = lang('last');
- $showing_items = lang('showing items');
- $of = lang('of');
- $to = lang('to');
- $shows_from = lang('shows from');
- $of_total = lang('of total');
-
- if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
- {
- $rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- }
- else
- {
- $rows_per_page = 10;
- }
-
- $data['yui_phpgw_i18n'] = array(
- 'Calendar' => array(
- 'WEEKDAYS_SHORT' =>
json_encode($this->lang_array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa')),
- 'WEEKDAYS_FULL' =>
json_encode($this->lang_array('Sunday', 'Monday', 'Tuesday', 'Wednesday',
'Thursday', 'Friday', 'Saturday')),
- 'MONTHS_LONG' =>
json_encode($this->lang_array('January', 'February', 'March', 'April', 'May',
'June', 'July', 'August', 'September', 'October', 'November', 'December')),
- ),
- 'DataTable' => array(
- 'MSG_EMPTY' => json_encode(lang('No
records found.')),
- 'MSG_LOADING' =>
json_encode(lang("Loading...")),
- 'MSG_SORTASC' =>
json_encode(lang('Click to sort ascending')),
- 'MSG_SORTDESC' =>
json_encode(lang('Click to sort descending')),
- ),
- 'setupDatePickerHelper' => array(
- 'LBL_CHOOSE_DATE' =>
json_encode(lang('Choose a date')),
- ),
- 'setupPaginator' => array(
- 'pageReportTemplate' =>
json_encode("{$showing_items} {startRecord} - {endRecord} {$of}
{totalRecords}"),
- 'previousPageLinkLabel' =>
json_encode("< {$previous}"),
- 'nextPageLinkLabel' =>
json_encode("{$next} >"),
- 'firstPageLinkLabel' =>
json_encode("<< {$first}"),
- 'lastPageLinkLabel' =>
json_encode("{$last} >>"),
- 'template' =>
json_encode("{CurrentPageReport}<br/> {FirstPageLink} {PreviousPageLink}
{PageLinks} {NextPageLink} {LastPageLink}"),
- 'pageReportTemplate' =>
json_encode("{$shows_from} {startRecord} {$to} {endRecord} {$of_total}
{totalRecords}."),
- 'rowsPerPage' => $rows_per_page
- ),
- 'common' => array(
- 'LBL_NAME' => json_encode(lang('Name')),
- 'LBL_TIME' => json_encode(lang('Time')),
- 'LBL_WEEK' => json_encode(lang('Week')),
- 'LBL_RESOURCE' =>
json_encode(lang('Resource')),
- ),
- );
- }
public function add_jquery_translation(&$data)
{
$this->add_template_file('jquery_phpgw_i18n');
@@ -432,7 +364,6 @@
$this->reset_flash_msgs();
-// $this->add_yui_translation($data);
$this->add_jquery_translation($data);
$data['webserver_url'] =
$GLOBALS['phpgw_info']['server']['webserver_url'];
@@ -810,14 +741,8 @@
}
$this->redirect(array('menuaction' =>
$this->url_prefix.'.index'));
}
-/*
- public function use_yui_editor()
- {
-
self::add_stylesheet('phpgwapi/js/yahoo/assets/skins/sam/skin.css');
- self::add_javascript('yahoo', 'yahoo/editor',
'simpleeditor-min.js');
- }
-*/ static protected function fix_php_files_array($data)
+ static protected function fix_php_files_array($data)
{
$fileKeys = array('error', 'name', 'size', 'tmp_name',
'type');
$keys = array_keys($data);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14593] clean up from yui,
Sigurd Nes <=