Ignore:
Timestamp:
Sep 18, 2010, 11:36:50 AM (14 years ago)
Author:
grum
Message:

error on GallyFunctions::expandMenuEvent
'missing token' message when user try to change theme
+some minor bugs & improvements not referenced
bug:1714, bug:1864

Location:
extensions/gally/gally-default
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • extensions/gally/gally-default/admin/GallyFunctions.class.inc.php

    r6109 r6956  
    3030   * DO NOT USE IT DIRECTLY
    3131   */
    32   static public function expandMenuEvent(&$where)
     32  static public function expandMenuEvent($where)
    3333  {
    3434    $where=get_sql_condition_FandF(array('visible_categories' => 'id'), null, true);
  • extensions/gally/gally-default/css/picture.css

    r6109 r6956  
    8686
    8787#navThumbPrev, #navThumbNext {
    88   background-image:url(./icon/1x1transp.gif);
     88  background-image:url(./../icon/1x1transp.gif);
    8989  background-repeat:repeat;
    9090  position:absolute;
     
    220220
    221221#imageInfos {
    222   background-image:url(./icon/1x1transp.gif);
     222  background-image:url(./../icon/1x1transp.gif);
    223223  background-repeat:repeat;
    224224  width:100%;
     
    384384 * trick necessary for IE7.0
    385385*/
    386 #theTabsContainer{ visibility:visible; background:url(icon/1x1transp.gif) }
    387 #imageToolBar { visibility:visible; background:url(icon/1x1transp.gif) }
     386#theTabsContainer{ visibility:visible; background:url(./../icon/1x1transp.gif) }
     387#imageToolBar { visibility:visible; background:url(./../icon/1x1transp.gif) }
     388
  • extensions/gally/gally-default/js/gallyjs-tpp.js

    r6752 r6956  
    354354    if(showtabs=='y')
    355355    {
    356       $("#theTabsContainer").animate({height:options.tabsVisible+"px"}, options.animateDelay);
     356      $("#theTabsContainer").animate({height:options.tabsVisible+"px"}, options.animateDelay).trigger('resize');
    357357    }
    358358    else
     
    360360      $('#theTabs div.tabPanel').addClass("ui-tabs-hide").css("display", "");
    361361      $('#theTabs li').removeClass("ui-tabs-selected");
    362       $("#theTabsContainer").animate({height:options.tabsHidden+"px"}, options.animateDelay);
     362      $("#theTabsContainer").animate({height:options.tabsHidden+"px"}, options.animateDelay).trigger('resize');
    363363    }
    364364  }
     
    367367    if(showtabs=='y')
    368368    {
    369       $("#theTabsContainer").css({height:options.tabsVisible+"px"});
     369      $("#theTabsContainer").css({height:options.tabsVisible+"px"}).trigger('resize');
    370370    }
    371371    else
     
    373373      $('#theTabs div.tabPanel').addClass("ui-tabs-hide").css("display", "");
    374374      $('#theTabs li').removeClass("ui-tabs-selected");
    375       $("#theTabsContainer").css({height:options.tabsHidden+"px"});
     375      $("#theTabsContainer").css({height:options.tabsHidden+"px"}).trigger('resize');
    376376    }
    377377  }
  • extensions/gally/gally-default/release_notes.txt

    r6752 r6956  
    8585  |         |            |   a high resolution image
    8686  |         |            |
     87  | 1.3.2   | 2010-08-21 | * add a 'resize' trigger on on the #theTabsContainer
     88  |         |            |   item
     89  |         |            | * bug fixed : multiple tabs have the same name
     90  |         |            | * on the metadata tabs management, add the possiblity
     91  |         |            |   to display raw content in the tab
     92  |         |            |   . to use it, just give one line of data with the
     93  |         |            |     key name '<!--rawContent-->' ; value is dumped in
     94  |         |            |     the tabs without being formatted in a table
     95  |         |            |
     96  | 1.3.3   | 2010-09-13 | * mantis: bug 1714
     97  |         |            |   . error on GallyFunctions::expandMenuEvent on
     98  |         |            |     gally-lapis-lazuli
     99  |         |            | * mantis: bug 1864
     100  |         |            |   . 'missing token' message when user try to change
     101  |         |            |     theme
     102  |         |            |
     103  |         |            |
     104  |         |            |
     105  |         |            |
     106  |         |            |
     107  |         |            |
     108  |         |            |
    87109  |         |            |
    88110  |         |            |
  • extensions/gally/gally-default/template/picture.tpl

    r6109 r6956  
    152152      {if isset($metadata)}
    153153        {foreach from=$metadata item=meta key=id}
    154           <li class="tab" id="tabImageMeta"><a href="#imageMeta{$id}">{$meta.TITLE|@translate}</a></li>
     154          <li class="tab" id="tabImageMeta{$id}"><a href="#imageMeta{$id}">{$meta.TITLE|@translate}</a></li>
    155155        {/foreach}
    156156      {/if}
     
    360360      <div id="imageMetaContainer{$id}">
    361361        <div class="imageMetaBg">&nbsp;</div>
    362         <table id="displaymeta{$id}" class="displaymeta infoTable">
    363           {foreach from=$meta.lines item=value key=label name=metaloop}
    364           {if ($smarty.foreach.metaloop.iteration-1) % #metaNumCols# == 0}
    365             {if !$smarty.foreach.metaloop.first}</tr>{/if}
    366             {if !$smarty.foreach.metaloop.last}<tr>{/if}
    367           {/if}
    368             <td class="label">{$label|@translate}</td>
    369             <td class="value">{$value}</td>
    370         {/foreach}
    371         </table>
     362
     363        {if count($meta.lines)>0 and !array_key_exists('<!--rawContent-->', $meta.lines)}
     364          <table id="displaymeta{$id}" class="displaymeta infoTable">
     365            {foreach from=$meta.lines item=value key=label name=metaloop}
     366              {if ($smarty.foreach.metaloop.iteration-1) % #metaNumCols# == 0}
     367                {if !$smarty.foreach.metaloop.first}</tr>{/if}
     368                {if !$smarty.foreach.metaloop.last}<tr>{/if}
     369              {/if}
     370              <td class="label">{$label|@translate}</td>
     371              <td class="value">{$value}</td>
     372            {/foreach}
     373          </table>
     374        {else}
     375          {assign var='empty' value='<!--rawContent-->'}
     376          {$meta.lines.$empty}
     377        {/if}
    372378      </div>
    373379    </div> <!-- imageMeta -->
  • extensions/gally/gally-default/template/profile_content.tpl

    r6109 r6956  
    105105
    106106  <p class="bottomButtons">
     107    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
    107108    <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
    108109    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
  • extensions/gally/gally-default/themeconf.inc.php

    r6700 r6956  
    22/*
    33Theme Name: Gally
    4 Version: 1.3.1
     4Version: 1.3.3
    55Description: Parent theme for all the Gally themes
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=382
Note: See TracChangeset for help on using the changeset viewer.