Changeset 15360


Ignore:
Timestamp:
05/27/12 23:48:53 (7 years ago)
Author:
grum
Message:

feature:2635 - Compatibility with Piwigo 2.4

Location:
extensions/ASearchEngine
Files:
23 added
3 deleted
21 edited

Legend:

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

    r7374 r15360  
    3939    $this->tabsheet->add('search', 
    4040                          l10n('ase_search'), 
    41                           $this->getAdminLink()."&fASE_tabsheet=search"); 
     41                          $this->getAdminLink()."-search"); 
    4242    $this->tabsheet->add('config', 
    4343                          l10n('ase_config'), 
    44                           $this->getAdminLink()."&fASE_tabsheet=config"); 
     44                          $this->getAdminLink()."-config"); 
    4545  } 
    4646 
     
    5858    parent::initEvents(); 
    5959 
    60     if($_REQUEST['fASE_tabsheet']=='search') 
     60    if($_GET['tab']=='search') 
    6161    { 
    6262      // load request builder JS only on the search page 
     
    7878    $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/ase_admin.tpl"); 
    7979 
    80     switch($_REQUEST['fASE_tabsheet']) 
     80    switch($_GET['tab']) 
    8181    { 
    8282      case 'search': 
     
    8888    } 
    8989 
    90     $this->tabsheet->select($_REQUEST['fASE_tabsheet']); 
     90    $this->tabsheet->select($_GET['tab']); 
    9191    $this->tabsheet->assign(); 
    9292    $selected_tab=$this->tabsheet->get_selected(); 
     
    9494 
    9595    $template_plugin["ASE_VERSION"] = "<i>".$this->getPluginName()."</i> ".l10n('ase_release').ASE_VERSION; 
    96     $template_plugin["ASE_PAGE"] = $_REQUEST['fASE_tabsheet']; 
     96    $template_plugin["ASE_PAGE"] = $_GET['tab']; 
    9797    $template_plugin["ASE_TITLE"] = ""; 
    9898 
     
    118118    if(!isset($_REQUEST['errcode'])) $_REQUEST['errcode']=''; 
    119119 
    120     if(!isset($_REQUEST['fASE_tabsheet'])) 
    121     { 
    122       $_REQUEST['fASE_tabsheet']="search"; 
    123     } 
    124  
    125     if(!($_REQUEST['fASE_tabsheet']!="search" or 
    126          $_REQUEST['fASE_tabsheet']!="config" 
    127          )) $_REQUEST['fASE_tabsheet']="search"; 
     120    if(!isset($_GET['tab'])) 
     121    { 
     122      $_GET['tab']="search"; 
     123    } 
     124 
     125    if(!($_GET['tab']!="search" or 
     126         $_GET['tab']!="config" 
     127         )) $_GET['tab']="search"; 
    128128  } 
    129129 
  • extensions/ASearchEngine/ase_install.class.inc.php

    r7406 r15360  
    8484      GPCRequestBuilder::register('ASECategory', dirname($this->getFileLocation()).'/ase_rb_callback_category.class.inc.php'); 
    8585      GPCRequestBuilder::register('ASEKeyword', dirname($this->getFileLocation()).'/ase_rb_callback_keyword.class.inc.php'); 
    86       GPCRequestBuilder::register('ASEHD', dirname($this->getFileLocation()).'/ase_rb_callback_hd.class.inc.php'); 
    8786      GPCRequestBuilder::register('ASERate', dirname($this->getFileLocation()).'/ase_rb_callback_rate.class.inc.php'); 
     87 
     88      GPCRequestBuilder::unregister('ASEHD'); // need to be keeped to be able to unregister it... 
    8889      return(''); 
    8990    } 
     
    9596      GPCRequestBuilder::unregister('ASECategory'); 
    9697      GPCRequestBuilder::unregister('ASEKeyword'); 
    97       GPCRequestBuilder::unregister('ASEHD'); 
    9898      GPCRequestBuilder::unregister('ASERate'); 
     99 
     100      GPCRequestBuilder::unregister('ASEHD'); // need to be keeped to be able to unregister it... 
    99101    } 
    100102 
  • extensions/ASearchEngine/ase_pip.class.inc.php

    r10886 r15360  
    2121class ASE_PIP extends ASE_root 
    2222{ 
    23   const SEARCH_SECTION = 'Search'; 
     23  const SEARCH_SECTION = 'ASearch'; 
    2424  protected $sectionPage; 
    2525  protected $css2; 
     
    2828  { 
    2929    parent::__construct($prefixeTable, $filelocation); 
    30     $this->css2 = new GPCCss(dirname($this->getFileLocation()).'/'.$this->getPluginNameFiles()."2.css"); 
     30    $this->css2 = new GPCCss(dirname($this->getFileLocation()).'/'.$this->getPluginNameFiles()."2.css",10); 
    3131    $this->loadConfig(); 
    3232 
     
    8989    $theme=$template->get_themeconf('name'); 
    9090 
     91    // css file for piwigo's default themes (provided by ASE) 
    9192    $file='plugins/ASearchEngine/themes/'.$theme.'/ASE'.$theme.'.css'; 
    9293    if(($theme=='Sylvia' or 
    9394        $theme=='clear' or 
    94         $theme=='dark') and 
    95         file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE0', $file); 
     95        $theme=='dark' or 
     96        $theme=='elegant') and 
     97        file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE0', $file, 35); 
    9698 
     99    // css file for ASE provided by themes 
    97100    $file='themes/'.$theme.'/css/ASE'.$theme.'.css'; 
    98     if(file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE1', $file); 
     101    if(file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE1', $file, 40); 
    99102 
     103    // css file for ASE provided in local directory 
    100104    $file=PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'local/css/ASE'.$theme.'.css'; 
    101     if(file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE2', $file); 
     105    if(file_exists(GPCCore::getPiwigoSystemPath().'/'.$file)) GPCCore::addHeaderCSS('ASE2', $file, 45); 
    102106  } 
    103107 
     
    112116    $template->assign('TITLE', $page['title']); 
    113117 
    114     if($template->get_themeconf('parent')=='gally-default') 
    115     { 
    116       $template->assign('PLUGIN_INDEX_ACTIONS' , 
    117       '<li><a rel="nofollow" title="'.l10n('return to homepage').'" href="'.make_index_url().'" class="button" id="icon_home"></a></li>'); 
    118     } 
    119     else 
    120     { 
    121       $template->assign('PLUGIN_INDEX_ACTIONS' , 
    122       '<li><a href="'.make_index_url().'" title="'.l10n('return to homepage').'"><img src="'.$template->get_themeconf('icon_dir').'/home.png" class="button" alt="'.l10n('home').'"/></a></li>'); 
    123     } 
    124  
    125  
    126118    $template->clear_assign(array('U_MODE_CREATED', 'U_MODE_POSTED')); 
    127119 
     
    131123     */ 
    132124 
    133     $template->set_filename('main', dirname(__FILE__)."/templates/search_page.tpl"); 
     125    $template->set_filename('ASEmain', dirname(__FILE__)."/templates/search_page.tpl"); 
    134126 
    135127    $template->assign('ase_search_page', GPCRequestBuilder::displaySearchPage($this->config['ase_publicAccess_allowedPlugins'])); 
    136128 
    137     $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_BEGIN', 'main'); 
     129    $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_BEGIN', 'ASEmain'); 
    138130  } 
    139131 
    140132 
    141133  /** 
    142    * replace the piwigo search.php url by ?/aSearch url 
     134   * replace the piwigo search.php url by ?/ASearch url 
    143135   */ 
    144136  public function blockManagerApply($menu_ref_arr) 
     
    150142    { 
    151143      $block=$menu->get_block('mbMenu'); 
    152       if(!is_null($block)) $block->data['search']['URL']=get_root_url().'?/'.self::SEARCH_SECTION; 
     144      if(!is_null($block)) $block->data['search']['URL']='./?/'.self::SEARCH_SECTION; 
    153145    } 
    154146  } 
  • extensions/ASearchEngine/ase_rb_callback_rate.class.inc.php

    r7318 r15360  
    3737  static public function getSelect($param="") 
    3838  { 
    39     return(" ase_pitn.average_rate AS averageRate"); 
     39    return(" ase_pitn.rating_score AS averageRate"); 
    4040  } 
    4141 
     
    6161    global $user; 
    6262 
    63     $returned=" ase_pitn.average_rate "; 
     63    $returned=" ase_pitn.rating_score "; 
    6464 
    6565    switch($param['searchType']) 
     
    6767      case 'no': 
    6868        $returned.=" IS NULL "; 
    69         break; 
    70       case 'eq': 
    71         $returned.=" = '".$param['minValue']."' "; 
    7269        break; 
    7370      case 'bt': 
  • extensions/ASearchEngine/ase_root.class.inc.php

    r7374 r15360  
    191191    /** 
    192192     *  return all HTML&JS code necessary to display a dialogbox to choose 
    193      *  HD picture 
    194      */ 
    195     static public function dialogBoxASEHD() 
    196     { 
    197       global $template; 
    198  
    199       $template->set_filename('ase_hd_choose', 
    200                     dirname(__FILE__).'/templates/ase_dialog_hd_choose.tpl'); 
    201  
    202       return($template->parse('ase_hd_choose', true)); 
    203     } 
    204  
    205     /** 
    206      *  return all HTML&JS code necessary to display a dialogbox to choose 
    207193     *  rate on picture 
    208194     */ 
  • extensions/ASearchEngine/ase_version.inc.php

    r10886 r15360  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 
    1616 
    17   define('ASE_VERSION',  '1.1.0'); 
    18   define('ASE_VERSION2', '01.01.00'); 
    19   define('ASE_GPC_NEEDED', '3.5.1'); 
     17  define('ASE_VERSION',  '1.2.0'); 
     18  define('ASE_VERSION2', '01.02.00'); 
     19  define('ASE_GPC_NEEDED', '3.5.2'); 
    2020?> 
  • extensions/ASearchEngine/language/de_DE/plugin.lang.php

    r8005 r15360  
    1010$lang['ASECategory']="Erweiterte Suchmaschine - Kategorien"; 
    1111$lang['ASEKeyword']="Erweiterte Suchmaschine - Stichwörter"; 
    12 $lang['ASEHD']="Erweiterte Suchmaschine - HD Bilder"; 
    1312 
    1413$lang['ase_search']='Suche'; 
     
    2322$lang['ase_add_date']="Fügt eine Zeitspanne hinzu"; 
    2423$lang['ase_add_keyword']="Fügt ein Stichwort hinzu"; 
    25 $lang['ase_add_HD']="Fügt die Anwesenheit eines HD Bildes hinzu"; 
    2624$lang['ase_add_rate']="Fügt eine Bewertung hinzu"; 
    2725$lang['ase_add_tag']="Fügt eine oder mehrere Tags hinzu"; 
     
    3129$lang['ase_choose_date']="Suche in einem bestimmten Zeitraum"; 
    3230$lang['ase_search_keyword']="Suchen Sie auf ein Stichwort"; 
    33 $lang['ase_search_HD']="Suchen Sie auf der Anwesenheit eines HD-Bild"; 
    3431$lang['ase_search_tags']="Suche nach Tags"; 
    3532$lang['ase_choose_rate']="Suche nach Bewertung"; 
     
    8582$lang['ase_search_hd']="HD Bilder suchen"; 
    8683 
    87 $lang['ase_the_picture_has_HD']="Anwesenheit eines HD Bildes"; 
    8884$lang['ase_the_picture']="Bild"; 
    89 $lang['ase_picture_with_hd']="hat ein HD Bild"; 
    90 $lang['ase_picture_without_hd']="hat kein HD Bild"; 
    9185 
    9286$lang['ase_the_rate']="Bewertung"; 
  • extensions/ASearchEngine/language/en_UK/plugin.lang.php

    r7404 r15360  
    1010$lang['ASECategory']="Advanced Search Engine - Categories"; 
    1111$lang['ASEKeyword']="Advanced Search Engine - Keywords"; 
    12 $lang['ASEHD']="Advanced Search Engine - HD Pictures"; 
    1312 
    1413$lang['ase_search']='Search'; 
     
    2322$lang['ase_add_date']="Add a period"; 
    2423$lang['ase_add_keyword']="Add a keyword"; 
    25 $lang['ase_add_HD']="Add the presence of an HD picture"; 
    2624$lang['ase_add_rate']="Add a rate"; 
    2725$lang['ase_add_tag']="Add one or more tags"; 
     
    3129$lang['ase_choose_date']="Search over a given period"; 
    3230$lang['ase_search_keyword']="Search on a keyword"; 
    33 $lang['ase_search_HD']="Search on the presence of an HD picture"; 
    3431$lang['ase_search_tags']="Search by tags"; 
    3532$lang['ase_choose_rate']="Search by rate"; 
     
    8380$lang['ase_search_with_whole_words']="On whole words only"; 
    8481 
    85 $lang['ase_search_hd']="Search HD pictures"; 
    8682 
    87 $lang['ase_the_picture_has_HD']="Présence d'une photo HD"; 
    8883$lang['ase_the_picture']="Picture"; 
    89 $lang['ase_picture_with_hd']="have a HD picture"; 
    90 $lang['ase_picture_without_hd']="don't have a HD picture"; 
    9184 
    9285$lang['ase_the_rate']="Rate"; 
     
    10093$lang['ase_is_greater_or_equal2']="is greater than or equal to"; // rate is greater or equal than ... 
    10194$lang['ase_is_less_or_equal2']="is less than or equal to"; // rate is less or equal ... 
    102 $lang['ase_is_equal2']="equals"; // rate equals... 
    10395 
    10496 
  • extensions/ASearchEngine/language/fr_FR/plugin.lang.php

    r7374 r15360  
    1010$lang['ASECategory']="Advanced Search Engine - Catégories"; 
    1111$lang['ASEKeyword']="Advanced Search Engine - Mots-clefs"; 
    12 $lang['ASEHD']="Advanced Search Engine - Photos HD"; 
    1312 
    1413$lang['ase_search']='Rechercher'; 
     
    2322$lang['ase_add_date']="Ajouter une période"; 
    2423$lang['ase_add_keyword']="Ajouter un mot-clef"; 
    25 $lang['ase_add_HD']="Ajouter la présence d'une photo HD"; 
    2624$lang['ase_add_rate']="Ajouter une note"; 
    2725$lang['ase_add_tag']="Ajouter un ou des tags"; 
     
    3129$lang['ase_choose_date']="Recherche sur une période"; 
    3230$lang['ase_search_keyword']="Recherche sur un mot-clef"; 
    33 $lang['ase_search_HD']="Recherche sur la présence d'une photo HD"; 
    3431$lang['ase_search_tags']="Recherche par tags"; 
    3532$lang['ase_choose_rate']="Recherche par note"; 
     
    8380$lang['ase_search_with_whole_words']="Sur les mots entiers uniquement"; 
    8481 
    85 $lang['ase_search_hd']="Recherche de photos HD"; 
    86  
    8782$lang['ase_the_picture']="La photo"; 
    88 $lang['ase_the_picture_has_HD']="Présence d'une photo HD"; 
    89 $lang['ase_picture_with_hd']="dispose d'une photo HD"; 
    90 $lang['ase_picture_without_hd']="ne dispose pas d'une photo HD"; 
    9183 
    9284$lang['ase_the_rate']="La note"; 
     
    10092$lang['ase_is_greater_or_equal2']="est supérieure ou égale à"; // the rate is greater or equal than ... 
    10193$lang['ase_is_less_or_equal2']="est inférieure ou égale à"; // the rate is less or equal ... 
    102 $lang['ase_is_equal2']="est égale à"; // the rate is equal to ... 
    10394 
    10495 
  • extensions/ASearchEngine/language/it_IT/description.txt

    r7679 r15360  
    1 Motore per effettuare delle ricerche avanzate 
  • extensions/ASearchEngine/language/lv_LV/plugin.lang.php

    r8050 r15360  
    1111$lang['ASECategory']="Paplašinātās meklēšanas dzinis - Kategorijas"; 
    1212$lang['ASEKeyword']="Paplašinātās meklēšanas dzinis - Atslēgvārdi"; 
    13 $lang['ASEHD']="Paplašinātās meklēšanas dzinis - HD Attēli"; 
    1413 
    1514$lang['ase_search']='Meklēt'; 
     
    2423$lang['ase_add_date']="Pievienot periodu"; 
    2524$lang['ase_add_keyword']="Pievienot atslēgvārdu"; 
    26 $lang['ase_add_HD']="Pievienot info par HD attēla klātbūtni"; 
    2725$lang['ase_add_rate']="Pievienot vērtējumu"; 
    2826$lang['ase_add_tag']="Pievienot vienu vai vairākas iezīmes"; 
     
    3230$lang['ase_choose_date']="Meklēt noteiktā laika periodā"; 
    3331$lang['ase_search_keyword']="Meklēt pēc atslēgvārda"; 
    34 $lang['ase_search_HD']=" Meklēt pēc HD attēla klātbūtnes"; 
    3532$lang['ase_search_tags']="Meklēt pēc iezīmēm"; 
    3633$lang['ase_choose_rate']="Meklēt pēc vērtējuma"; 
     
    8683$lang['ase_search_hd']="Meklēt HD attēlus"; 
    8784 
    88 $lang['ase_the_picture_has_HD']="HD attēla klātbūtne"; 
    8985$lang['ase_the_picture']="Attēls"; 
    90 $lang['ase_picture_with_hd']="ir HD attēls"; 
    91 $lang['ase_picture_without_hd']="nav HD attēla"; 
    9286 
    9387$lang['ase_the_rate']="Vērtēt"; 
  • extensions/ASearchEngine/language/tr_TR/plugin.lang.php

    r10304 r15360  
    1010$lang['ASECategory']="Gelişmiş Arama Motoru - Kategoriler"; 
    1111$lang['ASEKeyword']="Gelişmiş Arama Motoru - Anahtar Kelime"; 
    12 $lang['ASEHD']="Gelişmiş Arama Motoru - HD Resimler"; 
    1312 
    1413$lang['ase_search']='Ara'; 
     
    2322$lang['ase_add_date']="Bir zaman dilimi ekle"; 
    2423$lang['ase_add_keyword']="Bir anahtar kelime ekle"; 
    25 $lang['ase_add_HD']="Bir HD görüntü varlığı ekle"; 
    2624$lang['ase_add_rate']="Bir puan ekle"; 
    2725$lang['ase_add_tag']="Bir yada daha fazla etiket ekle"; 
     
    3129$lang['ase_choose_date']="Belirli bir süre aralığında arama"; 
    3230$lang['ase_search_keyword']="Bir anahtar kelimede arama"; 
    33 $lang['ase_search_HD']="Bir HD resim varlığında arama"; 
    3431$lang['ase_search_tags']="Etiketlerde arama"; 
    3532$lang['ase_choose_rate']="Puanlamada arama"; 
     
    8582$lang['ase_search_hd']="HD resimlerde arama"; 
    8683 
    87 $lang['ase_the_picture_has_HD']="Bir HD resimde"; 
    8884$lang['ase_the_picture']="Resim"; 
    89 $lang['ase_picture_with_hd']="Bir HD resim mevcut"; 
    90 $lang['ase_picture_without_hd']="Bir HD resim mevcut değil"; 
    9185 
    9286$lang['ase_the_rate']="Puan"; 
  • extensions/ASearchEngine/main.inc.php

    r10886 r15360  
    22/* 
    33Plugin Name: Advanced Search Engine 
    4 Version: 1.1.0 
     4Version: 1.2.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 
     46| 1.1.0   | 2011-04-26 | * mantis feature:2145 
    4747|         |            |   . Compatibility with Piwigo 2.2 
    4848|         |            | 
    49 |         |            | 
     49| 1.2.0   | 2012-05-25 | * mantis feature:2635 
     50|         |            |   . Compatibility with Piwigo 2.4 
     51|         |            |   . remove search on HD picture 
    5052|         |            | 
    5153|         |            | 
  • extensions/ASearchEngine/templates/ase_dialog_category_choose.tpl

    r10886 r15360  
    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'} 
    4  
     1{combine_script id="gpc.categorySelector" path="plugins/GrumPluginClasses/js/ui.categorySelector.js" require='jquery,jquery.ui'} 
     2{combine_css path="plugins/GrumPluginClasses/css/categorySelector.css"} 
    53 
    64{literal} 
  • extensions/ASearchEngine/templates/ase_dialog_date_choose.tpl

    r10886 r15360  
    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"} 
     1{combine_script id="jquery.ui.datepicker" path="themes/default/js/ui/jquery.ui.datepicker.js" require='jquery,jquery.ui'} 
     2 
     3{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-"|@cat:$lang_info.code|@cat:".js"} 
    64{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists} 
    75{combine_script id="jquery.ui.datepicker-$lang_info.code" path=$datepicker_language} 
  • extensions/ASearchEngine/templates/ase_dialog_keyword_choose.tpl

    r10886 r15360  
    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'} 
    31 
    42{literal} 
  • extensions/ASearchEngine/templates/ase_dialog_rate_choose.tpl

    r10886 r15360  
    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'} 
    31 
    42{literal} 
     
    5957                { 
    6058                  case 'gt': 
    61                   case 'eq': 
    6259                    dialogOptions.values.maxValue=''; 
    6360                    break; 
     
    108105        break; 
    109106      case 'gt': 
    110       case 'eq': 
    111107        $("#iASERateMinValueRow").show(); 
    112108        $("#iASERateMaxValueRow").hide(); 
     
    264260        content="<div>{/literal}{'ase_Dont_have_rate'|@translate}{literal} "; 
    265261        break; 
    266       case 'eq': 
    267         content+="{/literal}{'ase_is_equal2'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.minValue+"</span>"; 
    268         break; 
    269262      case 'bt': 
    270263        content+="{/literal}{'ase_is_between2'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.minValue+"</span> {/literal}{'ase_is_between_and2'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.maxValue+"</span>"; 
     
    332325        <select id="iASERateSearchType"> 
    333326          <option value="no">{'ase_dont_have_rate'|@translate}</option> 
    334           <option value="eq">{'ase_is_equal2'|@translate} ...</option> 
    335327          <option value="bt">{'ase_is_between2'|@translate} ... {'ase_is_between_and2'|@translate} ...</option> 
    336328          <option value="gt">{'ase_is_greater_or_equal2'|@translate} ... </option> 
  • extensions/ASearchEngine/templates/ase_dialog_tag_choose.tpl

    r10886 r15360  
    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'} 
     1{combine_script id="gpc.tagSelector" path="plugins/GrumPluginClasses/js/ui.tagSelector.js" require='jquery,jquery.ui'} 
    42 
    53{literal} 
     
    108106      $('#iBDTagTags').addClass('error'); 
    109107      returned=false; 
    110       alert("{/literal}{'ase_error_no_tags_selected'|@translate}{literal}"); 
     108      alert("{/literal}{'ase_error_no_tag_selected'|@translate}{literal}"); 
    111109    } 
    112110    return(returned); 
  • extensions/ASearchEngine/themes/Sylvia/ASESylvia.css

    r7374 r15360  
    2828.ui-datepicker td:hover { background-color:#666666; } 
    2929.ui-datepicker td.ui-datepicker-current-day { background-color:#222222; } 
     30 
     31 
    3032.ui-category-selector-arrow { color:#FF3333; } 
    3133li.ui-category-selector-item:hover, li.ui-tag-selector-list-item:hover { background-color:#303030; } 
     
    3537li.ui-category-selector-item div.ui-category-selector-check { background-image:url(check_notchecked.png); } 
    3638li.ui-category-selector-selected-item div.ui-category-selector-check { background-image:url(check_checked.png); } 
     39 
    3740.ui-tag-selector-text { 
    3841  font-style:italic; 
     
    5457} 
    5558.iconEdit { background:url(edit.png) no-repeat 0 0 transparent; } 
    56 .iconDelete { background:url(./../../../../themes/Sylvia/icon/delete.png) no-repeat 0 0 transparent; } 
     59.iconDelete { background:url(delete.png) no-repeat 0 0 transparent; } 
    5760.iconMove { background:url(move.png) no-repeat 0 0 transparent; } 
    5861.iconSwitchCondition  { background:url(switch.png) no-repeat 0 0 transparent; } 
    5962.cbItemMultiple { border:1px solid #666666; } 
    6063.cbItemOverGroup { border:1px dotted #666666; } 
     64 
     65 
     66 
     67 
     68 
     69 
     70.ui-category-selector, 
     71.ui-category-selector-list { 
     72  background-color:#444444; 
     73  border:1px solid #666666; 
     74  color:#999999; 
     75} 
     76 
     77li.ui-category-selector-item:hover { 
     78  background-color:#666666; 
     79} 
     80 
     81.ui-category-selector-selected-item { 
     82  background-color:#777777; 
     83} 
     84 
     85 
     86.ui-category-selector-name ul li.ui-category-selector-selected-cat { 
     87  background:#666666; 
     88  color:#999999; 
     89  margin-top:1px; 
     90  padding-top:1px; 
     91} 
     92 
     93.ui-error, input[type='text'].ui-error { 
     94  background:#ff8080; 
     95  border-color:#800000; 
     96  color:#800000; 
     97} 
     98 
     99.ui-category-selector-arrow { 
     100  background:none repeat scroll 0 0 #666666; 
     101  border-color:#999999 #444444 #444444 #999999; 
     102  color:#FF3363; 
     103} 
     104 
     105.ui-category-selector-arrow-active { 
     106  border-color:#444444 #999999 #999999 #444444; 
     107} 
     108 
     109 
     110.cSimpleTipContent { 
     111  background: none repeat scroll 0 0 #202020; 
     112  border: 2px solid #c0c0c0; 
     113  color: #c0c0c0; 
     114} 
     115.cSimpleTipArrow { 
     116  background-image:url(sTipArrows.png); 
     117} 
     118 
    61119 
    62120/* AMD specific CSS */ 
     
    68126 
    69127 
     128 
     129 
  • extensions/ASearchEngine/themes/clear/ASEclear.css

    r7374 r15360  
    2424  border:1px solid gray; 
    2525} 
    26 .ui-category-selector { 
    27   background-color:#D3D3D3; 
    28   color:#000000; 
    29   border-color:gray; 
    30 } 
     26 
    3127.ui-datepicker .ui-datepicker-header { background-color:#D3D3D3; } 
    3228.ui-datepicker td:hover { background-color:#EEEEEE; } 
     
    5652  background:#EEEEEE; 
    5753} 
    58 .iconEdit { background:url(./../../../../themes/default/icon/edit.png) no-repeat 0 0 transparent; } 
    59 .iconDelete { background:url(./../../../../themes/default/icon/delete.png) no-repeat 0 0 transparent; } 
     54.iconEdit { background:url(edit.png) no-repeat 0 0 transparent; } 
     55.iconDelete { background:url(delete.png) no-repeat 0 0 transparent; } 
    6056.iconMove { background:url(move.png) no-repeat 0 0 transparent; } 
    6157.iconSwitchCondition  { background:url(switch.png) no-repeat 0 0 transparent; } 
    6258.cbItemMultiple { border:1px solid #999999; } 
    6359.cbItemOverGroup { border:1px dotted #999999; } 
     60 
     61 
     62 
     63 
     64.ui-category-selector-arrow { 
     65  color:#005E89; 
     66} 
     67 
     68.ui-category-selector, 
     69.ui-category-selector-list { 
     70  background-color:#f5f5f5; 
     71  border:1px solid #999999; 
     72  color:#000000; 
     73} 
     74 
     75li.ui-category-selector-item:hover { 
     76  background-color:#AAAAAA; 
     77  color:#DDDDDD; 
     78} 
     79 
     80.ui-category-selector-selected-item { 
     81  background-color:#999999; 
     82  color:#DDDDDD; 
     83} 
     84 
     85 
     86/* --- */ 
     87.ui-category-selector-name ul li.ui-category-selector-selected-cat { 
     88  background:#d3d3d3; 
     89  color:#000000; 
     90  margin-top:1px; 
     91  padding-top:1px; 
     92} 
     93 
     94.ui-error, input[type='text'].ui-error { 
     95  background:#ff8080; 
     96  border-color:#800000; 
     97  color:#800000; 
     98} 
     99 
     100.ui-category-selector-arrow { 
     101  background:none repeat scroll 0 0 #999999; 
     102  border-color:#DDDDDD #666666 #666666 #DDDDDD; 
     103  color:#005E89; 
     104} 
     105 
     106.ui-category-selector-arrow-active { 
     107  border-color:#666666 #DDDDDD #DDDDDD #666666; 
     108} 
     109 
     110 
     111.cSimpleTipContent { 
     112  background: none repeat scroll 0 0 #202020; 
     113  border: 2px solid #c0c0c0; 
     114  color: #c0c0c0; 
     115} 
     116.cSimpleTipArrow { 
     117  background-image:url(sTipArrows.png); 
     118} 
    64119 
    65120/* AMD specific CSS */ 
  • extensions/ASearchEngine/themes/dark/ASEdark.css

    r7374 r15360  
    2323  color:#000000; 
    2424  border:1px solid gray; 
    25 } 
    26 .ui-category-selector { 
    27   background-color:#D3D3D3; 
    28   color:#000000; 
    29   border-color:gray; 
    3025} 
    3126.ui-datepicker td a { color:#000000; } 
     
    6055  background:#D3D3D3; 
    6156} 
    62 .iconEdit { background:url(./../../../../themes/default/icon/edit.png) no-repeat 0 0 transparent; } 
    63 .iconDelete { background:url(./../../../../themes/default/icon/delete.png) no-repeat 0 0 transparent; } 
     57.iconEdit { background:url(edit.png) no-repeat 0 0 transparent; } 
     58.iconDelete { background:url(delete.png) no-repeat 0 0 transparent; } 
    6459.iconMove { background:url(move.png) no-repeat 0 0 transparent; } 
    6560.iconSwitchCondition  { background:url(switch.png) no-repeat 0 0 transparent; } 
     
    8277div#iMenuCriterions div#iMenuCItems { margin-left:-1px; } 
    8378 
     79 
     80 
     81.ui-category-selector-arrow { 
     82  color:#005E89; 
     83} 
     84 
     85.ui-category-selector, 
     86.ui-category-selector-list { 
     87  background-color:#f5f5f5; 
     88  border:1px solid gray; 
     89  color:#000000; 
     90} 
     91 
     92li.ui-category-selector-item:hover { 
     93  background-color:#AAAAAA; 
     94  color:#DDDDDD; 
     95} 
     96 
     97.ui-category-selector-selected-item { 
     98  background-color:#999999; 
     99  color:#DDDDDD; 
     100} 
     101 
     102 
     103/* --- */ 
     104.ui-category-selector-name ul li.ui-category-selector-selected-cat { 
     105  background:#d3d3d3; 
     106  color:#000000; 
     107  margin-top:1px; 
     108  padding-top:1px; 
     109} 
     110 
     111.ui-error, input[type='text'].ui-error { 
     112  background:#ff8080; 
     113  border-color:#800000; 
     114  color:#800000; 
     115} 
     116 
     117.ui-category-selector-arrow { 
     118  background:none repeat scroll 0 0 #999999; 
     119  border-color:#DDDDDD #666666 #666666 #DDDDDD; 
     120  color:#005E89; 
     121} 
     122 
     123.ui-category-selector-arrow-active { 
     124  border-color:#666666 #DDDDDD #DDDDDD #666666; 
     125} 
     126 
     127.cSimpleTipContent { 
     128  background: none repeat scroll 0 0 #202020; 
     129  border: 2px solid #c0c0c0; 
     130  color: #c0c0c0; 
     131} 
     132.cSimpleTipArrow { 
     133  background-image:url(sTipArrows.png); 
     134} 
     135 
     136 
    84137/* AMD specific CSS */ 
    85138span.tagName { border-right:1px dotted gray; } 
Note: See TracChangeset for help on using the changeset viewer.