hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
This commit is contained in:
Romain Neutron
2014-02-28 19:37:54 +01:00
parent 1497b6413a 871b19c407
commit c641ab7841
10 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/prod/actions/Bridge/callback.html.twig
View File

@@ -6,7 +6,7 @@
{% if error_message is empty %}
<script type="text/javascript">
window.opener.publicator_reload_publicator();
window.opener.publicator_reload_publicator("{{ path("prod_bridge_manager") }}");
window.close();
</script>

5
templates/web/prod/actions/Bridge/index.html.twig
View File

@@ -1,7 +1,7 @@
{% import "common/thumbnail.html.twig" as thumb %}
<div class="PNB" id='dialog_publicator'>
<div class="PNB" id='dialog_publicator' data-url="{{ path("prod_bridge_manager") }}">
<div id='publicator_selection' class="PNB10 ui-corner-all">
<div class="PNB10">
{% for id, record in route.get_elements %}
@@ -86,6 +86,7 @@
$(function() {
var pub_tabs = $("#pub_tabs");
var container = $('#dialog_publicator');
var managerUrl = container.data("url");
function popme(url) {
var newwindow=window.open(url,'logger','height=500,width=800');
@@ -157,7 +158,7 @@ $(function() {
success: function(datas){
if(datas.success) {
confirmBox.Close();
publicator_reload_publicator();
publicator_reload_publicator(managerUrl);
} else {
confirmBox.Close();
var alertBox = p4.Dialog.Create({