Changeset 6700


Ignore:
Timestamp:
Jul 24, 2010, 3:57:36 PM (10 years ago)
Author:
grum
Message:

Version 1.3.1, fix bug:1654, bug:1767

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

Legend:

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

    r6109 r6700  
    197197  public function getFile($type, $fileName)
    198198  {
    199     if(file_exists($this->directories[$type.'.local'].'/'.$fileName))
     199    if(@file_exists($this->directories[$type.'.local'].'/'.$fileName))
    200200    {
    201201      return($this->directories[$type.'.local'].'/'.$fileName);
    202202    }
    203     elseif(file_exists($this->directories[$type.'.parent'].'/'.$fileName))
     203    elseif(@file_exists($this->directories[$type.'.parent'].'/'.$fileName))
    204204    {
    205205      return($this->directories[$type.'.parent'].'/'.$fileName);
  • extensions/gally/gally-default/release_notes.txt

    r6109 r6700  
    7575  |         |            |   . The information bar is not displayed with IE7
    7676  |         |            |
    77   |         |            |
    78   |         |            |
    79   |         |            |
     77  | 1.3.1   | 2010-07-09 | * mantis: bug 1767
     78  |         |            |   . Local.conf file is not loaded
     79  |         |            | * mantis: bug 1654
     80  |         |            |   . warning on the admin configuration page
    8081  |         |            |
    8182  |         |            |
  • extensions/gally/gally-default/template/header.tpl

    r6109 r6700  
    5757      {
    5858        $dir=dirname($_SERVER['SCRIPT_FILENAME'])."/themes/".$theme['id']."/conf/";
     59        $dirlocal=dirname($_SERVER['SCRIPT_FILENAME'])."/local/themes/".$theme['id']."/conf/";
    5960        $this->assign("default_conf", $dir."default.conf");
    60         if(file_exists($dir."local.conf"))
     61        if(file_exists($dirlocal."local.conf"))
    6162        {
    62           $this->assign("local_conf", $dir."local.conf");
     63          $this->assign("local_conf", $dirlocal."local.conf");
    6364        }
    6465        else
  • extensions/gally/gally-default/template/mainpage_categories.tpl

    r6109 r6700  
    77      <div class="illustration">
    88        <a href="{$cat.URL}">
    9           <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'shows images at the root of this category'|@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:'"':' '} - {'shows images at the root of this category'|@translate}">
    1010        </a>
    1111      </div>
  • extensions/gally/gally-default/template/thumbnails.tpl

    r6109 r6700  
    99          <span class="wrap2">
    1010          <a href="{$thumbnail.URL}">
    11             <img class="thumbnail" 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} class="thumbnail {if isset($thumbnail.EXTRA_CLASS)}{$thumbnail.EXTRA_CLASS}{/if}" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" />
    1212          </a>
    1313          </span>
  • extensions/gally/gally-default/themeconf.inc.php

    r6109 r6700  
    22/*
    33Theme Name: Gally
    4 Version: 1.3.0
     4Version: 1.3.1
    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.