Changeset 14687
- Timestamp:
- May 2, 2012, 10:18:48 PM (12 years ago)
- Location:
- extensions/stripped
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/stripped/admin/admin.inc.php
r12960 r14687 27 27 if(isset($_POST['submit_stripped'])) 28 28 { 29 $config['paramVersion']='2. 1';29 $config['paramVersion']='2.2'; 30 30 31 31 $config['themeStyle']=$_POST['f_themeStyle']; … … 47 47 $config['infoTabAdminOnly']=isset($_POST['f_infoTabAdminOnly']); 48 48 $config['defaultTab']=$_POST['f_defaultTab']; 49 50 $config['albumSize']=$_POST['f_albumSize']; 51 $config['thumbSize']=$_POST['f_thumbSize']; 52 $config['imageSize']=$_POST['f_imageSize']; 53 $config['hdSize']=$_POST['f_hdSize']; 49 54 50 55 $config['imageAutosize']=isset($_POST['f_imageAutosize']); -
extensions/stripped/admin/admin.tpl
r12960 r14687 104 104 <span class="property">{'Show Information tab only to admins'|@translate}</span> 105 105 <input type="checkbox" name="f_infoTabAdminOnly" {if $options.infoTabAdminOnly}checked{/if}> 106 </label></li> 107 </ul> 108 </fieldset> 109 <fieldset> 110 <legend>{'Multiple size'|@translate}</legend> 111 <ul> 112 <li><label> 113 <span class="property">{'Album thumbnail size'|@translate}</span> 114 <select name="f_albumSize" style="min-width:150px;"> 115 <option value="square" {if ($options.albumSize=="square")}selected{/if}>{'square'|@translate}</option> 116 <option value="thumb" {if ($options.albumSize=="thumb")}selected{/if}>{'thumb'|@translate}</option> 117 <option value="2small" {if ($options.albumSize=="2small")}selected{/if}>{'2small'|@translate}</option> 118 <option value="xsmall" {if ($options.albumSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option> 119 <option value="medium" {if ($options.albumSize=="medium")}selected{/if}>{'medium'|@translate}</option> 120 <option value="large" {if ($options.albumSize=="large")}selected{/if}>{'large'|@translate}</option> 121 <option value="xlarge" {if ($options.albumSize=="xlarge")}selected{/if}>{'xlarge'|@translate}</option> 122 <option value="xxlarge" {if ($options.albumSize=="xxlarge")}selected{/if}>{'xxlarge'|@translate}</option> 123 </select> 124 </label></li> 125 <li><label> 126 <span class="property">{'Thumbnail size'|@translate}</span> 127 <select name="f_thumbSize" style="min-width:150px;"> 128 <option value="square" {if ($options.thumbSize=="square")}selected{/if}>{'square'|@translate}</option> 129 <option value="thumb" {if ($options.thumbSize=="thumb")}selected{/if}>{'thumb'|@translate}</option> 130 <option value="2small" {if ($options.thumbSize=="2small")}selected{/if}>{'2small'|@translate}</option> 131 <option value="xsmall" {if ($options.thumbSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option> 132 <option value="medium" {if ($options.thumbSize=="medium")}selected{/if}>{'medium'|@translate}</option> 133 <option value="large" {if ($options.thumbSize=="large")}selected{/if}>{'large'|@translate}</option> 134 <option value="xlarge" {if ($options.thumbSize=="xlarge")}selected{/if}>{'xlarge'|@translate}</option> 135 <option value="xxlarge" {if ($options.thumbSize=="xxlarge")}selected{/if}>{'xxlarge'|@translate}</option> 136 </select> 137 </label></li> 138 <li><label> 139 <span class="property">{'Image size'|@translate}</span> 140 <select name="f_imageSize" style="min-width:150px;"> 141 <option value="square" {if ($options.imageSize=="square")}selected{/if}>{'square'|@translate}</option> 142 <option value="thumb" {if ($options.imageSize=="thumb")}selected{/if}>{'thumb'|@translate}</option> 143 <option value="2small" {if ($options.imageSize=="2small")}selected{/if}>{'2small'|@translate}</option> 144 <option value="xsmall" {if ($options.imageSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option> 145 <option value="medium" {if ($options.imageSize=="medium")}selected{/if}>{'medium'|@translate}</option> 146 <option value="large" {if ($options.imageSize=="large")}selected{/if}>{'large'|@translate}</option> 147 <option value="xlarge" {if ($options.imageSize=="xlarge")}selected{/if}>{'xlarge'|@translate}</option> 148 <option value="xxlarge" {if ($options.imageSize=="xxlarge")}selected{/if}>{'xxlarge'|@translate}</option> 149 </select> 150 </label></li> 151 <li><label> 152 <span class="property">{'HD Image size'|@translate}</span> 153 <select name="f_hdSize" style="min-width:150px;"> 154 <option value="square" {if ($options.hdSize=="square")}selected{/if}>{'square'|@translate}</option> 155 <option value="thumb" {if ($options.hdSize=="thumb")}selected{/if}>{'thumb'|@translate}</option> 156 <option value="2small" {if ($options.hdSize=="2small")}selected{/if}>{'2small'|@translate}</option> 157 <option value="xsmall" {if ($options.hdSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option> 158 <option value="medium" {if ($options.hdSize=="medium")}selected{/if}>{'medium'|@translate}</option> 159 <option value="large" {if ($options.hdSize=="large")}selected{/if}>{'large'|@translate}</option> 160 <option value="xlarge" {if ($options.hdSize=="xlarge")}selected{/if}>{'xlarge'|@translate}</option> 161 <option value="xxlarge" {if ($options.hdSize=="xxlarge")}selected{/if}>{'xxlarge'|@translate}</option> 162 <option value="original" {if ($options.hdSize=="original")}selected{/if}>{'original'|@translate}</option> 163 </select> 106 164 </label></li> 107 165 </ul> -
extensions/stripped/admin/maintain.inc.php
r12960 r14687 8 8 { 9 9 $config = array( 10 'paramVersion' => '2. 1',10 'paramVersion' => '2.2', 11 11 12 12 'themeStyle' => 'black', … … 29 29 'defaultTab' => "none", 30 30 31 'albumSize' => "thumb", 32 'thumbSize' => "thumb", 33 'imageSize' => "xlarge", 34 'hdSize' => "original", 35 31 36 'imageAutosize' => true, 32 37 'imageAutosizeMargin' => 60, -
extensions/stripped/admin/upgrade.inc.php
r12960 r14687 8 8 { 9 9 $config = array( 10 'paramVersion' => '2. 1',10 'paramVersion' => '2.2', 11 11 12 12 'themeStyle' => 'black', … … 29 29 'defaultTab' => "none", 30 30 31 'albumSize' => "thumb", 32 'thumbSize' => "thumb", 33 'imageSize' => "xlarge", 34 'hdSize' => "original", 35 31 36 'imageAutosize' => true, 32 37 'imageAutosizeMargin' => 60, … … 66 71 $config['imageArrows']=true; 67 72 $config['navArrows']=false; 73 $config['paramVersion']='2.2'; 74 $config['albumType']='small'; 75 $config['albumFrame']=$config['thumbFrame']; 76 $config['albumSize']='thumb'; 77 $config['thumbSize']='thumb'; 78 $config['imageSize']='xlarge'; 79 $config['hdSize']='original'; 68 80 69 81 conf_update_param('stripped', pwg_db_real_escape_string(serialize($config))); … … 73 85 74 86 $config = $stripped; 75 $config['paramVersion']='2. 1';87 $config['paramVersion']='2.2'; 76 88 $config['albumType']='small'; 77 89 $config['albumFrame']=$config['thumbFrame']; 90 $config['albumSize']='thumb'; 91 $config['thumbSize']='thumb'; 92 $config['imageSize']='xlarge'; 93 $config['hdSize']='original'; 78 94 79 95 conf_update_param('stripped', pwg_db_real_escape_string(serialize($config))); 96 97 } else { 98 99 if ($stripped['paramVersion'] == '2.1') { 100 101 $config = $stripped; 102 $config['paramVersion']='2.2'; 103 $config['albumSize']='thumb'; 104 $config['thumbSize']='thumb'; 105 $config['imageSize']='xlarge'; 106 $config['hdSize']='original'; 107 108 conf_update_param('stripped', pwg_db_real_escape_string(serialize($config))); 109 110 } 80 111 81 112 } -
extensions/stripped/readme.txt
r14481 r14687 32 32 --------- 33 33 34 *** version 2.2.0.beta 35 36 - first version for Piwigo 2.4 (beta test)34 *** version 2.2.0.beta2 35 36 - betatest version for Piwigo 2.4 37 37 38 38 *** version 2.1.4 -
extensions/stripped/template/about.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/comments.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 6 1 <div class="titrePage"> 7 2 <div class="browsePath"> -
extensions/stripped/template/identification.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 6 1 <div class="titrePage"> 7 2 <div class="browsePath"> -
extensions/stripped/template/mainpage_categories.tpl
r14481 r14687 9 9 <div class="illustration"> 10 10 <a href="{$cat.URL}"> 11 <img src="{$pwg->derivative_url($ derivative_params, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}">11 <img src="{$pwg->derivative_url($stripped.albumSize, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}"> 12 12 </a> 13 13 </div> -
extensions/stripped/template/nbm.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/notification.tpl
r12960 r14687 3 3 <link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (photos, comments)'|@translate}" href="{$U_FEED}"> 4 4 {/html_head} 5 {php}6 global $conf;7 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);8 {/php}9 5 <div class="titrePage"> 10 6 <div class="browsePath"> -
extensions/stripped/template/password.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/picture.tpl
r14481 r14687 1 {define_derivative name='derivative_stripped_pict' type='xlarge'} 2 {assign var=derivative value=$pwg->derivative($derivative_stripped_pict, $current.src_image)} 1 {assign var=derivative value=$pwg->derivative($stripped.imageSize, $current.src_image)} 3 2 {assign var='size' value=$derivative->get_size()} 4 3 {literal} -
extensions/stripped/template/picture_content.tpl
r14481 r14687 4 4 $this->assign( 'stripped', $stripped ); 5 5 {/php} 6 {if isset($U_ORIGINAL)} 6 {if ($stripped.hdSize == 'original')} 7 {if isset($U_ORIGINAL)} 8 {assign var='displayHD' value=true} 9 {assign var='HD_url' value=$U_ORIGINAL} 10 {/if} 11 {else} 12 {assign var='displayHD' value=true} 13 {assign var='HDderivative' value=$pwg->derivative($stripped.hdSize, $current.src_image)} 14 {assign var='HD_url' value=$HDderivative->get_url()} 15 {/if} 16 {if isset($displayHD)} 7 17 {if ($HDShadowbox_loaded)} 8 18 {assign var='pwghigh' value=true} … … 12 22 {/if} 13 23 <div id="theImg" {if ($stripped.imageFrame)}class="img_frame"{/if}> 14 {if isset($ U_ORIGINAL)}15 {if isset($pwghigh)}<a href="{$ U_ORIGINAL}" rel="shadowbox" class="hd_link"> </a>{/if}16 {if isset($winhigh)}<div onclick="openDisplayHigh('{$ U_ORIGINAL}');" class="hd_link"> </div>{/if}17 {if ($stripped.imagePreloadHD)}<div class="preload" style="display:none;">{$ U_ORIGINAL}</div>{/if}24 {if isset($displayHD)} 25 {if isset($pwghigh)}<a href="{$HD_url}" rel="shadowbox" class="hd_link"> </a>{/if} 26 {if isset($winhigh)}<div onclick="openDisplayHigh('{$HD_url}');" class="hd_link"> </div>{/if} 27 {if ($stripped.imagePreloadHD)}<div class="preload" style="display:none;">{$HD_url}</div>{/if} 18 28 {/if} 19 29 {if ($stripped.imageArrows) } … … 28 38 {/if} 29 39 {/if} 30 {define_derivative name='derivative_stripped_pict' type='xlarge'} 31 {assign var=derivative value=$pwg->derivative($derivative_stripped_pict, $current.src_image)} 40 {assign var=derivative value=$pwg->derivative($stripped.imageSize, $current.src_image)} 32 41 <img src="{$derivative->get_url()}" {$derivative->get_size_htm()} alt="{$ALT_IMG}" id="theMainImage" class="hideTabs"> 33 42 </div> -
extensions/stripped/template/profile.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/register.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/search.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/slideshow.tpl
r12547 r14687 4 4 {/literal} 5 5 {/html_head} 6 {assign var=derivative value=$pwg->derivative($stripped.imageSize, $current.src_image)} 7 {assign var='size' value=$derivative->get_size()} 6 8 {literal} 7 9 <script type="text/javascript"> 8 var image_w = {/literal}{$ WIDTH_IMG}{literal}9 var image_h = {/literal}{$ HEIGHT_IMG}{literal}10 var image_w = {/literal}{$size[0]}{literal} 11 var image_h = {/literal}{$size[1]}{literal} 10 12 </script> 11 13 {/literal} -
extensions/stripped/template/tags.tpl
r12960 r14687 1 {php}2 global $conf;3 $this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);4 {/php}5 1 <div class="titrePage"> 6 2 <div class="browsePath"> -
extensions/stripped/template/thumbnails.tpl
r14481 r14687 1 {php} 2 global $stripped; 3 $this->assign( 'stripped', $stripped ); 4 {/php} 1 5 {if !empty($thumbnails)}{strip} 2 6 {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 3 7 {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 4 {*define_derivative name='derivative_params' width=160 height=90 crop=true*}5 8 <ul class="thumbList"> 6 9 {foreach from=$thumbnails item=thumbnail} 7 {assign var=derivative value=$pwg->derivative($ derivative_params, $thumbnail.src_image)}10 {assign var=derivative value=$pwg->derivative($stripped.thumbSize, $thumbnail.src_image)} 8 11 {php} 9 12 global $pwg_loaded_plugins, $conf, $stripped; … … 16 19 <a href="{$thumbnail.URL}"><div class="thumbframe"><div class="thumbpos"> 17 20 <img class="thumbnail" {if !$derivative->is_cached()}data-{/if}src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" {if ((isset($thumbnail.NAME))&!($downloadMulti_loaded))}title="{$thumbnail.NAME}"{else}title="{$thumbnail.TN_TITLE}"{/if} /> 18 {if (isset($stripped.imagePreload) & isset($stripped.imagePreloadThumbs))}<div class="preload" style="display:none;">{$thumbnail.FILE_PATH}</div>{/if} 21 {if (isset($stripped.imagePreload) & isset($stripped.imagePreloadThumbs))} 22 {assign var=preload value=$pwg->derivative($stripped.imageSize, $thumbnail.src_image)} 23 <div class="preload" style="display:none;">{$preload->get_url()}</div> 24 {/if} 19 25 </div></div></a> 20 26 </span> -
extensions/stripped/themeconf.inc.php
r14481 r14687 25 25 // Need upgrade from v2.x? 26 26 if (!isset($stripped['paramVersion'])) { 27 include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php'); 28 $stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped ); 29 } 30 31 // Need upgrade from v2.1? 32 if ((isset($stripped['paramVersion'])) && ($stripped['paramVersion'] == '2.1')) { 27 33 include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php'); 28 34 $stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
Note: See TracChangeset
for help on using the changeset viewer.