Changeset 8401

Timestamp:

Dec 30, 2010, 8:47:17 PM (13 years ago)

Author:

rvelices

Message:

index.tpl and thumbnails change: category description above thumbs and enclosing ul moved to index.tpl
fix some combine_xxx

Location:

trunk

Files:

• include/template.class.php (modified) (10 diffs)
• index.php (modified) (3 diffs)
• themes/default/template/index.tpl (modified) (2 diffs)
• themes/default/template/thumbnails.tpl (modified) (2 diffs)

trunk/include/template.class.php

@@ -429 +429 @@
           $css = array_merge($css, $files);
       }
-      
+
       $content = array();
       foreach( $css as $file_ver )
@@ -598 +598 @@
       if (count($this->scriptLoader->inline_scripts))
       {
-        $content[]= '<script type="text/javascript">//<![CDATA[ 
+        $content[]= '<script type="text/javascript">//<![CDATA[
 ';
         $content = array_merge($content, $this->scriptLoader->inline_scripts);
@@ -979 +979 @@
       }
     }
+
     foreach( array_keys($todo) as $id )
     {
@@ -1020 +1021 @@
     return $results;
   }
-  
+
   // checks that if B depends on A, then B->load_mode >= A->load_mode in order to respect execution order
   private static function check_load_dep($scripts)
@@ -1042 +1043 @@
             $changed = true;
           }
-          if ($load==2 && $scripts[$precedent]->load_mode==2 && ($script->is_remote() or !$conf['template_combine_files']) )
+          if ($load==2 && $scripts[$precedent]->load_mode==2 && ($scripts[$precedent]->is_remote() or !$conf['template_combine_files']) )
           {// we are async -> a predecessor cannot be async unlesss it can be merged; otherwise script execution order is not guaranteed
             $scripts[$precedent]->load_mode = 1;
@@ -1159 +1160 @@
     global $conf;
     $key = array();
-    if ($is_css) 
+    if ($is_css)
       $key[] = get_absolute_root_url(false);//because we modify bg url
     for ($i=0; $i<count($this->files); $i++)
@@ -1171 +1172 @@
     $file = base_convert(crc32($key),10,36);
     $file = self::OUT_SUB_DIR . $file . '.' . $this->type;
-    
+
     $exists = file_exists( PHPWG_ROOT_PATH . $file );
     if ($exists)
@@ -1221 +1222 @@
     return $js;
   }
-  
+
   private static function process_css($file)
   {
@@ -1227 +1228 @@
     require_once(PHPWG_ROOT_PATH.'include/cssmin.class.php');
     $css = CssMin::minify($css, array('emulate-css3-variables'=>false));
-                $css = trigger_event('combined_css_postfilter', $css);
+    $css = trigger_event('combined_css_postfilter', $css);
     return $css;
   }
-  
+
   private static function process_css_rec($file)
   {
@@ -1244 +1245 @@
           $relative = dirname($file) . "/$match[1]";
           $search[] = $match[0];
-          $replace[] = 'url('.embellish_url(get_absolute_root_url(false)).$relative.')';
+          $replace[] = 'url('.embellish_url(get_absolute_root_url(false).$relative).')';
         }
       }

trunk/index.php

@@ -27 +27 @@
 include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
 
+// Check Access and exit when user status is not ok
+check_status(ACCESS_GUEST);
+
+if (!isset($page['start']))
+{
+  $page['start'] = 0;
+}
+
+// access authorization check
+if (isset($page['category']))
+{
+  check_restrictions($page['category']['id']);
+}
+
 trigger_action('loc_begin_index');
-
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
-// +-----------------------------------------------------------------------+
-check_status(ACCESS_GUEST);
 
 //---------------------------------------------- change of image display order
@@ -53 +62 @@
 }
 //-------------------------------------------------------------- initialization
-// detection of the start picture to display
-if (!isset($page['start']))
-{
-  $page['start'] = 0;
-}
-
-// access authorization check
-if (isset($page['category']))
-{
-  check_restrictions($page['category']['id']);
-}
 
 $page['navigation_bar'] = array();
@@ -256 +254 @@
 
 // category comment
-if (isset($page['comment']) and $page['comment'] != '')
+if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) )
 {
   $template->assign('CONTENT_DESCRIPTION', $page['comment'] );

trunk/themes/default/template/index.tpl

@@ -4 +4 @@
 <div class="titrePage">
         <ul class="categoryActions">
-                {if !empty($image_orders) }
+                {if !empty($image_orders)}
                 <li>
                 {'Sort order'|@translate}:
                 <select onchange="document.location = this.options[this.selectedIndex].value;">
-                        {foreach from=$image_orders item=image_order }
+                        {foreach from=$image_orders item=image_order}
                         <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
                         {/foreach}
@@ -76 +76 @@
 {/if}
 
-{if isset($chronology.TITLE) }
+{if isset($chronology.TITLE)}
 <h2>{$chronology.TITLE}</h2>
 {/if}
 
-</div> <!-- titrePage -->
+</div><!-- titrePage -->
 
 {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
 
-{if !empty($category_search_results) }
+{if !empty($category_search_results)}
 <div style="font-size:16px;margin:10px 16px">{'Album results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
-  <em><strong>
-  {foreach from=$category_search_results item=res name=res_loop}
-  {if !$smarty.foreach.res_loop.first} &mdash; {/if}
-  {$res}
-  {/foreach}
-  </strong></em>
+        <em><strong>
+        {foreach from=$category_search_results item=res name=res_loop}
+        {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+        {$res}
+        {/foreach}
+        </strong></em>
 </div>
 {/if}
 
-{if !empty($tag_search_results) }
+{if !empty($tag_search_results)}
 <div style="font-size:16px;margin:10px 16px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
-  <em><strong>
-  {foreach from=$tag_search_results item=res name=res_loop}
-  {if !$smarty.foreach.res_loop.first} &mdash; {/if}
-  {$res}
-  {/foreach}
-  </strong></em>
+        <em><strong>
+        {foreach from=$tag_search_results item=res name=res_loop}
+        {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+        {$res}
+        {/foreach}
+        </strong></em>
 </div>
 {/if}
 
-{if isset($FILE_CHRONOLOGY_VIEW) }
+{if isset($FILE_CHRONOLOGY_VIEW)}
 {include file=$FILE_CHRONOLOGY_VIEW}
 {/if}
 
-{if !empty($CATEGORIES) }{$CATEGORIES}{/if}
-{if !empty($THUMBNAILS) }{$THUMBNAILS}{/if}
-
-{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
-
-{if !empty($CONTENT_DESCRIPTION) }
+{if !empty($CONTENT_DESCRIPTION)}
 <div class="additional_info">
-  {$CONTENT_DESCRIPTION}
+        {$CONTENT_DESCRIPTION}
 </div>
 {/if}
 
-{if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if}
-</div> <!-- content -->
+{if !empty($CATEGORIES)}{$CATEGORIES}{/if}
+{if !empty($THUMBNAILS)}
+<ul class="thumbnails" id="thumbnails">
+{$THUMBNAILS}
+</ul>
+{/if}
 
+{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+
+{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
+</div><!-- content -->
 {if !empty($PLUGIN_INDEX_CONTENT_AFTER)}{$PLUGIN_INDEX_CONTENT_AFTER}{/if}

trunk/themes/default/template/thumbnails.tpl

@@ -1 +1 @@
 
 {if !empty($thumbnails)}
-<ul class="thumbnails">
 {foreach from=$thumbnails item=thumbnail}
         <li>
@@ -32 +31 @@
         </li>
 {/foreach}
-</ul>
 {/if}
-
-