Ignore:
Timestamp:
Aug 14, 2012, 9:55:13 PM (12 years ago)
Author:
grum
Message:

bug:2723
+ improve some GPC framework functionnalities

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/GrumPluginClasses/classes/GPCCore.class.inc.php

    r16733 r17562  
    33/* -----------------------------------------------------------------------------
    44  class name     : GPCCore
    5   class version  : 1.4.1
    6   plugin version : 3.5.2
    7   date           : 2011-09-19
     5  class version  : 1.4.2
     6  plugin version : 3.5.3
     7  date           : 2012-07-27
    88  ------------------------------------------------------------------------------
    99  author: grum at piwigo.org
     
    6060|         |            |
    6161|         |            | * Compatibility with jquery 1.7.2 & jquery-ui 1.8.16
    62 |         |            |   . implement getMinified() & setMinifiedState() functions
     62|         |            |   . remove getMinified() & setMinifiedState() functions
    6363|         |            |        (let piwigo combined function manage the minified
    6464|         |            |         state)
     
    7373|         |            | * AddHeaderCSS and AddJS are ignored if called in an ajax session (AJAX_CALL defined)
    7474|         |            |
     75| 1.4.2   | 2012/07/27 | * AddHeaderContent can manage 'raw' content
    7576|         |            |
    7677|         |            |
     
    143144        Array('name' => "GPCAjax", 'version' => "3.1.0"),
    144145        Array('name' => "GPCCategorySelector", 'version' => "1.0.1"),
    145         Array('name' => "GPCCore", 'version' => "1.4.1"),
     146        Array('name' => "GPCCore", 'version' => "1.4.2"),
    146147        //Array('name' => "GPCCss", 'version' => "3.1.0"),  removed with v1.4.1
    147148        Array('name' => "GPCPagesNavigation", 'version' => "2.0.0"),
     
    149150        Array('name' => "GPCRequestBuilder", 'version' => "1.1.7"),
    150151        Array('name' => "GPCTables", 'version' => "1.5.0"),
    151         Array('name' => "GPCTabSheet", 'version' => "1.1.1"),
     152        Array('name' => "GPCTabSheet", 'version' => "1.1.2"),
    152153        Array('name' => "GPCTranslate", 'version' => "2.1.1"),
    153154        Array('name' => "GPCUsersGroups", 'version' => "2.1.0"),
     
    555556  /**
    556557   * used to add a js or css directly in the header
     558   * use 'raw' type to add any raw data in the header
    557559   *
    558560   * @param String $id : a unique id for the file
     
    574576      case 'js':
    575577        $template->block_html_head(null, '<script type="text/javascript">'.$content.'</script>', $null, $null);
     578        break;
     579      case 'raw':
     580        $template->block_html_head(null, $content);
    576581        break;
    577582    }
     
    640645  static public function addUI($list)
    641646  {
    642     global $template;
     647    global $template, $lang_info;
    643648
    644649    if(is_string($list)) $list=explode(',', $list);
     
    662667          self::addHeaderCSS('gpc.css', $fileName.'.css', 10);
    663668          self::addHeaderCSS('gpc.cssT', $fileName.'_'.$template->get_themeconf('name').'.css', 15);
     669          break;
     670        case 'canvasDraw.graph':
     671          self::addHeaderCSS('gpc.canvasDrawT', sprintf($themeFile, 'canvasDraw'));
     672          self::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
     673          self::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui'));
     674          self::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery.ui.widget'));
     675          self::addHeaderJS('gpc.canvasDraw.commonClasses', GPC_PATH.'js/CanvasDraw.CommonClasses.js', array('jquery.ui.widget'));
     676          self::addHeaderJS('gpc.canvasDraw.graphClasses', GPC_PATH.'js/CanvasDraw.GraphClasses.js', array('gpc.canvasDraw.commonClasses'));
     677          self::addHeaderJS('gpc.canvasDraw.drawing', GPC_PATH.'js/CanvasDraw.Drawing.js', array('gpc.canvasDraw.graphClasses'));
     678          self::addHeaderJS('gpc.canvasDraw', GPC_PATH.'js/canvasDraw.js', array('gpc.canvasDraw.drawing'));
     679          self::addHeaderJS('gpc.canvasDraw.drawingGraph', GPC_PATH.'js/canvasDraw.ui.drawingGraph.js', array('gpc.canvasDraw'));
    664680          break;
    665681        case 'categorySelector':
     
    715731          break;
    716732        case 'inputDate':
     733          self::addHeaderCSS('jquery.ui.datepicker', 'themes/default/js/ui/theme/jquery.ui.datepicker.css');
    717734          self::addHeaderCSS('gpc.inputDate', GPC_PATH.'css/inputDate.css');
    718735          self::addHeaderCSS('gpc.inputDateT', sprintf($themeFile, 'inputDate'));
    719736          self::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
    720           self::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui'));
     737          self::addHeaderJS('jquery.ui.widget',     'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui'));
    721738          self::addHeaderJS('jquery.ui.datepicker', 'themes/default/js/ui/jquery.ui.datepicker.js', array('jquery.ui.widget'));
     739          self::addHeaderJS('jquery.ui.datepicker-'.$lang_info['code'], self::getPiwigoSystemPath().'themes/default/js/ui/i18n/jquery.ui.datepicker-'.$lang_info['code'].'.js');
    722740          self::addHeaderJS('gpc.inputDate', GPC_PATH.'js/ui.inputDate.js', array('jquery.ui.widget'));
    723741          break;
     
    730748          break;
    731749        case 'inputFilterBox':
     750          self::addHeaderCSS('jquery.ui.datepicker', 'themes/default/js/ui/theme/jquery.ui.datepicker.css');
    732751          self::addHeaderCSS('gpc.inputNum', GPC_PATH.'css/inputNum.css');
    733752          self::addHeaderCSS('gpc.inputNumT', sprintf($themeFile, 'inputNum'));
     
    751770          self::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.draggable'));
    752771          self::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/jquery.ui.dialog.js', array('jquery.ui.sortable'));
     772          self::addHeaderJS('jquery.ui.datepicker', 'themes/default/js/ui/jquery.ui.datepicker.js', array('jquery.ui.widget'));
     773          self::addHeaderJS('jquery.ui.datepicker-'.$lang_info['code'], self::getPiwigoSystemPath().'themes/default/js/ui/i18n/jquery.ui.datepicker-'.$lang_info['code'].'.js');
    753774
    754775          self::addHeaderJS('gpc.inputNum', GPC_PATH.'js/ui.inputNum.js', array('jquery.ui.dialog'));
     
    841862          break;
    842863        case 'dynamicTable':
     864          self::addHeaderCSS('jquery.ui.datepicker', 'themes/default/js/ui/theme/jquery.ui.datepicker.css');
    843865          self::addHeaderCSS('gpc.inputNum', GPC_PATH.'css/inputNum.css');
    844866          self::addHeaderCSS('gpc.inputNumT', sprintf($themeFile, 'inputNum'));
     
    855877          self::addHeaderCSS('gpc.inputPages', GPC_PATH.'css/inputPages.css');
    856878          self::addHeaderCSS('gpc.inputPagesT', sprintf($themeFile, 'inputPages'));
    857           self::addHeaderCSS('gpc.inputDynamicTable', GPC_PATH.'css/inputDynamicTable.css');
    858           self::addHeaderCSS('gpc.inputDynamicTableT', sprintf($themeFile, 'inputDynamicTable'));
     879          self::addHeaderCSS('gpc.dynamicTable', GPC_PATH.'css/dynamicTable.css');
     880          self::addHeaderCSS('gpc.dynamicTableT', sprintf($themeFile, 'dynamicTable'));
    859881
    860882          self::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
     
    867889          self::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.draggable'));
    868890          self::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/jquery.ui.dialog.js', array('jquery.ui.sortable'));
     891          self::addHeaderJS('jquery.ui.datepicker', 'themes/default/js/ui/jquery.ui.datepicker.js', array('jquery.ui.widget'));
     892          self::addHeaderJS('jquery.ui.datepicker-'.$lang_info['code'], self::getPiwigoSystemPath().'themes/default/js/ui/i18n/jquery.ui.datepicker-'.$lang_info['code'].'.js');
    869893
    870894          self::addHeaderJS('gpc.inputNum', GPC_PATH.'js/ui.inputNum.js', array('jquery.ui.dialog'));
Note: See TracChangeset for help on using the changeset viewer.