Changeset 10736


Ignore:
Timestamp:
May 1, 2011, 10:07:10 PM (9 years ago)
Author:
grum
Message:

bug:2291 ; compatibility with piwigo 2.2

Location:
extensions/gally
Files:
4 added
4 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/gally/gally-black-graphite/themeconf.inc.php

    r8534 r10736  
    22/*
    33Theme Name: Gally/Black-graphite
    4 Version: 1.0.0
     4Version: 1.4.1
    55Description: simple dark-grey theme (inspired from Zaphod's theme <STRIPPED>)
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=
  • extensions/gally/gally-default/admin/gally_img_interface.tpl

    r6109 r10736  
    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.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
     2{combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
    33
    44{literal}
  • extensions/gally/gally-default/admin/gally_img_other.tpl

    r6752 r10736  
    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.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}
     1{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
     2{combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
    33
    44{literal}
  • extensions/gally/gally-default/js/gallyjs-tpp.js

    r8528 r10736  
    5050  init = function()
    5151  {
    52     regexp = /[1234567]\./i;
     52    var regexp = /[1234567]\./i;
    5353
    5454    if(jQuery.browser.msie && jQuery.browser.version.match(regexp))
     
    187187  initializeImageMode = function (mode)
    188188  {
     189    var thumbWidth=0,
     190        imgTop=0,
     191        cssValues = new Object;
     192
    189193    if(mode=="init")
    190194    {
     
    214218    }
    215219
    216     cssValues = new Object;
    217220    cssValues.height = $("#theImg").attr("height")+"px";
    218221
     
    224227      $("#theImage").bind("mousemove",
    225228        function(event){
    226           deadArea = Math.max(options.imageScrollMinDeadArea, $("#navThumbPrev").attr("clientWidth")*1.2);
     229          if($("#navThumbPrev").length>0) thumbWidth=$("#navThumbPrev").attr("clientWidth");
     230          deadArea = Math.max(options.imageScrollMinDeadArea, thumbWidth*1.2);
    227231          mouse=Math.max(Math.min(event.clientX-image.leftPos, this.clientWidth - deadArea), deadArea);
    228232          $("#theImg")
     
    523527  displayZoomHigh = function()
    524528  {
    525     container=calcImgHighPositionAndSize(image.zoomMode);
     529    var container=calcImgHighPositionAndSize(image.zoomMode);
    526530
    527531    $('#theImgHighContainer').css(
     
    548552            function(event)
    549553            {
    550               deadArea = Math.max(options.marginContainer*2, options.imageScrollMinDeadArea);
    551               mouseX=Math.max(Math.min(event.clientX-container.left, container.width - deadArea), deadArea);
    552               mouseY=Math.max(Math.min(event.clientY-container.top, container.height - deadArea), deadArea);
     554              var deadArea = Math.max(options.marginContainer*2, options.imageScrollMinDeadArea)
     555                  mouseX=Math.max(Math.min(event.clientX-container.left, container.width - deadArea), deadArea),
     556                  mouseY=Math.max(Math.min(event.clientY-container.top, container.height - deadArea), deadArea);
    553557              $("#theImgHigh")
    554558                .css("left",Math.round((image.highWidth-container.width) * -(mouseX-deadArea)/(container.width-2*deadArea))+"px")
  • extensions/gally/gally-default/release_notes.txt

    r8585 r10736  
    132132  |         |            |   . since release 1.4.0, the script was not loaded
    133133  |         |            |
     134  | 1.4.2   | 2011-05-01 | * mantis feature:2291
     135  |         |            |   . compatibility with piwigo 2.2
    134136  |         |            |
    135137  |         |            |
  • extensions/gally/gally-default/template/config.js.tpl

    r8528 r10736  
    33<script type="text/javascript">
    44// configuration options for interfaces
    5 options = { {/literal}
     5var options = { {/literal}
    66  imageHaveHighRes:{if isset($high)}true{else}false{/if},
    77{if $BODY_ID=='thePicturePage'}
     
    4040  themePath:"{$themeconf.icon_dir}"
    4141{literal}
    42 }
     42};
    4343</script>
    4444{/literal}
  • extensions/gally/gally-default/template/footer.tpl

    r6109 r10736  
    2929
    3030{if isset($debug.QUERIES_LIST)}<div id="debug">{$debug.QUERIES_LIST}</div>{/if}
     31
     32{get_combined_scripts load='footer'}
    3133</body>
    3234<!-- **GBL** <FOOTER< -->
  • extensions/gally/gally-default/template/header.tpl

    r8585 r10736  
    4343  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/content.css">
    4444
    45   {known_script id="jquery" src=$ROOT_URL|cat:"themes/default/js/jquery.packed.js"}
    46   {known_script id="jquery.ui" src=$ROOT_URL|cat:"themes/default/js/ui/packed/ui.core.packed.js"}
    47   {known_script id="jquery.ui.tabs" src=$ROOT_URL|cat:"themes/default/js/ui/packed/ui.tabs.packed.js"}
    48   {known_script id="jquery.ui.dialog" src=$ROOT_URL|cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
     45  {combine_script id="jquery" path="themes/default/js/jquery.min.js"}
     46  {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
     47  {combine_script id="jquery.ui.tabs" path="themes/default/js/ui/minified/jquery.ui.tabs.min.js"}
     48  {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
    4949
    5050
     
    5454    {
    5555      $dir=dirname($_SERVER['SCRIPT_FILENAME'])."/themes/".$theme['id']."/conf/";
    56       $dirlocal=dirname($_SERVER['SCRIPT_FILENAME'])."/local/themes/".$theme['id']."/conf/";
     56      $dirlocal=dirname($_SERVER['SCRIPT_FILENAME'])."/".PWG_LOCAL_DIR."themes/".$theme['id']."/conf/";
    5757      $this->assign("default_conf", $dir."default.conf");
    5858      if(file_exists($dirlocal."local.conf"))
     
    7979
    8080  {if #manageTips#=='yes'}
    81     {known_script id="gpc.simpleTip" src=$ROOT_URL|@cat:"themes/gally-default/js/simpleTip.packed.js" }
    82     {known_script id="gallyjs-ttm" src=$ROOT_URL|cat:"themes/gally-default/js/gallyjs-ttm.packed.js"}
     81    {combine_script id="gpc.simpleTip" path="themes/gally-default/js/simpleTip.min.js" require="jquery"}
     82    {combine_script id="gallyjs-ttm" path="themes/gally-default/js/gallyjs-ttm.min.js" require="jquery"}
    8383  {/if}
    8484
    8585  {if $BODY_ID=='theCategoryPage'}
    86   {known_script id="gallyjs-tcp" src=$ROOT_URL|cat:"themes/gally-default/js/gallyjs-tcp.packed.js"}
     86  {combine_script id="gallyjs-tcp" path="themes/gally-default/js/gallyjs-tcp.min.js" require="jquery"}
    8787  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/thumbnails.css">
    8888  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/menubar.css">
     
    9090
    9191  {if $BODY_ID=='thePicturePage'}
    92   {known_script id="gallyjs-tpp" src=$ROOT_URL|cat:"themes/gally-default/js/gallyjs-tpp.packed.js"}
     92  {combine_script id="gallyjs-tpp" path="themes/gally-default/js/gallyjs-tpp.js" require="jquery"}
    9393  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/picture.css">
    9494  {/if}
     
    101101  {/if}
    102102
    103   {foreach from=$themes item=theme}
    104     <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/css/theme.css">
    105     {if isset($theme.local_head)}{include file=$theme.local_head}{/if}
    106   {/foreach}
     103{get_combined_css}
     104{foreach from=$themes item=theme}
     105  {if $theme.load_css}
     106{combine_css path="themes/`$theme.id`/css/theme.css" order=-10}
     107  {/if}
     108  {if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if}
     109{/foreach}
    107110
    108111{if not empty($head_elements)}
     
    111114{/if}
    112115
     116{get_combined_scripts load='header'}
    113117</head>
    114118
  • extensions/gally/gally-default/themeconf.inc.php

    r8585 r10736  
    22/*
    33Theme Name: Gally
    4 Version: 1.4.1
     4Version: 1.4.2
    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.