upgrade buttons : improve button behavior

library/ZendAfi/View/Helper/Button.php

@@ -21,18 +21,34 @@
 
 
 class ZendAfi_View_Helper_Button extends ZendAfi_View_Helper_BaseHelper {
-  public function button($instance) {
-    if(!$instance)
+  public function button($button) {
+    if(!$button)
       return '';
 
-    if(!isset($instance->getAttribs()['onclick']))
-      $instance->setAttribs(array_merge($instance->getAttribs(),
-                                        ['data-url' => $instance->getUrl()]));
+    $this->_setDefaultAttribs($button);
 
     return $this->_tag('button',
-                       implode([$instance->getImage(),
-                                $instance->getText()]),
-                       $instance->getAttribs());
+                       implode([$button->getImage(),
+                                $button->getText()]),
+                       $button->getAttribs());
+  }
+
+
+  protected function _setDefaultAttribs($button) {
+    if(isset($button->getAttribs()['onclick']))
+      return $button;
+
+    $button->setAttribs(array_merge($button->getAttribs(),
+                                    ['data-url' => $button->getUrl()]));
+
+    if($this->view->isPopup())
+      return $button;
+
+    return $button->setAttribs(array_merge($button->getAttribs(),
+                                           ['onclick' => sprintf('window.location = \'%s\'',
+                                                                 $button->getUrl())]));
+
+
   }
 }
 ?>
\ No newline at end of file