Changeset 3690


Ignore:
Timestamp:
Jul 27, 2009, 12:01:10 PM (15 years ago)
Author:
grum
Message:

Update AMM 2.1.1 - bug resolved + improvement
See main.inc.php file for details

Location:
extensions/AMenuManager
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • extensions/AMenuManager/admin/amm_randompicconfig.tpl

    r3681 r3690  
    4343    $("#iamm_rp_pc_slider").slider(
    4444      {
    45         min:0, 
     45        min:0,
    4646        max:60000,
    4747        steps:120,
     
    4949        slide: function(event, ui) { formatDelay(ui.value); }
    5050      });
     51
     52    formatHeight({/literal}{$datas.height}{literal});
     53    $("#iamm_rp_height_slider").slider(
     54      {
     55        min:99,
     56        max:300,
     57        steps:201,
     58        startValue:affectHeight({/literal}{$datas.height}{literal}),
     59        slide: function(event, ui) { formatHeight(ui.value); }
     60      });
    5161  }
    5262
    5363  function formatDelay(delay)
    54   { 
     64  {
    5565    $("#iamm_randompicture_periodicchange").val(delay);
    5666    if(delay==0)
     
    6272      $("#iamm_rp_pc_display").html((delay/1000).toFixed(2)+"s");
    6373    }
     74  }
     75
     76  function formatHeight(height)
     77  {
     78    (height==99)?vheight=0:vheight=height;
     79
     80    $("#iamm_randompicture_height").val(vheight);
     81    if(vheight==0)
     82    {
     83      $("#iamm_rp_height_display").html("{/literal}{'g002_setting_randompic_height_auto'|@translate}{literal}");
     84    }
     85    else
     86    {
     87      $("#iamm_rp_height_display").html(vheight+"px");
     88    }
     89  }
     90
     91  function affectHeight(height)
     92  {
     93    if(height==0)
     94    {return(0);}else{return(height);}
    6495  }
    6596
     
    110141      <tr>
    111142        <td>{'g002_setting_block_title'|@translate}</td>
    112         <td>
     143        <td colspan="2">
    113144          <input type="text" id="iamm_randompicture_title" value="" maxlength="50" onkeyup="apply_changes('iamm_randompicture_title');" onblur="apply_changes('iamm_randompicture_title');"/>
    114145          <select onchange="change_lang();" id="islang">
     
    119150      <tr>
    120151        <td></td>
    121         <td style="font-size:80%;">
     152        <td style="font-size:80%;" colspan="2">
    122153          <a style="cursor:pointer;" onclick="do_translation()">{'g002_translate'|@translate}</a>
    123154        </td>
    124155      </tr>
     156
     157      <tr>
     158        <td>{'g002_setting_randompic_height'|@translate}</td>
     159        <td>
     160          <input type="hidden" name="famm_randompicture_height" id="iamm_randompicture_height" value="{$datas.height}">
     161          <div id="iamm_rp_height_slider"></div>
     162        </td>
     163        <td width="90px">
     164          <div id="iamm_rp_height_display"></div>
     165        </td>
     166      </tr>
     167
    125168
    126169    </table>
  • extensions/AMenuManager/amm2.css

    r3681 r3690  
    33  font-size:85%;
    44  float:none;
    5   width:100%;
     5  margin-right:auto;
     6  margin-left:auto;
     7  max-width:180px;
     8  position:relative;
     9  padding:10px;
     10}
     11
     12.ammillustrationc{
     13  margin:0px 10px 10px 10px;
    614}
    715
    816#menubar dd.randompicdd {
    9   /*min-height:180px;*/
    10   margin:10px;
    1117  display:block;
     18  margin-left:0px;
    1219}
     20
     21#irandompicinner {
     22  width:100%;
     23  overflow:hidden;
     24  float:none;
     25}
     26
     27
  • extensions/AMenuManager/amm_aip.class.inc.php

    r3681 r3690  
    467467  protected function action_randompic_modify_config()
    468468  {
     469    $this->my_config['amm_randompicture_height']=$_POST['famm_randompicture_height'];
    469470    $this->my_config['amm_randompicture_periodicchange']=$_POST['famm_randompicture_periodicchange'];
    470471    $this->my_config['amm_randompicture_showname']=$_POST['famm_randompicture_showname'];
     
    529530      'showcomment_selected' => $this->my_config['amm_randompicture_showcomment'],
    530531      'periodic_change' => $this->my_config['amm_randompicture_periodicchange'],
     532      'height' => $this->my_config['amm_randompicture_height'],
    531533      'lang_selected' => $user['language'],
    532534      'fromlang' => substr($user['language'],0,2)
  • extensions/AMenuManager/amm_pip.class.inc.php

    r3683 r3690  
    33  Plugin     : Advanced Menu Manager
    44  Author     : Grum
    5     email    : grum@grum.dnsalias.com
    6     website  : http://photos.grum.dnsalias.com
     5    email    : grum@piwigo.org
     6    website  : http://photos.grum.fr
    77    PWG user : http://forum.phpwebgallery.net/profile.php?id=3706
    88
     
    7878    {
    7979      $block->set_title(  base64_decode($this->my_config['amm_randompicture_title'][$user['language']]) );
    80       $block->data = array("delay" => $this->my_config['amm_randompicture_periodicchange']);
     80      $block->data = array(
     81        "delay" => $this->my_config['amm_randompicture_periodicchange'],
     82        "blockHeight" => $this->my_config['amm_randompicture_height'],
     83        "firstPicture" => $this->ajax_amm_get_random_picture()
     84      );
    8185      $block->template = dirname(__FILE__).'/menu_templates/menubar_randompic.tpl';
    8286    }
  • extensions/AMenuManager/amm_root.class.inc.php

    r3681 r3690  
    4747      'amm_randompicture_showcomment' => 'n',   //n:no, o:over, u:under
    4848      'amm_randompicture_periodicchange' => 0,   //0: no periodic change ; periodic change in milliseconds
     49      'amm_randompicture_height' => 0,           //0: automatic, otherwise it's the fixed height in pixels
    4950      'amm_randompicture_title' => array(),
    5051      'amm_sections_modspecials' => array(
  • extensions/AMenuManager/language/de_DE/plugin.lang.php

    r3682 r3690  
    9090$lang['g002_setting_randompic_periodicchange_delay'] = "Frist";
    9191$lang['g002_setting_randompic_periodicchange_deactivated'] = "Deaktiviert";
     92$lang['g002_setting_randompic_height'] = "Höhe der Block Menü";
     93$lang['g002_setting_randompic_height_auto'] = "Auto";
    9294
    9395?>
  • extensions/AMenuManager/language/en_UK/plugin.lang.php

    r3682 r3690  
    8989$lang['g002_setting_randompic_periodicchange_delay'] = "Delay";
    9090$lang['g002_setting_randompic_periodicchange_deactivated'] = "Disabled";
    91 
     91$lang['g002_setting_randompic_height'] = "Height of menu block";
     92$lang['g002_setting_randompic_height_auto'] = "Automatic";
    9293
    9394?>
  • extensions/AMenuManager/language/fr_FR/plugin.lang.php

    r3681 r3690  
    8989$lang['g002_setting_randompic_periodicchange_delay'] = "Délai";
    9090$lang['g002_setting_randompic_periodicchange_deactivated'] = "Désactivé";
    91 
     91$lang['g002_setting_randompic_height'] = "Hauteur du bloc de menu";
     92$lang['g002_setting_randompic_height_auto'] = "Automatique";
    9293?>
  • extensions/AMenuManager/language/it_IT/plugin.lang.php

    r3688 r3690  
    8888$lang['g002_setting_randompic_periodicchange'] = "Cambiamento periodico dell\'immagine";
    8989$lang['g002_setting_randompic_periodicchange_delay'] = "Ritardo";
    90 $lang['g002_setting_randompic_periodicchange_deactivated'] = "Disattivato";
     90$lang['g002_setting_randompic_periodicchange_deactivated'] = "Disabili";
     91$lang['g002_setting_randompic_height'] = "Altezza blocco del menu";
     92$lang['g002_setting_randompic_height_auto'] = "Automatico";
    9193
    9294?>
  • extensions/AMenuManager/main.inc.php

    r3683 r3690  
    22/*
    33Plugin Name: Advanced Menu Manager
    4 Version: 2.1.0
     4Version: 2.1.1
    55Description: Gestion avancée du menu / Advanced management of menu
    66Plugin URI: http://piwigo.org
     
    3232|         |            |   (cf. post:107877 on french forum)
    3333|         |            |   (cf. topic:14374 on french forum)
     34| 2.1.1   | 2009/07/27 | * random picture is preloaded before the first ajax call
     35|         |            |   assuming the display of a thumbnail even if javascript
     36|         |            |   is disabled on the browser
     37|         |            |   (cf. post:116807 on french forum)
     38|         |            | * give the possibility to choose between an automatic
     39|         |            |   and a fixed height for the block menu
     40|         |            |   (cf. post:116804 on french forum)
     41|         |            | * compatibility with Sylvia theme
     42|         |            |   (cf. post:116800 on french forum)
     43|         |            |
    3444|         |            |
    3545|         |            |
     
    6070define('AMM_PATH' , PHPWG_PLUGINS_PATH . AMM_DIR . '/');
    6171
    62 define('AMM_VERSION' , '2.1.0'); // => ne pas oublier la version dans l'entête !!
     72define('AMM_VERSION' , '2.1.1'); // => ne pas oublier la version dans l'entête !!
    6373
    6474global $prefixeTable, $page;
  • extensions/AMenuManager/menu_templates/menubar_randompic.tpl

    r3681 r3690  
    66{literal}
    77<script type="text/javascript">
    8 //var divnum = 1;
    9 //var divprec = 0;
     8var fixedHeight = {/literal}{$block->data.blockHeight}{literal};
    109
    1110  function init()
    1211  {
    13     $("#iamm_ill0").hide();
    14     //$("#iamm_ill1").hide();
     12    {/literal}
     13    {if $block->data.blockHeight>0}
     14      $("#irandompicinner").height(fixedHeight);
     15      {literal}$("#iammrpic").load( function () { computePositionTop(); } );{/literal}
     16    {else}
     17      {literal}
     18      $("#iammrpic").load( function () { $("#irandompicinner").animate({height: ($("#iamm_ill0").innerHeight())+"px"}, "normal"); } );
     19      {/literal}
     20    {/if}
     21    {literal}
     22  }
     23
     24  function computePositionTop()
     25  {
     26    $("#iamm_ill0").css({top:(fixedHeight-$("#iamm_ill0").innerHeight())/2});
    1527  }
    1628
    1729  function getRandomPicture()
    1830  {
    19     //divprec=divnum;
    20     //divnum=1-divnum;
    2131    $.get("./index.php", {ajaxfct:"randompic"},
    2232      function (data)
     
    2535        {
    2636          $("#iamm_ill0").html(data);
    27           $("#iammrpic").load( function () {
    28             $("#irandompicdd").animate({height: ($("#iamm_ill0").height())+"px"}, "normal", function ()
    29             {
    30               $("#iamm_ill0").fadeTo('slow', 1, function ()
     37
     38          {/literal}
     39          {if $block->data.blockHeight>0}
     40            {literal}
     41            $("#iammrpic").load( function () {
     42              computePositionTop();
     43              $("#iamm_ill0").fadeTo('slow', 1);
     44            } );
     45            {/literal}
     46          {else}
     47            {literal}
     48            $("#iammrpic").load( function () {
     49              $("#irandompicinner").animate({height: ($("#iamm_ill0").innerHeight())+"px"}, "normal", function ()
    3150              {
    32                 $("#irandompicdd").animate({height: this.clientHeight+"px"}, "normal");
     51                $("#iamm_ill0").fadeTo('slow', 1, function ()
     52                {
     53                  $("#irandompicinner").animate({height: this.clientHeight+"px"}, "normal");
     54                });
    3355              });
    34             });
    35           } );
     56            } );
     57            {/literal}
     58          {/if}
     59          {literal}
     60
    3661        } );
    3762      }
    3863    );
    3964  }
     65
     66
    4067</script>
    4168{/literal}
    4269
    4370<dd id="irandompicdd" class="randompicdd">
    44   <div id="iamm_ill0" class="illustration ammillustration"></div>
    45   <!--<div id="iamm_ill1" class="illustration ammillustration"></div>-->
     71  <div id="irandompicinner" class="illustration">
     72    <div class="ammillustrationc">
     73      <div id="iamm_ill0" class="ammillustration">{$block->data.firstPicture}</div>
     74    </div>
     75  </div>
    4676</dd>
    4777
    4878<script type="text/javascript">
    49   getRandomPicture();
     79  init();
    5080  {if $block->data.delay > 0 }
    5181    var vIntervalID = window.setInterval(getRandomPicture, {$block->data.delay});
Note: See TracChangeset for help on using the changeset viewer.