Changeset 6978
- Timestamp:
- Sep 20, 2010, 5:31:13 PM (14 years ago)
- Location:
- extensions/Autosize
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Autosize/admin/admin_autosize.php
r6913 r6978 37 37 38 38 $my_base_url = get_admin_plugin_menu_link(__FILE__); 39 39 40 40 41 -
extensions/Autosize/admin/template/admin.tpl
r6936 r6978 48 48 {assign var="visible" value="none"} 49 49 {/if} 50 {if $check_auto_w == true} 51 {assign var="visible_w" value="visible"} 52 {else} 53 {assign var="visible_w" value="hidden"} 54 {/if} 50 55 <div class="titrePage"> 51 56 <h2>{'Autosize'|translate} {'version'|translate}{$version}</h2> … … 62 67 <fieldset> 63 68 <legend class="cluetip" title="{'cl_autosize_config_title_1'|@translate}|{'cl_autosize_hlp_line1'|@translate}">{'cl_autosize_config_title_1'|@translate}</legend> 64 <td>{'User status'|@translate}</td><td>{'cl_autosize_height'|@translate}</td><td style="visibility:hidden">{'width'|@translate}</td> 69 <td>{'User status'|@translate}</td> 70 <td>{'cl_autosize_height'|@translate}</td> 71 <td style="visibility:visible">{'cl_autosize_width'|@translate} 72 <input type="checkbox" name="check_auto_w" value="on" {$check_auto_w} /></td> 65 73 <tr> 66 74 <td>{'user_status_webmaster'|@translate}</td> 67 75 <td><input name="webmaster_height" id="Text7" type="text" value ="{$webmaster_height}" /></td> 68 <td style="visibility: hidden"><input name="webmaster_width" id="Text8" type="text" value ="{$webmaster_width}" /></td>76 <td style="visibility:{$visible_w}"><input name="webmaster_width" id="Text8" type="text" value ="{$webmaster_width}" /></td> 69 77 </tr> 70 78 <tr> 71 79 <td>{'user_status_admin'|@translate}</td> 72 80 <td><input name="admin_height" id="admin_height" type="text" value ="{$admin_height}" /></td> 73 <td style="visibility: hidden"><input name="admin_width" id="admin_width" type="text" value ="{$admin_width}" /></td>81 <td style="visibility:{$visible_w}"><input name="admin_width" id="admin_width" type="text" value ="{$admin_width}" /></td> 74 82 </tr> 75 83 <tr> 76 84 <td>{'user_status_generic'|@translate}</td> 77 85 <td><input name="generic_height" id="Text1" type="text" value ="{$generic_height}" /></td> 78 <td style="visibility: hidden"><input name="generic_width" id="Text2" type="text" value ="{$generic_width}" /></td>86 <td style="visibility:{$visible_w}"><input name="generic_width" id="Text2" type="text" value ="{$generic_width}" /></td> 79 87 </tr> 80 88 <tr> 81 89 <td>{'user_status_guest'|@translate}</td> 82 90 <td><input name="guest_height" id="Text3" type="text" value ="{$guest_height}" /></td> 83 <td style="visibility: hidden"><input name="guest_width" id="Text4" type="text" value ="{$guest_width}" /></td>91 <td style="visibility:{$visible_w}"><input name="guest_width" id="Text4" type="text" value ="{$guest_width}" /></td> 84 92 </tr> 85 93 <tr> 86 94 <td>{'user_status_normal'|@translate}</td> 87 95 <td><input name="normal_height" id="Text5" type="text" value ="{$normal_height}" /></td> 88 <td style="visibility: hidden"><input name="normal_width" id="Text6" type="text" value ="{$normal_width}" /></td>96 <td style="visibility:{$visible_w}"><input name="normal_width" id="Text6" type="text" value ="{$normal_width}" /></td> 89 97 </tr> 90 98 91 99 </fieldset> 92 100 </table> 101 93 102 <br /> 94 103 <table id="table_d" style=" background:none;border:outset;width:90%; z-index:-500 " > -
extensions/Autosize/include/affiche.php
r6936 r6978 5 5 $img_height=isset($picture['current']['height'])?$picture['current']['height']:200; 6 6 $version=isset($version)?$version:""; 7 8 7 $theme=$user['theme']; 9 8 $user_status = $user['status'] ; 10 9 … … 14 13 'version' => $version, 15 14 'AUTOSIZE_PATH' => AUTOSIZE_PATH, 15 'theme' => $theme, 16 16 'SCALED_WIDTH' => $picture['current']['scaled_width'], 17 17 'SCALED_HEIGHT' => $picture['current']['scaled_height'], … … 22 22 'MARGE_BASSE' => $autosize_parametres->marge_basse, 23 23 'ECHELLE_MAX' => $autosize_parametres->echelle_max, 24 'check_auto_w' => ($autosize_parametres->check_auto_w == 'on') ? 'checked="checked"' : '' , 24 25 'webmaster_width' => $autosize_parametres->webmaster_width, 25 26 'webmaster_height' => $autosize_parametres->webmaster_height, -
extensions/Autosize/js/Affiche_script.js
r6954 r6978 1 1 jQuery.noConflict(); 2 2 jQuery(document).ready( 3 4 3 5 function (jQuery) { 6 function Marge_haute(myObj, ajoute_h) { 7 if (ajoute_h) h_p = parseInt(jQuery(myObj).height()); 8 else h_p = 0; 9 10 if (jQuery(myObj).css("marginTop")) 11 if (jQuery(myObj).css("marginTop") != "auto") h_p += parseInt(jQuery(myObj).css("marginTop")); 12 if (jQuery(myObj).css("marginBottom")) 13 if (jQuery(myObj).css("marginBottom") != "auto") h_p += parseInt(jQuery(myObj).css("marginBottom")); 14 if (jQuery(myObj).css("paddingTop")) 15 if (jQuery(myObj).css("paddingTop") != "auto") h_p += parseInt(jQuery(myObj).css("paddingTop")); 16 if (parseInt(jQuery(myObj).css("paddingBottom"))) 17 if (jQuery(myObj).css("paddingBottom") != "auto") h_p += parseInt(jQuery(myObj).css("paddingBottom")); 18 return h_p; 19 } 4 20 //=================================================================== 21 5 22 6 23 7 24 jQuery(window).resize(function (event, ui) { 8 25 if (typeof (event) == 'undefined') return; 26 9 27 var Type_Img = ""; 10 28 //====== détection du type d'images ====== … … 22 40 return; 23 41 } 42 43 24 44 //================================================================= 25 45 switch (Type_Img) { 26 46 case "img": 27 47 var Image = jQuery("#theImage").find("img"); 28 var TheImg = jQuery(Image).get(0); 48 var TheImg = jQuery("#theImg").find("img").get(0); 49 if (!TheImg) 50 TheImg = jQuery(Image).get(0); 29 51 break 30 52 case "img_autre": … … 39 61 break 40 62 case "pamoorama": 63 //========================================================= 41 64 var Images = jQuery("#pamoorama"); 42 65 var Image = jQuery(Images).get(0); … … 44 67 var TheImg = jQuery("#pamoorama").get(0); 45 68 if (!TheImg) return; 69 TheImg = jQuery("#pamoorama_inner"); 70 if (TheImg.length < 1) return; 71 46 72 break 47 73 } … … 49 75 //================================================================================== 50 76 var sel0 = jQuery(TheImg).position(); 77 51 78 if (!sel0) return; 79 type_pos = jQuery(TheImg).css("position"); //static 80 if (jQuery(TheImg).css("position") == "relative") { 81 sel0.top += Marge_haute("#theHeader", true); 82 sel0.top += Marge_haute("#imageHeaderBar", true); 83 sel0.top += Marge_haute(TheImg, false); 84 if (jQuery("#theImage").css("marginTop")) 85 if (jQuery("#theImage").css("marginTop") != "auto") sel0.top += parseInt(jQuery("#theImage").css("marginTop")); 86 if (jQuery("#theImage").css("paddingTop")) 87 if (jQuery("#theImage").css("paddingTop") != "auto") sel0.top += parseInt(jQuery("#theImage").css("paddingTop")); 88 89 } 52 90 53 91 mini_width = parseInt(mini_width); … … 81 119 for (var i = 0; i < Pars.length; i++) { 82 120 P0 = Pars.get(i); 83 h_p += parseInt(jQuery(P0).height()); 84 if (jQuery(P0).css("marginTop")) 85 if (jQuery(P0).css("marginTop") != "auto") h_p += parseInt(jQuery(P0).css("marginTop")); 86 if (jQuery(P0).css("marginBottom")) 87 if (jQuery(P0).css("marginBottom") != "auto") h_p += parseInt(jQuery(P0).css("marginBottom")); 88 if (jQuery(P0).css("paddingTop")) h_p += parseInt(jQuery(P0).css("paddingTop")); 89 if (parseInt(jQuery(P0).css("paddingBottom"))) h_p += parseInt(jQuery(P0).css("paddingBottom")); 90 121 h_p += Marge_haute(P0, true); 91 122 } 92 123 … … 101 132 var Image_height = (winheight - sel0.top) - parseInt(marge_basse) - lmt; 102 133 var height_user = eval(user_status + "_height"); 103 var width_user = eval(user_status + "_width"); 134 104 135 //============================================================= 105 136 var reg1 = new RegExp("%", "g"); … … 108 139 else 109 140 Image_height = parseInt(height_user); 110 //============================================================= 141 142 //============================================================ 111 143 echelle_max = parseFloat(echelle_max, '3'); 112 144 var echelle = parseFloat(Image_height / H0, 3); … … 117 149 } 118 150 119 var Imgage_Width = parseInt(Image_height * rapport); 120 jQuery("#theImage").width("100%"); 121 jQuery("#theImage").height("auto"); 122 123 151 var Image_Width = parseInt(Image_height * rapport); 152 153 //=============================================================== 154 twidth = jQuery("#imageHeaderBar").width(); 155 img_la = jQuery(TheImg).width(); //initiale 156 offset = jQuery(TheImg).position(); 157 158 var winwidth = jQuery(window).width(); 159 var width_user = eval(user_status + "_width"); 160 161 if (check_auto_w == 'checked="checked"') { 162 if (Type_Img != "pamoorama") { 163 widthmin = (winwidth - offset.left); 164 165 if (Image_Width > widthmin) { 166 //============================================================= 167 if (width_user.match(reg1)) 168 Image_Width = Image_Width * parseInt(width_user) / 100; 169 else 170 Image_Width = parseInt(width_user); 171 172 var echelle_w = parseFloat(winwidth / W0, 3); 173 if (echelle_w > echelle_max) { 174 echelle_w = echelle_max; 175 Image_Width = parseInt(W0 * echelle_w); 176 } 177 Image_Width = parseInt(W0 * echelle_w); 178 179 align_auto = "left"; 180 } else { 181 182 align_auto = "center"; 183 } 184 Image_height = parseInt(Image_Width / rapport); 185 186 } 187 188 189 } 190 //============================================================= 124 191 125 192 if (Type_Img == "pamoorama") { 126 h1 = jQuery("#pamoorama").height(); 127 jQuery("#pamoorama").css("overflow", "hidden"); 128 jQuery("#pamoorama").css(jQuery(window).width() + "px"); 129 193 194 195 jQuery("#pamoorama").css("height", Image_height + "px"); 196 jQuery("#pamoorama").css("width", twidth + "px"); 197 198 jQuery("#pamoorama").height(Image_height + "px"); 199 jQuery("#pamoorama").width(twidth + "px"); 200 201 202 203 jQuery("#pamoorama_outter").height(Image_height + "px"); 204 jQuery("#pamoorama_outter").width(twidth + "px"); 205 130 206 jQuery("#pamoorama_outter").css("height", Image_height + "px"); 131 jQuery("#pamoorama_outter").css("width", jQuery(window).width() + "px"); 132 /* 133 jQuery(TheImg).css(Image_height + "px"); 134 jQuery(TheImg).css(jQuery(window).width() + "px"); 135 */ 207 jQuery("#pamoorama_outter").css("width", twidth + "px"); 208 136 209 zoom = Image_height / img_height; 137 210 138 jQuery("#pamoorama_inner").css("zoom", zoom); 211 h_frame = jQuery("#pamoorama_frame").height(); 212 h_width = jQuery("#pamoorama_frame").width(); 213 jQuery(TheImg).css("zoom", zoom); 139 214 140 215 141 216 142 217 } else { 143 jQuery(TheImg).height(Image_height + "px"); 144 jQuery(TheImg).width(Imgage_Width + "px"); 218 if (jQuery("#theImg").css("textAlign")) 219 jQuery("#theImg").css("textAlign", align_auto); 220 221 jQuery(TheImg).height(Image_height + "px"); 222 jQuery(TheImg).width(Image_Width + "px"); 223 jQuery(TheImg).css("height", Image_height + "px"); 224 jQuery(TheImg).css("width", Image_Width + "px"); 145 225 146 226 } … … 155 235 156 236 //=================================================================== 237 157 238 jQuery(window).resize(); 239 158 240 jQuery(window).resize(); 159 241 -
extensions/Autosize/main.inc.php
r6954 r6978 2 2 /* 3 3 Plugin Name: AutoSize 4 Version: 1.0. 64 Version: 1.0.7 5 5 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation 6 6 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448 … … 22 22 global $content, $element_info; 23 23 global $infos_message,$erreur_message; 24 global $conf,$lang ; 24 global $conf,$lang ,$user; 25 25 26 if ( $page['body_id']=='thePicturePage' ) { 26 27 if ( isset($picture['current'])){ … … 51 52 function cl_autosize_aff_infos_plus() 52 53 { 53 global $template,$infos_message,$erreur_message, $user ; ;54 global $template,$infos_message,$erreur_message, $user ; 54 55 global $conf,$lang ; 56 55 57 //============================================================== 56 58 if (isset($erreur_message)) … … 93 95 //============================================================================= 94 96 $autosize_parametres->webmaster_height =(isset($_POST['webmaster_height'])) ? $_POST['webmaster_height'] : ((isset($autosize_parametres->webmaster_height )) ? $autosize_parametres->webmaster_height : '100%' ) ; 95 $autosize_parametres->webmaster_width=(isset($_POST['webmaster_width']))? $_POST['webmaster_width']: ((isset($autosize_parametres->webmaster_width)) ? $autosize_parametres->webmaster_width: ' 100%') ;97 $autosize_parametres->webmaster_width=(isset($_POST['webmaster_width']))? $_POST['webmaster_width']: ((isset($autosize_parametres->webmaster_width)) ? $autosize_parametres->webmaster_width: '90%') ; 96 98 97 $autosize_parametres->admin_height =(isset($_POST['admin_height'])) ? $_POST['admin_height'] : ((isset($autosize_parametres->admin_height )) ? $autosize_parametres->admin_height : ' 100%' ) ;98 $autosize_parametres->admin_width=(isset($_POST['admin_width']))? $_POST['admin_width']: ((isset($autosize_parametres->admin_width)) ? $autosize_parametres->admin_width: ' 100%') ;99 $autosize_parametres->admin_height =(isset($_POST['admin_height'])) ? $_POST['admin_height'] : ((isset($autosize_parametres->admin_height )) ? $autosize_parametres->admin_height : '90%' ) ; 100 $autosize_parametres->admin_width=(isset($_POST['admin_width']))? $_POST['admin_width']: ((isset($autosize_parametres->admin_width)) ? $autosize_parametres->admin_width: '90%') ; 99 101 100 $autosize_parametres->generic_height =(isset($_POST['generic_height'])) ? $_POST['generic_height'] : ((isset($autosize_parametres->generic_height )) ? $autosize_parametres->generic_height : ' 200px' ) ;101 $autosize_parametres->generic_width=(isset($_POST['generic_width']))? $_POST['generic_width']: ((isset($autosize_parametres->generic_width)) ? $autosize_parametres->generic_width: ' 300px') ;102 $autosize_parametres->generic_height =(isset($_POST['generic_height'])) ? $_POST['generic_height'] : ((isset($autosize_parametres->generic_height )) ? $autosize_parametres->generic_height : '100%' ) ; 103 $autosize_parametres->generic_width=(isset($_POST['generic_width']))? $_POST['generic_width']: ((isset($autosize_parametres->generic_width)) ? $autosize_parametres->generic_width: '90%') ; 102 104 103 $autosize_parametres->guest_height =(isset($_POST['guest_height'])) ? $_POST['guest_height'] : ((isset($autosize_parametres->guest_height )) ? $autosize_parametres->guest_height : '1 50px' ) ;104 $autosize_parametres->guest_width=(isset($_POST['guest_width']))? $_POST['guest_width']: ((isset($autosize_parametres->guest_width)) ? $autosize_parametres->guest_width: ' 200px') ;105 $autosize_parametres->guest_height =(isset($_POST['guest_height'])) ? $_POST['guest_height'] : ((isset($autosize_parametres->guest_height )) ? $autosize_parametres->guest_height : '100%' ) ; 106 $autosize_parametres->guest_width=(isset($_POST['guest_width']))? $_POST['guest_width']: ((isset($autosize_parametres->guest_width)) ? $autosize_parametres->guest_width: '90%') ; 105 107 106 $autosize_parametres->normal_height =(isset($_POST['normal_height'])) ? $_POST['normal_height'] : ((isset($autosize_parametres->normal_height )) ? $autosize_parametres->normal_height : '1 50px' ) ;107 $autosize_parametres->normal_width=(isset($_POST['normal_width']))? $_POST['normal_width']: ((isset($autosize_parametres->normal_width)) ? $autosize_parametres->normal_width: ' 100px') ;108 $autosize_parametres->normal_height =(isset($_POST['normal_height'])) ? $_POST['normal_height'] : ((isset($autosize_parametres->normal_height )) ? $autosize_parametres->normal_height : '100%' ) ; 109 $autosize_parametres->normal_width=(isset($_POST['normal_width']))? $_POST['normal_width']: ((isset($autosize_parametres->normal_width)) ? $autosize_parametres->normal_width: '90%') ; 108 110 109 111 … … 113 115 $autosize_parametres->echelle_max=(isset($_POST['echelle_max']))? $_POST['echelle_max'] : ((isset($autosize_parametres->echelle_max)) ? $autosize_parametres->echelle_max : '1.2'); 114 116 $autosize_parametres->marge_basse=(isset($_POST['marge_basse']))? $_POST['marge_basse']: ((isset($autosize_parametres->marge_basse)) ? $autosize_parametres->marge_basse : '50'); 115 //================================================================================== 117 //=============================================================================== 118 119 if ( isset($_POST['submit'] ) && $_POST['submit'] == l10n('cl_autosize_save') ) { 120 121 $autosize_parametres->check_auto_w = isset($_POST['check_auto_w']) ? $_POST['check_auto_w'] : "off" ; 122 }else{ 123 $autosize_parametres->check_auto_w = isset($_POST['check_auto_w']) ? $_POST['check_auto_w'] : ( ( isset($autosize_parametres->check_auto_w) ) ? $autosize_parametres->check_auto_w : 'off') ; ; 124 } 116 125 117 126 return $autosize_parametres; 118 119 120 127 } 121 128 //======================================================================== -
extensions/Autosize/template/autosize.tpl
r6953 r6978 20 20 var generic_height='{ $generic_height }'; 21 21 var guest_width='{ $guest_width }'; 22 var guest_height='{ $guest_height }'; 23 var normal_width='{ $normal_width }'; 24 var normal_height='{ $normal_height }'; 25 var user_status='{ $user_status }'; 26 22 var guest_height='{$guest_height}'; 23 var normal_width='{$normal_width}'; 24 var normal_height='{$normal_height}'; 25 var user_status='{$user_status}'; 26 var user_status = '{$user_status}'; 27 var check_auto_w = '{$check_auto_w}'; 27 28 </script> 28 29 <style type="text/css">
Note: See TracChangeset
for help on using the changeset viewer.