Skip to content
Snippets Groups Projects
Commit b82a8307 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

hotline #56464 fix bokeh behavior in iframe

parent 6d52ee87
Branches
Tags
5 merge requests!2080Sandbox detach zf from storm,!2061Master,!2048Master,!2047Hotline master,!2043hotline #56464 fix bokeh behavior in iframe
Pipeline #560 failed with stage
in 21 minutes and 4 seconds
Showing
with 20 additions and 26 deletions
- ticket #56464 : Amélioration du comportement de Bokeh dans une iframe.
\ No newline at end of file
......@@ -28,8 +28,7 @@ $user_url = $this->url(['controller' => 'abonne',
$html .= $this->tag('a', $this->_($this->preferences['lien_compte']),
['href' => $user_url,
'class' => 'account-link',
'target' => '_parent']);
'class' => 'account-link']);
$cards = new Class_User_Cards($user);
if (!$cards->isEmpty())
......@@ -41,8 +40,7 @@ $html .= $this->tag('a', $this->_($this->preferences['lien_deconnection']),
['href' => $this->url(['controller'=>'auth',
'action'=>'logout'],
null, true),
'class' => 'account-disconnect',
'target' => '_parent']);
'class' => 'account-disconnect']);
echo $this->tag('div', $html, ['class' => 'form']);
?>
......@@ -262,7 +262,7 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
$viewRenderer = $this->getHelper('ViewRenderer');
$viewRenderer->setNoRender();
$this->getResponse()->setHeader('Content-Type', 'text/html;charset=utf-8');
$this->getResponse()->setBody('<script>window.location="'.$url.'";</script>');
$this->getResponse()->setBody('<script>document.location.href="'.$url.'";</script>');
}
......
......@@ -70,7 +70,6 @@ class ZendAfi_Form_Login extends ZendAfi_Form {
'lostpass',
['value' => ['controller' => 'auth', 'action' => 'lostpass'],
'onclick' => 'getUsername();',
'target' => '_parent',
'label' => $this->_data['lien_mot_de_passe_oublie']]);
$this->_ensureElementsLabel();
......@@ -80,7 +79,6 @@ class ZendAfi_Form_Login extends ZendAfi_Form {
'register',
['value' => ['controller' => 'auth',
'action' => 'register'],
'target' => '_parent',
'label' => $this->_data['lien_creer_compte']]);
array_push($group, 'register');
......
......@@ -40,7 +40,7 @@ class ZendAfi_View_Helper_AdminTools extends ZendAfi_View_Helper_BaseHelper {
$clear_cache = $this->_tag('button',
$this->_("Vider le cache de Bokeh"),
['class' => 'clear_cache',
'onclick' => sprintf('window.location.href = &quot;%s&quot;', $clear_cache_url),
'onclick' => sprintf('document.location.href = &quot;%s&quot;', $clear_cache_url),
'style' => 'display: none']);
Class_ScriptLoader::getInstance()
......
......@@ -30,7 +30,7 @@ class ZendAfi_View_Helper_AjaxRedirect extends ZendAfi_View_Helper_BaseHelper {
['class' => 'saving-process'])
. $this->_tag('script',
'parent.window.location = parent.document.location.href;');
'document.location.href = document.location.href;');
}
}
?>
\ No newline at end of file
......@@ -49,8 +49,7 @@ class ZendAfi_View_Helper_Article_RenderTitleOnlyCalendar extends ZendAfi_View_H
'action' => 'articleview',
'id' => $article->getId()],null,true),
$article->getTitre(),
['target' => '_parent',
'class' => 'calendar_event_title']);
['class' => 'calendar_event_title']);
}
}
......
......@@ -32,8 +32,7 @@ class ZendAfi_View_Helper_Article_RenderTitleOnlyCalendarWithBib extends ZendAfi
'id_module' => $id_module,
'b' => $article->getBibId()],null,true),
$article->getBibLibelle(),
['target' => '_parent',
'class' => 'calendar_event_info']);
['class' => 'calendar_event_info']);
}
}
......
......@@ -31,8 +31,7 @@ class ZendAfi_View_Helper_Article_RenderTitleOnlyCalendarWithCatalogue extends Z
'action' => 'articleviewbydate',
'cat' => $article->getIdCat()],null,true),
$article->getCategorieLibelle(),
['target' => '_parent',
'class' => 'calendar_event_info']);
['class' => 'calendar_event_info']);
}
}
......
......@@ -333,8 +333,7 @@ class ZendAfi_View_Helper_Calendar_Table extends ZendAfi_View_Helper_BaseHelper
return $this->view
->tagAnchor($this->getUrl('EVENTS', $day, $month),
$this->_isTimestampToday($time) ? $this->_tag('b', $day) : $day,
['class' => implode(' ', $classes),
'target' => '_parent']);
['class' => implode(' ', $classes)]);
}
......
......@@ -75,7 +75,7 @@ class ZendAfi_View_Helper_ComboProfils extends ZendAfi_View_Helper_BaseHelper {
$extra = '';
if ($autoload)
$extra = ' onchange="window.location=\''. $this->getProfilUrl() . '\' + this.value"';
$extra = ' onchange="document.location.href=\''. $this->getProfilUrl() . '\' + this.value"';
return sprintf('<label for="%s" style="display:none">'.
$this->view->_('Profil').
......
......@@ -23,7 +23,7 @@
class ZendAfi_View_Helper_Notice_HtmlThumbnail extends ZendAfi_View_Helper_BaseHelper {
public function Notice_HtmlThumbnail($notice, $preferences = []) {
$url = $this->view->urlNotice($notice, $preferences);
$onclick = 'javascript:window.location=\''.$url.'\'';
$onclick = 'javascript:document.location.href=\''.$url.'\'';
$img = $this->view->tagImg(URL_ADMIN_IMG . 'blank.gif');
......
......@@ -78,7 +78,7 @@ if (ui.newPanel.attr("id") == "ig-tab-items")
$button = $this->_tag('button', $this->_('Télécharger'),
['style' => 'float:right;font-size:80%',
'onclick' => 'window.location.href=\''
'onclick' => 'document.location.href=\''
.$this->view->url(['controller' => 'recherche',
'action' => 'download-record',
'id' => $notice->getId()],
......
......@@ -30,7 +30,7 @@ class ZendAfi_View_Helper_ShareByMail extends Zend_View_Helper_HtmlElement {
['class' => 'reseau-social-img',
'alt' => $this->view->_('icone formulaire de contact'),
'title' => $this->view->_('Accéder au formulaire de contact'),
'onclick' => sprintf('window.location=\'%s\'',
'onclick' => sprintf('document.location.href=\'%s\'',
$this->view->url(['controller' => 'index',
'action' => 'formulairecontact']))]);
}
......
......@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class ZendAfi_View_Helper_SocialShare extends Zend_View_Helper_HtmlElement {
......@@ -24,7 +24,7 @@ class ZendAfi_View_Helper_SocialShare extends Zend_View_Helper_HtmlElement {
$this->addHeadScript();
$html = '';
foreach ($networks as $network)
foreach ($networks as $network)
$html .= $this->htmlForNetwork($profil, $network);
return '<div class="share">'.$html.'</div>';
......@@ -34,13 +34,13 @@ class ZendAfi_View_Helper_SocialShare extends Zend_View_Helper_HtmlElement {
public function htmlForNetwork($profil, $network) {
$onclick_attr = array('facebook' => 'socialShare(\'facebook\')',
'twitter' => 'socialShare(\'twitter\')',
'mail' => sprintf('window.location=\'%s\'',
'mail' => sprintf('document.location.href=\'%s\'',
$this->view->url(array('controller' => 'index',
'action' => 'formulairecontact'))));
return sprintf('<img class="%s" src="%s" onclick="%s; return false" alt="%s"/>',
$network,
$this->networkImgUrl($network),
$this->networkImgUrl($network),
$onclick_attr[$network],
'partager sur '.$network);
}
......@@ -49,7 +49,7 @@ class ZendAfi_View_Helper_SocialShare extends Zend_View_Helper_HtmlElement {
public function addHeadScript() {
Class_ScriptLoader::getInstance()
->addInlineScript(sprintf("function socialShare(network) {"
."jQuery.getScript('%s/index/share/on/' + network + '/titre/' + $(\"title\").text() + '?url=' + encodeURIComponent(window.location));"
."jQuery.getScript('%s/index/share/on/' + network + '/titre/' + $(\"title\").text() + '?url=' + encodeURIComponent(document.location));"
."}",
BASE_URL));
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment