- Timestamp:
- Dec 30, 2010, 8:47:17 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/template.class.php
r8378 r8401 429 429 $css = array_merge($css, $files); 430 430 } 431 431 432 432 $content = array(); 433 433 foreach( $css as $file_ver ) … … 598 598 if (count($this->scriptLoader->inline_scripts)) 599 599 { 600 $content[]= '<script type="text/javascript">//<![CDATA[ 600 $content[]= '<script type="text/javascript">//<![CDATA[ 601 601 '; 602 602 $content = array_merge($content, $this->scriptLoader->inline_scripts); … … 979 979 } 980 980 } 981 981 982 foreach( array_keys($todo) as $id ) 982 983 { … … 1020 1021 return $results; 1021 1022 } 1022 1023 1023 1024 // checks that if B depends on A, then B->load_mode >= A->load_mode in order to respect execution order 1024 1025 private static function check_load_dep($scripts) … … 1042 1043 $changed = true; 1043 1044 } 1044 if ($load==2 && $scripts[$precedent]->load_mode==2 && ($script ->is_remote() or !$conf['template_combine_files']) )1045 if ($load==2 && $scripts[$precedent]->load_mode==2 && ($scripts[$precedent]->is_remote() or !$conf['template_combine_files']) ) 1045 1046 {// we are async -> a predecessor cannot be async unlesss it can be merged; otherwise script execution order is not guaranteed 1046 1047 $scripts[$precedent]->load_mode = 1; … … 1159 1160 global $conf; 1160 1161 $key = array(); 1161 if ($is_css) 1162 if ($is_css) 1162 1163 $key[] = get_absolute_root_url(false);//because we modify bg url 1163 1164 for ($i=0; $i<count($this->files); $i++) … … 1171 1172 $file = base_convert(crc32($key),10,36); 1172 1173 $file = self::OUT_SUB_DIR . $file . '.' . $this->type; 1173 1174 1174 1175 $exists = file_exists( PHPWG_ROOT_PATH . $file ); 1175 1176 if ($exists) … … 1221 1222 return $js; 1222 1223 } 1223 1224 1224 1225 private static function process_css($file) 1225 1226 { … … 1227 1228 require_once(PHPWG_ROOT_PATH.'include/cssmin.class.php'); 1228 1229 $css = CssMin::minify($css, array('emulate-css3-variables'=>false)); 1229 1230 $css = trigger_event('combined_css_postfilter', $css); 1230 1231 return $css; 1231 1232 } 1232 1233 1233 1234 private static function process_css_rec($file) 1234 1235 { … … 1244 1245 $relative = dirname($file) . "/$match[1]"; 1245 1246 $search[] = $match[0]; 1246 $replace[] = 'url('.embellish_url(get_absolute_root_url(false) ).$relative.')';1247 $replace[] = 'url('.embellish_url(get_absolute_root_url(false).$relative).')'; 1247 1248 } 1248 1249 } -
trunk/index.php
r6363 r8401 27 27 include(PHPWG_ROOT_PATH.'include/section_init.inc.php'); 28 28 29 // Check Access and exit when user status is not ok 30 check_status(ACCESS_GUEST); 31 32 if (!isset($page['start'])) 33 { 34 $page['start'] = 0; 35 } 36 37 // access authorization check 38 if (isset($page['category'])) 39 { 40 check_restrictions($page['category']['id']); 41 } 42 29 43 trigger_action('loc_begin_index'); 30 31 // +-----------------------------------------------------------------------+32 // | Check Access and exit when user status is not ok |33 // +-----------------------------------------------------------------------+34 check_status(ACCESS_GUEST);35 44 36 45 //---------------------------------------------- change of image display order … … 53 62 } 54 63 //-------------------------------------------------------------- initialization 55 // detection of the start picture to display56 if (!isset($page['start']))57 {58 $page['start'] = 0;59 }60 61 // access authorization check62 if (isset($page['category']))63 {64 check_restrictions($page['category']['id']);65 }66 64 67 65 $page['navigation_bar'] = array(); … … 256 254 257 255 // category comment 258 if ( isset($page['comment']) and $page['comment'] != '')256 if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) ) 259 257 { 260 258 $template->assign('CONTENT_DESCRIPTION', $page['comment'] ); -
trunk/themes/default/template/index.tpl
r8091 r8401 4 4 <div class="titrePage"> 5 5 <ul class="categoryActions"> 6 {if !empty($image_orders) 6 {if !empty($image_orders)} 7 7 <li> 8 8 {'Sort order'|@translate}: 9 9 <select onchange="document.location = this.options[this.selectedIndex].value;"> 10 {foreach from=$image_orders item=image_order 10 {foreach from=$image_orders item=image_order} 11 11 <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option> 12 12 {/foreach} … … 76 76 {/if} 77 77 78 {if isset($chronology.TITLE) 78 {if isset($chronology.TITLE)} 79 79 <h2>{$chronology.TITLE}</h2> 80 80 {/if} 81 81 82 </div> 82 </div><!-- titrePage --> 83 83 84 84 {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} 85 85 86 {if !empty($category_search_results) 86 {if !empty($category_search_results)} 87 87 <div style="font-size:16px;margin:10px 16px">{'Album results for'|@translate} <strong>{$QUERY_SEARCH}</strong> : 88 89 90 91 92 93 88 <em><strong> 89 {foreach from=$category_search_results item=res name=res_loop} 90 {if !$smarty.foreach.res_loop.first} — {/if} 91 {$res} 92 {/foreach} 93 </strong></em> 94 94 </div> 95 95 {/if} 96 96 97 {if !empty($tag_search_results) 97 {if !empty($tag_search_results)} 98 98 <div style="font-size:16px;margin:10px 16px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> : 99 100 101 102 103 104 99 <em><strong> 100 {foreach from=$tag_search_results item=res name=res_loop} 101 {if !$smarty.foreach.res_loop.first} — {/if} 102 {$res} 103 {/foreach} 104 </strong></em> 105 105 </div> 106 106 {/if} 107 107 108 {if isset($FILE_CHRONOLOGY_VIEW) 108 {if isset($FILE_CHRONOLOGY_VIEW)} 109 109 {include file=$FILE_CHRONOLOGY_VIEW} 110 110 {/if} 111 111 112 {if !empty($CATEGORIES) }{$CATEGORIES}{/if} 113 {if !empty($THUMBNAILS) }{$THUMBNAILS}{/if} 114 115 {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} 116 117 {if !empty($CONTENT_DESCRIPTION) } 112 {if !empty($CONTENT_DESCRIPTION)} 118 113 <div class="additional_info"> 119 114 {$CONTENT_DESCRIPTION} 120 115 </div> 121 116 {/if} 122 117 123 {if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if} 124 </div> <!-- content --> 118 {if !empty($CATEGORIES)}{$CATEGORIES}{/if} 119 {if !empty($THUMBNAILS)} 120 <ul class="thumbnails" id="thumbnails"> 121 {$THUMBNAILS} 122 </ul> 123 {/if} 125 124 125 {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} 126 127 {if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if} 128 </div><!-- content --> 126 129 {if !empty($PLUGIN_INDEX_CONTENT_AFTER)}{$PLUGIN_INDEX_CONTENT_AFTER}{/if} -
trunk/themes/default/template/thumbnails.tpl
r8362 r8401 1 1 2 2 {if !empty($thumbnails)} 3 <ul class="thumbnails">4 3 {foreach from=$thumbnails item=thumbnail} 5 4 <li> … … 32 31 </li> 33 32 {/foreach} 34 </ul>35 33 {/if} 36 37
Note: See TracChangeset
for help on using the changeset viewer.