Changeset 7327


Ignore:
Timestamp:
Oct 21, 2010, 11:35:20 PM (14 years ago)
Author:
grum
Message:

fix bug on the rbuilder and ajax initialization and enhance some template & css properties

Location:
extensions/GrumPluginClasses
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

    r7317 r7327  
    263263
    264264
     265load_language('rbuilder.lang', GPC_PATH);
     266
    265267
    266268class GPCRequestBuilder {
    … …  
    490492    GPCCore::addHeaderJS('gpc.interface', 'plugins/'.$baseName.'external/interface/interface.js');
    491493    GPCCore::addHeaderJS('gpc.inestedsortable', 'plugins/'.$baseName.'external/inestedsortable.pack.js');
    492     GPCCore::addHeaderJS('gpc.criteriaBuilder', 'plugins/'.$baseName.'criteriaBuilder.js');
     494    GPCCore::addHeaderJS('gpc.criteriaBuilder', 'plugins/'.$baseName.'criteriaBuilder.packed.js');
    493495
    494496    $template->append('head_elements',
    … …  
    497499      textAND:'".l10n('gpc_rb_textAND')."',
    498500      textOR:'".l10n('gpc_rb_textOR')."',
     501      textNoCriteria:\"".l10n('There is no criteria ! At least, one criteria is required to do search...')."\",
    499502      imgEditUrl:'',
    500503      imgDeleteUrl:'',
    … …  
    909912        $datas['imageCategoriesDir']=explode(',', $row['imageCategoriesDir']);
    910913
    911 
    912914        $datas['imageCategories']=Array();
    913915        for($i=0;$i<count($datas['imageCategoriesId']);$i++)
    … …  
    918920            'dirType' => $datas['imageCategoriesDir'][$i],
    919921            'pLinks' => $datas['imageCategoriesPLink'][$i],
    920             'link'=> make_index_url(
    921                               array(
    922                                 'category' => array(
    923                                   'id' => $datas['imageCategoriesId'][$i],
    924                                   'name' => $datas['imageCategoriesNames'][$i],
    925                                   'permalink' => $datas['imageCategoriesPLink'][$i])
    926                               )
     922            'link'=> make_picture_url(
     923                        array(
     924                          'image_id' => $datas['imageId'],
     925                          'category' => array
     926                            (
     927                              'id' => $datas['imageCategoriesId'][$i],
     928                              'name' => $datas['imageCategoriesNames'][$i],
     929                              'permalink' => $datas['imageCategoriesPLink'][$i]
    927930                            )
     931                        )
     932                      )
    928933          );
    929934        }
    … …  
    13181323    global $template, $lang;
    13191324
    1320     load_language('rbuilder.lang', GPC_PATH);
     1325    //load_language('rbuilder.lang', GPC_PATH);
    13211326
    13221327    if(is_string($filter)) $filter=array($filter);

  • extensions/GrumPluginClasses/css/rbuilder.css

    r7317 r7327  
    7777}
    7878
     79input.cRequestCriterions {
     80  margin-left:1em;
     81}
    7982
    8083div#iMenuCriterions div#iMenuCItems {
    … …  
    8487  position:absolute;
    8588  padding:0px;
    86   margin:36px 2px 2px;
     89  margin-top:-1px;
    8790}
    8891
    … …  
    113116  margin-bottom:3px;
    114117  cursor:default;
     118  padding-left:0;
     119  padding-right:0;
     120}
     121div#iMenuCriterions div#iMenuCTitle div#iMenuCText {
     122  padding-bottom:12px;
     123  padding-left:8px;
     124  padding-right:8px;
     125  position:relative;
     126  z-index:950;
    115127}
    116128

  • extensions/GrumPluginClasses/gpc_ajax.php

    r7312 r7327  
    3939  include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php');
    4040  include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCAjax.class.inc.php');
     41
     42  global $page;
     43  $page['root_path']='./';
    4144
    4245  load_language('plugin.lang', GPC_PATH);

  • extensions/GrumPluginClasses/js/criteriaBuilder.js

    r7312 r7327  
    33 * file: criteriaBuilder.js
    44 * file version: 1.1.0
    5  * date: 2010-05-01
     5 * date: 2010-10-21
    66 *
    77 * JS file provided by the piwigo's plugin "GrumPluginClasses"
    … …  
    5656 * | 1.0.0   | 2010/04/27 | * start to coding
    5757 * |         |            |
    58  * | 1.1.0   | 2010/10/20 | * change ajax methods
     58 * | 1.1.0   | 2010/10/21 | * change ajax methods
     59 * |         |            |
     60 * |         |            | * fix bug : if there is no criteria, don't send
     61 * |         |            |   request
     62 * |         |            |
    5963 * |         |            |
    6064 * |         |            |
    … …  
    8084          textAND:'AND',
    8185          textOR:'OR',
     86          textNoCriteria:'There is no criteria ! At least, one criteria is required to do search...',
    8287          textHint:'',
    8388          classGroup:'',
    … …  
    554559
    555560  /**
    556    *
     561   * send the request to the server
    557562   *
    558563   */
    559564  var sendRequest = function()
    560565  {
     566    if(extraData.length==0)
     567    {
     568      alert(options.textNoCriteria);
     569      return(false);
     570    }
     571
    561572    datas=encodeURI('ajaxfct=public.rbuilder.searchExecute&requestName='+itemsId.container+'&'+getItems());
    562573    $.ajax(
    … …  
    580591
    581592  /**
    582    *
     593   * get a result page from the server
    583594   *
    584595   */

  • extensions/GrumPluginClasses/js/criteriaBuilder.packed.js

    r7312 r7327  
    1 /* file: criteriaBuilder.packed.js - v1.1.0 | packed on 2010/10/13 with http://joliclic.free.fr/php/javascript-packer/ */
    2 eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('7 1A(l){e b={d:\'2u\',g:\'2t\',l:l,},c={d:0,g:0,},5={1I:\'2a\',1G:\'2d\',2s:\'\',1M:\'\',1N:\'\',1d:\'\',26:\'2r\',1f:0.8,L:f,M:f,Y:f,10:f,11:f,12:f,U:\'\',S:\'\',1n:\'\',},q=1y 1a();6(a.o==2){6(B a[1]==\'1e\'){5=u.23(5,a[1])}}n.2v=7(1K){2w(1K){v\'2z\':6(a.o==3){6(B a[1]==\'R\'){1H(a[1],a[2])}}t;v\'2q\':6(a.o==2){6(B a[1]==\'R\'){1w(a[1])}}t;v\'2x\':6(a.o==4){6(B a[1]==\'R\'&&B a[2]==\'R\'){1u(a[1],a[2],a[3])}}t;v\'2b\':x(1q());t;v\'1h\':6(a.o==2){x(1h(a[1]))}p{x(f)}t;v\'2n\':1C();t;v\'2i\':2e();t;v\'1o\':6(a.o==4){1o(a[1],a[2],a[3])}t;v\'1k\':6(a.o==2){x(1k(a[1]))}t}};e 17=7(m){c.d++;e h="<E k=\'"+b.d+c.d+"\' F=\'19 16 N "+5.1M+"\'>";h+="<1J></1J></E>";$(\'#\'+m).2k(h);h="<r F=\'Z\'>";h+="<r k=\'"+b.d+c.d+"J\' F=\'"+5.1d+"\' 1c=\'s:I;\'>"+5.1I+"</r>";h+="<r k=\'"+b.d+c.d+"H\' F=\'"+5.1d+"\' 1c=\'s:I;\'>"+5.1G+"</r>";h+="</r>";$("#"+b.d+c.d).2o(h);$(\'#\'+b.d+c.d+\'J\').X(\'13\',b.d+c.d,1l);$(\'#\'+b.d+c.d+\'H\').X(\'13\',b.d+c.d,1l);1g()};e 28=7(j){$(\'#\'+j).1s()};e 1H=7(1V,w){c.g++;e h="<E k=\'"+b.g+c.g+"\' F=\'Q 16 "+5.1N+"\'>";h+="<r F=\'2R\' 1c=\'2P:2O;\'>";6(5.U!=\'\'&&5.L!=f&&u.G(5.L))h+="<1O k=\'1P"+c.g+"\' 1U=\'"+5.U+"\'/>";6(5.S!=\'\'&&5.M!=f&&u.G(5.M))h+="<1O k=\'1W"+c.g+"\' 1U=\'"+5.S+"\'/>";h+="</r><r F=\'Z\'>"+1V+"</r></E>";$(\'#\'+b.l).2G(h);17(b.g+c.g);6(5.U!=\'\'&&5.L!=f){$(\'#1P\'+c.g).X(\'13\',b.g+c.g,5.L)}6(5.S!=\'\'&&5.M!=f){$(\'#1W\'+c.g).X(\'13\',b.g+c.g,5.M)}q[c.g]=w};e 1w=7(m){6($(\'#\'+m).o!=0){$(\'#\'+m).1s();z=/[0-9]*$/;q[1x(z.V(m)[0])]=f;1r()}};e 1u=7(m,h,w){6($(\'#\'+m).o!=0){$(\'#\'+m+\' .Z\').1X(h);z=/[0-9]*$/;q[1x(z.V(m)[0])]=w}};e 1C=7(){$(\'#\'+b.l).25();$(\'#\'+b.l).1X("");c.g=0;c.d=0;q=1y 1a()};e 1i=7(14,C){O=\'\';6(B C==\'1e\'){2c(e K 2L C){6(B C[K]==\'1e\'){O+=1i(14+\'[\'+K+\']\',C[K])}p{O+=\'&\'+14+\'[\'+K+\']=\'+C[K]}}}p{O+=\'&\'+14+\'=\'+C}x(O)};e 1q=7(){D=u.2l.2A(b.l)[\'2T\'];2H=1a();2c(i=0;i<q.o;i++){6(q[i]!=f){D+=1i(\'q[\'+i+\']\',q[i])}}$(\'#\'+b.l+\' .19\').29(7(){z=/[0-9]*$/;D+=\'&2K[\'+z.V(n.k)[0]+\']=\';6($(n).P(\'1m\')){D+=\'2d\'}p{D+=\'2a\'}});x(D)};e 1h=7(m){z=/[0-9]*$/;1Y=z.V(m)[0];x(q[1Y])};e 1k=7(24){5=u.23(5,24)};e 18=7(j,1j){6($(\'#\'+j).P(\'N\')){6(1j){$(\'#\'+j+\'J\').y(\'s\',\'W\')}p{$(\'#\'+j+\'J\').y(\'s\',\'I\')}}p{6(1j){$(\'#\'+j+\'H\').y(\'s\',\'W\')}p{$(\'#\'+j+\'H\').y(\'s\',\'I\')}}};e 1r=7(){$(\'#\'+b.l+\' E\').29(7(){6($(n).P(\'19\')){6($(\'#\'+n.k+\' E.Q\').o==0){28(n.k)}p 6($(\'#\'+n.k+\' E.Q\').o==1){18(n.k,27)}p{18(n.k,T)}}p 6($(n).P(\'Q\')){6($(n).2U().2b(0).k==b.l){17(n.k)}}})};e 1g=7(){$(\'#\'+b.l).25();$(\'#\'+b.l).2m({2j:\'16\',2f:\'Q\',1f:5.1f,2y:5.26,2B:/.*/i,2p:T,2C:\'.Z\',2M:27,2F:15,2D:7(D){1r()},})};1l=7(20){j=20.w;6($(\'#\'+j).P(\'N\')){$(\'#\'+j).21(\'N\').22(\'1m\');$(\'#\'+j+\'J\').y(\'s\',\'I\');$(\'#\'+j+\'H\').y(\'s\',\'W\')}p{$(\'#\'+j).21(\'1m\').22(\'N\');$(\'#\'+j+\'J\').y(\'s\',\'W\');$(\'#\'+j+\'H\').y(\'s\',\'I\')}};e 2e=7(){1z=2I(\'1Q=1S.1T.2N&2E=\'+b.l+\'&\'+1q());$.1B({1D:"1v",1t:5.1n,1E:T,w:1z,1Z:7(A){6(5.Y!=f&&u.G(5.Y))5.Y(A)},1R:7(A){6(5.10!=f&&u.G(5.10))5.10(A)},})};e 1o=7(1p,1F,1L){$.1B({1D:"1v",1t:5.1n,1E:T,w:{1Q:\'1S.1T.2S\',2Q:1F,1p:1p,2h:1L},1Z:7(A){6(5.11!=f&&u.G(5.11))5.11(A)},1R:7(A){6(5.12!=f&&u.G(5.12))5.12(A)},})};1g()};1A.2J=7(1b,w){x({1b:1b,2g:w,})}',62,181,'|||||options|if|function|||arguments|itemsId|counters|group|var|null|item|content||groupId|id|container|itemId|this|length|else|extraData|div|display|break|jQuery|case|data|return|css|re|msg|typeof|value|serialized|li|class|isFunction|OpOR|none|OpAND|key|onEdit|onDelete|cbOpAND|returned|hasClass|cbItem|string|imgDeleteUrl|true|imgEditUrl|exec|block|bind|onRequestSuccess|cbSortHandle|onRequestError|onGetPageSuccess|onGetPageError|click|prefix||cbSortable|addGroup|displayOperator|cbGroup|Array|owner|style|classOperator|object|opacity|applyNested|getExtraData|serializeData|visible|setOptions|onSwitchOperator|cbOpOR|ajaxUrl|getPage|requestNumber|getItems|manage|remove|url|editItem|POST|deleteItem|eval|new|datas|criteriaBuilder|ajax|clearItems|type|async|pageNumber|textOR|addItem|textAND|ul|fct|numberPerPage|classGroup|classItem|img|iImgEdit|ajaxfct|error|public|rbuilder|src|itemContent|iImgDelete|html|extraDataNumber|success|event|removeClass|addClass|extend|optionsToSet|NestedSortableDestroy|classHelper|false|removeGroup|each|AND|get|for|OR|sendRequest|noNestingClass|param|numPerPage|send|accept|wrap|iNestedSortable|NestedSortable|clear|prepend|autoScroll|delete|helper|textHint|iCbItem|iCbGroup|doAction|switch|edit|helperclass|add|serialize|serializeRegExp|handle|onChange|requestName|nestingPxSpace|append|tmp|encodeURI|makeExtendedData|operator|in|ghosting|searchExecute|right|float|page|cbItemButtons|searchGetPage|hash|parent'.split('|'),0,{}))
     1/* file: criteriaBuilder.packed.js - v1.1.0 | packed on 2010/10/21 with http://joliclic.free.fr/php/javascript-packer/ */
     2eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('7 1N(l){e b={d:\'2y\',f:\'2z\',l:l,},c={d:0,f:0,},5={1K:\'2e\',1L:\'2f\',2d:\'2x 1P 2w 1O ! 2u 2v, 2A 1O 1P 2H 2F 2E 2C...\',2t:\'\',1M:\'\',1S:\'\',1c:\'\',2g:\'2I\',17:0.8,Q:g,O:g,W:g,X:g,U:g,T:g,S:\'\',10:\'\',1l:\'\',},p=1E 19();6(a.m==2){6(E a[1]==\'1a\'){5=t.23(5,a[1])}}n.2o=7(1Q){2k(1Q){v\'2p\':6(a.m==3){6(E a[1]==\'13\'){1R(a[1],a[2])}}w;v\'2r\':6(a.m==2){6(E a[1]==\'13\'){1x(a[1])}}w;v\'2n\':6(a.m==4){6(E a[1]==\'13\'&&E a[2]==\'13\'){1y(a[1],a[2],a[3])}}w;v\'27\':u(1r());w;v\'1e\':6(a.m==2){u(1e(a[1]))}q{u(g)}w;v\'2m\':1u();w;v\'2s\':2a();w;v\'1q\':6(a.m==4){1q(a[1],a[2],a[3])}w;v\'1g\':6(a.m==2){u(1g(a[1]))}w}};e 18=7(o){c.d++;e j="<B k=\'"+b.d+c.d+"\' F=\'1i 16 L "+5.1M+"\'>";j+="<1J></1J></B>";$(\'#\'+o).2X(j);j="<r F=\'Y\'>";j+="<r k=\'"+b.d+c.d+"K\' F=\'"+5.1c+"\' 1b=\'s:H;\'>"+5.1K+"</r>";j+="<r k=\'"+b.d+c.d+"J\' F=\'"+5.1c+"\' 1b=\'s:H;\'>"+5.1L+"</r>";j+="</r>";$("#"+b.d+c.d).30(j);$(\'#\'+b.d+c.d+\'K\').V(\'14\',b.d+c.d,1p);$(\'#\'+b.d+c.d+\'J\').V(\'14\',b.d+c.d,1p);1k()};e 29=7(h){$(\'#\'+h).1v()};e 1R=7(1T,x){c.f++;e j="<B k=\'"+b.f+c.f+"\' F=\'P 16 "+5.1S+"\'>";j+="<r F=\'33\' 1b=\'37:36;\'>";6(5.S!=\'\'&&5.Q!=g&&t.I(5.Q))j+="<1Z k=\'1V"+c.f+"\' 1X=\'"+5.S+"\'/>";6(5.10!=\'\'&&5.O!=g&&t.I(5.O))j+="<1Z k=\'1G"+c.f+"\' 1X=\'"+5.10+"\'/>";j+="</r><r F=\'Y\'>"+1T+"</r></B>";$(\'#\'+b.l).2Y(j);18(b.f+c.f);6(5.S!=\'\'&&5.Q!=g){$(\'#1V\'+c.f).V(\'14\',b.f+c.f,5.Q)}6(5.10!=\'\'&&5.O!=g){$(\'#1G\'+c.f).V(\'14\',b.f+c.f,5.O)}p[c.f]=x};e 1x=7(o){6($(\'#\'+o).m!=0){$(\'#\'+o).1v();A=/[0-9]*$/;p[1t(A.12(o)[0])]=g;1m()}};e 1y=7(o,j,x){6($(\'#\'+o).m!=0){$(\'#\'+o+\' .Y\').1H(j);A=/[0-9]*$/;p[1t(A.12(o)[0])]=x}};e 1u=7(){$(\'#\'+b.l).2c();$(\'#\'+b.l).1H("");c.f=0;c.d=0;p=1E 19()};e 1d=7(Z,D){N=\'\';6(E D==\'1a\'){2h(e G 2R D){6(E D[G]==\'1a\'){N+=1d(Z+\'[\'+G+\']\',D[G])}q{N+=\'&\'+Z+\'[\'+G+\']=\'+D[G]}}}q{N+=\'&\'+Z+\'=\'+D}u(N)};e 1r=7(){C=t.34.2T(b.l)[\'2S\'];2U=19();2h(i=0;i<p.m;i++){6(p[i]!=g){C+=1d(\'p[\'+i+\']\',p[i])}}$(\'#\'+b.l+\' .1i\').2b(7(){A=/[0-9]*$/;C+=\'&2W[\'+A.12(n.k)[0]+\']=\';6($(n).M(\'1j\')){C+=\'2f\'}q{C+=\'2e\'}});u(C)};e 1e=7(o){A=/[0-9]*$/;25=A.12(o)[0];u(p[25])};e 1g=7(22){5=t.23(5,22)};e 1h=7(h,1f){6($(\'#\'+h).M(\'L\')){6(1f){$(\'#\'+h+\'K\').z(\'s\',\'R\')}q{$(\'#\'+h+\'K\').z(\'s\',\'H\')}}q{6(1f){$(\'#\'+h+\'J\').z(\'s\',\'R\')}q{$(\'#\'+h+\'J\').z(\'s\',\'H\')}}};e 1m=7(){$(\'#\'+b.l+\' B\').2b(7(){6($(n).M(\'1i\')){6($(\'#\'+n.k+\' B.P\').m==0){29(n.k)}q 6($(\'#\'+n.k+\' B.P\').m==1){1h(n.k,1n)}q{1h(n.k,11)}}q 6($(n).M(\'P\')){6($(n).35().27(0).k==b.l){18(n.k)}}})};e 1k=7(){$(\'#\'+b.l).2c();$(\'#\'+b.l).2Z({2J:\'16\',31:\'P\',17:5.17,2D:5.2g,2j:/.*/i,2l:11,2G:\'.Y\',2K:1n,2B:15,32:7(C){1m()},})};1p=7(24){h=24.x;6($(\'#\'+h).M(\'L\')){$(\'#\'+h).26(\'L\').28(\'1j\');$(\'#\'+h+\'K\').z(\'s\',\'H\');$(\'#\'+h+\'J\').z(\'s\',\'R\')}q{$(\'#\'+h).26(\'1j\').28(\'L\');$(\'#\'+h+\'K\').z(\'s\',\'R\');$(\'#\'+h+\'J\').z(\'s\',\'H\')}};e 2a=7(){6(p.m==0){2M(5.2d);u(1n)}1U=2L(\'1F=21.1w.2Q&2V=\'+b.l+\'&\'+1r());$.1C({1B:"1A",1D:5.1l,1z:11,x:1U,1W:7(y){6(5.W!=g&&t.I(5.W))5.W(y)},1Y:7(y){6(5.X!=g&&t.I(5.X))5.X(y)},})};e 1q=7(1o,20,1I){$.1C({1B:"1A",1D:5.1l,1z:11,x:{1F:\'21.1w.2N\',2P:20,1o:1o,2O:1I},1W:7(y){6(5.U!=g&&t.I(5.U))5.U(y)},1Y:7(y){6(5.T!=g&&t.I(5.T))5.T(y)},})};1k()};1N.2i=7(1s,x){u({1s:1s,2q:x,})}',62,194,'|||||options|if|function|||arguments|itemsId|counters|group|var|item|null|groupId||content|id|container|length|this|itemId|extraData|else|div|display|jQuery|return|case|break|data|msg|css|re|li|serialized|value|typeof|class|key|none|isFunction|OpOR|OpAND|cbOpAND|hasClass|returned|onDelete|cbItem|onEdit|block|imgEditUrl|onGetPageError|onGetPageSuccess|bind|onRequestSuccess|onRequestError|cbSortHandle|prefix|imgDeleteUrl|true|exec|string|click||cbSortable|opacity|addGroup|Array|object|style|classOperator|serializeData|getExtraData|visible|setOptions|displayOperator|cbGroup|cbOpOR|applyNested|ajaxUrl|manage|false|requestNumber|onSwitchOperator|getPage|getItems|owner|eval|clearItems|remove|rbuilder|deleteItem|editItem|async|POST|type|ajax|url|new|ajaxfct|iImgDelete|html|numberPerPage|ul|textAND|textOR|classGroup|criteriaBuilder|criteria|is|fct|addItem|classItem|itemContent|datas|iImgEdit|success|src|error|img|pageNumber|public|optionsToSet|extend|event|extraDataNumber|removeClass|get|addClass|removeGroup|sendRequest|each|NestedSortableDestroy|textNoCriteria|AND|OR|classHelper|for|makeExtendedData|serializeRegExp|switch|autoScroll|clear|edit|doAction|add|param|delete|send|textHint|At|least|no|There|iCbGroup|iCbItem|one|nestingPxSpace|search|helperclass|do|to|handle|required|helper|accept|ghosting|encodeURI|alert|searchGetPage|numPerPage|page|searchExecute|in|hash|serialize|tmp|requestName|operator|wrap|append|NestedSortable|prepend|noNestingClass|onChange|cbItemButtons|iNestedSortable|parent|right|float'.split('|'),0,{}))

  • extensions/GrumPluginClasses/language/en_UK/rbuilder.lang.php

    r6917 r7327  
    1717$lang['gpc_something_is_wrong_on_the_server_side'] = 'An error has occured on the server-side';
    1818
     19// GPC 3.3.2
     20$lang['There is no criteria ! At least, one criteria is required to do search...']="There is no criteria ! At least, one criteria is required to do search...";
     21
    1922
    2023?>

  • extensions/GrumPluginClasses/language/fr_FR/rbuilder.lang.php

    r6894 r7327  
    1717$lang['gpc_something_is_wrong_on_the_server_side'] = 'Une anomalie est survenue lors de la connexion avec le serveur';
    1818
     19// GPC 3.3.2
     20$lang['There is no criteria ! At least, one criteria is required to do search...']="Il n'y a aucun critères ! Au minimum, un critère est requis pour pouvoir effectuer une recherche...";
    1921
    2022?>

  • extensions/GrumPluginClasses/main.inc.php

    r7310 r7327  
    7676|         |            | * Adding GPCCategorySelector class
    7777|         |            |
    78 | 3.3.1   |           | * nothing changed, the 3.3.1 package was built to
    79 |         |            |   replace a wrong fil
     78| 3.3.1   | ---- -- -- | * nothing changed, the 3.3.1 package was built to
     79|         |            |   replace a wrong file
    8080|         |            |
    8181| 3.3.2   | 2010/10/20 | * Fix mantis bug:1945
    8282|         |            |   . categorySelector : category list is empty
    8383|         |            |
     84|         |            | * Fix many bugs on request builder and improve the css
     85|         |            |   and templates
    8486|         |            |
    8587|         |            |

  • extensions/GrumPluginClasses/templates/GPCRequestBuilder_search.tpl

    r7317 r7327  
    110110          break;
    111111        case 'resultQuery':
    112           $('#iResultQueryContent').html("<br><img src='./plugins/GrumPluginClasses/icons/processing.gif'>");
     112          $('#iResultQueryContent').html("<br><img class='waitingResult' src='./plugins/GrumPluginClasses/icons/processing.gif'>");
    113113          $('.'+options.requestCriterionsVisible).css('display', 'none');
    114114          $('.'+options.requestCriterionsHidden).css('display', 'block');
    … …  
    289289          function (requestNumber, page, numberPerPage)
    290290          {
    291             $('#iResultQueryContent').html("<br><img src='./plugins/GrumPluginClasses/icons/processing.gif'>");
     291            $('#iResultQueryContent').html("<br><img class='waitingResult' src='./plugins/GrumPluginClasses/icons/processing.gif'>");
    292292            cb.doAction('getPage', requestNumber, page, numberPerPage);
    293293          }
    … …  
    317317
    318318      <div id='iMenuCriterions' >
    319         <div id='iMenuCTitle' class='gcLink gcBgInput cbButtons'>{'gpc_rb_add_criterions'|@translate}&nbsp;&dArr;</div>
    320         <div id='iMenuCItems'>
    321           <ul class='gcBgInput'>
    322             {foreach from=$datas.dialogBox item=dialogBox}
    323               <li class='gcBgInput'><a onclick="{$dialogBox.handle}.show({literal}{cBuilder:cb}{/literal});">{$dialogBox.label}</a></li>
    324             {/foreach}
    325           </ul>
     319        <div id='iMenuCTitle' class='gcLink gcBgInput cbButtons'>
     320          <div id='iMenuCText'>{'gpc_rb_add_criterions'|@translate}&nbsp;&dArr;</div>
     321          <div id='iMenuCItems'>
     322            <ul class='gcBgInput'>
     323              {foreach from=$datas.dialogBox item=dialogBox}
     324                <li class='gcBgInput'><a onclick="{$dialogBox.handle}.show({literal}{cBuilder:cb}{/literal});">{$dialogBox.label}</a></li>
     325              {/foreach}
     326            </ul>
     327          </div>
    326328        </div>
    327329      </div>
    … …  
    335337  </fieldset>
    336338
    337   <input type="button" class='cRequestCriterions' style="margin-left:1em;" onclick="cb.doAction('send');" value="{'gpc_rb_search'|@translate}">
     339  <input type="button" class='cRequestCriterions' onclick="cb.doAction('send');" value="{'gpc_rb_search'|@translate}">
    338340</form>
    339341
Note: See TracChangeset for help on using the changeset viewer.