Changeset 10886


Ignore:
Timestamp:
05/15/11 20:29:26 (9 years ago)
Author:
grum
Message:

feature:2145 - compatibility with piwigo 2.2

Location:
extensions/ASearchEngine
Files:
4 added
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/ASearchEngine/ase_pip.class.inc.php

    r7450 r10886  
    6565    parent::initEvents(); 
    6666 
     67    add_event_handler('blockmanager_apply', array(&$this, 'blockManagerApply'), 40); // call ASE before AMM 
     68 
    6769    if($this->sectionPage->pageIsSection()) 
    6870    { 
     
    7173      add_event_handler('init', array(&$this, 'applyJS')); 
    7274      add_event_handler('loc_begin_page_header', array(&$this->css2, 'applyCSS'), 9); // have to be loaded before other css file (event level from GPCCore=10) 
    73       add_event_handler('blockmanager_apply', array(&$this, 'blockmanagerApply'), 40); // call ASE before AMM 
    7475      add_event_handler('user_init', array(&$this, 'load_lang')); 
    7576    } 
     
    8687    global $template; 
    8788 
    88  
    89     GPCCore::addHeaderJS('jquery', 'themes/default/js/jquery.packed.js'); 
    90  
    9189    $theme=$template->get_themeconf('name'); 
    9290 
     
    10098    if(file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE1', $file); 
    10199 
    102     $file='local/css/ASE'.$theme.'.css'; 
     100    $file=PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'local/css/ASE'.$theme.'.css'; 
    103101    if(file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE2', $file); 
    104102  } 
     
    144142   * replace the piwigo search.php url by ?/aSearch url 
    145143   */ 
    146   public function blockmanagerApply($menu_ref_arr) 
     144  public function blockManagerApply($menu_ref_arr) 
    147145  { 
    148146    global $user, $page; 
  • extensions/ASearchEngine/ase_version.inc.php

    r7450 r10886  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 
    1616 
    17   define('ASE_VERSION',  '1.0.3'); 
    18   define('ASE_VERSION2', '01.00.03'); 
    19   define('ASE_GPC_NEEDED', '3.3.3'); 
     17  define('ASE_VERSION',  '1.1.0'); 
     18  define('ASE_VERSION2', '01.01.00'); 
     19  define('ASE_GPC_NEEDED', '3.5.1'); 
    2020?> 
  • extensions/ASearchEngine/main.inc.php

    r7450 r10886  
    22/* 
    33Plugin Name: Advanced Search Engine 
    4 Version: 1.0.3 
     4Version: 1.1.0 
    55Description: An advanced search engine 
    66Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid= 
     
    4444|         |            |   . optimization in css management 
    4545|         |            | 
     46| 1.1.0   | 2011-04-26 | * mantis bug:2145 
     47|         |            |   . Compatibility with Piwigo 2.2 
    4648|         |            | 
    4749|         |            | 
  • extensions/ASearchEngine/templates/ase_dialog_category_choose.tpl

    r7374 r10886  
    1 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"} 
    2 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"} 
    3 {known_script id="gpc.categorySelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.categorySelector.packed.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js" require='jquery'} 
     2{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js" require='jquery'} 
     3{combine_script id="gpc.categorySelector" path="plugins/GrumPluginClasses/js/ui.categorySelector.min.js" require='jquery'} 
    44 
    55 
  • extensions/ASearchEngine/templates/ase_dialog_date_choose.tpl

    r7374 r10886  
    1 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"} 
    2 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"} 
    3 {known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.datepicker.packed.js"} 
    4  
    5 {assign var="datepicker_language" value="themes/default/js/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js" require='jquery'} 
     2{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js" require='jquery'} 
     3{combine_script id="jquery.ui.datepicker" path="themes/default/js/ui/minified/jquery.ui.datepicker.min.js" require='jquery'} 
     4 
     5{assign var="datepicker_language" value="themes/default/js/ui/minified/i18n/jquery.ui.datepicker-"|@cat:$lang_info.code|@cat:".js"} 
    66{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists} 
    7 {known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language} 
     7{combine_script id="jquery.ui.datepicker-$lang_info.code" path=$datepicker_language} 
    88{/if} 
     9 
    910{html_head} 
    10 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/js/ui/theme/ui.datepicker.css"> 
     11<link rel="stylesheet" type="text/css" href="themes/default/js/ui/theme/jquery.ui.datepicker.css"> 
    1112{/html_head} 
     13 
    1214 
    1315{literal} 
  • extensions/ASearchEngine/templates/ase_dialog_hd_choose.tpl

    r7196 r10886  
    1 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"} 
    2 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js" require='jquery'} 
     2{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js" require='jquery'} 
    33 
    44{literal} 
  • extensions/ASearchEngine/templates/ase_dialog_keyword_choose.tpl

    r7374 r10886  
    1 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"} 
    2 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js" require='jquery'} 
     2{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js" require='jquery'} 
    33 
    44{literal} 
  • extensions/ASearchEngine/templates/ase_dialog_rate_choose.tpl

    r7374 r10886  
    1 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"} 
    2 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js" require='jquery'} 
     2{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js" require='jquery'} 
    33 
    44{literal} 
  • extensions/ASearchEngine/templates/ase_dialog_tag_choose.tpl

    r7374 r10886  
    1 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"} 
    2 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"} 
    3 {known_script id="gpc.tagSelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.tagSelector.packed.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js" require='jquery'} 
     2{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js" require='jquery'} 
     3{combine_script id="gpc.tagSelector" path="plugins/GrumPluginClasses/js/ui.tagSelector.min.js" require='jquery'} 
    44 
    55{literal} 
Note: See TracChangeset for help on using the changeset viewer.