Changeset 17843
- Timestamp:
- Sep 10, 2012, 4:58:25 PM (12 years ago)
- Location:
- extensions/stripped_black_bloc
- Files:
-
- 6 edited
-
local_head.tpl (modified) (1 diff)
-
template/mainpage_categories.tpl (modified) (4 diffs)
-
template/stuffs_thumbnails.tpl (modified) (1 diff)
-
template/thumbnails.tpl (modified) (2 diffs)
-
theme.css (modified) (8 diffs)
-
themeconf.inc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
extensions/stripped_black_bloc/local_head.tpl
r17828 r17843 2 2 {combine_script id='jquery.isotope' load='header' require='jquery' path='themes/stripped_black_bloc/js/isotope.js'} 3 3 {combine_script id='jquery.cookie' load='header' require='jquery' path='themes/stripped_black_bloc/js/jquery.ck.min.js'} 4 {assign var='one_column' value=$stripped_black_bloc.thumbnail_width} 5 {assign var='two_columns' value=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width} 6 {assign var='three_columns' value=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width} 4 7 {html_style}{literal} 5 #theHeader a, .titrePage a, .footer_login a, .navigationBar a, #calendar_block A 8 #theHeader a, .titrePage a, .footer_login a, .navigationBar a, #calendar_block A { 6 9 color: {/literal}{if $stripped_black_bloc.color_main}#{$stripped_black_bloc.color_main}{/if}{literal}; 7 10 } 8 .bloc, .gmapsMarkup { 9 max-width: {/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width}{/if}{literal}px; 11 .album a { 12 border: 1.5px solid #{/literal}{$stripped_black_bloc.color_main}{literal}; 13 margin:-2px; 10 14 } 11 .bloc a { 12 max-width:{/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width}{/if}{literal}px; 15 16 .onecol, .gmapsMarkup, .onecol a { 17 max-width: {/literal}{$one_column}{literal}px; 13 18 } 14 . bloc_big{15 max-width: {/literal}{ if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}{/if}{literal}px;19 .twocol, .twocol a { 20 max-width: {/literal}{$two_columns}{literal}px; 16 21 } 17 . bloc_biga {18 max-width: {/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}{/if}{literal}px;22 .threecol, .threecol a { 23 max-width: {/literal}{$three_columns}{literal}px; 19 24 } 20 .bloc_wide { 21 max-width: {/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width}{/if}{literal}px; 22 } 23 .bloc_wide a { 24 max-width:{/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width}{/if}{literal}px; 25 .stuffs_thumbnails, .stuffs_thumbnails #thumbnails, .one_column { 26 width:{/literal}{$one_column}{literal}px; 25 27 } 26 28 .content_block, .bloc_stuff, .two_columns { 27 width:{/literal}{ if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.column_width*2-20}{/if}{literal}px;29 width:{/literal}{$two_columns}{literal}px; 28 30 } 29 . stuffs_thumbnails, .stuffs_thumbnails #thumbnails, .one_column{30 width:{/literal}{ if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width-10 }{/if}{literal}px;31 .bloc_stuff #comments ul.commentList { 32 width:{/literal}{$two_columns-30}{literal}px; 31 33 } 32 .bloc, .bloc_big { 34 .content_block, #the_page .middle_block { 35 margin-left:5px !important; 36 {/literal} 37 margin-top: {math equation="( x - y )/2" y=$stripped_black_bloc.thumbnail_width x=$stripped_black_bloc.column_width}px !important; 38 margin-bottom:{math equation="( x - y )/2" y=$stripped_black_bloc.thumbnail_width x=$stripped_black_bloc.column_width}px !important; 39 {literal} 40 } 41 .bloc, .stuffs_thumbnails, .stuffs_thumbnails #thumbnails { 33 42 {/literal} 34 43 margin-top: {math equation="( x - y - 10)/2" y=$stripped_black_bloc.thumbnail_width x=$stripped_black_bloc.column_width}px; -
extensions/stripped_black_bloc/template/mainpage_categories.tpl
r17828 r17843 10 10 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_wide, $cat.representative.src_image)} 11 11 {assign var='size' value=$derivative->get_size()} 12 <div class="bloc _bigalbum">12 <div class="bloc twocol album"> 13 13 <a href="{$cat.URL}" style="background: url({$derivative->get_url()}) no-repeat scroll center center transparent; height: {$size[1]}px; width: {$size[0]}px; opacity: 0.75;" > 14 14 {$cat.NAME} … … 18 18 {else} 19 19 {if $cat.representative.width < $cat.representative.height and $stripped_black_bloc.catthumb=="yes"} 20 {if $cat.TN_CLASS==" bloc_big" and $stripped_black_bloc.catthumb=="same"}20 {if $cat.TN_CLASS=="twocol" and $stripped_black_bloc.catthumb=="same"} 21 21 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $cat.representative.src_image)} 22 22 {elseif $stripped_black_bloc.catthumb=="all"} … … 26 26 {/if} 27 27 {else} 28 {if $cat.TN_CLASS==" bloc_big" and $stripped_black_bloc.catthumb=="same"}28 {if $cat.TN_CLASS=="twocol" and $stripped_black_bloc.catthumb=="same"} 29 29 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)} 30 30 {elseif $stripped_black_bloc.catthumb=="all"} … … 35 35 {/if} 36 36 {assign var='size' value=$derivative->get_size()} 37 <div class=" {if $stripped_black_bloc.catthumb=="all"}bloc_big{else}{$cat.TN_CLASS}{/if} album">37 <div class="bloc {if $stripped_black_bloc.catthumb=="all"}twocol{else}{$cat.TN_CLASS}{/if} album"> 38 38 <a href="{$cat.URL}" style="background: url({$derivative->get_url()}) no-repeat scroll center center transparent; height: {$size[1]}px; width: {$size[0]}px; opacity: 0.75;" > 39 39 {$cat.NAME} -
extensions/stripped_black_bloc/template/stuffs_thumbnails.tpl
r17740 r17843 7 7 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)} 8 8 {assign var='size' value=$derivative->get_size()} 9 <div class=" {$thumbnail.TN_CLASS}">9 <div class="bloc {$thumbnail.TN_CLASS}"> 10 10 <a href="{$thumbnail.URL}" style="background: url({if $derivative->is_cached()}{$derivative->get_url()}{else}{$ROOT_URL}{$themeconf.img_dir}/loading.gif{/if}) no-repeat scroll center center transparent; height: {$size[1]}px; width: {$size[0]}px; opacity: 0.75;" {if !$derivative->is_cached()}data-src="{$derivative->get_url()}"{/if}> 11 11 {if isset($thumbnail.NAME)}{$thumbnail.NAME}{else}{$thumbnail.TN_TITLE}{/if} 12 12 </a> 13 {if $SHOW_THUMBNAIL_CAPTION }14 13 <div class="title">{if isset($block.TITLE)}{$block.TITLE}{elseif isset($thumbnail.NAME)}{$thumbnail.NAME}{/if}</div> 15 {/if}16 14 </div> 17 15 {/foreach} -
extensions/stripped_black_bloc/template/thumbnails.tpl
r17828 r17843 9 9 {foreach from=$thumbnails item=thumbnail} 10 10 {assign var=triplehigh value=$thumbnail.height+$thumbnail.height+$thumbnail.height} 11 {if ($thumbnail.width > $triplehigh) }11 {if ($thumbnail.width > $triplehigh) and ($thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width)} 12 12 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_wide, $thumbnail.src_image)} 13 13 {assign var='size' value=$derivative->get_size()} 14 <div class="bloc bloc_wide">14 <div class="bloc threecol"> 15 15 <a href="{$thumbnail.URL}" style="background: url({if $derivative->is_cached()}{$derivative->get_url()}{else}{$ROOT_URL}{$themeconf.img_dir}/loading.gif{/if}) no-repeat scroll center center transparent; height: {$size[1]}px; width: {$size[0]}px; opacity: 0.75;" {if !$derivative->is_cached()}data-src="{$derivative->get_url()}"{/if}> 16 16 {if isset($thumbnail.NAME)}{$thumbnail.NAME}{else}{$thumbnail.TN_TITLE}{/if} … … 22 22 {else} 23 23 {if (($thumbnail.width < $thumbnail.height) and $stripped_black_bloc.portrait_limitation=="yes")} 24 {if $thumbnail.TN_CLASS=="bloc"} 24 {if $thumbnail.TN_CLASS=="twocol" and $thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width} 25 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $thumbnail.src_image)} 26 {else} 25 27 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_vert, $thumbnail.src_image)} 26 {else}27 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $thumbnail.src_image)}28 28 {/if} 29 29 {else} 30 {if $thumbnail.TN_CLASS==" bloc"}31 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)}30 {if $thumbnail.TN_CLASS=="twocol" and $thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width} 31 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)} 32 32 {else} 33 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}33 {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)} 34 34 {/if} 35 35 {/if} 36 36 {assign var='size' value=$derivative->get_size()} 37 <div class=" {$thumbnail.TN_CLASS}">37 <div class="bloc {$thumbnail.TN_CLASS}"> 38 38 <a href="{$thumbnail.URL}" style="background: url({if $derivative->is_cached()}{$derivative->get_url()}{else}{$ROOT_URL}{$themeconf.img_dir}/loading.gif{/if}) no-repeat scroll center center transparent; height: {$size[1]}px; width: {$size[0]}px; opacity: 0.75;" {if !$derivative->is_cached()}data-src="{$derivative->get_url()}"{/if}> 39 39 {if isset($thumbnail.NAME)}{$thumbnail.NAME}{else}{$thumbnail.TN_TITLE}{/if} -
extensions/stripped_black_bloc/theme.css
r16790 r17843 133 133 width: auto !important; 134 134 } 135 .bloc , .bloc_big{135 .bloc { 136 136 display: block; 137 137 margin-top: 3px; … … 149 149 z-index: 1100; 150 150 } 151 .bloc * , .bloc_big *{151 .bloc * { 152 152 position: relative; 153 153 } 154 .bloc .title , .bloc_big .title{154 .bloc .title { 155 155 left: 6px; 156 156 max-width: 138px; … … 165 165 padding: 7px 10px 8px; 166 166 } 167 .bloc a , .bloc_big a{167 .bloc a { 168 168 display: block; 169 169 overflow: hidden; … … 189 189 } 190 190 #subcontent .stuffs_block #comments ul.thumbnailCategories, #comments ul { 191 padding: 20px;192 191 padding:5px; 192 display: inline-block; 193 193 } 194 194 #subcontent .stuffs_block, .content_block { … … 214 214 text-decoration: none; 215 215 } 216 .masonry-brick, .bloc .title, . bloc_big .title, .nav_bulle {216 .masonry-brick, .bloc .title, .nav_bulle { 217 217 color: #FFFFFF; 218 218 background-image: url("img/btn.png"); … … 227 227 228 228 } 229 .bloc a, .bloc_big a { 230 border-radius: 5px 5px 5px 5px; 231 } 232 .thumbnails .bloc a, .thumbnails .bloc_big a { 229 .bloc a { 230 border-radius: 5px 5px 5px 5px; 233 231 box-shadow: 0 5px 5px rgba(0, 0, 0, 0.75); 234 232 -webkit-box-shadow: 0 5px 5px rgba(0,0,0,0.75); … … 242 240 } 243 241 .album { 244 background-color:#595959; 245 } 246 247 .content_block .additional_info { 248 color:inherit; 249 background: none; 250 border:none; 251 } 242 background-color:transparent; 243 } 244 252 245 .bloc_stuff { 253 246 border: 1px solid #424242; … … 285 278 padding:5px; 286 279 } 280 .content_block .additional_info { 281 color: #FFFFFF; 282 background-image: url("img/btn.png"); 283 background-color:transparent; 284 border-radius: 5px 5px 5px 5px; 285 font-family: Helvetica,Arial,sans-serif; 286 text-decoration: none; 287 white-space: normal; 288 border: 1px solid #424242; 289 padding:5px; 290 } 291 .bloc_stuff { 292 color: #FFFFFF; 293 background-image: url("img/btn.png"); 294 background-color:transparent; 295 border-radius: 5px 5px 5px 5px; 296 font-family: Helvetica,Arial,sans-serif; 297 text-decoration: none; 298 white-space: normal; 299 border: 1px solid #424242; 300 } 287 301 .titrePage .categoryActions { 288 302 color: #FFFFFF; -
extensions/stripped_black_bloc/themeconf.inc.php
r16790 r17843 64 64 foreach ($tpl_thumbnails_var as $tplvar) 65 65 { 66 $tplvar['TN_CLASS']=($i==$config['starting_to']) ? " bloc_big" : "bloc";66 $tplvar['TN_CLASS']=($i==$config['starting_to']) ? "twocol" : "onecol"; 67 67 $new_tplvar[]=$tplvar; 68 68 $i= ($i==$config['every_x']) ? 1 : $i+1 ;
Note: See TracChangeset
for help on using the changeset viewer.
