Changeset 29918 for extensions
- Timestamp:
- Oct 7, 2014, 5:01:31 PM (10 years ago)
- Location:
- extensions/Fotorama
- Files:
-
- 3 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Fotorama/admin.php
r29915 r29918 19 19 'close_button' => isset($_POST['close_button']), 20 20 'resize' => isset($_POST['resize']), 21 'info_button' => isset($_POST['info_button']), 21 22 ); 22 23 if (isset($_POST['allowfullscreen'])) -
extensions/Fotorama/language/en_UK/plugin.lang.php
r29916 r29918 21 21 $lang['Waiting time before loading a new image'] = 'Waiting time before loading a new picture'; 22 22 $lang['milliseconds'] = 'milliseconds'; 23 $lang['Add image info button'] = 'Add image info button'; 23 24 24 25 ?> -
extensions/Fotorama/language/ru_RU/plugin.lang.php
r29916 r29918 21 21 $lang['Waiting time before loading a new image'] = 'Ждать перед сменой изображения'; 22 22 $lang['milliseconds'] = 'миллисекунд'; 23 $lang['Add image info button'] = 'Добавить кнопку информации об изображении'; 23 24 24 25 ?> -
extensions/Fotorama/main.inc.php
r29917 r29918 55 55 if (!isset($conf['Fotorama']['period'])) { 56 56 $conf['Fotorama']['period'] = 4000; 57 $conf['Fotorama']['info_button'] = false; 57 58 } 58 59 } … … 61 62 { 62 63 global $template, $conf, $user, $page; 63 64 if ($conf['Fotorama']['replace_picture'] and (!$conf['Fotorama']['replace_picture_only_users'] or !is_admin()) )64 65 if ($conf['Fotorama']['replace_picture'] and (!$conf['Fotorama']['replace_picture_only_users'] or !is_admin()) and (!isset($_GET['slidestop']))) 65 66 { 66 67 $page['slideshow'] = true; … … 85 86 $template->assign('replace_picture', true); 86 87 } 87 88 88 89 if ($page['slideshow'] and $conf['light_slideshow']) 89 90 { … … 184 185 global $template, $conf, $page; 185 186 186 if ($conf['Fotorama']['replace_picture'] and (!$conf['Fotorama']['replace_picture_only_users'] or !is_admin()) )187 if ($conf['Fotorama']['replace_picture'] and (!$conf['Fotorama']['replace_picture_only_users'] or !is_admin()) and (!isset($_GET['slidestop']))) 187 188 { 188 189 $page['slideshow'] = true; -
extensions/Fotorama/maintain.inc.php
r29915 r29918 26 26 'resize' => false, 27 27 'period' => 4000, 28 'info_button' => false, 28 29 ); 29 30 -
extensions/Fotorama/template/admin.tpl
r29916 r29918 34 34 <label for="close_button"> 35 35 <b>{'Add close button'|translate}</b> 36 </label> 37 </li> 38 <li> 39 <input type="checkbox" id="info_button" name="info_button"{if $Fotorama.info_button} checked="checked"{/if}> 40 <label for="info_button"> 41 <b>{'Add image info button'|translate}</b> 36 42 </label> 37 43 </li> -
extensions/Fotorama/template/close_button.css
r29730 r29918 14 14 @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 2dppx) { 15 15 .fotorama__close-icon { 16 background: url(' plugins/Fotorama/fotorama/fotorama@2x.png') no-repeat scroll -64px 0;16 background: url('../fotorama/fotorama@2x.png') no-repeat scroll -64px 0; 17 17 background-size: 96px 160px; 18 18 } -
extensions/Fotorama/template/fotorama-content.tpl
r29915 r29918 4 4 {if $Fotorama.close_button} 5 5 {combine_css path="plugins/Fotorama/template/close_button.css"} 6 {/if} 7 {if $Fotorama.info_button} 8 {combine_css path="plugins/Fotorama/template/info_button.css"} 6 9 {/if} 7 10 … … 25 28 <a href="{$U_SLIDESHOW_STOP}" class="fotorama__close-icon"></a> 26 29 {/if} 30 <a class="fotorama__info-icon"></a> 27 31 28 32 {footer_script require='jquery'} … … 40 44 jQuery('#slideshow .browsePath a').attr('href', fotorama.activeFrame['url']); 41 45 {/if} 46 47 jQuery('a.fotorama__info-icon').attr('href', fotorama.activeFrame['url']+'&slidestop='); 42 48 43 49 jQuery('#slideshow .showtitle').text(fotorama.activeFrame['caption']); … … 116 122 }); 117 123 {/if} 124 {if $Fotorama.info_button} 125 jQuery('.fotorama').on('fotorama:ready', function (e, fotorama) { 126 jQuery('.fotorama__info-icon').detach().insertAfter('.fotorama__fullscreen-icon'); 127 }); 128 {/if} 118 129 119 130 {if $Fotorama.autoplay}
Note: See TracChangeset
for help on using the changeset viewer.