Changeset 28601 for extensions

Timestamp:

Jun 2, 2014, 10:44:01 PM (10 years ago)

Author:

rvelices

Message:

• modus icons compatible with batch downloader, language switch
• better photo auto size on first time hit with retina devices

Location:

extensions/modus

Files:

• css/fontello/css/modus.css (modified) (1 diff)
• css/iconfontello.css (deleted)
• css/iconfontello.css.tpl (modified) (2 diffs)
• themeconf.inc.php (modified) (14 diffs)

extensions/modus/css/fontello/css/modus.css

@@ -22 +22 @@
 */
  
- [class^="pwg-icon-"]:before, [class*=" pwg-icon-"]:before {
+ .pwg-icon:before {
   font-family: "modus";
   font-style: normal;

extensions/modus/css/iconfontello.css.tpl

@@ -6 +6 @@
 
 .pwg-icon {
-        font-size: 24px;
+{if isset($loaded_plugins['language_switch']) || isset($loaded_plugins['BatchDownloader'])}
+        display: inline-block;
+{/if}
+        font-size: 24px
 }
 
@@ -28 +31 @@
 .pwg-icon-slideshow:before { content: '\25b6';}
 .pwg-icon-favorite-del:before { content: '\2661\2d'; letter-spacing: -2px}
+
+{if  isset($loaded_plugins['BatchDownloader'])}
+.batch-downloader-icon {
+        width: 26px
+}
+{/if}

extensions/modus/themeconf.inc.php

@@ -9 +9 @@
 */
 $themeconf = array(
-        'name'  => 'modus',
+        'name' => 'modus',
         'parent' => 'default',
 );
@@ -108 +108 @@
 function rv_cdn_combined_script($url, $script)
 {
-        if (!$script->is_remote() /*&& strpos($script->path,'thumb.arrange')===false*/)
+        if (!$script->is_remote())
                 $url = RVCDN_ROOT_URL.$script->path;
         return $url;
@@ -120 +120 @@
         $all = $template->scriptLoader->get_all();
         if ( ($jq = @$all['jquery']) )
-        {
                 $jq->set_path(RVPT_JQUERY_SRC);
-        }
 }
 
@@ -129 +127 @@
 {
         global $conf;
-        include_once(dirname(__FILE__).'/functions.inc.php');
-  $template->smarty->unregisterPlugin('modifier', 'cssGradient');
-        $template->smarty->registerPlugin('modifier', 'cssGradient', 'modus_css_gradient');
+        if (!is_callable('modus_css_gradient')) {
+                include_once(dirname(__FILE__).'/functions.inc.php');
+                $template->smarty->registerPlugin('modifier', 'cssGradient', 'modus_css_gradient');
+        }
 
         include( dirname(__FILE__).'/skins/'.$conf['modus_theme']['skin'].'.inc.php' );
@@ -139 +138 @@
                 'MODUS_ALBUM_THUMB_SIZE' => intval(@$conf['modus_theme']['album_thumb_size']),
                 'SQUARE_WIDTH' => ImageStdParams::get_by_type(IMG_SQUARE)->max_width(),
+                'loaded_plugins' => $GLOBALS['pwg_loaded_plugins']
                 ));
 }
@@ -240 +240 @@
                         $a_style=' style="top:'.floor(($row_height-$csize[1])/2).'px"';
                 elseif ($csize[1] > $row_height)
-                {
                         $csize = $c->get_scaled_size(9999, $row_height);
-                }
 ?>
 <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>
@@ -280 +278 @@
         }
         if($req!=null)
-        {
-                $my_base_name = basename(dirname(__FILE__));
-    $template->scriptLoader->add('modus.pop', 2, array($req), 'themes/'.$my_base_name."/js/thumb.pop.js", 0);
-        }
+                $template->scriptLoader->add('modus.pop', 2, array($req), 'themes/'.basename(dirname(__FILE__))."/js/thumb.pop.js", 0);
 }
 
@@ -357 +352 @@
                         $styles = array();
                 if ($l<-1 || $l>1)
-                {
-                        //$styles[] = 'left:'.$l.'px';
                         $styles[] = 'left:'.(100*$l/$wh).'%';
-                }
+
                 if ($t<-1 || $t>1)
                         $styles[] = 'top:'.$t.'px';
@@ -388 +381 @@
 }
 
-add_event_handler('loc_end_picture', 'modus_loc_end_picture');
-function modus_loc_end_picture()
-{
-        global $template, $picture;
-}
-
 add_event_handler('render_element_content', 'modus_picture_content', EVENT_HANDLER_PRIORITY_NEUTRAL-1, 2 );
 function modus_picture_content($content, $element_info)
@@ -399 +386 @@
         global $conf, $picture, $template;
 
-        if ( !empty($content) )
-        {// someone hooked us - so we skip;
+        if ( !empty($content) ) // someone hooked us - so we skip;
                 return $content;
-        }
 
         $unique_derivatives = array();
@@ -426 +411 @@
         $selected_derivative = null;
         if (isset($_COOKIE['phavsz']))
-        {
                 $available_size = explode('x', $_COOKIE['phavsz']);
-                if (empty($available_size[2]))
-                        $available_size[2] = 1;
-
+        elseif ( $caps=pwg_get_session_var('caps') && $caps[0]>1 )
+                $available_size = array($caps[0]*$caps[1], $caps[0]*($caps[2]-100), $caps[0]);
+
+        if (isset($available_size))
+        {
                 foreach($unique_derivatives as $derivative)
                 {
@@ -438 +424 @@
 
                         if ($size[0] <= $available_size[0] and $size[1] <= $available_size[1])
-                        {
                                 $selected_derivative = $derivative;
-                        }
                         else
                         {
@@ -490 +474 @@
                                 $template->assign('U_PREFETCH', $derivative->get_url() );
                 }
-
         }
 
@@ -501 +484 @@
 
 
-
         if ($show_original)
-        {
                 $template->assign( 'U_ORIGINAL', $element_info['element_url'] );
-        }
 
         $template->append('current', array(