Changeset 21216 for extensions

Timestamp:

Mar 5, 2013, 8:01:31 PM (12 years ago)

Author:

flop25

Message:

* version 2.4.0

• update for 2.5:

--website for comments (r21215)
--ajax loader and thumbnails icons
--navigation bar updated (r21210)

Location:

extensions/stripped

Files:

• icon/errors_small.png (added)
• icon/img_small.png (added)
• images/ajax_loader.gif (added)
• readme.txt (modified) (1 diff)
• template/comment_list.tpl (modified) (1 diff)
• template/index.tpl (modified) (1 diff)
• template/mainpage_categories.tpl (modified) (1 diff)
• template/thumbnails.tpl (modified) (2 diffs)
• theme.css (modified) (2 diffs)
• themeconf.inc.php (modified) (1 diff)

extensions/stripped/readme.txt

@@ -31 +31 @@
 Changelog
 ---------
+
+*** version 2.4.0
+
+- update for 2.5:
+--website for comments
+--ajax loader and thumbnails icons
+--navigation bar updated
 
 *** version 2.3.2

extensions/stripped/template/comment_list.tpl

@@ -13 +13 @@
         {foreach from=$comments item=comment name=comment_loop}
                 <li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
-                        {if isset($comment.src_image)}
+      {if isset($comment.src_image)}
+      {if isset($comment_derivative_params)}
+      {assign var=derivative value=$pwg->derivative($comment_derivative_params, $comment.src_image)}
+      {else}
+      {assign var=derivative value=$pwg->derivative($derivative_params, $comment.src_image)}
+      {/if}
+      {if !$derivative->is_cached()}
+      {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
+      {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
+      {/if}
                                 <div class="illustration">
                                         <a href="{$comment.U_PICTURE}">
-                                                <img src="{$pwg->derivative_url($derivative_params, $comment.src_image)}" alt="{$comment.ALT}">
+            <img {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.icon_dir}/img_small.png" data-src="{$derivative->get_url()}"{/if} alt="{$comment.ALT}">
                                         </a>
                                 </div>

extensions/stripped/template/index.tpl

@@ -100 +100 @@
                                                 {/if}
                                 </div>
+        <div class="loader"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
                         {/if}
                         {if !empty($PLUGIN_INDEX_CONTENT_END) }<div class="content_block">{$PLUGIN_INDEX_CONTENT_END}</div>{/if}

extensions/stripped/template/mainpage_categories.tpl

@@ -3 +3 @@
         $this->assign( 'stripped', $stripped );
 {/php}
+{footer_script}
+  var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png", max_requests = {$maxRequests};
+{/footer_script}
+<div class="loader"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
 <ul class="thumbnailCategories">
   {foreach from=$category_thumbnails item=cat name=catloop}
+  {if !$derivative->is_cached()}
+  {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
+  {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
+  {/if}
+  {assign var=derivative value=$pwg->derivative($stripped.albumSize, $cat.representative.src_image)}
   <li class="odd{if ($smarty.foreach.catloop.iteration-1) % 2 == 0}0{else}1{/if}" {if ($stripped.albumFrame)}onclick="window.location='{$cat.URL}';"{/if}>
         <div class="thumbnailCategory">
                 <div class="illustration">
                         <a href="{$cat.URL}">
-                                <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}">
+        <img {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.icon_dir}/img_small.png" data-src="{$derivative->get_url()}"{/if} alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}">
                         </a>
                 </div>

extensions/stripped/template/thumbnails.tpl

@@ -3 +3 @@
         $this->assign( 'stripped', $stripped );
 {/php}
+{footer_script}
+  var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png", max_requests = {$maxRequests};
+{/footer_script}
 {if !empty($thumbnails)}{strip}
-{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
-{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
 <ul class="thumbList">
         {foreach from=$thumbnails item=thumbnail}
                 {assign var=derivative value=$pwg->derivative($stripped.thumbSize, $thumbnail.src_image)}
-                {php}
+  {if !$derivative->is_cached()}
+  {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
+  {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
+  {/if}
+  {php}
                         global $pwg_loaded_plugins, $conf, $stripped;
-                        $this->assign('downloadMulti_loaded', isset($pwg_loaded_plugins[ 'download_multi' ]));
                         $this->assign( 'stripped', $stripped );
                 {/php}
@@ -18 +22 @@
                                 <span class="wrap2 {if !($stripped.showThumbLegend)}wrap2full{/if}">
                                         <a href="{$thumbnail.URL}"><div class="thumbframe"><div class="thumbpos">
-                                                <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|@replace:'"':' '}"{else}title="{$thumbnail.TN_TITLE}"{/if} />
+                                                <img class="thumbnail" {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.icon_dir}/img_small.png" data-src="{$derivative->get_url()}"{/if} alt="{$thumbnail.TN_ALT}" title="{if isset($thumbnail.NAME)}{$thumbnail.NAME|@replace:'"':' '}{else}{$thumbnail.TN_TITLE}{/if}">
                                                 {if (isset($stripped.imagePreload) & isset($stripped.imagePreloadThumbs))}
                                                         {assign var=preload value=$pwg->derivative($stripped.imageSize, $thumbnail.src_image)}

extensions/stripped/theme.css

@@ -618 +618 @@
 .navigationBar {
   padding: 0.5em;
-  text-align: right;
+  text-align: center;
 }
 
@@ -1500 +1500 @@
 #content .stuffs_block  .wrap2 { height:130px!important;}
 #content .stuffs_block .wrap1 .wrap2full { height:160px!important;}
+/* Loader gif new in 2.5 */
+.loader {
+  display: none;
+  position: fixed;
+  right: 0;
+  bottom: 0;
+}

extensions/stripped/themeconf.inc.php

@@ -50 +50 @@
   'theme_dir' => 'stripped',
   'icon_dir' => 'themes/stripped/icon',
+  'img_dir'      => 'themes/stripped/images',
   'admin_icon_dir' => 'themes/default/icon/admin',
   'mime_icon_dir' => 'themes/default/icon/mimetypes/',