Changeset 28936

Timestamp:

Jul 3, 2014, 10:08:40 PM (10 years ago)

Author:

rvelices

Message:

modus

• use a la gthumb captions instead of flyouts (code for popout is still available by changing a const in the code)
• better album thumbs display for mobile (when there would be too much free space in the row)
• menu categories display with squares (required only when menutree plugin is not active)

Location:

extensions/modus

Files:

• css/index.css.tpl (modified) (2 diffs)
• css/menuh.css.tpl (modified) (1 diff)
• template/thumbnails.tpl (modified) (1 diff)
• themeconf.inc.php (modified) (5 diffs)

extensions/modus/css/index.css.tpl

@@ -35 +35 @@
 }
 
+{if $smarty.const.MODUS_POP}
+.popDesc {
+        display: none
+}
+{else}
+.overDesc {
+        color: white;
+        background-color: rgba(0,0,0,0.5);
+
+        position: absolute;
+        height: 1.5em;
+        width: 100%;
+        left: 0; /* for IE7, all others use 0 by default*/
+        bottom: -100px;
+        overflow: hidden;
+        text-align: center;
+        text-shadow: 1px 1px 3px rgba(0,0,0,0.8);
+        line-height: 1.4;
+        font-weight: bold;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        transition: all 200ms ease-out 0s;
+}
+
+LI:hover>.overDesc {
+        bottom: -1px; /* -1 for IE8 which has some rounding issues */
+}
+{/if}
+
 
 
@@ -163 +192 @@
 }
 
+{if $MODUS_ALBUM_THUMB_SIZE>222 && $MODUS_ALBUM_THUMB_SIZE<360}
+@media (max-width:320px), {cssResolution min=1.3}{
+        .albThumbs LI {
+                width: 156px;
+                height: 156px;
+                margin: 5px 1px;
+        }
+}
+{/if}
 
 

extensions/modus/css/menuh.css.tpl

@@ -4 +4 @@
         margin: 0; /*various default user agent css*/
 }
+
+{if !isset($loaded_plugins['rv_menutree'])}
+#mbCategories UL {
+        list-style-type: square;
+        padding-left: 8px;
+}
+{/if}
 
 #menubar LI.selected>A {

extensions/modus/template/thumbnails.tpl

@@ -1 +1 @@
 {if !empty($thumbnails)}{strip}
 {if $derivative_params->max_width()/$derivative_params->max_height() > 1.5 || ($derivative_params->max_height()<400 && !$derivative_params->sizing->max_crop)}
-{html_style}{literal}
-.popDesc{display:none}
-{/literal}{/html_style}
 {modus_thumbs}
 {else}

extensions/modus/themeconf.inc.php

@@ -13 +13 @@
 );
 
+define('MODUS_POP',0);
 define('MODUS_STR_RECENT', "\xe2\x9c\xbd"); //HEAVY TEARDROP-SPOKED ASTERISK
 define('MODUS_STR_RECENT_CHILD', "\xe2\x9c\xbb"); //TEARDROP-SPOKED ASTERISK
@@ -28 +29 @@
                 @$conf['modus_theme']['album_thumb_size'],
                 ImageStdParams::get_by_type(IMG_SQUARE)->max_width(),
+                MODUS_POP
         ))));
 
@@ -207 +209 @@
         }
 
-        $do_pop = 'desktop' == $device;
+        $do_pop = MODUS_POP && 'desktop' == $device;
+        $do_over = !MODUS_POP && 'desktop' == $device;
 
         $new_icon = " <span class=albSymbol title=\"".l10n('posted on %s')."\">".MODUS_STR_RECENT.'</span>';
@@ -241 +244 @@
                 elseif ($csize[1] > $row_height)
                         $csize = $c->get_scaled_size(9999, $row_height);
-?>
+                if ($do_pop) {?>
 <li style=width:<?=$csize[0]?>px;height:<?=$row_height?>px><a href="<?=$item['URL']?>"<?=$a_style?>><img src="<?=$c->get_url()?>" width=<?=$csize[0]?> height=<?=$csize[1]?> alt="<?=$item['TN_ALT']?>" data-pop='{"w":<?=$popsize[0]?>,"h":<?=$popsize[1]?>,"url":"<?=$pop->get_url()?>"}'></a><b class=popDesc><b><?=$item['NAME']?></b><?=$new?><br><?=$item['DESCRIPTION']?></b></li>
 <?php
+                } elseif ($do_over) {?>
+<li style=width:<?=$csize[0]?>px;height:<?=$row_height?>px><a href="<?=$item['URL']?>"<?=$a_style?>><img src="<?=$c->get_url()?>" width=<?=$csize[0]?> height=<?=$csize[1]?> alt="<?=$item['TN_ALT']?>"></a><div class=overDesc><?=$item['NAME']?><?=$new?></div></li>
+<?php
+                } else {?>
+<li style=width:<?=$csize[0]?>px;height:<?=$row_height?>px><a href="<?=$item['URL']?>"<?=$a_style?>><img src="<?=$c->get_url()?>" width=<?=$csize[0]?> height=<?=$csize[1]?> alt="<?=$item['TN_ALT']?>"></a></li>
+<?php
+                }
         }
 
@@ -267 +277 @@
         $req = null;
         $all = $template->scriptLoader->get_all();
-        if (isset($all['modus.thumb.pop']) || 'desktop' != get_device())
+        if (isset($all['modus.thumb.pop']) || !MODUS_POP || 'desktop' != get_device())
                 return;
         foreach($all as $script)