Changeset 6533 for extensions/Panoramas

Timestamp:

Jun 15, 2010, 10:46:56 AM (14 years ago)

Author:

vdigital

Message:

Fix: Notice: Undefined index: name in .../plugins/Panoramas/AS_Panorama.php on line 47
Fix: Panorama / Panoramas
Fix: Panoramas are disconnected when picture widths are lower than the viewport width

Location:

extensions/Panoramas

Files:

• AS_Panorama.php (modified) (2 diffs)
• AS_Panorama_admin.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• template/AS_Panorama_admin.tpl (modified) (2 diffs)
• template/AS_panorama_content.tpl (modified) (1 diff)

extensions/Panoramas/AS_Panorama.php

@@ -45 +45 @@
       $asp = & $conf['AS_panorama'];
       $picture = $template->get_template_vars('current');
-      $picture['TITLE'] = $asp['name'];
-      $template->assign('current', $picture);
-      $template->assign( array( 'ASP' => $asp, ) );
+          if ( isset($asp['name']) ) {
+                  $picture['TITLE'] = $asp['name'];
+                  $template->assign('current', $picture);
+                  $template->assign( array( 'ASP' => $asp, ) );
+          }
     }
   }
@@ -59 +61 @@
         array_push($menu,
             array(
-                'NAME' => 'Simple Panorama',
+                'NAME' => 'Panoramas',
                 'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/AS_Panorama_admin.php')
             )

extensions/Panoramas/AS_Panorama_admin.php

@@ -1 +1 @@
 <?php
-/* Configuration of Panorama */
+/* Configuration of Panoramas */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 if (!defined('IN_ADMIN') or !IN_ADMIN) die('Hacking attempt!');

extensions/Panoramas/language/en_UK/plugin.lang.php

@@ -10 +10 @@
 $lang['Off'] = 'Off';
 $lang['On'] = 'On';
-$lang['Panorama configuration'] = 'Panorama configuration';
+$lang['Panoramas configuration'] = 'Panoramas configuration';
 $lang['Permanent'] = 'Permanent';
 $lang['Picture name substring could not be empty.'] = 'Picture name substring could not be empty.'; 

extensions/Panoramas/language/fr_FR/plugin.lang.php

@@ -10 +10 @@
 $lang['Off'] = 'Inactif';
 $lang['On'] = 'Actif';
-$lang['Panorama configuration'] = 'Configuration';
+$lang['Panoramas configuration'] = 'Configuration';
 $lang['Permanent'] = 'Permanent';
 $lang['Picture name substring could not be empty.'] = 'Les critères de sélection des noms d\'images ne peuvent pas être vide.'; 

extensions/Panoramas/template/AS_Panorama_admin.tpl

@@ -3 +3 @@
 {/html_head}
 <div class="titrePage">
-  <h2>Panorama [{$ASP.Ver}]</h2>
+  <h2>Panoramas [{$ASP.Ver}]</h2>
 </div>
 <p>
@@ -13 +13 @@
 <form method="post" action="" class="general">
  <fieldset id="ASP_Config">
-  <legend>{'Panorama configuration'|@translate}</legend>
+  <legend>{'Panoramas configuration'|@translate}</legend>
   <table id="table">
    <tr>

extensions/Panoramas/template/AS_panorama_content.tpl

@@ -13 +13 @@
         var s = (100 - {$ASP.speed}) * 2000;
         var p = Math.round(Math.min(Math.max({$ASP.width} * ( {$ASP.start_position} / 100 ), 0), {$ASP.width}));
-    $("#theImage img").eq(0).removeAttr("style").attr({ldelim}width:{$ASP.width},height:{$ASP.height}}).addClass("simple_panorama");
-        var options = {ldelim}
-                 viewport_width: w,
-                 speed: s,
-                 direction: '{$ASP.direction}',
-                 control_display: '{$ASP.control_display}',
-                                 start_position : p,
-                                 auto_start : {$ASP.auto_start},
-                                 mode_360 : {$ASP.mode_360},
-                                 loop_180 : {$ASP.loop_180}
-         };
-        $("#theImage img.simple_panorama").panorama(options);
+        if ({$ASP.width} > w) {ldelim}
+                $("#theImage img").eq(0).removeAttr("style").attr({ldelim}width:{$ASP.width},height:{$ASP.height}}).addClass("simple_panorama");
+                var options = {ldelim}
+                                         viewport_width: w,
+                                         speed: s,
+                                         direction: '{$ASP.direction}',
+                                         control_display: '{$ASP.control_display}',
+                                         start_position : p,
+                                         auto_start : {$ASP.auto_start},
+                                         mode_360 : {$ASP.mode_360},
+                                         loop_180 : {$ASP.loop_180}
+                         };
+                $("#theImage img.simple_panorama").panorama(options);
+        };
 });
 </script>
 {/html_head}
-        <!-- Adapted simply by the "Panorama" plugin (version {$ASP.Ver}): {$ASP.Dir}/template/AS_panorama_content.tpl -->
+        <!-- Adapted simply by the "Panoramas" plugin (version {$ASP.Ver}): {$ASP.Dir}/template/AS_panorama_content.tpl -->
         <!-- for: {$ASP.image_name} ({$ASP.width}x{$ASP.height}) -->
         <div id="Panorama">