[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14594] clean up from yui
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14594] clean up from yui |
|
Date: |
Mon, 14 Dec 2015 12:01:44 +0000 |
Revision: 14594
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14594
Author: sigurdne
Date: 2015-12-14 12:01:42 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/activitycalendar/head.inc.php
branches/dev-syncromind/phpgwapi/templates/mobilefrontend/head.inc.php
branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
branches/dev-syncromind/phpgwapi/templates/verdilak/head.inc.php
branches/dev-syncromind/registration/inc/class.uipending.inc.php
branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php
Modified:
branches/dev-syncromind/phpgwapi/templates/activitycalendar/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/activitycalendar/head.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/phpgwapi/templates/activitycalendar/head.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -1,5 +1,4 @@
<?php
- phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.template_portico');
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
@@ -17,24 +16,6 @@
$javascripts = array();
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('element');
- phpgwapi_yui::load_widget('container');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('resize');
- phpgwapi_yui::load_widget('layout');
-
- phpgwapi_yui::load_widget('button');
-// $stylesheets = array
-// (
-//
"/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css",
-//
"/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css",
-// "/phpgwapi/js/yahoo/resize/assets/skins/sam/resize.css",
-// "/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css",
-// );
-// $stylesheets[] = "/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css";
-// $stylesheets[] =
"/phpgwapi/js/yahoo/button/assets/skins/sam/button.css";
-
$stylesheets = array();
$stylesheets[] = "/phpgwapi/templates/pure/css/global.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
Modified: branches/dev-syncromind/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/mobilefrontend/head.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/phpgwapi/templates/mobilefrontend/head.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -1,5 +1,4 @@
<?php
- phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.template_portico');
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
@@ -17,14 +16,6 @@
$javascripts = array();
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('element');
- phpgwapi_yui::load_widget('container');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('resize');
- phpgwapi_yui::load_widget('layout');
-
- phpgwapi_yui::load_widget('button');
$stylesheets = array
(
"/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css",
Modified: branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -10,8 +10,6 @@
* @version $Id$
*/
- phpgw::import_class('phpgwapi.yui');
-
// css file handling
$theme_styles = array();
$css_file = PHPGW_SERVER_ROOT .
'/phpgwapi/templates/probusiness/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
@@ -24,30 +22,6 @@
$theme_styles[] =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/probusiness/css/styles.css';
}
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css";
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/button/assets/skins/sam/button.css";
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css";
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/resize/assets/skins/sam/resize.css";
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css";
-
- if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
- {
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('element');
- phpgwapi_yui::load_widget('container');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('resize');
- phpgwapi_yui::load_widget('layout');
-/* $javascripts = array
- (
- "/phpgwapi/js/json/json.js",
- "/phpgwapi/templates/portico/js/base.js"
-
- );
-*/
- }
- phpgwapi_yui::load_widget('button');
-
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
Modified: branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -8,7 +8,6 @@
* @version $Id$
*/
- phpgw::import_class('phpgwapi.yui');
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
@@ -25,12 +24,6 @@
$theme_styles = array();
if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
{
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('element');
- phpgwapi_yui::load_widget('container');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('resize');
- phpgwapi_yui::load_widget('layout');
$javascripts = array
(
@@ -42,15 +35,8 @@
$theme_styles = array
(
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/base.css",
-
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css",
-
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css",
-
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/button/assets/skins/sam/button.css",
-
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css",
-
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/resize/assets/skins/sam/resize.css",
-
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css"
);
}
- phpgwapi_yui::load_widget('button');
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/simple/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
Modified: branches/dev-syncromind/phpgwapi/templates/verdilak/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/verdilak/head.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/phpgwapi/templates/verdilak/head.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -7,8 +7,7 @@
* @subpackage gui
* @version $Id$
*/
- phpgw::import_class('phpgwapi.yui');
-
+
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
@@ -27,27 +26,6 @@
}
$stylesheets = array();
- if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
- {
-
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('element');
- phpgwapi_yui::load_widget('container');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('resize');
- phpgwapi_yui::load_widget('layout');
-
- $stylesheets = array
- (
-
"/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css",
-
"/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css",
- "/phpgwapi/js/yahoo/resize/assets/skins/sam/resize.css",
- "/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css",
- );
- }
-
- phpgwapi_yui::load_widget('button');
-
$stylesheets[] = '/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css';
$stylesheets[] =
'/phpgwapi/js/yahoo/button/assets/skins/sam/button.css';
$stylesheets[] = '/phpgwapi/templates/base/css/base.css';
Modified: branches/dev-syncromind/registration/inc/class.uipending.inc.php
===================================================================
--- branches/dev-syncromind/registration/inc/class.uipending.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/registration/inc/class.uipending.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -544,11 +544,11 @@
);
$active_tab = 'main';
- phpgwapi_yui::tabview_setup('edit_user_tabview');
+ phpgwapi_jquery::tabview_setup('edit_user_tabview');
$data = array
(
- 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, $active_tab),
+ 'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'value_id' => $id,
'user_data' =>
$user_data,
'location_data' =>
$location_data,
Modified:
branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php
2015-12-14 11:52:57 UTC (rev 14593)
+++ branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php
2015-12-14 12:01:42 UTC (rev 14594)
@@ -201,7 +201,7 @@
'is_one_time' =>
$this->is_one_time(),
// We set a format fitting for the
DateCellEditor here because
// this table has inline editing enabled. The
DateCellEditor is not
- // happy about empty values if a custom parser
is set, so we use the YUI built
+ // happy about empty values if a custom parser
is set, so we use the
// in "date" parser which requires a format
like: 2009/07/30 to work.
// EHL: Removed 2009-10-27, due to change to
int datatype.
'date_start' =>
$this->get_date_start() != NULL ? date($date_format, $this->get_date_start()) :
'',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14594] clean up from yui,
Sigurd Nes <=