Changeset 7374


Ignore:
Timestamp:
10/24/10 14:48:41 (9 years ago)
Author:
grum
Message:

Add search by tag ; improve css theming ; add en_Uk language

Location:
extensions/ASearchEngine
Files:
12 added
12 edited

Legend:

Unmodified
Added
Removed
  • extensions/ASearchEngine/admin/ase_config.tpl

    r7207 r7374  
    108108    </div> 
    109109 
    110     <div class='cfgBloc'> 
     110    <div class='cfgBloc' style='display:none;'> 
    111111      <label><input type="checkbox" id='iPAApplyLimits' name='fPAApplyLimits' {if $aseConfig.ase_publicAccess_applyLimits}checked{/if}>&nbsp;{'ase_publicAccess_applyLimits'|@translate}</label> 
    112112      <input id="iPALimits" name="fPALimits" type="text" maxlength='6' size='6' value="{$aseConfig.ase_publicAccess_limits}"> 
  • extensions/ASearchEngine/ase2.css

    r7328 r7374  
    5353} 
    5454 
    55 .cRequestCriterions { margin-bottom:10px; } 
     55#iRBCriteriaForm { padding-bottom:10px; } 
    5656 
    5757div#iMenuCriterions ul { margin-top:0px; } 
     
    6161.rbResultItemDetail hr { border:none; border-top:1px solid; } 
    6262 
     63.ui-tag-selector-input { padding:1px; } 
     64.ui-tag-selector-input input { border:none; background:transparent; } 
     65.ui-tag-selector-list { margin-top:-1px; } 
     66.ui-tag-selector-selected-tag-list { list-style:none; margin:0; padding:0; } 
     67.ui-tag-selector-selected-tag-list li span { 
     68  font-family:sans; 
     69  font-size:80%; 
     70  font-weight:bold; 
     71  padding:0 3px; 
     72  position:relative; 
     73  top:-1px; 
     74} 
     75li.ui-tag-selector-list-item, .ui-tag-selector-text { padding:2px; } 
     76.ui-tag-selector-selected-tag-list li.ui-tag-selector-selected-tag { 
     77  -moz-border-radius:8px; 
     78  -webkit-border-radius:8px; 
     79  -khtml-border-radius:8px; 
     80  border-radius:8px; 
     81  float:left; 
     82  margin-bottom:1px; 
     83  margin-right:1px; 
     84  padding:0 4px; 
     85  cursor:default; 
     86} 
     87.ui-tag-selector-selected-tag-list li.ui-tag-selector-selected-tag span { cursor:pointer; } 
     88 
     89li.ui-tag-selector-list-item { cursor:pointer; } 
    6390 
    6491/* AMD specific css */ 
     
    86113 
    87114.waitingResult { margin:30px auto; display:block; } 
     115 
     116.iconEdit, .iconDelete, .iconSwitchCondition { width:18px; height:18px; cursor:pointer; display:inline-block; } 
     117.iconMove { width:18px; height:18px; cursor:move; display:inline-block; } 
     118.itemContent { padding-left:24px; } 
     119.cbItemUnique { border:none; } 
     120.cbItemMultiple { border:1px solid; } 
  • extensions/ASearchEngine/ase_aip.class.inc.php

    r7207 r7374  
    139139 
    140140    GPCCore::addHeaderCSS('categorySelector', 'plugins/GrumPluginClasses/css/categorySelector_'.$template->get_themeconf('name').'.css'); 
     141    GPCCore::addHeaderCSS('tagSelector', 'plugins/GrumPluginClasses/css/tagSelector_'.$template->get_themeconf('name').'.css'); 
    141142 
    142143 
  • extensions/ASearchEngine/ase_root.class.inc.php

    r7318 r7374  
    141141 
    142142 
    143     /** 
    144      *  return all HTML&JS code necessary to display a dialogbox to choose 
    145      *  tags 
    146      */ 
    147     static public function dialogBoxASETags() 
    148     { 
    149       global $template; 
    150  
    151       $template->set_filename('ase_tag_choose', 
    152                     dirname(__FILE__).'/templates/ase_dialog_tag_choose.tpl'); 
    153  
    154       return($template->parse('ase_tag_choose', true)); 
    155     } 
    156143 
    157144 
     
    230217    } 
    231218 
     219    /** 
     220     *  return all HTML&JS code necessary to display a dialogbox to choose 
     221     *  tags on picture 
     222     */ 
     223    static public function dialogBoxASETag() 
     224    { 
     225      global $template; 
     226 
     227      $template->set_filename('ase_tag_choose', 
     228                    dirname(__FILE__).'/templates/ase_dialog_tag_choose.tpl'); 
     229 
     230      return($template->parse('ase_tag_choose', true)); 
     231    } 
     232 
    232233  } //ASE_functions 
    233234 
  • extensions/ASearchEngine/language/fr_FR/plugin.lang.php

    r7207 r7374  
    55$lang['ase_release']='v'; 
    66 
     7$lang['ASETag']="Advanced Search Engine - Tags"; 
    78$lang['ASERate']="Advanced Search Engine - Note moyenne"; 
    89$lang['ASEDate']="Advanced Search Engine - Dates"; 
     
    2425$lang['ase_add_HD']="Ajouter la présence d'une photo HD"; 
    2526$lang['ase_add_rate']="Ajouter une note"; 
     27$lang['ase_add_tag']="Ajouter un ou des tags"; 
    2628 
    2729 
     
    3032$lang['ase_search_keyword']="Recherche sur un mot-clef"; 
    3133$lang['ase_search_HD']="Recherche sur la présence d'une photo HD"; 
     34$lang['ase_search_tags']="Recherche par tags"; 
    3235$lang['ase_choose_rate']="Recherche par note"; 
    3336 
     
    106109$lang['ase_publicAccess_active']="Remplacer la page de recherche de Piwigo par celle d'<i>Advanced Search Engine</i>"; 
    107110$lang['ase_publicAccess_allowedPlugins']="Modules accessibles :"; 
    108 $lang['ase_publicAccess_applyLimits']="Limiter le nombre d'élements restitués"; 
     111$lang['ase_publicAccess_applyLimits']="Limiter le nombre d'éléments restitués"; 
    109112$lang['ase_keyword_minLength']="Nombre minimum de caractères requis pour un accepter la recherche sur un mot-clef"; 
    110113 
    111 $lang['ase_error_limit_must_be_integer_gt_0']="Le nombre d'élements restitués doit être un entier supérieur à 0"; 
     114$lang['ase_error_limit_must_be_integer_gt_0']="Le nombre d'éléments restitués doit être un entier supérieur à 0"; 
    112115$lang['ase_error_key_word_min_length_must_be_integer_gt_0']="Le nombre minimum de caractères doit être un entier supérieur à 0"; 
    113116$lang['ase_error_no_module_checked']="Si la page de recherche Piwigo est à remplacer, au moins un module doit être sélectionné"; 
     
    116119$lang['ase_config_saved']="La configuration est enregistrée"; 
    117120 
     121$lang['ase_tags']="Tags"; 
     122$lang['ase_tag_start_to_type_text']="Commencez votre saisie..."; 
     123$lang['ase_tag_x_tags_display']="%s tags affichés"; 
     124$lang['ase_tag_x_tags_found']="%s tags trouvés"; 
     125$lang['ase_tag_method_and']="Tous les tags sélectionnés doivent être présents"; 
     126$lang['ase_tag_method_or']="Au moins un des tags sélectionnés doit être présent"; 
     127$lang['ase_tag_method_and_text']="Tous les tags doivent être présents :"; 
     128$lang['ase_tag_method_or_text']="Au moins un des tags doit être présent :"; 
     129$lang['ase_error_no_tag_selected']="Au moins un tag doit être sélectionné"; 
     130 
     131 
    118132?> 
  • extensions/ASearchEngine/templates/ase_dialog_category_choose.tpl

    r7328 r7374  
    244244 
    245245 
     246    content+="<div style='font-style:italic;padding-left:15px;'>" 
    246247    for(i=0;i<list.length;i++) 
    247248    { 
    248       content+="<br>&nbsp;-&nbsp;"+list[i]; 
    249     } 
    250  
    251     content+="</div>"; 
     249      content+=list[i]+"<br>"; 
     250    } 
     251 
     252    content+="</div></div>"; 
    252253 
    253254 
  • extensions/ASearchEngine/templates/ase_dialog_date_choose.tpl

    r7328 r7374  
    324324    { 
    325325      case 'eq': 
    326         content+="{/literal}{'ase_is_equal_to'|@translate}{literal} "+dialogOptions.values.from; 
     326        content+="{/literal}{'ase_is_equal_to'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.from+'</span>'; 
    327327        break; 
    328328      case 'bt': 
    329         content+="{/literal}{'ase_is_between'|@translate}{literal} "+dialogOptions.values.from+" {/literal}{'ase_is_between_and'|@translate}{literal} "+dialogOptions.values.to; 
     329        content+="{/literal}{'ase_is_between'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.from+"</span> {/literal}{'ase_is_between_and'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.to+"</span>"; 
    330330        break; 
    331331      case 'gt': 
    332         content+="{/literal}{'ase_is_greater_or_equal'|@translate}{literal} "+dialogOptions.values.from; 
     332        content+="{/literal}{'ase_is_greater_or_equal'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.from+"</span>"; 
    333333        break; 
    334334      case 'lt': 
    335         content+="{/literal}{'ase_is_less_or_equal'|@translate}{literal} "+dialogOptions.values.to; 
     335        content+="{/literal}{'ase_is_less_or_equal'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.to+"</span>"; 
    336336        break; 
    337337    } 
  • extensions/ASearchEngine/templates/ase_dialog_keyword_choose.tpl

    r7328 r7374  
    232232    var content="<div>{/literal}{'ase_search_the_keyword'|@translate}{literal}&nbsp;"; 
    233233 
    234     content+="\"<span style='font-weight:bold'>"+dialogOptions.values.keyword+"</span>\"&nbsp:"; 
     234    content+="<span style='font-style:italic;text-decoration:underline;'>"+dialogOptions.values.keyword+"</span>&nbsp:"; 
    235235 
    236236    if(dialogOptions.values.searchName=='y') content+="<br>&nbsp;-&nbsp;{/literal}{'ase_search_into_name'|@translate}{literal}"; 
  • extensions/ASearchEngine/templates/ase_dialog_rate_choose.tpl

    r7196 r7374  
    265265        break; 
    266266      case 'eq': 
    267         content+="{/literal}{'ase_is_equal2'|@translate}{literal} "+dialogOptions.values.minValue; 
     267        content+="{/literal}{'ase_is_equal2'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.minValue+"</span>"; 
    268268        break; 
    269269      case 'bt': 
    270         content+="{/literal}{'ase_is_between2'|@translate}{literal} "+dialogOptions.values.minValue+" {/literal}{'ase_is_between_and'|@translate}{literal} "+dialogOptions.values.maxValue; 
     270        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>"; 
    271271        break; 
    272272      case 'gt': 
    273         content+="{/literal}{'ase_is_greater_or_equal2'|@translate}{literal} "+dialogOptions.values.minValue; 
     273        content+="{/literal}{'ase_is_greater_or_equal2'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.minValue+"</span>"; 
    274274        break; 
    275275      case 'lt': 
    276         content+="{/literal}{'ase_is_less_or_equal2'|@translate}{literal} "+dialogOptions.values.maxValue; 
     276        content+="{/literal}{'ase_is_less_or_equal2'|@translate}{literal} <span style='font-style:italic;'>"+dialogOptions.values.maxValue+"</span>"; 
    277277        break; 
    278278    } 
  • extensions/ASearchEngine/themes/Sylvia/ASESylvia.css

    r7318 r7374  
    1414.gcBorder    { border: 1px solid #FF3363; }            /* used for borders */ 
    1515.gcBorder2   { border: 1px solid #666666; }            /* used for widgets borders */ 
    16 .gcBorderInput { border: 1px solid #666666; }           /* used for inputs */ 
     16.gcBorderInput { border: #666666; }           /* used for inputs */ 
    1717.cPnDisabled { cursor:default; color:#666666; } 
    1818.pnInactive:hover { background:#999999; color:#444444; } 
    1919.pnActive { background:#999999; color:#444444; font-weight:bold; } 
    2020div.cbOperatorBg { background:#333333; } 
    21 .ui-datepicker, .ui-category-selector, .ui-category-selector-list { 
     21.ui-datepicker, .ui-category-selector, .ui-category-selector-list, 
     22.ui-tag-selector-list, .ui-tag-selector-input { 
    2223  background-color:#444444; 
    2324  color:#999999; 
    24   border-color:#666666; 
     25  border:1px solid #666666; 
    2526} 
    2627.ui-datepicker .ui-datepicker-header { background-color:#222222; } 
     
    2829.ui-datepicker td.ui-datepicker-current-day { background-color:#222222; } 
    2930.ui-category-selector-arrow { color:#FF3333; } 
    30 li.ui-category-selector-item:hover { background-color:#303030; } 
     31li.ui-category-selector-item:hover, li.ui-tag-selector-list-item:hover { background-color:#303030; } 
    3132.ui-category-selector-selected-item { background-color:#777777; } 
    3233.ui-category-selector-expandable-item { background-image:url(expand.png); } 
     
    3435li.ui-category-selector-item div.ui-category-selector-check { background-image:url(check_notchecked.png); } 
    3536li.ui-category-selector-selected-item div.ui-category-selector-check { background-image:url(check_checked.png); } 
    36  
     37.ui-tag-selector-text { 
     38  font-style:italic; 
     39  font-size:80%; 
     40  border-top:1px dotted #666666; 
     41  background:#444444; 
     42  color:#999999; 
     43} 
     44.ui-tag-selector-selected-tag-list li.ui-tag-selector-selected-tag { 
     45  background:#666666; 
     46  color:#999999; 
     47  margin-top:1px; 
     48  padding-top:1px; 
     49} 
     50.ui-tag-selector-highlight { 
     51  color:#FF7700; 
     52  font-weight:bold; 
     53  background:#666666; 
     54} 
     55.iconEdit { background:url(edit.png) no-repeat 0 0 transparent; } 
     56.iconDelete { background:url(./../../../../themes/Sylvia/icon/delete.png) no-repeat 0 0 transparent; } 
     57.iconMove { background:url(move.png) no-repeat 0 0 transparent; } 
     58.iconSwitchCondition  { background:url(switch.png) no-repeat 0 0 transparent; } 
     59.cbItemMultiple { border:1px solid #666666; } 
     60.cbItemOverGroup { border:1px dotted #666666; } 
    3761 
    3862/* AMD specific CSS */ 
  • extensions/ASearchEngine/themes/clear/ASEclear.css

    r7318 r7374  
    1212.gcBorder    { border: 1px solid gray; }            /* used for borders */ 
    1313.gcBorder2   { border: 1px solid #666666; }            /* used for widgets borders */ 
    14 .gcBorderInput { border: 1px solid gray; }           /* used for inputs */ 
     14.gcBorderInput { border: gray; }           /* used for inputs */ 
    1515.cPnDisabled { cursor:default; color:#666666; } 
    1616.pnInactive:hover { background:#999999; color:#F5F5F5; } 
     
    1818div.cbOperatorBg { background:#D3D3D3; color:#005E89; } 
    1919.ui-dialog { border-width:3px; } 
    20 .ui-datepicker, .ui-category-selector-list { 
     20.ui-datepicker, .ui-category-selector-list, 
     21.ui-tag-selector-list, .ui-tag-selector-input { 
    2122  background-color:#F5F5F5; 
    2223  color:#000000; 
    23   border-color:gray; 
     24  border:1px solid gray; 
    2425} 
    2526.ui-category-selector { 
     
    3233.ui-datepicker td.ui-datepicker-current-day { background-color:#D3D3D3; } 
    3334.ui-category-selector-arrow { color:#005E89; } 
    34 li.ui-category-selector-item:hover { background-color:#EEEEEE; color:#858460; } 
     35li.ui-category-selector-item:hover, li.ui-tag-selector-list-item:hover { background-color:#EEEEEE; color:#858460; } 
    3536.ui-category-selector-selected-item { background-color:#D3D3D3; } 
    3637.ui-category-selector-expandable-item { background-image:url(expand.png); } 
     
    3839li.ui-category-selector-item div.ui-category-selector-check { background-image:url(check_notchecked.png); } 
    3940li.ui-category-selector-selected-item div.ui-category-selector-check { background-image:url(check_checked.png); } 
    40  
     41.ui-tag-selector-text { 
     42  font-style:italic; 
     43  font-size:80%; 
     44  border-top:1px dotted gray; 
     45  background:#F5F5F5; 
     46  color:#000000; 
     47} 
     48.ui-tag-selector-selected-tag-list li.ui-tag-selector-selected-tag { 
     49  background:#D3D3D3; 
     50  margin-top:1px; 
     51  padding-top:1px; 
     52} 
     53.ui-tag-selector-highlight { 
     54  color:#005E89; 
     55  font-weight:bold; 
     56  background:#EEEEEE; 
     57} 
     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; } 
     60.iconMove { background:url(move.png) no-repeat 0 0 transparent; } 
     61.iconSwitchCondition  { background:url(switch.png) no-repeat 0 0 transparent; } 
     62.cbItemMultiple { border:1px solid #999999; } 
     63.cbItemOverGroup { border:1px dotted #999999; } 
    4164 
    4265/* AMD specific CSS */ 
  • extensions/ASearchEngine/themes/dark/ASEdark.css

    r7328 r7374  
    1212.gcBorder    { border: 1px solid gray; }            /* used for borders */ 
    1313.gcBorder2   { border: 1px solid #666666; }            /* used for widgets borders */ 
    14 .gcBorderInput { border: 1px solid gray; }           /* used for inputs */ 
     14.gcBorderInput { border: gray; }           /* used for inputs */ 
    1515.cPnDisabled { cursor:default; color:#666666; } 
    1616.pnInactive:hover { background:gray; color:#fff48e; } 
     
    1818div.cbOperatorBg { background:gray; color:#FFF48E; } 
    1919.ui-dialog { border-width:3px; } 
    20 .ui-datepicker, .ui-category-selector-list { 
     20.ui-datepicker, .ui-category-selector-list, 
     21.ui-tag-selector-list, .ui-tag-selector-input { 
    2122  background-color:#F5F5F5; 
    2223  color:#000000; 
    23   border-color:gray; 
     24  border:1px solid gray; 
    2425} 
    2526.ui-category-selector { 
     
    3334.ui-datepicker td.ui-datepicker-current-day { background-color:#505050; color:#fff48e; } 
    3435.ui-category-selector-arrow { color:#000000; } 
    35 li.ui-category-selector-item:hover { background-color:gray; color:#fff48e; } 
     36li.ui-category-selector-item:hover, li.ui-tag-selector-list-item:hover { background-color:gray; color:#fff48e; } 
    3637.ui-category-selector-selected-item { background-color:#505050; color:#fff48e; } 
    3738.ui-category-selector-expandable-item { background-image:url(expand_b.png); } 
     
    4142li.ui-category-selector-item div.ui-category-selector-check { background-image:url(check_notchecked.png); } 
    4243li.ui-category-selector-selected-item div.ui-category-selector-check { background-image:url(check_checked.png); } 
     44 
     45.ui-tag-selector-text { 
     46  font-style:italic; 
     47  font-size:80%; 
     48  border-top:1px dotted gray; 
     49  background:#F5F5F5; 
     50  color:#000000; 
     51} 
     52.ui-tag-selector-selected-tag-list li.ui-tag-selector-selected-tag { 
     53  background:#D3D3D3; 
     54  margin-top:1px; 
     55  padding-top:1px; 
     56} 
     57.ui-tag-selector-highlight { 
     58  color:#000000; 
     59  font-weight:bold; 
     60  background:#D3D3D3; 
     61} 
     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; } 
     64.iconMove { background:url(move.png) no-repeat 0 0 transparent; } 
     65.iconSwitchCondition  { background:url(switch.png) no-repeat 0 0 transparent; } 
     66.cbItemMultiple { border:1px solid gray; } 
     67.cbItemOverGroup { border:1px dotted gray; } 
    4368 
    4469.cbButtons { color:#000000; border:1px solid gray; z-index:510; } 
Note: See TracChangeset for help on using the changeset viewer.