Changeset 12592


Ignore:
Timestamp:
11/11/11 00:10:02 (8 years ago)
Author:
grum
Message:

feature:2499 - compatibility with Piwigo 2.3

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

Legend:

Unmodified
Added
Removed
  • extensions/gally/gally-default/conf/default.conf

    r8528 r12592  
    146146tabsVisible=250 
    147147 
    148 # -- 1.2.0 -- 
     148# -- 1.4.3 -- 
    149149# The 'tabsPosition' option can take theses values : 
    150 #   "top"     => display the tabs area at the bottom of the image toobar area 
    151 #                (top of the page) 
    152 #   "bottom"  => display the tabs area at the top of the copyright area 
    153 #                (bottom of the page) 
     150#   "top"           => display the tabs area at the bottom of the image toobar area 
     151#                      (top of the page) 
     152#   "bottom"        => display the tabs area at the top of the copyright area 
     153#                      (bottom of the page) 
     154#   "pictureTop"    => display the tabs area at the top of the image area 
     155#   "pictureBottom" => display the tabs area at the bottom of the image area 
    154156tabsPosition="top" 
    155157 
  • extensions/gally/gally-default/css/picture.css

    r6956 r12592  
    175175 
    176176 
    177 #theImg { 
     177#theMainImage { 
    178178  position:relative; 
    179179  left:0px; 
  • extensions/gally/gally-default/css/theme.css

    r8528 r12592  
    1616  cursor:pointer; 
    1717} 
     18 
     19.button { 
     20  cursor:pointer; 
     21  display:inline-block; 
     22} 
  • extensions/gally/gally-default/js/gallyjs-tcp.js

    r8528 r12592  
    44  ------------------------------------------------------------------------------ 
    55  file: gally/gallyjs-tcp.js 
    6   file release: 1.4.0 
     6  file release: 1.4.4 
    77  ------------------------------------------------------------------------------ 
    88  author: grum at piwigo.org 
     
    3232  initContentDesc = function() 
    3333  { 
     34    var tmpInfo=''; 
     35 
    3436    if(($("#additional_infoTOP").length + $("#additional_infoBOTTOM").length)<2) 
    3537    { 
     
    7072 
    7173    // <!--up-down--> tag 
    72     txt = $("#additional_infoLEFT").attr("innerHTML"); 
     74    txt = $("#additional_infoLEFT").prop("innerHTML"); 
    7375    if(txt==null) { txt=""; } 
    7476    tmp = txt.indexOf("<!--up-down-->"); 
     
    7678    if(tmp>-1) 
    7779    { // tag is not managed by the ExtendedDescription plugin 
    78       $("#additional_infoTOP").attr("innerHTML", txt.slice(0,tmp)); 
     80      $("#additional_infoTOP").prop("innerHTML", txt.slice(0,tmp)); 
    7981      txt=txt.substr(tmp+14); //remove the tag 
    8082    } 
     
    8587          if(this.id=="") 
    8688          { 
    87             $("#additional_infoTOP").attr("innerHTML", $("#additional_infoTOP").attr("innerHTML")+this.innerHTML); 
     89            $("#additional_infoTOP").prop("innerHTML", $("#additional_infoTOP").prop("innerHTML")+this.innerHTML); 
    8890            this.parentNode.removeChild(this); 
    8991          } 
     
    9799    if(tmp>-1) 
    98100    { // tag is present, cut the right text to the 
    99       $("#additional_infoBOTTOM").attr("innerHTML", txt.slice(0,tmp)); 
     101      $("#additional_infoBOTTOM").prop("innerHTML", txt.slice(0,tmp)); 
    100102      txt=txt.substr(tmp+17); 
    101103    } 
    102104 
    103     $("#additional_infoLEFT").attr("innerHTML", txt); 
     105    $("#additional_infoLEFT").prop("innerHTML", txt); 
    104106 
    105107    if((txt.replace(/\s*/im, "")=="")&&($("#additional_infoID").length>0)) 
     
    110112    $(".additional_info").css("visibility", "visible"); 
    111113 
    112     if($("#additional_infoBOTTOM").attr("innerHTML").replace(/\s*/im, "")=="") 
     114    tmpInfo=$("#additional_infoBOTTOM").prop("innerHTML"); 
     115    if(tmpInfo==null) tmpInfo=''; 
     116 
     117    if(tmpInfo.replace(/\s*/im, "")=="") 
    113118    { 
    114119      // remove the bottom area if empty 
     
    120125    } 
    121126 
    122     if($("#additional_infoTOP").attr("innerHTML").replace(/\s*/im, "")=="") 
     127    tmpInfo=$("#additional_infoTOP").prop("innerHTML"); 
     128    if(tmpInfo==null) tmpInfo=''; 
     129    if(tmpInfo.replace(/\s*/im, "")=="") 
    123130    { 
    124131      // remove the top area if empty 
     
    138145        { 
    139146          visibility:"hidden", 
    140           top: $("#titrePageID").attr("offsetTop")+$("#titrePageID").attr("offsetHeight")-2+'px' 
     147          top: $("#titrePageID").prop("offsetTop")+$("#titrePageID").prop("offsetHeight")-2+'px' 
    141148        } 
    142149      ); 
     
    167174        function (index, elem) 
    168175        { 
    169           //alert($(this.parentNode).attr('offsetWidth')+"---"+$(this.parentNode).attr('id')); 
    170           $(this).css("min-width", $(this.parentNode).attr('offsetWidth')); 
     176          //alert($(this.parentNode).prop('offsetWidth')+"---"+$(this.parentNode).prop('id')); 
     177          $(this).css("min-width", $(this.parentNode).prop('offsetWidth')); 
    171178          if(jQuery.browser.msie) 
    172179          { 
     
    194201            height:"auto" 
    195202          }).fadeTo(options.animateDelay,1); 
    196           $("#icon_menu").attr("className", "button2"); 
     203          $("#icon_menu").toggleClass("button button2"); 
    197204          menuState=true; 
    198205          break; 
     
    204211            }); 
    205212          }); 
    206           $("#icon_menu").attr("className", "button"); 
     213          $("#icon_menu").toggleClass("button button2"); 
    207214          menuState=false; 
    208215      } 
     
    217224            height:"auto" 
    218225          }); 
    219           $("#icon_menu").attr("className", "button2"); 
     226          $("#icon_menu").toggleClass("button button2"); 
    220227          menuState=true; 
    221228          break; 
     
    225232            height:"0px" 
    226233          }); 
    227           $("#icon_menu").attr("className", "button"); 
     234          $("#icon_menu").toggleClass("button button2"); 
    228235          menuState=false; 
    229236      } 
  • extensions/gally/gally-default/js/gallyjs-tcp.min.js

    r10736 r12592  
    1 /* file: gally-tcp.js - v1.4.0 | minified on 2011/05/01 with http://jscompress.com/ */ 
    2 var gallyCP=null;$(document).ready(function() 
    3 {gallyCP=new GallyCP();});function GallyCP() 
    4 {var menuState,initContentDesc=function() 
    5 {if(($("#additional_infoTOP").length+$("#additional_infoBOTTOM").length)<2) 
    6 {return(false);} 
    7 txt=$("#additional_infoLEFT").attr("innerHTML");if(txt==null){txt="";} 
    8 tmp=txt.indexOf("<!--up-down-->");if(tmp>-1) 
    9 {$("#additional_infoTOP").attr("innerHTML",txt.slice(0,tmp));txt=txt.substr(tmp+14);} 
    10 else 
    11 {$(".additional_info").each(function(i) 
    12 {if(this.id=="") 
    13 {$("#additional_infoTOP").attr("innerHTML",$("#additional_infoTOP").attr("innerHTML")+this.innerHTML);this.parentNode.removeChild(this);}});} 
    14 tmp=txt.indexOf("<!--right-left-->");if(tmp>-1) 
    15 {$("#additional_infoBOTTOM").attr("innerHTML",txt.slice(0,tmp));txt=txt.substr(tmp+17);} 
    16 $("#additional_infoLEFT").attr("innerHTML",txt);if((txt.replace(/\s*/im,"")=="")&&($("#additional_infoID").length>0)) 
    17 {$("#additional_infoID").get(0).parentNode.removeChild($("#additional_infoID").get(0));} 
    18 $(".additional_info").css("visibility","visible");if($("#additional_infoBOTTOM").attr("innerHTML").replace(/\s*/im,"")=="") 
    19 {$("#additional_infoBOTTOM").get(0).parentNode.removeChild($("#additional_infoBOTTOM").get(0));} 
    20 else 
    21 {$("#additional_infoBOTTOM").css("visibility","visible");} 
    22 if($("#additional_infoTOP").attr("innerHTML").replace(/\s*/im,"")=="") 
    23 {$("#additional_infoTOP").get(0).parentNode.removeChild($("#additional_infoTOP").get(0));} 
    24 else 
    25 {$("#additional_infoTOP").css("visibility","visible");}},initMenu=function() 
    26 {if(options.menuAnimated!="noswitch") 
    27 {$("#menubar").css({visibility:"hidden",top:$("#titrePageID").attr("offsetTop")+$("#titrePageID").attr("offsetHeight")-2+'px'});switchmenu('n');switch(options.menuWidth) 
    28 {case"auto":$("#menubar").css("width","auto");maxwidth=options.menuMaxWidth;regexp=/[1234567]\./i;if(jQuery.browser.msie&&jQuery.browser.version.match(regexp)) 
    29 {maxwidth=options.menuMSIEMaxWidth;} 
    30 if(maxwidth>0){$("#menubar").css("max-width",maxwidth+"px");} 
    31 break;case"info":$("#menubar").css("width",$(".additionnal_info").css("width"));break;default:$("#menubar").css("width",options.menuWidth+"px");}} 
    32 else 
    33 {$("#menubar dl dd").each(function(index,elem) 
    34 {$(this).css("min-width",$(this.parentNode).attr('offsetWidth'));if(jQuery.browser.msie) 
    35 {$(this).css("max-width",options.menuMSIEMaxWidth+"px");}});}},switchmenu=function(force,iconpath) 
    36 {if(force=='') 
    37 {(!menuState)?force='y':force='n';} 
    38 if(options.menuAnimated=="fade") 
    39 {switch(force) 
    40 {case'y':$("#menubar").css({visibility:"visible",height:"auto"}).fadeTo(options.animateDelay,1);$("#icon_menu").attr("className","button2");menuState=true;break;default:$("#menubar").fadeTo(options.animateDelay,0,function(){$("#menubar").css({visibility:"hidden",height:"0px"});});$("#icon_menu").attr("className","button");menuState=false;}} 
    41 else 
    42 {switch(force) 
    43 {case'y':$("#menubar").css({visibility:"visible",height:"auto"});$("#icon_menu").attr("className","button2");menuState=true;break;default:$("#menubar").css({visibility:"hidden",height:"0px"});$("#icon_menu").attr("className","button");menuState=false;}}};this.switchmenu=function(force,iconpath){switchmenu(force,iconpath);};initMenu();initContentDesc();} 
     1/* file: gally-tcp.js - v1.4.4 | minified on 2011/11/10 with http://jscompress.com/ */ 
     2function GallyCP(){var a,b=function(){var a="";if($("#additional_infoTOP").length+$("#additional_infoBOTTOM").length<2){return false}txt=$("#additional_infoLEFT").prop("innerHTML");if(txt==null){txt=""}tmp=txt.indexOf("<!--up-down-->");if(tmp>-1){$("#additional_infoTOP").prop("innerHTML",txt.slice(0,tmp));txt=txt.substr(tmp+14)}else{$(".additional_info").each(function(a){if(this.id==""){$("#additional_infoTOP").prop("innerHTML",$("#additional_infoTOP").prop("innerHTML")+this.innerHTML);this.parentNode.removeChild(this)}})}tmp=txt.indexOf("<!--right-left-->");if(tmp>-1){$("#additional_infoBOTTOM").prop("innerHTML",txt.slice(0,tmp));txt=txt.substr(tmp+17)}$("#additional_infoLEFT").prop("innerHTML",txt);if(txt.replace(/\s*/im,"")==""&&$("#additional_infoID").length>0){$("#additional_infoID").get(0).parentNode.removeChild($("#additional_infoID").get(0))}$(".additional_info").css("visibility","visible");a=$("#additional_infoBOTTOM").prop("innerHTML");if(a==null)a="";if(a.replace(/\s*/im,"")==""){$("#additional_infoBOTTOM").get(0).parentNode.removeChild($("#additional_infoBOTTOM").get(0))}else{$("#additional_infoBOTTOM").css("visibility","visible")}a=$("#additional_infoTOP").prop("innerHTML");if(a==null)a="";if(a.replace(/\s*/im,"")==""){$("#additional_infoTOP").get(0).parentNode.removeChild($("#additional_infoTOP").get(0))}else{$("#additional_infoTOP").css("visibility","visible")}},c=function(){if(options.menuAnimated!="noswitch"){$("#menubar").css({visibility:"hidden",top:$("#titrePageID").prop("offsetTop")+$("#titrePageID").prop("offsetHeight")-2+"px"});d("n");switch(options.menuWidth){case"auto":$("#menubar").css("width","auto");maxwidth=options.menuMaxWidth;regexp=/[1234567]\./i;if(jQuery.browser.msie&&jQuery.browser.version.match(regexp)){maxwidth=options.menuMSIEMaxWidth}if(maxwidth>0){$("#menubar").css("max-width",maxwidth+"px")}break;case"info":$("#menubar").css("width",$(".additionnal_info").css("width"));break;default:$("#menubar").css("width",options.menuWidth+"px")}}else{$("#menubar dl dd").each(function(a,b){$(this).css("min-width",$(this.parentNode).prop("offsetWidth"));if(jQuery.browser.msie){$(this).css("max-width",options.menuMSIEMaxWidth+"px")}})}},d=function(b,c){if(b==""){!a?b="y":b="n"}if(options.menuAnimated=="fade"){switch(b){case"y":$("#menubar").css({visibility:"visible",height:"auto"}).fadeTo(options.animateDelay,1);$("#icon_menu").toggleClass("button button2");a=true;break;default:$("#menubar").fadeTo(options.animateDelay,0,function(){$("#menubar").css({visibility:"hidden",height:"0px"})});$("#icon_menu").toggleClass("button button2");a=false}}else{switch(b){case"y":$("#menubar").css({visibility:"visible",height:"auto"});$("#icon_menu").toggleClass("button button2");a=true;break;default:$("#menubar").css({visibility:"hidden",height:"0px"});$("#icon_menu").toggleClass("button button2");a=false}}};this.switchmenu=function(a,b){d(a,b)};c();b()}var gallyCP=null;$(document).ready(function(){gallyCP=new GallyCP}) 
  • extensions/gally/gally-default/js/gallyjs-tpp.js

    r10972 r12592  
    44  ------------------------------------------------------------------------------ 
    55  file: gally/gallyjs-tpp.js 
    6   file release: 1.4.0 
     6  file release: 1.4.4 
    77  ------------------------------------------------------------------------------ 
    88  author: grum at piwigo.org 
     
    8787    if((options.interfaceOnImage=="always" || (options.interfaceOnImage=="noscroll" && !image.isScrollable)) && options.interfaceCanSwitch) 
    8888    { 
    89       $("#theImg").bind("mouseenter", function () { switchInterface('y', true); } ) 
    90                   .bind("mouseleave", function () { switchInterface('n', true); } ) 
    91                   .bind("mousemove", function () { switchInterface('y', true); } ); 
     89      $("#theMainImage").bind("mouseenter", function () { switchInterface('y', true); } ) 
     90                        .bind("mouseleave", function () { switchInterface('n', true); } ) 
     91                        .bind("mousemove", function () { switchInterface('y', true); } ); 
    9292    } 
    9393 
     
    111111 
    112112 
    113     $("#navThumbPrev").css("top", $("#navThumbPrev").attr("offsetTop")+$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight")+"px"); 
    114     $("#navThumbNext").css("top", $("#navThumbNext").attr("offsetTop")+$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight")+"px"); 
    115  
    116     $("#theImage").css("top", $("#theImage").attr("offsetTop")+$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight")+"px"); 
     113    $("#navThumbPrev").css("top", $("#navThumbPrev").prop("offsetTop")+$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight")+"px"); 
     114    $("#navThumbNext").css("top", $("#navThumbNext").prop("offsetTop")+$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight")+"px"); 
     115 
     116    $("#theImage").css("top", $("#theImage").prop("offsetTop")+$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight")+"px"); 
    117117 
    118118    $("#contentid").attr("rows", options.commentRows); 
     
    178178      $('#theImgContainer').bind('click', function () 
    179179        { 
    180           openDisplayHigh($('#theImg').attr('src')); 
     180          openDisplayHigh($('#theMainImage').attr('src')); 
    181181        } 
    182182      ).addClass('pointer'); 
     
    185185  }, 
    186186 
     187  /** 
     188   * mode = "init" or "resize" 
     189   */ 
    187190  initializeImageMode = function (mode) 
    188191  { 
     
    191194        cssValues = new Object; 
    192195 
    193     if(mode=="init") 
    194     { 
    195       theHeaderHeight=$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight"); 
    196  
    197       $("#imageToolBar").css("top", $("#imageToolBar").attr("offsetTop")+theHeaderHeight+$("#imageHeaderBar").attr("offsetHeight")+"px"); 
    198  
    199       if(options.tabsPosition=="bottom") 
    200       { 
    201         copyrightArea = $("#copyright").attr("clientHeight")+1; 
    202         $("#theTabsContainer").css("bottom", copyrightArea+"px"); 
    203       } 
    204       else if(options.tabsPosition=="top") 
    205       { 
    206         toolBarArea = $("#imageToolBar").attr("offsetTop")+$("#imageToolBar").attr("offsetHeight"); 
    207         $("#theTabsContainer").css("top", toolBarArea+"px"); 
    208       } 
    209  
    210       if($("#navThumbPrev").length>0) 
    211       { 
    212         $("#navThumbPrev").css("height", $("#copyright").attr("offsetTop")-$("#navThumbPrev").attr("offsetTop")-options.tabsHidden+"px"); 
    213       } 
    214       if($("#navThumbNext").length>0) 
    215       { 
    216         $("#navThumbNext").css("height", $("#copyright").attr("offsetTop")-$("#navThumbNext").attr("offsetTop")-options.tabsHidden+"px"); 
    217       } 
    218     } 
    219  
    220     cssValues.height = $("#theImg").attr("height")+"px"; 
     196    cssValues.height = $("#theMainImage").prop("height")+"px"; 
    221197 
    222198    // autoscroll 
    223     if(options.imageAutoScroll && ($("#theImg").attr("scrollWidth")>($("#theImage").attr("clientWidth")-2*options.marginContainer))) 
    224     { 
    225       cssValues.width = ($("#theImage").attr("clientWidth")- 2*(options.marginContainer+options.paddingContainer))+"px"; 
     199    if(options.imageAutoScroll && ($("#theMainImage").prop("scrollWidth")>($("#theImage").prop("clientWidth")-2*options.marginContainer))) 
     200    { 
     201      cssValues.width = ($("#theImage").prop("clientWidth")- 2*(options.marginContainer+options.paddingContainer))+"px"; 
    226202 
    227203      $("#theImage").bind("mousemove", 
    228204        function(event){ 
    229           if($("#navThumbPrev").length>0) thumbWidth=$("#navThumbPrev").attr("clientWidth"); 
     205          if($("#navThumbPrev").length>0) thumbWidth=$("#navThumbPrev").prop("clientWidth"); 
    230206          deadArea = Math.max(options.imageScrollMinDeadArea, thumbWidth*1.2); 
    231207          mouse=Math.max(Math.min(event.clientX-image.leftPos, this.clientWidth - deadArea), deadArea); 
    232           $("#theImg") 
    233             .css("left",Math.round(($("#theImg").attr("scrollWidth")-this.clientWidth) * -(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px") 
     208          $("#theMainImage") 
     209            .css("left",Math.round(($("#theMainImage").prop("scrollWidth")-this.clientWidth) * -(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px") 
    234210            .trigger('scrolled'); 
    235211        } 
     
    240216    { 
    241217      $("#theImage").unbind("mousemove"); 
    242       $("#theImg").css("left", "0px"); 
    243       cssValues.width = $("#theImg").attr("scrollWidth")+"px"; 
     218      $("#theMainImage").css("left", "0px"); 
     219      cssValues.width = $("#theMainImage").prop("scrollWidth")+"px"; 
    244220      image.isScrollable=false; 
    245221    } 
     
    249225    if($("#copyright").css("position")=="fixed") 
    250226    { 
    251       $("#theImage").css("padding-bottom", $("#copyright").attr("offsetHeight")+"px"); 
     227      $("#theImage").css("padding-bottom", $("#copyright").prop("offsetHeight")+"px"); 
    252228    } 
    253229    switch(options.imageCenterMode) 
    254230    { 
    255231      case "img": 
    256         imgTop = $("#theImgContainer").attr('offsetHeight'); 
     232        imgTop = $("#theImgContainer").prop('offsetHeight'); 
    257233        break; 
    258234      case "all": 
    259         imgTop = $("#theImage").attr('offsetHeight'); 
     235        imgTop = $("#theImage").prop('offsetHeight'); 
    260236        break; 
    261237      default: 
     
    263239        break; 
    264240    } 
    265     imgTop = ($("#copyright").attr("offsetTop") - ($("#imageHeaderBar").attr("offsetTop") + $("#imageHeaderBar").attr("offsetHeight")) - imgTop)/2 + options.imageCenterOffset; 
    266  
    267     if(imgTop<options.imageCenterTopMin) 
    268     { 
    269       imgTop=options.imageCenterTopMin; 
    270     } 
    271     imgTop=imgTop+"px"; 
    272  
    273     $("#theImage").css("top", imgTop); 
    274  
     241    imgTop = ($("#copyright").prop("offsetTop") - ($("#imageHeaderBar").prop("offsetTop") + $("#imageHeaderBar").prop("offsetHeight")) - imgTop)/2 + options.imageCenterOffset; 
     242 
     243    switch($("#theImage").css("position")) 
     244    { 
     245      case "static": 
     246          $("#theImage").css("padding-top", imgTop); 
     247        break; 
     248      /* 
     249      case "fixed": 
     250      case "absolute": 
     251      case "relative": 
     252      */ 
     253      default: 
     254          if(imgTop<options.imageCenterTopMin) 
     255          { 
     256            imgTop=options.imageCenterTopMin; 
     257          } 
     258          imgTop=imgTop+"px"; 
     259          $("#theImage").css("top", imgTop); 
     260        break; 
     261    } 
    275262 
    276263    image.leftPos=$('#theImage').offset().left; 
    277264 
     265 
     266    if(mode=="init") 
     267    { 
     268      theHeaderHeight=$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight"); 
     269 
     270      $("#imageToolBar").css("top", $("#imageToolBar").prop("offsetTop")+theHeaderHeight+$("#imageHeaderBar").prop("offsetHeight")+"px"); 
     271 
     272      if($("#navThumbPrev").length>0) 
     273      { 
     274        $("#navThumbPrev").css("height", $("#copyright").prop("offsetTop")-$("#navThumbPrev").prop("offsetTop")-options.tabsHidden+"px"); 
     275      } 
     276      if($("#navThumbNext").length>0) 
     277      { 
     278        $("#navThumbNext").css("height", $("#copyright").prop("offsetTop")-$("#navThumbNext").prop("offsetTop")-options.tabsHidden+"px"); 
     279      } 
     280    } 
     281 
     282    switch(options.tabsPosition) 
     283    { 
     284      case "top": 
     285          toolBarArea = $("#imageToolBar").prop("offsetTop")+$("#imageToolBar").prop("offsetHeight"); 
     286          $("#theTabsContainer").css("top", toolBarArea+"px"); 
     287        break; 
     288      case "bottom": 
     289          copyrightArea = $("#copyright").prop("clientHeight")+1; 
     290          $("#theTabsContainer").css("bottom", copyrightArea+"px"); 
     291        break; 
     292      case "pictureTop": 
     293        $("#theTabsContainer").css( 
     294          { 
     295            top: $("#theMainImage").prop("offsetTop")+"px", 
     296            left:$("#theMainImage").prop("offsetLeft")+"px", 
     297            width:$('#theImgContainer').innerWidth()+"px" 
     298          } 
     299        ); 
     300        break; 
     301      case "pictureBottom": 
     302        pictureArea = $("#theMainImage").prop("offsetTop")+$("#theMainImage").prop("offsetHeight"); 
     303        $("#theTabsContainer").css( 
     304          { 
     305            top: pictureArea+"px", 
     306            left:$("#theMainImage").prop("offsetLeft")+"px", 
     307            width:$("#theMainImage").prop("offsetWidth")+"px" 
     308          } 
     309        ); 
     310        break; 
     311    } 
     312 
     313 
     314 
     315 
    278316    simulateHighRes(); 
    279  
    280317  }, 
    281318 
     
    419456    { 
    420457      p = new Object(); 
    421       p.left = (($(window).width()-$("#theImgHighContainer").attr("clientWidth")-options.paddingContainer*2)/2)+"px"; 
    422       p.top = (($(window).height()-$("#theImgHighContainer").attr("clientHeight")-options.paddingContainer*2)/2)+"px"; 
     458      p.left = (($(window).width()-$("#theImgHighContainer").prop("clientWidth")-options.paddingContainer*2)/2)+"px"; 
     459      p.top = (($(window).height()-$("#theImgHighContainer").prop("clientHeight")-options.paddingContainer*2)/2)+"px"; 
    423460 
    424461 
  • extensions/gally/gally-default/js/gallyjs-tpp.min.js

    r10972 r12592  
    1 /* file: gally-tpp.js - v1.4.0 | minified on 2011/05/01 with http://jscompress.com/ */ 
    2 var gallyPP=null;$(document).ready(function() 
    3 {gallyPP=new GallyPP();});function GallyPP(){var tabs={show:'n',current:-1,selected:-1},interface={visible:false,initialized:0,timerDelay:null},image={isScrollable:false,highWidth:0,highHeight:0,leftPos:0,zoomMode:''},container=null,init=function() 
    4 {var regexp=/[1234567]\./i;if(jQuery.browser.msie&&jQuery.browser.version.match(regexp)) 
    5 {options.interfaceAnimated="none";options.imageAutoScroll=false;} 
    6 if(options.imageAutoScroll) 
    7 {$("html").css("overflow-x","hidden");} 
    8 else 
    9 {$("html").css("overflow-x","scroll");} 
    10 if(options.imageCenterTopBorder=="imageHeaderBar") 
    11 {options.imageCenterTopMin+=$("#imageHeaderBar").get(0).offsetTop+$("#imageHeaderBar").get(0).offsetHeight;} 
    12 if(!options.interfaceCanSwitch) 
    13 {options.interfaceHidden=false;} 
    14 image.zoomMode=options.defaultZoomSize;switchInterface('0',true);initializeImageMode("init");if((options.interfaceOnImage=="always"||(options.interfaceOnImage=="noscroll"&&!image.isScrollable))&&options.interfaceCanSwitch) 
    15 {$("#theImg").bind("mouseenter",function(){switchInterface('y',true);}).bind("mouseleave",function(){switchInterface('n',true);}).bind("mousemove",function(){switchInterface('y',true);});} 
    16 if(options.interfaceCanSwitch) 
    17 {$("#imageHeaderBar").bind("mouseenter",function(){switchInterface('y',false);}).bind("mousemove",function(){switchInterface('y',false);});$("#imageToolBar").bind("mouseenter",function(){switchInterface('y',true);}).bind("mouseleave",function(){switchInterface('n',true);}).bind("mousemove",function(){switchInterface('y',true);});$("#navThumbPrev").bind("mouseenter",function(){switchInterface('Y',true);}).bind("mouseleave",function(){switchInterface('n',true);}).bind("mousemove",function(){switchInterface('y',true);});$("#navThumbNext").bind("mouseenter",function(){switchInterface('Y',true);}).bind("mouseleave",function(){switchInterface('n',true);}).bind("mousemove",function(){switchInterface('y',true);});} 
    18 $("#navThumbPrev").css("top",$("#navThumbPrev").attr("offsetTop")+$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight")+"px");$("#navThumbNext").css("top",$("#navThumbNext").attr("offsetTop")+$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight")+"px");$("#theImage").css("top",$("#theImage").attr("offsetTop")+$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight")+"px");$("#contentid").attr("rows",options.commentRows);if(options.animateDelay>0) 
    19 {$("#theTabs").tabs({fx:{opacity:'toggle',duration:options.animateDelay}});} 
    20 else 
    21 {$("#theTabs").tabs();} 
    22 switchTabs('n');if(options.interfaceCanSwitch) 
    23 {$('#theTabsContainer').bind("mouseenter",function(){switchInterface('Y',false);}).bind("mouseleave",function(){switchInterface('n');}).bind("mousemove",function(){switchInterface('y',false);});} 
    24 $("#theTabs").bind('tabsselect',function(event,ui) 
    25 {tabs.selected=ui.index;});$('.tab a').click(function() 
    26 {$(this).get(0).blur();if(tabs.selected==tabs.current) 
    27 {if(tabs.current!=-1)switchTabs('n');tabs.current=-1;tabs.selected=-1;} 
    28 else 
    29 {if(tabs.current==-1)switchTabs('y');tabs.current=tabs.selected;}});$(window).resize(function(){initializeImageMode("resize");});interface.initialized=1;$(document).trigger('gallyInterfaceReady');},simulateHighRes=function() 
    30 {if(image.isScrollable&&options.imageHaveHighRes==false&&options.imageSimulateHighRes) 
    31 {$('#theImgContainer').bind('click',function() 
    32 {openDisplayHigh($('#theImg').attr('src'));}).addClass('pointer');}},initializeImageMode=function(mode) 
    33 {var thumbWidth=0,imgTop=0,cssValues=new Object;if(mode=="init") 
    34 {theHeaderHeight=$("#theHeader").attr("offsetHeight")+$("#theHeaderAlt").attr("offsetHeight");$("#imageToolBar").css("top",$("#imageToolBar").attr("offsetTop")+theHeaderHeight+$("#imageHeaderBar").attr("offsetHeight")+"px");if(options.tabsPosition=="bottom") 
    35 {copyrightArea=$("#copyright").attr("clientHeight")+1;$("#theTabsContainer").css("bottom",copyrightArea+"px");} 
    36 else if(options.tabsPosition=="top") 
    37 {toolBarArea=$("#imageToolBar").attr("offsetTop")+$("#imageToolBar").attr("offsetHeight");$("#theTabsContainer").css("top",toolBarArea+"px");} 
    38 if($("#navThumbPrev").length>0) 
    39 {$("#navThumbPrev").css("height",$("#copyright").attr("offsetTop")-$("#navThumbPrev").attr("offsetTop")-options.tabsHidden+"px");} 
    40 if($("#navThumbNext").length>0) 
    41 {$("#navThumbNext").css("height",$("#copyright").attr("offsetTop")-$("#navThumbNext").attr("offsetTop")-options.tabsHidden+"px");}} 
    42 cssValues.height=$("#theImg").attr("height")+"px";if(options.imageAutoScroll&&($("#theImg").attr("scrollWidth")>($("#theImage").attr("clientWidth")-2*options.marginContainer))) 
    43 {cssValues.width=($("#theImage").attr("clientWidth")-2*(options.marginContainer+options.paddingContainer))+"px";$("#theImage").bind("mousemove",function(event){if($("#navThumbPrev").length>0)thumbWidth=$("#navThumbPrev").attr("clientWidth");deadArea=Math.max(options.imageScrollMinDeadArea,thumbWidth*1.2);mouse=Math.max(Math.min(event.clientX-image.leftPos,this.clientWidth-deadArea),deadArea);$("#theImg").css("left",Math.round(($("#theImg").attr("scrollWidth")-this.clientWidth)*-(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px").trigger('scrolled');});image.isScrollable=true;} 
    44 else 
    45 {$("#theImage").unbind("mousemove");$("#theImg").css("left","0px");cssValues.width=$("#theImg").attr("scrollWidth")+"px";image.isScrollable=false;} 
    46 $("#theImgContainer").css(cssValues);if($("#copyright").css("position")=="fixed") 
    47 {$("#theImage").css("padding-bottom",$("#copyright").attr("offsetHeight")+"px");} 
    48 switch(options.imageCenterMode) 
    49 {case"img":imgTop=$("#theImgContainer").attr('offsetHeight');break;case"all":imgTop=$("#theImage").attr('offsetHeight');break;default:imgTop=-10000;break;} 
    50 imgTop=($("#copyright").attr("offsetTop")-($("#imageHeaderBar").attr("offsetTop")+$("#imageHeaderBar").attr("offsetHeight"))-imgTop)/2+options.imageCenterOffset;if(imgTop<options.imageCenterTopMin) 
    51 {imgTop=options.imageCenterTopMin;} 
    52 imgTop=imgTop+"px";$("#theImage").css("top",imgTop);image.leftPos=$('#theImage').offset().left;simulateHighRes();},switchInterface=function(show,resetTimer) 
    53 {if((interface.initialized==1)&&(options.interfaceHidden)) 
    54 {interface.initialized=2;if(show=="Y")return('');} 
    55 if(!options.interfaceHidden&&show=="0"){show="1";} 
    56 if(options.interfaceAnimated=="fade") 
    57 {switch(show) 
    58 {case'0':$(".uiImg").css({opacity:0,visibility:"hidden"});interface.visible=false;break;case'1':if(!interface.visible)$(".uiImg").css({opacity:1,visibility:"visible"});interface.visible=true;if(resetTimer)resetInterfaceTimer();break;case'2':case'Y':case'y':if(!interface.visible)$(".uiImg").css("visibility","visible").stop(true,false).fadeTo(options.animateDelay,1);interface.visible=true;if(resetTimer)resetInterfaceTimer();break;default:$(".uiImg").stop(true,false).fadeTo(options.animateDelay,0,function() 
    59 {this.style.visibility="hidden";interface.visible=false;});clearInterfaceTimer();break;}} 
    60 else 
    61 {switch(show) 
    62 {case'y':case'Y':case'1':case'2':if(!interface.visible)$(".uiImg").css("visibility","visible");interface.visible=true;if(resetTimer)resetInterfaceTimer();break;default:$(".uiImg").css("visibility","hidden");interface.visible=false;clearInterfaceTimer();break;}}},switchTabs=function(show) 
    63 {if(show!='') 
    64 {tabs.show=show;} 
    65 else 
    66 {if(tabs.show!='n') 
    67 {tabs.show='n';} 
    68 else 
    69 {tabs.show='y';}} 
    70 if(options.tabsAnimated) 
    71 {if(tabs.show=='y') 
    72 {$("#theTabsContainer").animate({height:options.tabsVisible+"px"},options.animateDelay).trigger('resize');} 
    73 else 
    74 {$('#theTabs div.tabPanel').addClass("ui-tabs-hide").css("display","");$('#theTabs li').removeClass("ui-tabs-selected");$("#theTabsContainer").animate({height:options.tabsHidden+"px"},options.animateDelay).trigger('resize');}} 
    75 else 
    76 {if(tabs.show=='y') 
    77 {$("#theTabsContainer").css({height:options.tabsVisible+"px"}).trigger('resize');} 
    78 else 
    79 {$('#theTabs div.tabPanel').addClass("ui-tabs-hide").css("display","");$('#theTabs li').removeClass("ui-tabs-selected");$("#theTabsContainer").css({height:options.tabsHidden+"px"}).trigger('resize');}}},clearInterfaceTimer=function() 
    80 {if(interface.timerDelay!=null) 
    81 {window.clearInterval(interface.timerDelay);interface.timerDelay=null;}},resetInterfaceTimer=function() 
    82 {clearInterfaceTimer();if(options.interfaceTimerDelay>0&&options.interfaceCanSwitch)interface.timerDelay=window.setInterval(switchInterface,options.interfaceTimerDelay,"n",false);},openDisplayHigh=function(url) 
    83 {$('#theImageHigh').css({width:$("html").get(0).scrollWidth+"px",height:$("html").get(0).scrollHeight+"px",display:"block"});if($("#theImgHigh").attr('src')=="") 
    84 {p=new Object();p.left=(($(window).width()-$("#theImgHighContainer").attr("clientWidth")-options.paddingContainer*2)/2)+"px";p.top=(($(window).height()-$("#theImgHighContainer").attr("clientHeight")-options.paddingContainer*2)/2)+"px";$('#theImgHighContainer').css({left:p.left,top:p.top,padding:options.paddingContainer+"px"});$("#theImgHigh").load(function() 
    85 {image.highWidth=$("#theImgHigh").width();image.highHeight=$("#theImgHigh").height();p=calcImgHighPositionAndSize(image.zoomMode);$('#theImgHighContainer').css("background-image","none");displayZoomHigh();$("#theImgHigh").css({display:"block"});}).attr('src',url);if(options.highResClickMode=='close') 
    86 {$("#theImgHigh").bind('click',closeDisplayHigh);} 
    87 else 
    88 {$("#theImgHigh").bind('click',switchZoomHigh);}} 
    89 else 
    90 {p=calcImgHighPositionAndSize(image.zoomMode);$('#theImgHighContainer').css({left:p.left+"px",top:p.top+"px",width:p.width+"px",height:p.height+"px"});}},calcImgHighPositionAndSize=function(zoom) 
    91 {var p={left:options.marginContainer,top:options.marginContainer,width:0,height:0},margins=(options.marginContainer+options.paddingContainer)*2;if(zoom=='full') 
    92 {p.width=$("html").get(0).clientWidth-margins;p.height=$("html").get(0).clientHeight-margins;} 
    93 else 
    94 {ratioImg=image.highWidth/image.highHeight;ratioPage=$("html").get(0).clientWidth/$("html").get(0).clientHeight;if((ratioPage>1&&(ratioPage>ratioImg))||(ratioPage<1&&(ratioPage<ratioImg))) 
    95 {p.height=$("html").get(0).clientHeight-margins;p.width=p.height*ratioImg;} 
    96 else 
    97 {p.width=$("html").get(0).clientWidth-margins;p.height=p.width/ratioImg;} 
    98 p.left=($("html").get(0).clientWidth-p.width)/2-options.paddingContainer;p.top=($("html").get(0).clientHeight-p.height)/2-options.paddingContainer;} 
    99 if(p.width>image.highWidth) 
    100 {p.width=image.highWidth;p.left=($("html").get(0).clientWidth-p.width)/2;} 
    101 if(p.height>image.highHeight) 
    102 {p.height=image.highHeight;p.top=($("html").get(0).clientHeight-p.height)/2;} 
    103 return(p);},displayZoomHigh=function() 
    104 {var container=calcImgHighPositionAndSize(image.zoomMode);$('#theImgHighContainer').css({left:container.left+"px",top:container.top+"px",width:container.width+"px",height:container.height+"px"});if(image.zoomMode=="full") 
    105 {$("#theImgHigh").css({width:image.highWidth+"px",height:image.highHeight+"px"});$('#theImgHighContainer').bind("mousemove",function(event) 
    106 {var deadArea=Math.max(options.marginContainer*2,options.imageScrollMinDeadArea) 
    107 mouseX=Math.max(Math.min(event.clientX-container.left,container.width-deadArea),deadArea),mouseY=Math.max(Math.min(event.clientY-container.top,container.height-deadArea),deadArea);$("#theImgHigh").css("left",Math.round((image.highWidth-container.width)*-(mouseX-deadArea)/(container.width-2*deadArea))+"px").css("top",Math.round((image.highHeight-container.height)*-(mouseY-deadArea)/(container.height-2*deadArea))+"px");});} 
    108 else 
    109 {$("#theImgHigh").css({width:container.width+"px",height:container.height+"px",left:"0px",top:"0px"});$('#theImgHighContainer').unbind("mousemove");}},closeDisplayHigh=function() 
    110 {$('#theImageHigh').css('display','none');},switchZoomHigh=function() 
    111 {if(image.zoomMode=='full') 
    112 {image.zoomMode="fit";} 
    113 else 
    114 {image.zoomMode="full";} 
    115 $("#theImgHighZoomButton").toggleClass('full').toggleClass('fit');displayZoomHigh();};this.closeDisplayHigh=function(){closeDisplayHigh();};this.switchZoomHigh=function(){switchZoomHigh();};this.getImageProp=function(){return image;};this.getInterfaceProp=function(){return interface;};this.getTabsProp=function(){return tabs;};this.openDisplayHigh=function(url){openDisplayHigh(url);};init();} 
     1/* file: gally-tpp.js - v1.4.4 | minified on 2011/11/09 with http://jscompress.com/ */ 
     2function GallyPP(){var a={show:"n",current:-1,selected:-1},b={visible:false,initialized:0,timerDelay:null},c={isScrollable:false,highWidth:0,highHeight:0,leftPos:0,zoomMode:""},d=null,e=function(){var d=/[1234567]\./i;if(jQuery.browser.msie&&jQuery.browser.version.match(d)){options.interfaceAnimated="none";options.imageAutoScroll=false}if(options.imageAutoScroll){$("html").css("overflow-x","hidden")}else{$("html").css("overflow-x","scroll")}if(options.imageCenterTopBorder=="imageHeaderBar"){options.imageCenterTopMin+=$("#imageHeaderBar").get(0).offsetTop+$("#imageHeaderBar").get(0).offsetHeight}if(!options.interfaceCanSwitch){options.interfaceHidden=false}c.zoomMode=options.defaultZoomSize;h("0",true);g("init");if((options.interfaceOnImage=="always"||options.interfaceOnImage=="noscroll"&&!c.isScrollable)&&options.interfaceCanSwitch){$("#theMainImage").bind("mouseenter",function(){h("y",true)}).bind("mouseleave",function(){h("n",true)}).bind("mousemove",function(){h("y",true)})}if(options.interfaceCanSwitch){$("#imageHeaderBar").bind("mouseenter",function(){h("y",false)}).bind("mousemove",function(){h("y",false)});$("#imageToolBar").bind("mouseenter",function(){h("y",true)}).bind("mouseleave",function(){h("n",true)}).bind("mousemove",function(){h("y",true)});$("#navThumbPrev").bind("mouseenter",function(){h("Y",true)}).bind("mouseleave",function(){h("n",true)}).bind("mousemove",function(){h("y",true)});$("#navThumbNext").bind("mouseenter",function(){h("Y",true)}).bind("mouseleave",function(){h("n",true)}).bind("mousemove",function(){h("y",true)})}$("#navThumbPrev").css("top",$("#navThumbPrev").prop("offsetTop")+$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight")+"px");$("#navThumbNext").css("top",$("#navThumbNext").prop("offsetTop")+$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight")+"px");$("#theImage").css("top",$("#theImage").prop("offsetTop")+$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight")+"px");$("#contentid").attr("rows",options.commentRows);if(options.animateDelay>0){$("#theTabs").tabs({fx:{opacity:"toggle",duration:options.animateDelay}})}else{$("#theTabs").tabs()}i("n");if(options.interfaceCanSwitch){$("#theTabsContainer").bind("mouseenter",function(){h("Y",false)}).bind("mouseleave",function(){h("n")}).bind("mousemove",function(){h("y",false)})}$("#theTabs").bind("tabsselect",function(b,c){a.selected=c.index});$(".tab a").click(function(){$(this).get(0).blur();if(a.selected==a.current){if(a.current!=-1)i("n");a.current=-1;a.selected=-1}else{if(a.current==-1)i("y");a.current=a.selected}});$(window).resize(function(){g("resize")});b.initialized=1;$(document).trigger("gallyInterfaceReady")},f=function(){if(c.isScrollable&&options.imageHaveHighRes==false&&options.imageSimulateHighRes){$("#theImgContainer").bind("click",function(){l($("#theMainImage").attr("src"))}).addClass("pointer")}},g=function(a){var b=0,d=0,e=new Object;e.height=$("#theMainImage").prop("height")+"px";if(options.imageAutoScroll&&$("#theMainImage").prop("scrollWidth")>$("#theImage").prop("clientWidth")-2*options.marginContainer){e.width=$("#theImage").prop("clientWidth")-2*(options.marginContainer+options.paddingContainer)+"px";$("#theImage").bind("mousemove",function(a){if($("#navThumbPrev").length>0)b=$("#navThumbPrev").prop("clientWidth");deadArea=Math.max(options.imageScrollMinDeadArea,b*1.2);mouse=Math.max(Math.min(a.clientX-c.leftPos,this.clientWidth-deadArea),deadArea);$("#theMainImage").css("left",Math.round(($("#theMainImage").prop("scrollWidth")-this.clientWidth)*-(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px").trigger("scrolled")});c.isScrollable=true}else{$("#theImage").unbind("mousemove");$("#theMainImage").css("left","0px");e.width=$("#theMainImage").prop("scrollWidth")+"px";c.isScrollable=false}$("#theImgContainer").css(e);if($("#copyright").css("position")=="fixed"){$("#theImage").css("padding-bottom",$("#copyright").prop("offsetHeight")+"px")}switch(options.imageCenterMode){case"img":d=$("#theImgContainer").prop("offsetHeight");break;case"all":d=$("#theImage").prop("offsetHeight");break;default:d=-1e4;break}d=($("#copyright").prop("offsetTop")-($("#imageHeaderBar").prop("offsetTop")+$("#imageHeaderBar").prop("offsetHeight"))-d)/2+options.imageCenterOffset;switch($("#theImage").css("position")){case"static":$("#theImage").css("padding-top",d);break;default:if(d<options.imageCenterTopMin){d=options.imageCenterTopMin}d=d+"px";$("#theImage").css("top",d);break}c.leftPos=$("#theImage").offset().left;if(a=="init"){theHeaderHeight=$("#theHeader").prop("offsetHeight")+$("#theHeaderAlt").prop("offsetHeight");$("#imageToolBar").css("top",$("#imageToolBar").prop("offsetTop")+theHeaderHeight+$("#imageHeaderBar").prop("offsetHeight")+"px");if($("#navThumbPrev").length>0){$("#navThumbPrev").css("height",$("#copyright").prop("offsetTop")-$("#navThumbPrev").prop("offsetTop")-options.tabsHidden+"px")}if($("#navThumbNext").length>0){$("#navThumbNext").css("height",$("#copyright").prop("offsetTop")-$("#navThumbNext").prop("offsetTop")-options.tabsHidden+"px")}}switch(options.tabsPosition){case"top":toolBarArea=$("#imageToolBar").prop("offsetTop")+$("#imageToolBar").prop("offsetHeight");$("#theTabsContainer").css("top",toolBarArea+"px");break;case"bottom":copyrightArea=$("#copyright").prop("clientHeight")+1;$("#theTabsContainer").css("bottom",copyrightArea+"px");break;case"pictureTop":$("#theTabsContainer").css({top:$("#theMainImage").prop("offsetTop")+"px",left:$("#theMainImage").prop("offsetLeft")+"px",width:$("#theImgContainer").innerWidth()+"px"});break;case"pictureBottom":pictureArea=$("#theMainImage").prop("offsetTop")+$("#theMainImage").prop("offsetHeight");$("#theTabsContainer").css({top:pictureArea+"px",left:$("#theMainImage").prop("offsetLeft")+"px",width:$("#theMainImage").prop("offsetWidth")+"px"});break}f()},h=function(a,c){if(b.initialized==1&&options.interfaceHidden){b.initialized=2;if(a=="Y")return""}if(!options.interfaceHidden&&a=="0"){a="1"}if(options.interfaceAnimated=="fade"){switch(a){case"0":$(".uiImg").css({opacity:0,visibility:"hidden"});b.visible=false;break;case"1":if(!b.visible)$(".uiImg").css({opacity:1,visibility:"visible"});b.visible=true;if(c)k();break;case"2":case"Y":case"y":if(!b.visible)$(".uiImg").css("visibility","visible").stop(true,false).fadeTo(options.animateDelay,1);b.visible=true;if(c)k();break;default:$(".uiImg").stop(true,false).fadeTo(options.animateDelay,0,function(){this.style.visibility="hidden";b.visible=false});j();break}}else{switch(a){case"y":case"Y":case"1":case"2":if(!b.visible)$(".uiImg").css("visibility","visible");b.visible=true;if(c)k();break;default:$(".uiImg").css("visibility","hidden");b.visible=false;j();break}}},i=function(b){if(b!=""){a.show=b}else{if(a.show!="n"){a.show="n"}else{a.show="y"}}if(options.tabsAnimated){if(a.show=="y"){$("#theTabsContainer").animate({height:options.tabsVisible+"px"},options.animateDelay).trigger("resize")}else{$("#theTabs div.tabPanel").addClass("ui-tabs-hide").css("display","");$("#theTabs li").removeClass("ui-tabs-selected");$("#theTabsContainer").animate({height:options.tabsHidden+"px"},options.animateDelay).trigger("resize")}}else{if(a.show=="y"){$("#theTabsContainer").css({height:options.tabsVisible+"px"}).trigger("resize")}else{$("#theTabs div.tabPanel").addClass("ui-tabs-hide").css("display","");$("#theTabs li").removeClass("ui-tabs-selected");$("#theTabsContainer").css({height:options.tabsHidden+"px"}).trigger("resize")}}},j=function(){if(b.timerDelay!=null){window.clearInterval(b.timerDelay);b.timerDelay=null}},k=function(){j();if(options.interfaceTimerDelay>0&&options.interfaceCanSwitch)b.timerDelay=window.setInterval(h,options.interfaceTimerDelay,"n",false)},l=function(a){$("#theImageHigh").css({width:$("html").get(0).scrollWidth+"px",height:$("html").get(0).scrollHeight+"px",display:"block"});if($("#theImgHigh").attr("src")==""){p=new Object;p.left=($(window).width()-$("#theImgHighContainer").prop("clientWidth")-options.paddingContainer*2)/2+"px";p.top=($(window).height()-$("#theImgHighContainer").prop("clientHeight")-options.paddingContainer*2)/2+"px";$("#theImgHighContainer").css({left:p.left,top:p.top,padding:options.paddingContainer+"px"});$("#theImgHigh").load(function(){c.highWidth=$("#theImgHigh").width();c.highHeight=$("#theImgHigh").height();p=m(c.zoomMode);$("#theImgHighContainer").css("background-image","none");n();$("#theImgHigh").css({display:"block"})}).attr("src",a);if(options.highResClickMode=="close"){$("#theImgHigh").bind("click",o)}else{$("#theImgHigh").bind("click",q)}}else{p=m(c.zoomMode);$("#theImgHighContainer").css({left:p.left+"px",top:p.top+"px",width:p.width+"px",height:p.height+"px"})}},m=function(a){var b={left:options.marginContainer,top:options.marginContainer,width:0,height:0},d=(options.marginContainer+options.paddingContainer)*2;if(a=="full"){b.width=$("html").get(0).clientWidth-d;b.height=$("html").get(0).clientHeight-d}else{ratioImg=c.highWidth/c.highHeight;ratioPage=$("html").get(0).clientWidth/$("html").get(0).clientHeight;if(ratioPage>1&&ratioPage>ratioImg||ratioPage<1&&ratioPage<ratioImg){b.height=$("html").get(0).clientHeight-d;b.width=b.height*ratioImg}else{b.width=$("html").get(0).clientWidth-d;b.height=b.width/ratioImg}b.left=($("html").get(0).clientWidth-b.width)/2-options.paddingContainer;b.top=($("html").get(0).clientHeight-b.height)/2-options.paddingContainer}if(b.width>c.highWidth){b.width=c.highWidth;b.left=($("html").get(0).clientWidth-b.width)/2}if(b.height>c.highHeight){b.height=c.highHeight;b.top=($("html").get(0).clientHeight-b.height)/2}return b},n=function(){var a=m(c.zoomMode);$("#theImgHighContainer").css({left:a.left+"px",top:a.top+"px",width:a.width+"px",height:a.height+"px"});if(c.zoomMode=="full"){$("#theImgHigh").css({width:c.highWidth+"px",height:c.highHeight+"px"});$("#theImgHighContainer").bind("mousemove",function(b){var d=Math.max(options.marginContainer*2,options.imageScrollMinDeadArea);mouseX=Math.max(Math.min(b.clientX-a.left,a.width-d),d),mouseY=Math.max(Math.min(b.clientY-a.top,a.height-d),d);$("#theImgHigh").css("left",Math.round((c.highWidth-a.width)*-(mouseX-d)/(a.width-2*d))+"px").css("top",Math.round((c.highHeight-a.height)*-(mouseY-d)/(a.height-2*d))+"px")})}else{$("#theImgHigh").css({width:a.width+"px",height:a.height+"px",left:"0px",top:"0px"});$("#theImgHighContainer").unbind("mousemove")}},o=function(){$("#theImageHigh").css("display","none")},q=function(){if(c.zoomMode=="full"){c.zoomMode="fit"}else{c.zoomMode="full"}$("#theImgHighZoomButton").toggleClass("full").toggleClass("fit");n()};this.closeDisplayHigh=function(){o()};this.switchZoomHigh=function(){q()};this.getImageProp=function(){return c};this.getInterfaceProp=function(){return b};this.getTabsProp=function(){return a};this.openDisplayHigh=function(a){l(a)};e()}var gallyPP=null;$(document).ready(function(){gallyPP=new GallyPP}) 
  • extensions/gally/gally-default/release_notes.txt

    r10972 r12592  
    144144  |         |            |   . HD Picture are not displayed 
    145145  |         |            | 
     146  | 1.4.4   | 2011-11-09 | * mantis feature:2499 
     147  |         |            |   . compatibility with piwigo 2.3 
     148  |         |            |       -> replace the id #theImg with #theMainImage 
     149  |         |            |       -> update templates allowing to display menu in 
     150  |         |            |          all pages 
     151  |         |            |       -> update js to be compatible with jQuery 1.6 
     152  |         |            |       -> fix some css bugs 
     153  |         |            | 
     154  |         |            | 
    146155  |         |            | 
    147156  |         |            | 
  • extensions/gally/gally-default/template/about.tpl

    r11025 r12592  
    11<!-- **GBL** >ABOUT> --> 
     2 
    23<div id="content" class="content"> 
    3   <div class="titrePage"> 
     4  <div class="titrePage" id='titrePageID'> 
     5 
     6    {if isset($MENUBAR)} 
     7      {if #menuAnimated# == "noswitch"} 
     8        {$MENUBAR} 
     9      {else} 
     10      <div id="menuswitcher"> 
     11        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     12        </a> 
     13      </div> 
     14      {/if} 
     15    {/if} 
     16 
    417    <ul class="categoryActions"> 
    518      <li> 
     
    1023    <h2>{'About'|@translate}</h2> 
    1124  </div> 
     25 
     26  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     27    {$MENUBAR} 
     28  {/if} 
     29 
    1230  <div id="content2"> 
    1331  {$ABOUT_MESSAGE} 
  • extensions/gally/gally-default/template/comment_list.tpl

    r6109 r12592  
    5151        {if isset($comment.U_DELETE)} 
    5252        <li> 
    53           <img style="cursor:pointer;" src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]" onclick="document.location='{$comment.U_DELETE}';" title="{'delete this comment'|@translate}"/> 
     53          <span class="button id_delete" onclick="document.location='{$comment.U_DELETE}';" title="{'delete this comment'|@translate}"></span> 
    5454        </li> 
    5555        {/if} 
     
    8787            $this->assign_by_ref('comment', $comment); 
    8888          {/php} 
    89           <img style="cursor:pointer;" src="{$ROOT_URL}{$themeconf.icon_dir}/edit.png" class="button" alt="[edit]" 
    90                onclick="editInside('{$comment.U_EDIT}#edit_comment}', '{$comment.CONTENT|@escape}', {$comment.IMAGE_ID|@default:$current.id}, '{$comment.KEY}', {$smarty.foreach.comment_loop.index});" title="{'edit this comment'|@translate}"/> 
     89          <span class="button id_edit" onclick="editInside('{$comment.U_EDIT}#edit_comment}', '{$comment.CONTENT|@escape}', {$comment.IMAGE_ID|@default:$current.id}, '{$comment.KEY}', {$smarty.foreach.comment_loop.index});" title="{'edit this comment'|@translate}"></span> 
     90 
    9191        </li> 
    9292        {/if} 
     
    9494        {if isset($comment.U_VALIDATE)} 
    9595        <li> 
    96           <img style="cursor:pointer;" src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" alt="[validate]" onclick="document.location='{$comment.U_VALIDATE}';" title="{'validate this comment'|@translate}"/> 
     96          <span class="button id_validate" onclick="document.location='{$comment.U_VALIDATE}';" title="{'validate this comment'|@translate}"></span> 
    9797        </li> 
    9898        {/if} 
  • extensions/gally/gally-default/template/comments.tpl

    r11024 r12592  
    1  
    21<div id="content" class="content"> 
    32 
    4   <div class="titrePage"> 
     3  <div class="titrePage" id='titrePageID'> 
     4 
     5    {if isset($MENUBAR)} 
     6      {if #menuAnimated# == "noswitch"} 
     7        {$MENUBAR} 
     8      {else} 
     9      <div id="menuswitcher"> 
     10        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     11        </a> 
     12      </div> 
     13      {/if} 
     14    {/if} 
     15 
    516    <ul class="categoryActions"> 
    617      <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li> 
     
    819    <h2>{'User comments'|@translate}</h2> 
    920  </div> 
     21 
     22  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     23    {$MENUBAR} 
     24  {/if} 
    1025 
    1126<form class="filter" action="{$F_ACTION}" method="get"> 
  • extensions/gally/gally-default/template/config.js.tpl

    r10736 r12592  
    2929  displayHighResIcon:{if #displayHighResIcon#=='yes'}true{else}false{/if}, 
    3030  highResClickMode:"{#highResClickMode#}", 
    31 {/if} {if $BODY_ID=='theCategoryPage'} 
     31{/if} {if $BODY_ID=='theCategoryPage' or isset($MENUBAR)} 
    3232  menuAnimated:"{#menuAnimated#}", 
    3333  menuWidth:"{#menuWidth#}", 
  • extensions/gally/gally-default/template/dialogs.tpl

    r6109 r12592  
    77  $(function() { 
    88    $("#divMsg").dialog({ 
    9       bgiframe: true, 
    109      modal: true, 
    1110      dialogClass: '{/literal}{if isset($errors) and count($errors)}errors{elseif isset($infos) and count($infos)}infos{/if}{literal}', 
  • extensions/gally/gally-default/template/header.tpl

    r11024 r12592  
    8080  {if #manageTips#=='yes'} 
    8181    {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"} 
     82    {combine_script id="gallyjs-ttm" path="themes/gally-default/js/gallyjs-ttm.js" require="jquery"} 
    8383  {/if} 
    8484 
    85   {if $BODY_ID=='theCategoryPage'} 
    86   {combine_script id="gallyjs-tcp" path="themes/gally-default/js/gallyjs-tcp.min.js" require="jquery"} 
     85  {if $BODY_ID=='theCategoryPage' or isset($MENUBAR)} 
     86  {combine_script id="gallyjs-tcp" path="themes/gally-default/js/gallyjs-tcp.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"> 
  • extensions/gally/gally-default/template/identification.tpl

    r11024 r12592  
    33<div id="content" class="content"> 
    44 
    5   <div class="titrePage"> 
     5  <div class="titrePage" id='titrePageID'> 
     6 
     7    {if isset($MENUBAR)} 
     8      {if #menuAnimated# == "noswitch"} 
     9        {$MENUBAR} 
     10      {else} 
     11      <div id="menuswitcher"> 
     12        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     13        </a> 
     14      </div> 
     15      {/if} 
     16    {/if} 
     17 
    618    <ul class="categoryActions"> 
    719      <li><a id="icon_lost_password" class="button" href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"> </a></li> 
     
    1325    <h2>{'Identification'|@translate}</h2> 
    1426  </div> 
     27 
     28 
     29  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     30    {$MENUBAR} 
     31  {/if} 
    1532 
    1633{include file='dialogs.tpl'} 
  • extensions/gally/gally-default/template/index.tpl

    r11037 r12592  
    1111    <div id="menuswitcher"> 
    1212      <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
    13         <!-- <img  src="{$ROOT_URL}{$themeconf.icon_dir}/menu-show.png"  alt="{'display all elements in all sub-categories'|@translate}"> --> 
    1413      </a> 
    1514    </div> 
  • extensions/gally/gally-default/template/mainpage_categories.tpl

    r11024 r12592  
    77      <div class="illustration"> 
    88 
    9           <img {if isset($cat.EXTRA_CLASS)}class="{$cat.EXTRA_CLASS}"{/if} src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'display this album'|@translate}"> 
     9          <img {if isset($cat.EXTRA_CLASS)}class="{$cat.EXTRA_CLASS}"{/if} src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}"> 
    1010 
    1111      </div> 
  • extensions/gally/gally-default/template/menubar_categories.tpl

    r11024 r12592  
    11<dt> 
    22  {if isset($U_START_FILTER)} 
    3   <a id="icon_start_filter" class="button" href="{$U_START_FILTER}" title="{'display only recently posted photos'|@translate}" rel="nofollow"></a> 
     3  <a id="icon_start_filter" class="button sTipOnTop" href="{$U_START_FILTER}" title="{'display only recently posted photos'|@translate}" rel="nofollow"></a> 
    44  {/if} 
    55  {if isset($U_STOP_FILTER)} 
    6   <a id="icon_stop_filter" class="button" href="{$U_STOP_FILTER}" title="{'return to the display of all photos'|@translate}"></a> 
     6  <a id="icon_stop_filter" class="button sTipOnTop" href="{$U_STOP_FILTER}" title="{'return to the display of all photos'|@translate}"></a> 
    77  {/if} 
    88  <a href="{$block->data.U_CATEGORIES}">{'Albums'|@translate}</a> 
     
    2121        <a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}">{$cat.NAME}</a> 
    2222        {if $cat.count_images > 0} 
    23         <span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if}" title="{$cat.TITLE}">[{$cat.count_images}]</span> 
     23        <span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if} sTipOnTop" title="{$cat.TITLE}">[{$cat.count_images}]</span> 
    2424        {/if} 
    2525        {if !empty($cat.icon_ts)} 
    26         <img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)"> 
     26        <span class="button {if $cat.icon_ts.IS_CHILD_DATE}id_recent_cat_by_child{else}id_recent_cat{/if}"></span> 
    2727        {/if} 
    2828    {assign var='ref_level' value=$cat.LEVEL} 
  • extensions/gally/gally-default/template/menubar_identification.tpl

    r11024 r12592  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<dt>{'Identification'|@translate}</dt> 
    23<dd> 
  • extensions/gally/gally-default/template/menubar_tags.tpl

    r11024 r12592  
    99        title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" 
    1010        rel="nofollow"> 
    11         <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" /> 
     11        <span class="add_tag"></span> 
    1212      </a> 
    1313      {/if} 
  • extensions/gally/gally-default/template/nbm.tpl

    r11024 r12592  
    11<!-- **GBL** >NBM> --> 
     2<div id="content" class="content"> 
     3  <div class="titrePage" id='titrePageID'> 
    24 
    3 <div id="content" class="content"> 
    4   <div class="titrePage"> 
     5    {if isset($MENUBAR)} 
     6      {if #menuAnimated# == "noswitch"} 
     7        {$MENUBAR} 
     8      {else} 
     9      <div id="menuswitcher"> 
     10        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     11        </a> 
     12      </div> 
     13      {/if} 
     14    {/if} 
     15 
    516    <ul class="categoryActions"> 
    617      <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li> 
     
    920  </div> 
    1021 
     22  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     23    {$MENUBAR} 
     24  {/if} 
     25 
     26 
    1127{include file='dialogs.tpl'} 
    1228 
  • extensions/gally/gally-default/template/notification.tpl

    r11024 r12592  
    55<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (photos, comments)'|@translate}" href="{$U_FEED}"> 
    66{/html_head} 
     7 
    78<div id="content" class="content"> 
    89 
    9   <div class="titrePage"> 
     10  <div class="titrePage" id='titrePageID'> 
     11 
     12    {if isset($MENUBAR)} 
     13      {if #menuAnimated# == "noswitch"} 
     14        {$MENUBAR} 
     15      {else} 
     16      <div id="menuswitcher"> 
     17        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     18        </a> 
     19      </div> 
     20      {/if} 
     21    {/if} 
     22 
    1023    <ul class="categoryActions"> 
    1124      <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li> 
     
    1326    <h2>{'Notification'|@translate}</h2> 
    1427  </div> 
     28 
     29  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     30    {$MENUBAR} 
     31  {/if} 
    1532 
    1633  <div id="content2"> 
  • extensions/gally/gally-default/template/password.tpl

    r11024 r12592  
    11<!-- **GBL** >PASSWORD> --> 
     2{if isset($MENUBAR)}{$MENUBAR}{/if} 
    23 
    34<div id="content" class="content"> 
     
    1314 
    1415 
    15 <form action="{$F_ACTION}" method="post" class="properties"> 
    16   <fieldset> 
    17     <legend>{'Retrieve password'|@translate}</legend> 
     16{if $action != 'none'} 
     17  <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post"> 
    1818 
    19     <ul> 
    20       <li> 
    21         <div class="property"> 
    22           <label for="mail_address">{'Email address'|@translate}</label> 
    23         </div> 
    24         <input class="login" type="text" name="mail_address" id="mail_address" size="35" maxlength="40" > 
    25       </li> 
    26       <li> 
    27         <div class="property"> 
    28           <label for="no_mail_address">{'No email address'|@translate}</label> 
    29         </div> 
    30         <input type="checkbox" id="no_mail_address" name="no_mail_address" value="1"> 
    31       </li> 
    32     </ul> 
    33   </fieldset> 
     19    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
    3420 
    35   <p><input class="submit" type="submit" name="submit" value="{'Send new password'|@translate}"></p> 
    36 </form> 
     21    {if $action == 'lost'} 
     22      <div class="message">{'Please enter your username or email address.'|@translate} {'You will receive a link to create a new password via email.'|@translate}</div> 
    3723 
     24      <p> 
     25        <label> 
     26          {'Username or email'|@translate} 
     27          <br> 
     28          <input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}> 
     29        </label> 
     30      </p> 
     31 
     32      <p class="bottomButtons"> 
     33        <input type="submit" name="submit" value="{'Change my password'|@translate}"> 
     34      </p> 
     35 
     36    {elseif $action == 'reset'} 
     37 
     38      <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div> 
     39 
     40      <p> 
     41        <label> 
     42          {'New password'|@translate} 
     43          <br> 
     44          <input type="password" name="use_new_pwd" id="use_new_pwd" value=""> 
     45        </label> 
     46      </p> 
     47 
     48      <p> 
     49        <label> 
     50          {'Confirm Password'|@translate} 
     51          <br> 
     52          <input type="password" name="passwordConf" id="passwordConf" value=""> 
     53        </label> 
     54      </p> 
     55 
     56      <p class="bottomButtons"> 
     57        <input type="submit" name="submit" value="{'Submit'|@translate}"> 
     58      </p> 
     59 
     60    {/if} 
     61 
     62  </form> 
     63{/if} 
     64 
     65  <script type="text/javascript"> 
     66  {if $action == 'lost'} 
     67    {literal} 
     68      try{ 
     69        document.getElementById('username_or_email').focus(); 
     70      } 
     71      catch(e){} 
     72    {/literal} 
     73    {elseif $action == 'reset'} 
     74    {literal} 
     75      try{ 
     76        document.getElementById('use_new_pwd').focus(); 
     77      } 
     78      catch(e){} 
     79    {/literal} 
     80  {/if} 
     81 
     82  </script> 
    3883</div> <!-- content --> 
    3984 
  • extensions/gally/gally-default/template/picture.tpl

    r11030 r12592  
    11<!-- **GBL** >PICTURE> --> 
    22 
     3    {if isset($MENUBAR) and #menuAnimated# == "noswitch"} 
     4      <div class="titrePage" id='titrePageID'> 
     5        {$MENUBAR} 
     6      </div> 
     7    {/if} 
     8 
     9 
     10 
     11 
    312{include file='dialogs.tpl'} 
    413 
    5 <div id="content"> 
     14<div id="content" {if isset($MENUBAR)}class="pictureContent"{/if}> 
    615 
    716  <div id="theImageHigh" style="display:none;"> 
     
    2029 
    2130  <div id="imageHeaderBar"> 
     31 
     32    {if isset($MENUBAR) and #menuAnimated# != "noswitch"} 
     33      <div class="titrePage" id='titrePageID'> 
     34        <div id="menuswitcher"> 
     35          <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     36          </a> 
     37        </div> 
     38      </div> 
     39      {$MENUBAR} 
     40    {/if} 
     41 
    2242    <div class="browsePath"> 
    2343      <h2> 
     
    83103          }{/literal} 
    84104          </script> 
    85           <a id="icon_caddie" class="button" href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"></a> 
    86           {/if} {*caddie management END*} 
     105          <a id="icon_caddie" class="button" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"></a> 
     106          {/if} 
     107          <script type="text/javascript"> 
     108            $('div.randomButtons a.button').addClass('sTipOnRight'); 
     109          </script> 
    87110        </div> 
     111 
    88112        {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} 
    89113 
     
    127151 
    128152    {if isset($COMMENT_IMG)} 
    129     <p>{$COMMENT_IMG}</p> 
     153    <p class="imageComment">{$COMMENT_IMG}</p> 
    130154    {else} 
    131155    <p>&nbsp;</p> 
     
    166190 
    167191    </ul> 
     192 
    168193    <div id="theTabsBg"></div> 
    169194 
     
    277302            {/if} 
    278303 
    279             {if (isset($rate_summary) or isset($rating)) and  $display_info.average_rate} 
     304            {if (isset($rate_summary) or isset($rating)) and  $display_info.rating_score} 
    280305              <tr> 
    281306                {if isset($rate_summary)} 
    282                   <td class="label">{'Average rate'|@translate}</td> 
    283                   <td class="value" id="ratingSummary"> 
     307                  <td class="label">{'Rating score'|@translate}</td> 
     308                  <td class="value"> 
    284309                  {if $rate_summary.count} 
    285                     {assign var='rate_text' value='%.2f (rated %d times)'|@translate } 
    286                     {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count) } 
     310                    <span id="ratingScore">{$rate_summary.score}</span> 
     311                    <span id="ratingCount">({assign var='rate_text' value='%d rates'|@translate}{$pwg->sprintf($rate_text, $rate_summary.count)})</span> 
    287312                  {else} 
    288                     {'no rate'|@translate} 
     313                    <span id="ratingScore">{'no rate'|@translate}</span> <span id="ratingCount"></span> 
    289314                  {/if} 
    290315                  </td> 
  • extensions/gally/gally-default/template/picture_content.tpl

    r10972 r12592  
    22 
    33  <div id="theImgContainer" {if isset($high) }onclick="gallyPP.openDisplayHigh('{$high.U_HIGH}');" class="pointer"{/if}> 
    4     <img id="theImg" src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
     4    <img id="theMainImage" src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
    55      {if isset($COMMENT_IMG)} 
    66        title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}" 
  • extensions/gally/gally-default/template/picture_nav_buttons.tpl

    r10971 r12592  
    33 
    44  {if isset($last)} 
    5     <a id="icon_last" class="navButton" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"></a> 
     5    <a id="icon_last" class="navButton" href="{$last.U_IMG}" 
     6       title="<span class='navDesc'><span class='navAction'>{'Last'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$last.THUMB_SRC}' class='thumbLink thumbNav' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$last.TITLE}</span></span>" 
     7       rel="last"></a> 
    68  {else} 
    7     <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a> 
     9    <a id="icon_last_unactive" class="navButton"></a> 
    810  {/if} 
    911 
    1012  {if isset($next)} 
    11     <a id="icon_right" class="navButton" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"></a> 
     13    <a id="icon_right" class="navButton" href="{$next.U_IMG}" 
     14       title="<span class='navDesc'><span class='navAction'>{'Next'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$next.THUMB_SRC}' class='thumbLink thumbNav' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$next.TITLE}</span></span>" 
     15       rel="next"></a> 
    1216  {else} 
    13     <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a> 
     17    <a id="icon_right_unactive" class="navButton"></a> 
    1418  {/if} 
    1519 
     
    2731 
    2832  {if isset($previous)} 
    29     <a id="icon_left" class="navButton" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"></a> 
     33    <a id="icon_left" class="navButton" href="{$previous.U_IMG}" 
     34       title="<span class='navDesc'><span class='navAction'>{'Previous'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$previous.THUMB_SRC}' class='thumbLink' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$previous.TITLE}</span></span>" 
     35       rel="prev"></a> 
    3036  {else} 
    31     <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a> 
     37    <a id="icon_left_unactive" class="navButton"></a> 
    3238  {/if} 
    3339 
    3440  {if isset($first)} 
    35     <a id="icon_first" class="navButton" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"></a> 
     41    <a id="icon_first" class="navButton" href="{$first.U_IMG}" 
     42       title="<span class='navDesc'><span class='navAction'>{'First'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$first.THUMB_SRC}' class='thumbLink thumbNav' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$first.TITLE}</span></span>" 
     43       rel="first"></a> 
    3644  {else} 
    37     <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a> 
     45    <a id="icon_first_unactive" class="navButton"></a> 
    3846  {/if} 
    3947 
     
    5159      <a id="icon_dec_period" class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}"></a> 
    5260    {else} 
    53       <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a> 
     61      <a id="icon_dec_period_unactive" class="navButton" ></a> 
    5462    {/if} 
    5563 
     
    5765      <a id="icon_inc_period" class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}"></a> 
    5866    {else} 
    59       <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a> 
     67      <a id="icon_inc_period_unactive" class="navButton"></a> 
    6068    {/if} 
    6169  {/if} 
  • extensions/gally/gally-default/template/profile.tpl

    r11024 r12592  
    55{include file='dialogs.tpl'} 
    66 
    7   <div class="titrePage"> 
     7  <div class="titrePage" id='titrePageID'> 
     8 
     9    {if isset($MENUBAR)} 
     10      {if #menuAnimated# == "noswitch"} 
     11        {$MENUBAR} 
     12      {else} 
     13      <div id="menuswitcher"> 
     14        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     15        </a> 
     16      </div> 
     17      {/if} 
     18    {/if} 
     19 
    820    <ul class="categoryActions"> 
    921      <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li> 
     
    1224  </div> 
    1325 
     26 
     27  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     28    {$MENUBAR} 
     29  {/if} 
     30 
    1431{$PROFILE_CONTENT} 
    1532</div> <!-- content --> 
  • extensions/gally/gally-default/template/profile_content.tpl

    r11024 r12592  
    4848      <li> 
    4949        <div class="property"> 
    50           <label for="nb_image_line">{'Number of photos per row'|@translate}</label> 
     50          <label for="nb_image_page">{'Number of photos per page'|@translate}</label> 
    5151        </div> 
    52         <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}"> 
    53       </li> 
    54       <li> 
    55         <div class="property"> 
    56           <label for="nb_line_page">{'Number of rows per page'|@translate}</label> 
    57         </div> 
    58         <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" > 
     52        <input type="text" size="3" maxlength="2" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}"> 
    5953      </li> 
    6054      <li> 
  • extensions/gally/gally-default/template/register.tpl

    r11024 r12592  
    11<!-- **GBL** >REGISTER> --> 
     2 
    23 
    34<div id="registerPage"> 
     
    56<div id="content" class="content"> 
    67 
    7   <div class="titrePage"> 
     8  <div class="titrePage" id='titrePageID'> 
     9 
     10    {if isset($MENUBAR)} 
     11      {if #menuAnimated# == "noswitch"} 
     12        {$MENUBAR} 
     13      {else} 
     14      <div id="menuswitcher"> 
     15        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     16        </a> 
     17      </div> 
     18      {/if} 
     19    {/if} 
     20 
    821    <ul class="categoryActions"> 
    922      <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li> 
     
    1124    <h2>{'Registration'|@translate}</h2> 
    1225  </div> 
     26 
     27  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     28    {$MENUBAR} 
     29  {/if} 
    1330 
    1431{include file='dialogs.tpl'} 
     
    4158          <label for="mail_address">{'Email address'|@translate}</label> 
    4259        </div> 
    43         <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" size=35> 
    44         ({'useful when password forgotten'|@translate}) 
     60        <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" size=35>{if $main.obligatory_user_mail_address}<span class="mandatorystar">*</span>{else}({'useful when password forgotten'|@translate}){/if} 
     61 
    4562      </li> 
    4663    </ul> 
  • extensions/gally/gally-default/template/search.tpl

    r11024 r12592  
    11<!-- **GBL** >SEARCH> --> 
     2 
    23<div id="content" class="content"> 
    34 
    4   <div class="titrePage"> 
     5  <div class="titrePage" id='titrePageID'> 
     6 
     7    {if isset($MENUBAR)} 
     8      {if #menuAnimated# == "noswitch"} 
     9        {$MENUBAR} 
     10      {else} 
     11      <div id="menuswitcher"> 
     12        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     13        </a> 
     14      </div> 
     15      {/if} 
     16    {/if} 
     17 
    518    <ul class="categoryActions"> 
    619      <li><a id="icon_help" class="button" href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"> </a></li> 
     
    922    <h2>{'Search'|@translate}</h2> 
    1023  </div> 
     24 
     25 
     26  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     27    {$MENUBAR} 
     28  {/if} 
    1129 
    1230{include file='dialogs.tpl'} 
  • extensions/gally/gally-default/template/tags.tpl

    r11024 r12592  
    11<div id="content" class="content"> 
    22 
    3   <div class="titrePage"> 
     3  <div class="titrePage" id='titrePageID'> 
     4 
     5    {if isset($MENUBAR)} 
     6      {if #menuAnimated# == "noswitch"} 
     7        {$MENUBAR} 
     8      {else} 
     9      <div id="menuswitcher"> 
     10        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp; 
     11        </a> 
     12      </div> 
     13      {/if} 
     14    {/if} 
     15 
     16 
    417    <ul class="categoryActions"> 
    518{if $display_mode == 'letters'} 
     
    1528    <h2>{'Tags'|@translate}</h2> 
    1629  </div> 
     30 
     31 
     32  {if #menuAnimated# != "noswitch" and isset($MENUBAR)} 
     33    {$MENUBAR} 
     34  {/if} 
    1735 
    1836{if isset($tags)} 
     
    3553      {foreach from=$letter.tags item=tag} 
    3654      <tr class="tagLine"> 
    37         <td><a href="{$tag.URL}">{$tag.name}</a></td> 
     55        <td><a href="{$tag.URL}"  title="{$tag.name}">{$tag.name}</a></td> 
    3856        <td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td> 
    3957      </tr> 
  • extensions/gally/gally-default/template/thumbnails.tpl

    r6700 r12592  
    99          <span class="wrap2"> 
    1010          <a href="{$thumbnail.URL}"> 
    11             <img {if isset($thumbnail.LONGDESC) and $thumbnail.LONGDESC!=""}longdesc="{$thumbnail.LONGDESC}"{/if} class="thumbnail {if isset($thumbnail.EXTRA_CLASS)}{$thumbnail.EXTRA_CLASS}{/if}" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" /> 
     11            <img {if isset($thumbnail.LONGDESC) and $thumbnail.LONGDESC!=""}longdesc="{$thumbnail.LONGDESC}"{/if} 
     12                  class="thumbnail {if isset($thumbnail.EXTRA_CLASS)}{$thumbnail.EXTRA_CLASS}{/if}" 
     13                  src="{$thumbnail.TN_SRC}" 
     14                  alt="{$thumbnail.TN_ALT}" 
     15                  title="{$thumbnail.TN_TITLE}" /> 
    1216          </a> 
    1317          </span> 
     
    1620      <tr> 
    1721        <td> 
    18           <span class="thumbLegend"> 
     22          {if $SHOW_THUMBNAIL_CAPTION } 
     23            <span class="thumbLegend"> 
    1924 
    20           {if !empty($thumbnail.icon_ts)} 
    21             <img title="{$thumbnail.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent.png" class="newImage" alt="(!)"> 
    22           {/if} 
    23           {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if} 
     25            {if !empty($thumbnail.icon_ts)} 
     26              <span class="newImage button id_recent"></span> 
     27            {/if} 
     28            {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if} 
    2429 
    2530 
    26           {if isset($thumbnail.NB_COMMENTS)} 
    27           <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments"> 
    28           <br /> 
    29           {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)} 
    30           </span> 
     31            {if isset($thumbnail.NB_COMMENTS)} 
     32            <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments"> 
     33            <br /> 
     34            {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)} 
     35            </span> 
     36            {/if} 
     37 
     38            {if isset($thumbnail.NB_HITS)} 
     39            <span class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits"> 
     40            <br /> 
     41            {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)} 
     42            </span> 
     43            {/if} 
     44            </span> 
    3145          {/if} 
    32  
    33           {if isset($thumbnail.NB_HITS)} 
    34           <span class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits"> 
    35           <br /> 
    36           {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)} 
    37           </span> 
    38           {/if} 
    39           </span> 
    4046        </td> 
    4147      </tr> 
Note: See TracChangeset for help on using the changeset viewer.