Changeset 18234 for extensions
- Timestamp:
- Sep 25, 2012, 12:36:16 PM (12 years ago)
- Location:
- extensions/Autosize
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Autosize/admin/template/admin.tpl
r16931 r18234 6 6 <style type="text/css"> 7 7 .td_autosize { 8 width: 25%; 9 font-style: italic; 8 font-weight: bold; 9 background-color:transparent; 10 border:none; 11 padding-right:10px; 12 } 13 14 .sizeForUserStatus, .autosizeConfig { 15 margin:0; 16 background:none; 17 z-index:-500; 18 } 19 20 .autosizeConfig .cluetip { 21 font-weight:bold; 22 padding-right:10px; 23 } 24 25 .autosizeConfig input[type="text"] { 26 width:50px; 10 27 } 11 28 </style> … … 87 104 <h2>{'Autosize'|translate} {'version'|translate} {$cl_version}</h2> 88 105 </div> 89 <span>{'cl_autosize_Howto'|translate}</span>90 91 92 106 93 107 <!--============== !DIV ==={$IMG_WIDTH }=={$IMG_HEIGHT }======--> 94 <table >95 108 <form action="" method="post" name="form_autosize" id="form_autosize" > 96 109 97 <table id="table0" style=" background:none;border:outset;width:90%; z-index:-500 " >98 110 <fieldset> 99 111 <legend class="cluetip" title="{'cl_autosize_config_title_1'|@translate}|{'cl_autosize_hlp_line1'|@translate}">{'cl_autosize_config_title_1'|@translate}</legend> 112 <table class="sizeForUserStatus"> 113 <tr> 100 114 <td class="td_autosize pluginBox">{'User status'|@translate}</td> 101 115 <td class="td_autosize pluginBox">{'Photo sizes'|@translate}</td> 102 <td class="td_autosize pluginBox">{'cl_autosize_enabled'|@translate}</td>116 </tr> 103 117 <tr name="webmaster_enabled"> 104 118 105 <td> {'user_status_webmaster'|@translate}</td>119 <td><label><input name="webmaster_enabled" id="webmaster_enabled" type="checkbox" value ="on" {$webmaster_enabled} /> {'user_status_webmaster'|@translate}</label></td> 106 120 <td> 107 121 {if isset ($webmaster_type)} … … 113 127 {/if} 114 128 </td> 115 <td ><input name="webmaster_enabled" id="webmaster_enabled" type="checkbox" value ="on" {$webmaster_enabled} /></td>116 129 </tr> 117 130 118 131 <tr name="admin_enabled"> 119 <td> {'user_status_admin'|@translate}</td>132 <td><label><input name="admin_enabled" id="admin_enabled" type="checkbox" value ="on" {$admin_enabled} /> {'user_status_admin'|@translate}</label></td> 120 133 <td> {if isset ($admin_type)} 121 134 <select name="admin_type"> … … 126 139 {/if} 127 140 </td> 128 <td ><input name="admin_enabled" id="admin_enabled" type="checkbox" value ="on" {$admin_enabled} /></td>129 </tr> 141 </tr> 142 130 143 <tr name="generic_enabled"> 131 <td> {'user_status_generic'|@translate}</td>144 <td><label><input name="generic_enabled" id="generic_enabled" type="checkbox" value ="on" {$generic_enabled} /> {'user_status_generic'|@translate}</label></td> 132 145 <td>{if isset ($generic_type)} 133 146 <select name="generic_type"> … … 138 151 {/if} 139 152 </td> 140 <td ><input name="generic_enabled" id="generic_enabled" type="checkbox" value ="on" {$generic_enabled} /></td> 141 </tr> 153 <td ></td> 154 </tr> 155 142 156 <tr name="guest_enabled"> 143 <td> {'user_status_guest'|@translate}</td>157 <td><label><input name="guest_enabled" id="guest_enabled" type="checkbox" value ="on" {$guest_enabled} /> {'user_status_guest'|@translate}</label></td> 144 158 <td>{if isset ($guest_type)} 145 159 <select name="guest_type"> … … 149 163 </select> 150 164 {/if}</td> 151 <td ><input name="guest_enabled" id="guest_enabled" type="checkbox" value ="on" {$guest_enabled} /></td>152 </tr> 165 </tr> 166 153 167 <tr name="normal_enabled"> 154 <td> {'user_status_normal'|@translate}</td>168 <td><label><input name="normal_enabled" id="normal_enabled" type="checkbox" value ="on" {$normal_enabled} /> {'user_status_normal'|@translate}</label></td> 155 169 <td>{if isset ($normal_type)} 156 170 <select name="normal_type"> … … 160 174 </select> 161 175 {/if}</td> 162 <td ><input name="normal_enabled" id="normal_enabled" type="checkbox" value ="on" {$normal_enabled} /></td>163 </tr>176 </tr> 177 </table> 164 178 165 179 </fieldset> 166 180 167 </table> 168 169 <br /> 170 <table id="table_d" style=" background:none;border:outset;width:90%; z-index:-500 " > 181 171 182 <fieldset> 172 183 <legend class="cluetip" title="{'cl_autosize_config_title_2'|@translate}|{'cl_autosize_hlp_line2'|@translate}">{'cl_autosize_config_title_2'|@translate}</legend> 184 <table class="autosizeConfig"> 173 185 174 186 <!--======== Dimensions HL ===================--> … … 176 188 <td class="cluetip" title="{'cl_autosize_miniheight'|@translate}|{'cl_autosize_hlp_line3'|@translate}" >{'cl_autosize_miniheight'|translate}</td> 177 189 <td ><input name="mini_height" id="mini_height" type="text" value ="{$MINI_HEIGHT}" /> px 178 </td> 179 180 <td class="cluetip" title="{'cl_autosize_miniwidth'|translate}|{'cl_autosize_hlp_line3'|@translate}" > {'cl_autosize_miniwidth'|translate}</td> 181 <td > 182 <input name="mini_width" id="mini_width" type="text" value = "{$MINI_WIDTH}" /> px 183 </tr> 190 </td> 191 </tr> 192 <tr> 193 <td class="cluetip" title="{'cl_autosize_miniwidth'|translate}|{'cl_autosize_hlp_line3'|@translate}" > {'cl_autosize_miniwidth'|translate}</td> 194 <td> 195 <input name="mini_width" id="mini_width" type="text" value = "{$MINI_WIDTH}" /> px 196 </td> 197 </tr> 198 184 199 <!--======== Dimensions HL2 ===================--> 185 200 <tr> … … 187 202 <td ><input name="mini_height2" id="Text2" type="text" value ="{$MINI_HEIGHT2}" /> px 188 203 </td> 204 </tr> 205 <tr> 189 206 190 207 <td class="cluetip" title="{'cl_autosize_miniwidth2'|translate}|{'cl_autosize_hlp_line32'|@translate}" > {'cl_autosize_miniwidth2'|translate}</td> … … 211 228 212 229 </tr> 213 <!--======================================================================================-->214 <tr >215 216 </tr>217 218 219 </fieldset>220 230 </table> 221 <!--=================== Bloc choix =============================--> 222 <table> 223 <tr><td style="visibility:visible">{'cl_autosize_icon_view'|@translate} 224 <input type="checkbox" name="check_icon_v" value="on" {$check_icon_v} /> 225 </td> 226 <td>{'cl_autosize_desc_view'|@translate} 227 <input type="checkbox" name="check_desc_v" value="on" {$check_desc_v} /> 228 </td> 229 <td> 230 </td> 231 232 </tr> 233 </table> 234 235 <table> 236 <td><input name="submit" type="submit" value="{'cl_autosize_save'|@translate}" /></td> 237 </table> 231 </fieldset> 232 233 <fieldset> 234 <legend>{'Options'|@translate}</legend> 235 236 <label> 237 <input type="checkbox" name="check_icon_v" value="on" {$check_icon_v} /> 238 {'cl_autosize_icon_view'|@translate} 239 </label> 240 <br> 241 <label> 242 <input type="checkbox" name="check_desc_v" value="on" {$check_desc_v} /> 243 {'cl_autosize_desc_view'|@translate} 244 </label> 245 </fieldset> 246 247 <p class="formButtons"> 248 <input type="submit" name="submit" value="{'cl_autosize_save'|@translate}"> 249 </p> 238 250 </form> 239 240 </table >241 242 -
extensions/Autosize/autosize.inc.php
r18127 r18234 38 38 global $template,$version,$icon_path,$page,$picture,$conf; 39 39 40 $current = $template->get_template_vars('current');40 $current = $template->get_template_vars('current'); 41 41 $has_pamoorama=isset($template->files['pamooramics_content']); 42 42 //==================================================================== 43 $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 44 $SRC_IMG=""; 45 if(isset($current['derivatives']['Autosize'])) 46 $_COOKIE['picture_deriv']="Autosize"; 43 $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 44 $default_size = $conf['derivative_default_size']; 45 $SRC_IMG=""; 46 //===================================================================== 47 if(!isset($_COOKIE['picture_deriv'])) 48 if(isset($current['derivatives']['Autosize'])) 49 $_COOKIE['picture_deriv']="Autosize"; 50 47 51 if(isset( $_COOKIE['picture_deriv'])) 48 52 $model= $_COOKIE['picture_deriv'] ; … … 50 54 $model= $pictureDeriv ; 51 55 56 if(!isset($current['derivatives'][$model])) 57 $model=$default_size ; 58 52 59 $selected_derivative = $current['derivatives'][$model]; 60 61 53 62 if (!isset($current['selected_derivative'])){ 54 $_COOKIE['picture_deriv']="Autosize"; 55 $model= $_COOKIE['picture_deriv'] ; 56 $current['SelMaxi']=ImageStdParams::get_custom(900,900); 57 $current['derivatives'][$model]=ImageStdParams::get_custom($_COOKIE['theImageWidth'], $_COOKIE['theImageHeight']); 58 $selected_derivative=$current['derivatives'][$model]; 59 $selected_derivative->type="Autosize"; 63 64 $current['SelMaxi'] = ImageStdParams::get_custom(900,900); 65 $selected_derivative = ImageStdParams::get_custom($_COOKIE['theImageWidth'], $_COOKIE['theImageHeight']); 66 67 $selected_derivative->type=$model; 60 68 $template->append('current', array( 61 69 'selected_derivative' => $selected_derivative … … 63 71 true); 64 72 $current = $template->get_template_vars('current'); 73 65 74 } 66 75 … … 138 147 139 148 }else{ 140 $model=$conf['derivative_default_size'] ; 149 $model=$conf['derivative_default_size'] ; // format par défaut 141 150 } 142 151 $derivative=$current['derivatives'][$model] ; … … 150 159 $window_width=$imgSizeWH[0]; 151 160 $window_height=$imgSizeWH[1]; 152 //echo "<div style='background-color:black;color:white' >INIT: $model w:$window_width x h:$window_height </div>"; 161 153 162 154 163 … … 159 168 if (!isset($_COOKIE['theMainImageWidth'])) setcookie('theMainImageWidth',$window_width); 160 169 161 //echo "<div style='background-color:black;color:white' >$select_type w: $window_width x h: $window_height </div>"; 162 163 $last_defined=ImageStdParams::get_defined_type_map(); 164 170 // 171 172 $last_defined=ImageStdParams::get_defined_type_map(); 165 173 foreach ($img_all as $img_select){ 166 174 $img_type = $img_select->get_type(); 167 175 if ($img_type=="square" || $img_type=="thumb" ) continue ; 168 if (!isset($last_img)) $last_img =$img_select;176 if (!isset($last_img)) $last_img = $img_select; 169 177 170 178 $img_url = $img_select->get_url(); 171 179 $imgSizeWH = $img_select->get_size(); 180 172 181 173 182 if($img_type=="Autosize" || $img_type=="SelMaxi"){ … … 175 184 $imgSizeWH = $img_select->src_image->get_size(); 176 185 $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ; 177 }else{ 186 187 } 178 188 $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ; 179 if ($img_type=="Original"){ 180 $maxi_img= $img_type; 181 $maxi_url= $img_url; 182 $maxi_i=$img_select; 183 break ; 184 185 186 } 187 188 189 189 190 190 if($window_height < $imgSizeWH[0] ){ 191 191 $maxi_img= $img_type; … … 193 193 $maxi_i=$img_select; 194 194 } 195 195 196 if($window_height < $imgSizeWH[0] && $mini_img==""){ 196 197 $mini_img= $img_type; 197 198 $mini_url= $img_url; 198 199 $mini_i=$img_select; 199 200 }else if($imgSizeWH[0] > 10 && $maxi_img==""){ 201 $last_img=$img_select; 202 } 203 204 205 if($select_type==$img_type){ 200 } 201 202 if($select_type == $img_type){ 206 203 if($maxi_img==""){ 207 $maxi_img= $img_type; 208 $maxi_url= $img_url; 209 $maxi_i=$img_select; 210 } 211 212 break ; 213 } 214 } 215 204 $maxi_img = $img_type; 205 $maxi_url = $img_url; 206 $maxi_i = $img_select; 207 } 208 if($mini_img==""){ 209 $mini_img= $img_type; 210 $mini_url= $img_url; 211 $mini_i=$img_select; 212 } 213 break ; 214 } 216 215 } 217 218 216 //============================================================== 219 217 //==== Réécriture selection ==== 220 218 if( $img_type=="SelMaxi"){ 221 $maxi_img= $mini_img;222 $maxi_url= $mini_img;219 $maxi_img= $mini_img; 220 $maxi_url= $mini_img; 223 221 } 224 222 if ( !array_key_exists($maxi_img, $last_defined) ){ 223 225 224 $maxi_img = $last_img->get_type(); 226 225 $maxi_url = $last_img->get_url(); 227 226 $imgSizeWH = $last_img->get_size(); 227 228 228 } 229 230 pwg_set_session_var('picture_deriv', $maxi_img);231 $_COOKIE['picture_deriv']=$maxi_img ;229 $model= $maxi_img; 230 231 /* $_COOKIE['picture_deriv']=$maxi_img ; 232 232 $_COOKIE['picture_map']= $maxi_img ; 233 233 $_COOKIE['imgSrc']= $maxi_url; 234 234 */ 235 235 if (isset($_COOKIE['picture_deriv'])){ 236 236 if ( array_key_exists($_COOKIE['picture_deriv'], ImageStdParams::get_defined_type_map()) ){ 237 pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);237 // pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']); 238 238 }else{ 239 /* echo "<pre>".$_COOKIE['picture_deriv']. "No exist " ; 240 print_r($img_all ); 241 die(); 242 */ 239 // pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']); 243 240 } 244 setcookie('picture_deriv', false, 0, cookie_path() );241 // setcookie('picture_deriv', false, 0, cookie_path() ); 245 242 } 246 243 … … 254 251 *************************/ 255 252 static public function cl_autosize_affiche(){ 256 global $user, $picture, $template,$page,$known_script; 257 global $content, $element_info; 258 global $infos_message,$erreur_message; 259 global $conf,$lang ,$user,$userdata; 260 global $defined_types,$maxi_img ,$pictureDeriv ,$liste_type,$SRC_IMG,$select_type; 261 global $has_pamoorama; 262 global $autosize_parametres,$user_status; 253 global $user, $picture, $template,$page,$known_script; 254 global $content, $element_info; 255 global $infos_message,$erreur_message; 256 global $conf,$lang ,$user,$userdata; 257 global $defined_types,$maxi_img ,$pictureDeriv ,$liste_type,$SRC_IMG,$select_type; 258 global $has_pamoorama; 259 global $autosize_parametres,$user_status; 260 263 261 264 262 if(isset($page['body_id']) && $page['body_id'] == 'theAdminPage' ) return ; … … 270 268 $AUTOSIZE_PATH = dirname(__FILE__).'/'; 271 269 if (isset( $page['body_id']) && $page['body_id']=='thePicturePage' ) { 272 273 270 if ( isset($picture['current'])){ 274 271 include (AUTOSIZE_PATH."include/affiche.php"); … … 285 282 $file =AUTOSIZE_PATH_ABS.'template/header.tpl' ; 286 283 $template->set_filenames(array('autosize_init_header'=> $file )); 287 $template->parse( 'autosize_init_header', false); 288 289 $theme=$user['theme']; 290 284 $template->parse( 'autosize_init_header', false); 285 $theme=$user['theme']; 286 291 287 if($autosize_parametres->check_icon_v == 'on'){ 292 288 $template->assign('cl_autosize_button', … … 308 304 'theme' => $theme ) 309 305 ); 310 $template->concat('autosize_content', $template->parse('autosize_content_header', true)); 311 306 $template->concat('autosize_content', $template->parse('autosize_content_header', true)); 312 307 if(isset($conf['go_up_down']) && ($conf['go_up_down']==true) ){ 313 308 $template->set_filenames(array('mes_script' => realpath(AUTOSIZE_PATH).'/template/mes_scripts.tpl') ); -
extensions/Autosize/js/Affiche_script.js
r18127 r18234 443 443 marges_llgbo = 0; 444 444 //========================================================================================== 445 445 446 446 init_gen(); 447 447 jQuery(window).resize(); … … 511 511 jQuery("#form_autosize_picture").addClass("Autosize_margin"); 512 512 //===== marges suplémentaires en fonction theme === 513 options.valide = jQuery(".Autosize_margin").css("display"); 513 514 options.marge_haute = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("top")); 514 515 options.marge_basse = jQuery(".Autosize_margin").Get_Val_int(jQuery(".Autosize_margin").css("bottom")); … … 551 552 var pictureDeriv_maxi = eval("options." + user_status + "_type"); //limite taille 552 553 554 if (pictureDeriv_maxi != pictureDeriv) { 555 if (pictureDeriv == null) 556 pictureDeriv = pictureDeriv_maxi; 557 else 558 pictureDeriv_maxi = pictureDeriv; 559 } 553 560 554 561 … … 919 926 theImg.removeAttribute("width"); 920 927 theImg.removeAttribute("height"); 928 921 929 // jQuery(theMainImage_id).eq(0).removeAttr("style"); 922 930 jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden'); … … 933 941 jQuery("#loading").hide(0); 934 942 } 935 Zone_image.src = theImg.src; 936 theImg.src = url; // charge Image 943 944 theImg.src = url; // charge Image 945 if (Zone_image) { 946 Zone_image.src = theImg.src; 947 Zone_image.image_init = { width: jQuery(theImg).width(), height: jQuery(theImg).height() }; 948 949 } 937 950 //=================================================== 938 951 options.pictureDeriv = typeSave; … … 1296 1309 vn = this; 1297 1310 size_derive = { w: parseInt(vn[2]), h: parseInt(vn[3]) }; 1311 if (vn[0] == options.select_type) { 1312 maxi_size = size_derive; 1313 maxi_size.idx = n; 1314 return false 1315 } 1298 1316 if (vn[0] != "square" && vn[0] != "thumb" && vn[0] != "SelMaxi" && vn[0] != "Autosize") { 1299 1317 if (size_derive.h > size_encours.h) { … … 1330 1348 1331 1349 Select_Image = function () { 1350 1332 1351 var pt = options.liste_type; 1333 1352 if (pt.length > 0) { … … 1335 1354 //===== calcul Image === 1336 1355 Calcul_Image(); 1337 IMg = Get_Maxi(Zone_image.image); 1356 1357 if (options.select_type != "SelMaxi" && options.select_type != "Autosize") { 1358 1359 IMg = Get_Maxi(Zone_image.image_init); 1360 } else { 1361 IMg = Get_Maxi(Zone_image.image); 1362 } 1363 1364 1338 1365 imgSrc = IMg.url; 1339 1366 … … 1341 1368 ing_height = IMg.height; 1342 1369 if (Type_Img == "pamoorama") return; 1343 if (options.select_type != "SelMaxi" && options.select_type != "Autosize") return; 1370 // if (options.select_type != "SelMaxi" && options.select_type != "Autosize") return; 1371 1344 1372 if (typeof Zone_image.src == "undefined") Zone_image.src = " "; 1345 1373 status = imgSrc.match(RegExp(Zone_image.src, "gi")); // status = '' si == … … 1614 1642 height_theMainImage = Math.ceil(image_max.height); 1615 1643 width_theMainImage = Math.ceil(image_max.width); 1644 if (typeof Zone_image.image_init.rapport == "undefined") { 1645 Zone_image.image_init.rapport = Math.ceil(width_theMainImage) / height_theMainImage; 1646 } 1616 1647 1617 1648 if (Type_Img == "pamoorama") { … … 1870 1901 height = IMg.height; 1871 1902 } 1872 user_status = options.user_status; 1873 pictureDeriv_maxi = eval("options." + user_status + "_type"); //limite taille 1874 options.pictureDeriv_maxi = pictureDeriv_maxi; 1875 pictureDeriv_maxi = options.select_type; 1876 1903 if (pictureDeriv_maxi != options.select_type) { 1904 /* 1905 user_status = options.user_status; 1906 pictureDeriv_maxi = eval("options." + user_status + "_type"); //limite taille 1907 */ 1908 options.select_type = pictureDeriv_maxi; 1909 options.pictureDeriv_maxi = pictureDeriv_maxi; 1910 pictureDeriv_maxi = options.select_type; 1911 } 1877 1912 //========================================================== 1878 1913 href_path = "javascript:changeImgSrc('" + options.src_img + "', '" + "SelMaxi" + "', '" + "SelMaxi" + "')"; … … 1957 1992 //_______________________ init_gen _______________________ 1958 1993 1959 }); // ready1994 }); // ready 1960 1995 1961 1996 -
extensions/Autosize/language/fr_FR/plugin.lang.php
r12527 r18234 36 36 $lang['cl_autosize_hlp_line4'] = "Valeur maximale d'agrandissement(photo réelle/photo affichée) supportée sans dégradation visuelle."; 37 37 38 $lang['cl_autosize_marge_basse'] = "Marge inférieure.";39 $lang['cl_autosize_hlp_line5'] = " Réserve inférieure, pour afficher la légende";38 $lang['cl_autosize_marge_basse'] = "Marges."; 39 $lang['cl_autosize_hlp_line5'] = "Utiliser la classe<br/><span style='color:#80a080;'> .Autosize_margin{left:0px;right:0px;bottom:0px;top:0px} </span>en éditant le CSS(LocalFileEditor) du theme voulu"; 40 40 41 41 $lang['cl_autosize_save'] = "Sauvegarde"; -
extensions/Autosize/main.inc.php
r18127 r18234 2 2 /* 3 3 Plugin Name: AutoSize 4 Version: 2.0 84 Version: 2.0.9 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
Note: See TracChangeset
for help on using the changeset viewer.