Changeset 7337 for extensions/gally


Ignore:
Timestamp:
10/22/10 10:03:09 (9 years ago)
Author:
grum
Message:

fix bug:1948

Location:
extensions/gally
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/gally/gally-cuise/admin/maintain.inc.php

    r6471 r7337  
    11<?php 
     2 
     3include_once(PHPWG_THEMES_PATH.'gally-default/admin/Conf.class.inc.php'); 
     4 
    25 
    36function theme_activate($id, $version, &$errors) 
    47{ 
    5  
     8  $config = new Conf(); 
     9  $config->setFileName(PHPWG_ROOT_PATH."local/themes/gally-cuise/conf/local.conf"); 
     10  $config->read(false); 
     11  $config->setConf(array('menuAnimated'=>'fade'), false); 
     12  $config->write(); 
    613} 
    714 
  • extensions/gally/gally-default/admin/GallyDefault.class.inc.php

    r6752 r7337  
    5252    $this->setDirectoryPrivate('templates.local', $templateDirectory); 
    5353 
     54 
    5455    $this->setDirectoryPrivate('conf.parent', dirname(dirname(__FILE__)).'/conf'); 
    5556    $this->setDirectoryPrivate('conf.local', $confDirectory); 
     
    8990    $this->config = new Conf(); 
    9091    $this->config->setFileName($this->directories['conf.parent']."/default.conf"); 
     92    $this->config->read(); 
     93    $this->config->setFileName($this->directories['conf.local']."/default.conf"); 
    9194    $this->config->read(); 
    9295    $this->config->setFileName(PHPWG_ROOT_PATH."local/themes/".basename(dirname($this->directories['conf.local']))."/conf/local.conf"); 
  • extensions/gally/gally-default/js/gallyjs-tpp.js

    r6956 r7337  
    44  ------------------------------------------------------------------------------ 
    55  file: gally/gallyjs-tpp.js 
    6   file release: 1.2.0 
     6  file release: 1.3.4 
    77  ------------------------------------------------------------------------------ 
    88  author: grum at grum.dnsalias.com 
     
    157157  $(window).resize( function () { initializeImageMode("resize"); } ); 
    158158 
    159   $(document).data("initialized", 1); 
     159  $(document).data("initialized", 1).trigger('gallyInterfaceReady'); 
    160160} 
    161161 
     
    214214        deadArea = $("#navThumbPrev").attr("clientWidth")*1.2; 
    215215        mouse=Math.max(Math.min(event.clientX-this.offsetLeft, this.clientWidth - deadArea), deadArea); 
    216         $("#theImg").css("left",Math.round(($("#theImg").attr("scrollWidth")-this.clientWidth) * -(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px"); 
     216        $("#theImg") 
     217          .css("left",Math.round(($("#theImg").attr("scrollWidth")-this.clientWidth) * -(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px") 
     218          .trigger('scrolled'); 
    217219      } 
    218220    ); 
  • extensions/gally/gally-default/release_notes.txt

    r7329 r7337  
    107107  | 1.3.5   | 2010-10-21 | * add IT and DE languages 
    108108  |         |            | 
    109   |         |            | 
    110   |         |            | 
     109  |         |            | * mantis bug:1948 
     110  |         |            |   . default conf file is not the right conf file  
    111111  |         |            | 
    112112  |         |            | 
  • extensions/gally/gally-graphite/admin/maintain.inc.php

    r6109 r7337  
    11<?php 
     2 
     3include_once(PHPWG_THEMES_PATH.'gally-default/admin/Conf.class.inc.php'); 
    24 
    35function theme_activate($id, $version, &$errors) 
    46{ 
    5  
     7  $config = new Conf(); 
     8  $config->setFileName(PHPWG_ROOT_PATH."local/themes/gally-graphite/conf/local.conf"); 
     9  $config->read(false); 
     10  $config->setConf(array('menuAnimated'=>'none'), false); 
     11  $config->write(); 
    612} 
    713 
  • extensions/gally/gally-graphite/themeconf.inc.php

    r6109 r7337  
    22/* 
    33Theme Name: Gally/Graphite 
    4 Version: 1.3.0 
     4Version: 1.3.5 
    55Description: Grey theme 
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=381 
     
    1010 
    1111$themeconf = array( 
     12  'name' => 'gally-graphite', 
    1213  'theme' => 'gally-graphite', 
    1314  'parent' => 'gally-default', 
  • extensions/gally/gally-grum-dark-II/admin/maintain.inc.php

    r6109 r7337  
    11<?php 
     2 
     3include_once(PHPWG_THEMES_PATH.'gally-default/admin/Conf.class.inc.php'); 
     4 
    25 
    36function theme_activate($id, $version, &$errors) 
    47{ 
    5  
     8  $config = new Conf(); 
     9  $config->setFileName(PHPWG_ROOT_PATH."local/themes/gally-grum-dark-II/conf/local.conf"); 
     10  $config->read(false); 
     11  $config->setConf(array('menuAnimated'=>'fade'), false); 
     12  $config->write(); 
    613} 
    714 
  • extensions/gally/gally-grum-dark-II/themeconf.inc.php

    r6109 r7337  
    22/* 
    33Theme Name: Gally/Grum dark II 
    4 Version: 1.3.0 
     4Version: 1.3.5 
    55Description: Dark theme 
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=371 
     
    1010 
    1111$themeconf = array( 
     12  'name' => 'gally-grum-dark-II', 
    1213  'theme' => 'gally-grum-dark-II', 
    1314  'parent' => 'gally-default', 
  • extensions/gally/gally-lapis-lazuli/themeconf.inc.php

    r6109 r7337  
    22/* 
    33Theme Name: Gally/Lapis-lazuli 
    4 Version: 1.3.0 
     4Version: 1.3.5 
    55Description: Blue theme 
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=380 
     
    1212 
    1313$themeconf = array( 
     14  'name' => 'gally-lapis-lazuli', 
    1415  'theme' => 'gally-lapis-lazuli', 
    1516  'parent' => 'gally-default', 
Note: See TracChangeset for help on using the changeset viewer.