Changeset 30053

Timestamp:

Oct 14, 2014, 9:28:26 PM (10 years ago)

Author:

rvelices

Message:

modus improve display of image number on picture page + add fotorama template

Location:

extensions/modus

Files:

• css/picture.css.tpl (modified) (1 diff)
• functions.inc.php (modified) (1 diff)
• template/fotorama.tpl (added)
• themeconf.inc.php (modified) (4 diffs)

extensions/modus/css/picture.css.tpl

@@ -1 @@
-
-#imageToolBar .imageNumber {
+#imageHeaderBar .imageNumber {
+/* moved by prefilter from imageToolBar*/
         float: right;
-        margin:-28px 9px 0 0;
 }
 

extensions/modus/functions.inc.php

@@ -47 +47 @@
         }
 
+        /* move imageNumber from imageToolBar to imageHeaderBar*/
+        if (preg_match('#<div[ a-zA-Z"=]+id="?imageHeaderBar"?>#', $source, $matches, PREG_OFFSET_CAPTURE)
+                && preg_match('#<div class="?imageNumber"?>{\\$PHOTO}</div>#', $source, $matches2, PREG_OFFSET_CAPTURE, $matches[0][1]+20))
+        {
+                $source = substr_replace($source, '', $matches2[0][1], strlen($matches2[0][0]));
+                $source = substr_replace($source, $matches2[0][0], $matches[0][1]+strlen($matches[0][0]),0);
+        }
+
         if ( ($pos=strpos($source, '<ul class="categoryActions">'))!==false || ($pos=strpos($source, '<ul class=categoryActions>'))!==false){
                 if ( ($pos2=strpos($source, '</ul>', $pos))!==false

extensions/modus/themeconf.inc.php

@@ -26 +26 @@
 
 $this->assign('MODUS_CSS_VERSION', crc32(implode(',', array(
-                'a'.@$conf['modus_theme']['skin'],
+                'd'.@$conf['modus_theme']['skin'],
                 @$conf['modus_theme']['album_thumb_size'],
                 ImageStdParams::get_by_type(IMG_SQUARE)->max_width(),
@@ -402 +402 @@
                 }
 
+                /*$debug[]= "avsize ".implode(',', $available_size);
+                $debug[]= "selsize ".implode(',', $selected_derivative->get_size());*/
+
                 if ($available_size[2]>1 && $selected_derivative)
                 {
@@ -415 +418 @@
                         else
                                 $display_size = array( round($size[0]/$available_size[2]), round($size[1]/$available_size[2]) );
+
+                        /*$debug[]= "dsize ".implode(',', $display_size);
+                        $debug[]= "nsize ".implode(',', $size);*/
+
                         $template->assign( array(
                                         'rvas_display_size' => $display_size,
@@ -420 +427 @@
                                 ));
                 }
+                /*if (is_admin())
+                $template->append('footer_elements', implode("\n", $debug));*/
 
                 if (isset($picture['next'])