Changeset 9076

Timestamp:

Nov 11, 2008, 7:09:53 PM (12 years ago)

Author:

ShogoKawahara

Message:

#3119:ガジェットのデフォルトの高さが正しく設定されるように修正

Location:

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application

Files:

• actions/actions.class.php (modified) (1 diff)
• actions/components.class.php (modified) (1 diff)
• templates/_gadget.php (modified) (1 diff)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/actions/actions.class.php

@@ -78 +78 @@
     {
       //TODO : add error action
+      return $this->pager->getNbResults() ? sfView::SUCCESS : sfView::ERROR;
     }
     $criteria = new Criteria(MemberApplicationPeer::DATABASE_NAME);

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/actions/components.class.php

@@ -22 +22 @@
     $url      = $app->getUrl();
     $culture = $this->getUser()->getCulture();
-    $culture = split("_",$culture);    
+    $culture = split("_",$culture);
+    $this->height  = $app->getHeight() ? $app->getHeight() : 200;
 
     $viewer_id = $this->getUser()->getMemberId();

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/_gadget.php

@@ -5 +5 @@
 </div>
 <div class="gadget-gadget-content">
-<iframe width="<?php echo ($width) ?>" scrolling="on" height="200" frameborder="no" src="<? echo $iframe_url ?>" class="gadgets-gadget" name="remote_iframe_<?php echo $mid ?>" id="remote_iframe_<?php echo $mid ?>"></iframe>
+<iframe width="<?php echo ($width) ?>" scrolling="on" height="<?php echo ($height) ?>" frameborder="no" src="<? echo $iframe_url ?>" class="gadgets-gadget" name="remote_iframe_<?php echo $mid ?>" id="remote_iframe_<?php echo $mid ?>"></iframe>
 </div>
 </div>