Changeset 2481
- Timestamp:
- Aug 22, 2008, 2:45:03 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
include/template.class.php (modified) (2 diffs)
-
template-common/default-layout.css (modified) (1 diff)
-
template/yoga/comment_list.tpl (modified) (1 diff)
-
template/yoga/content.css (modified) (2 diffs)
-
template/yoga/menubar.css (modified) (1 diff)
-
template/yoga/not-ie.css (modified) (1 diff)
-
template/yoga/picture.tpl (modified) (1 diff)
-
template/yoga/theme/clear/theme.css (modified) (3 diffs)
-
template/yoga/theme/dark/theme.css (modified) (4 diffs)
-
template/yoga/theme/p0w0/theme.css (modified) (9 diffs)
-
template/yoga/theme/wipi/theme.css (modified) (8 diffs)
-
template/yoga/thumbnails.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/template.class.php
r2476 r2481 80 80 $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') ); 81 81 $this->smarty->register_block('html_head', array(&$this, 'block_html_head') ); 82 $this->smarty->register_prefilter( array('Template', 'prefilter_white_space') ); 82 83 if ( $conf['compiled_template_cache_language'] ) 83 84 { 84 $this->smarty->register_prefilter( array( &$this, 'prefilter_language') );85 $this->smarty->register_prefilter( array('Template', 'prefilter_language') ); 85 86 } 86 87 … … 356 357 } 357 358 359 /*static */ function prefilter_white_space($source, &$smarty) 360 { 361 $ld = $smarty->left_delimiter; 362 $rd = $smarty->right_delimiter; 363 $ldq = preg_quote($ld, '#'); 364 $rdq = preg_quote($rd, '#'); 365 366 $regex = array(); 367 $tags = array('if', 'foreach', 'section'); 368 foreach($tags as $tag) 369 { 370 array_push($regex, "#^\s+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m"); 371 array_push($regex, "#^\s+($ldq/$tag$rdq)\s*$#m"); 372 } 373 $tags = array('include', 'else', 'html_head'); 374 foreach($tags as $tag) 375 { 376 array_push($regex, "#^\s+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m"); 377 } 378 $source = preg_replace( $regex, "$1", $source); 379 return $source; 380 } 381 358 382 /** 359 383 * Smarty prefilter to allow caching (whenever possible) language strings 360 384 * from templates. 361 385 */ 362 function prefilter_language($source, &$smarty)386 /*static */ function prefilter_language($source, &$smarty) 363 387 { 364 388 global $lang; 365 $ldq = preg_quote($ this->smarty->left_delimiter, '~');366 $rdq = preg_quote($ this->smarty->right_delimiter, '~');389 $ldq = preg_quote($smarty->left_delimiter, '~'); 390 $rdq = preg_quote($smarty->right_delimiter, '~'); 367 391 368 392 $regex = "~$ldq *\'([^'$]+)\'\|@translate *$rdq~"; -
trunk/template-common/default-layout.css
r2480 r2481 27 27 .content DIV.thumbnailCategory DIV.description { 28 28 height: 140px; /* max thumbnail height + 2px */ 29 }30 DIV#comments DIV.comment A.illustration {31 width: 140px; /*maximum thumbnail width + ~5px */32 29 } 33 30 -
trunk/template/yoga/comment_list.tpl
r2480 r2481 1 1 {* $Id$ *} 2 2 {foreach from=$comments item=comment} 3 <div class="comment" > 4 {if isset($comment.TN_SRC)} 5 <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}" alt="{$comment.ALT}" /></a> 6 {/if} 7 <div class="commentHeader"> 3 <div class="thumbnailCategory"> 4 {if isset($comment.TN_SRC)} 5 <div class="illustration"> 6 <a href="{$comment.U_PICTURE}"> 7 <img src="{$comment.TN_SRC}" alt="{$comment.ALT}" /> 8 </a> 9 </div> 10 {/if} 11 <div class="description"> 8 12 {if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) } 9 13 <ul class="actions" style="float:right"> 10 14 {if isset($comment.U_DELETE)} 11 15 <li> 12 16 <a href="{$comment.U_DELETE}" title="{'comments_del'|@translate}"> 13 <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[ {'delete'|@translate}]"/>17 <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]" /> 14 18 </a> 15 </li>{/if}16 19 </li> 20 {/if} 17 21 {if isset($comment.U_VALIDATE)} 18 22 <li> 19 23 <a href="{$comment.U_VALIDATE}" title="validate this comment"> 20 <img src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" alt="[validate]" />24 <img src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" alt="[validate]" /> 21 25 </a> 22 </li>{/if} 26 </li> 27 {/if} 23 28 </ul> 24 29 {/if} 25 30 <span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span> 31 <blockquote>{$comment.CONTENT}</blockquote> 26 32 </div> 27 28 <blockquote>{$comment.CONTENT}</blockquote>29 33 </div> 34 {if isset($comment_separator)} 30 35 <hr/> 36 {/if} 31 37 {/foreach} 32 -
trunk/template/yoga/content.css
r2480 r2481 74 74 } 75 75 76 /* User comments */77 78 DIV#comments {79 padding-left: 5px;80 padding-right: 5px;81 }82 83 DIV#comments HR {84 clear:both;85 }86 87 DIV#comments DIV.comment A.illustration {88 display: block;89 float: left;90 margin: 0.5em 1em 0 0.5em;91 width: 140px;92 }93 94 76 /* begin chronology/calendar elements*/ 95 77 .content DIV.calendarViews { … … 210 192 float: left; 211 193 } 194 195 196 /* User comments */ 197 DIV#comments { 198 padding-left: 5px; 199 padding-right: 5px; 200 } 201 202 DIV#comments DIV.description { 203 font-size: 100%; 204 } -
trunk/template/yoga/menubar.css
r2480 r2481 11 11 12 12 #menubar .button { 13 margin: 0 2px;13 margin: 2px 2px ; 14 14 width: auto; 15 15 padding: 0; -
trunk/template/yoga/not-ie.css
r2480 r2481 8 8 -webkit-border-radius: 4px; /* Safari webkit project */ 9 9 } 10 ul.tabsheet li {11 -moz-border-radius: 6px 6px 0px 0px; /* round corners with Geko */12 -webkit-border-radius: 6px 6px 0px 0px; /* Safari webkit project */13 } -
trunk/template/yoga/picture.tpl
r2480 r2481 245 245 {if isset($COMMENT_COUNT)} 246 246 <div id="comments"> 247 <h2>[{$COMMENT_COUNT}] {'comments_title'|@translate}</h2> 248 249 <div class="navigationBar">{$COMMENT_NAV_BAR}</div> 250 251 {if isset($comments)} 252 {include file='comment_list.tpl'} 253 {/if} 254 255 {if isset($comment_add)} 256 <form method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment"> 257 <fieldset> 258 <legend>{'comments_add'|@translate}</legend> 259 {if $comment_add.SHOW_AUTHOR} 260 <label>{'upload_author'|@translate}<input type="text" name="author"></label> 261 {/if} 262 <label>{'comment'|@translate}<textarea name="content" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label> 263 <input type="hidden" name="key" value="{$comment_add.KEY}" /> 264 <input class="submit" type="submit" value="{'Submit'|@translate}"> 265 </fieldset> 266 </form> 267 {/if} 268 247 <h3>[{$COMMENT_COUNT}] {'comments_title'|@translate}</h3> 248 249 {if !empty($COMMENT_NAV_BAR)} 250 <div class="navigationBar">{$COMMENT_NAV_BAR}</div> 251 {/if} 252 253 {if isset($comments)} 254 {include file='comment_list.tpl' comment_separator=true} 255 {/if} 256 257 {if isset($comment_add)} 258 <form method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment"> 259 <fieldset> 260 <legend>{'comments_add'|@translate}</legend> 261 {if $comment_add.SHOW_AUTHOR} 262 <label>{'upload_author'|@translate}<input type="text" name="author"></label> 263 {/if} 264 <label>{'comment'|@translate}<textarea name="content" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label> 265 <input type="hidden" name="key" value="{$comment_add.KEY}" /> 266 <input class="submit" type="submit" value="{'Submit'|@translate}"> 267 </fieldset> 268 </form> 269 {/if} 269 270 </div> 270 271 {/if} {*comments*} -
trunk/template/yoga/theme/clear/theme.css
r2480 r2481 4 4 BODY, H1, H2, H3, DT, 5 5 INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ { 6 6 color:#696969; /* dimgray */ 7 7 } 8 8 9 9 /* backgrounds */ 10 BODY, H3 , .throw{11 10 BODY, H3 { 11 background-color: #ffffff; /* white */ 12 12 } 13 13 14 H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover , .row1{15 14 H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover { 15 background-color: #d3d3d3; 16 16 } 17 17 … … 34 34 35 35 FIELDSET, INPUT, SELECT, TEXTAREA, 36 .content DIV.comment A.illustration IMG,37 36 .content DIV.thumbnailCategory { 38 37 border: 1px solid gray; … … 81 80 82 81 83 UL.tabsheet LI.normal_tab { background-color: #d3d3d3; }84 UL.tabsheet LI.selected_tab { background-color: #eeeeee; }85 86 UL.tabsheet, UL.tabsheet LI {border-color: gray;}87 UL.tabsheet LI.normal_tab:hover { border-color: black; } -
trunk/template/yoga/theme/dark/theme.css
r2480 r2481 7 7 } 8 8 9 H2, #menubar DT , .throw{9 H2, #menubar DT { 10 10 color: #fff48e; 11 11 } … … 14 14 /* backgrounds */ 15 15 16 BODY, H3, #imageHeaderBar, #imageToolBar A:hover , .row1, UL.tabsheet LI.normal_tab{16 BODY, H3, #imageHeaderBar, #imageToolBar A:hover { 17 17 background-color: #2f2f2f; 18 18 } 19 19 20 #menubar DL, .content, #imageToolBar, .header_notes , UL.tabsheet LI.selected_tab{20 #menubar DL, .content, #imageToolBar, .header_notes { 21 21 background-color: #505050; 22 22 } 23 23 24 H2, #menubar DT , .throw{24 H2, #menubar DT { 25 25 background-image: url(images/tableh1_bg.png); 26 26 } … … 51 51 52 52 FIELDSET, INPUT, SELECT, TEXTAREA, 53 .content DIV.comment A.illustration IMG,54 53 .content DIV.thumbnailCategory { 55 54 border: 1px solid gray; … … 69 68 } 70 69 71 UL.tabsheet LI.normal_tab:hover { border-color: #fff48e; }72 70 73 71 /* links */ -
trunk/template/yoga/theme/p0w0/theme.css
r2480 r2481 18 18 /******************************************************************************/ 19 19 /* Texts Only */ 20 BODY, H1, H3, DT, H2 , .throw{ color: #369; }21 H2, #menubar DT, .throw,TD H3 {20 BODY, H1, H3, DT, H2 { color: #369; } 21 H2, #menubar DT, TD H3 { 22 22 color: #fff; 23 23 } … … 72 72 letter-spacing: 0em; 73 73 } 74 #thePicturePage #comments H 2{74 #thePicturePage #comments H3 { 75 75 color: #69c; 76 76 } … … 81 81 color: #369; 82 82 } 83 .tabsheet li, .tabsheet li a,84 83 .content div.thumbnailCategory .description h3 a { 85 84 color: #fff; 86 85 } 87 . tabsheet li a:hover, .content div.thumbnailCategory .description h3 a:hover {86 .content div.thumbnailCategory .description h3 a:hover { 88 87 color: #f92; 89 88 } … … 98 97 .content { background-color: #dfe8ff; } 99 98 #the_page { background-color: #dfe8ff; } 100 #menubar, H3, #imageHeaderBar, 101 .row1 { background-color: #eef; } 102 H2, #menubar DT, .throw, TD H3, 99 #menubar, H3, #imageHeaderBar { background-color: #eef; } 100 H2, #menubar DT, TD H3, 103 101 #imageToolBar, 104 #imageHeaderBar, #imageHeaderBar H2, .tabsheet li,102 #imageHeaderBar, #imageHeaderBar H2, 105 103 .content H2 { background-color: #369; } 106 104 .content .infos { background-color: #47a; ;} 107 105 .content .errors { background-color: #fc5; ;} 108 #thePicturePage #comments H 2{ background-color: #eef; ;}106 #thePicturePage #comments H3 { background-color: #eef; ;} 109 107 .content ul.thumbnailCategories li div.thumbnailCategory .description h3 { 110 108 background-color: #69c; … … 120 118 input#qsearchInput { background-color: #cde; } 121 119 .virtual_cat { background: #fff !important; } 122 .selected_tab { background-color: #69c !important; }123 120 /******************************************************************************/ 124 121 /* Borders, Margins, Padding Only */ … … 159 156 padding: 3px 0px 15px 0px; 160 157 } 161 #thePicturePage #comments H 2{158 #thePicturePage #comments H3 { 162 159 border-top: 2px solid #69c; 163 160 border-bottom: 1px solid #369; … … 181 178 } 182 179 FIELDSET, INPUT, SELECT, TEXTAREA, 183 .content DIV.comment A.illustration IMG,184 180 .content DIV.thumbnailCategory { 185 181 border: 1px solid #69c; … … 206 202 margin: 0px; 207 203 } 208 ul.tabsheet, ul.tabsheet li { border-color: #369 !important; }209 .tabsheet li:hover { border-color: #f92 !important; }210 204 211 205 /******************************************************************************/ … … 254 248 * { outline: none; } 255 249 256 tr.throw td a { color: #fff; }257 tr.throw td a:focus { color: #f92; } -
trunk/template/yoga/theme/wipi/theme.css
r2480 r2481 11 11 border: 0px; 12 12 } 13 H2 , .throw{13 H2 { 14 14 color: #eee; 15 15 } … … 63 63 padding: 0px; 64 64 } 65 H3, #imageToolBar A:hover , .row1, .tabsheet li{65 H3, #imageToolBar A:hover { 66 66 background-color: #222; 67 67 } … … 73 73 background-color: #333; 74 74 } 75 .selected_tab { background-color: eee !important; }76 75 A { 77 76 border-color: #69c; … … 86 85 } 87 86 88 H2, #menubar DT, .throw,TD H3 {87 H2, #menubar DT, TD H3 { 89 88 background-image: url(images/tableh1_bg.png); 90 89 background-repeat: repeat-x; … … 146 145 } 147 146 148 #thePicturePage #comments H 2{147 #thePicturePage #comments H3 { 149 148 background-image: none; 150 149 background-color: #222; … … 175 174 } 176 175 FIELDSET, INPUT, SELECT, TEXTAREA, 177 .content DIV.comment A.illustration IMG,178 176 .content DIV.thumbnailCategory { 179 177 border: 1px solid gray; … … 195 193 } 196 194 197 #menubar .buttonmenu {198 margin: 0 2px;199 width: auto;200 padding: 0;201 text-indent: 0;202 list-style: none;203 text-align: center;204 float: left;205 }206 195 /* links */ 207 196 A, INPUT.rateButton, legend { … … 287 276 h2.showtitle, #theImage p.showlegend { display: none } 288 277 * { outline-width: 0px; } 289 ul.tabsheet, ul.tabsheet li {290 border-color: #69c;291 }292 ul.tabsheet li.normal_tab {293 background-image: url(images/tableh1_bg.png);294 background-repeat: repeat-x;295 }296 ul.tabsheet li.normal_tab:hover { border-color: #f92 }297 ul.tabsheet li {298 -moz-border-radius: 0px 0px 3px 3px;299 border-radius: 0px 0px 12px 12px;300 -webkit-border-radius: 0px 0px 3px 3px;301 } -
trunk/template/yoga/thumbnails.css
r2352 r2481 51 51 top: 2px; 52 52 } 53 54 UL.thumbnails .levelIndicatorB {55 display:block; position:absolute; z-index:100;padding:0px 0 0 14px; color:black; font-weight:bold; fontsize:120%;56 }57 58 UL.thumbnails .levelIndicatorF {59 display:block; position:absolute; z-index:101;padding:1px 0 0 15px; color:white; font-weight:bold; fontsize:120%;60 }
Note: See TracChangeset
for help on using the changeset viewer.
