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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Language.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Developers.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
	lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/ZipArchiveImproved.php
	lib/classes/caption/Field/Value.php
	lib/classes/caption/record.php
	lib/classes/eventsmanager/notify/feed.php
	lib/classes/media/subdef.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/export.php
	lib/classes/setup.php
	lib/classes/task/abstract.php
	lib/classes/task/period/emptyColl.php
	lib/classes/uuid.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/bases_structure.xml
	lib/conf.d/configuration.yml
	lib/conf.d/minifyGroupsConfig.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/account/account.html.twig
	templates/web/account/base.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/admin/index.html.twig
	templates/web/admin/setup.html.twig
	templates/web/admin/tree.html.twig
	templates/web/client/index.html.twig
	templates/web/common/caption.html.twig
	templates/web/common/caption_templates/answer.html.twig
	templates/web/common/caption_templates/basket_element.html.twig
	templates/web/common/caption_templates/internal_publi.html.twig
	templates/web/common/caption_templates/lazaret.html.twig
	templates/web/common/caption_templates/overview.html.twig
	templates/web/common/caption_templates/preview.html.twig
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/indexfloat.html.twig
	templates/web/common/thumbnail.html.twig
	templates/web/developers/application_form.html.twig
	templates/web/lightbox/IE6/feed.html.twig
	templates/web/lightbox/IE6/validate.html.twig
	templates/web/lightbox/feed.html.twig
	templates/web/lightbox/validate.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/preview/caption.html.twig
	templates/web/prod/results/answerlist.html.twig
	templates/web/thesaurus/accept.html.twig
	templates/web/thesaurus/export-text-dialog.html.twig
	templates/web/thesaurus/export-text.html.twig
	templates/web/thesaurus/export-topics-dialog.html.twig
	templates/web/thesaurus/export-topics.html.twig
	templates/web/thesaurus/index.html.twig
	templates/web/thesaurus/link-field-step1.html.twig
	templates/web/thesaurus/link-field-step2.html.twig
	templates/web/thesaurus/link-field-step3.html.twig
	templates/web/thesaurus/new-term.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	templates/web/thesaurus/thesaurus.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
	tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
	tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
	tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
	tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
	tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
	tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
	tests/classes/Feed/Feed_AggregateTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/db-ref.sqlite
This commit is contained in:
Nicolas Le Goff
2014-06-17 15:30:41 +02:00
parent b92370cca2 a87c5bb8e4
commit a8da584666
146 changed files with 5549 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
www/include/jquery.common.js
View File

@@ -22,7 +22,6 @@ $(document).ready(function () {
$.datepicker.setDefaults($.datepicker.regional[jq_date]);
$('a.infoDialog,div.infoDialog').live('click', function (event) {
console.log("click");
infoDialog($(this));
});
@@ -83,9 +82,15 @@ $(document).ready(function () {
}
});
set_notif_position();
$(document).ajaxError(function( event, jqxhr, settings, exception ) {
if(jqxhr.status == 403 && jqxhr.getResponseHeader("X-Phraseanet-End-Session") == "1") {
disconnected();
}
});
set_notif_position();
});
@@ -317,7 +322,6 @@ function setPref(name, value) {
function infoDialog(el) {
$("#DIALOG").attr('title', '')
.empty()
.append(el.attr('infos'))
@@ -336,6 +340,7 @@ function infoDialog(el) {
}
}).dialog('open').css({'overflow-x': 'auto', 'overflow-y': 'auto'});
}
function manageSession(data, showMessages) {
if (typeof(showMessages) == "undefined")
showMessages = false;
@@ -412,7 +417,7 @@ function manageSession(data, showMessages) {
function disconnected() {
showModal('disconnected', {title: 'Disconnection'});
showModal('disconnected', {title: language.serverDisconnected});
}
function showModal(cas, options) {
@@ -440,15 +445,20 @@ function showModal(cas, options) {
content = language.serverDisconnected;
escape = false;
callback = function (e) {
self.location.replace(self.location.href)
self.location.replace(self.location.href);
};
break;
default:
break;
}
p4.Alerts(options.title, content, callback);
if(typeof(p4.Alerts) == "undefined") {
alert(language.serverDisconnected);
self.location.replace(self.location.href);
}
else {
p4.Alerts(options.title, content, callback);
}
return;
}

2
www/include/jquery.tooltip.js
View File

@@ -414,7 +414,7 @@
}
if (resizeImgTips) {
var factor = Math.min((width - 45) / width, (height - 75) / height);
var factor = Math.max(Math.min((width - 45) / width, (height - 75) / height), 1);
var imgWidth = Math.round(width * factor);
var imgHeight = Math.round(height * factor);

49
www/skins/account/account.js
View File

@@ -75,6 +75,51 @@ $(document).ready(function () {
} else {
input.empty().append(inputVal);
}
modifierBtn.show();
saveBtn.hide();
}
});
});
});
//modify application webhook url
$(".webhook-modify-btn").bind("click", function () {
var modifierBtn = $(this);
var saveBtn = $("a.save_webhook");
var input = $(".url_webhook_input");
var inputVal = input.html();
modifierBtn.hide();
saveBtn.show();
// wrapp current calback in an input
input
.empty()
.wrapInner(''
+ '<input value = "' + inputVal + '"'
+ ' name="oauth_webhook" size="50" type="text"/>'
);
$(".url_webhook").die();
// save new callback
saveBtn.bind("click", function (e) {
e.preventDefault();
var webhook = $("input[name=oauth_webhook]").val();
$.ajax({
type: "POST",
url: saveBtn.attr("href"),
dataType: 'json',
data: {webhook: webhook},
success: function (data) {
if (data.success) {
input.empty().append(webhook);
} else {
input.empty().append(inputVal);
}
modifierBtn.show();
saveBtn.hide();
}
});
});
@@ -83,9 +128,9 @@ $(document).ready(function () {
// hide or show callback url input whether user choose a web or dektop application
$("#form_create input[name=type]").bind("click", function () {
if ($(this).val() === "desktop") {
$("#form_create .callback td").hide().find("input").val('');
$("#form_create .callback-control-group").hide().find("input").val('');
} else {
$("#form_create .callback td").show();
$("#form_create .callback-control-group").show();
}
});

2
www/skins/client/jquery.p4client.1.0.js
View File

@@ -105,7 +105,7 @@ $(document).ready(function () {
$(this).removeClass("hover");
});
sessionactive();
window.setTimeout("pollNotifications();", 10000);
resize();
$(window).resize(function () {
resize();

4
www/skins/common/main.css
View File

@@ -236,3 +236,7 @@ input.checkbox{
.ui-dialog-titlebar {
min-height: 20px;
}
.ui-dialog[aria-describedby="p4_alerts"]{
z-index:2000 !important;
}

2
www/skins/prod/jquery.Alerts.js
View File

@@ -6,7 +6,6 @@ var p4 = p4 || {};
if ($('#p4_alerts').length === 0) {
$('body').append('<div id="p4_alerts"></div>');
}
return $('#p4_alerts');
}
@@ -21,7 +20,6 @@ var p4 = p4 || {};
else
dialog.dialog('close');
};
if (dialog.data('ui-dialog')) {
dialog.dialog('destroy');
}

4
www/skins/prod/jquery.Feedback.js
View File

@@ -166,12 +166,13 @@
$('input[name="duration"]', $FeedBackForm).val($('select[name="duration"]', $dialog.getDomElement()).val());
$('textarea[name="message"]', $FeedBackForm).val($('textarea[name="message"]', $dialog.getDomElement()).val());
$('input[name="recept"]', $FeedBackForm).attr('checked', $('input[name="recept"]', $dialog.getDomElement()).attr('checked'));
$('input[name="force_authentication"]', $FeedBackForm).attr('checked', $('input[name="force_authentication"]', $dialog.getDomElement()).attr('checked'));
$FeedBackForm.trigger('submit');
};
var options = {
size: 'Small',
size: 'Medium',
buttons: buttons,
loading: true,
title: language.send,
@@ -309,6 +310,7 @@
if (item.type === 'USER') {
html = _.template($("#list_user_tpl").html(), {
item: item
});
} else if (item.type === 'LIST') {

7
www/skins/prod/jquery.main-prod.js
View File

@@ -761,6 +761,7 @@ $(document).ready(function () {
var parent = searchForm.parent();
var options = {
size: 'Full',
loading: false,
closeCallback: function (dialog) {
@@ -912,6 +913,10 @@ $(document).ready(function () {
$answers.scrollTop(0);
}
$answers.append(data);
$answers.find("img.lazyload").lazyload({
container: $answers
});
}
else {
$('.see_more.loading', $answers).remove();
@@ -1126,7 +1131,7 @@ $(document).ready(function () {
initLook();
setTimeout("sessionactive();", 30000);
setTimeout("pollNotifications();", 10000);
$(this).bind('keydown', function (event) {
var cancelKey = false;

19
www/skins/report/report.js
View File

@@ -936,10 +936,9 @@ function loadDash() {
error : function( xhr, err ) {
},
timeout: function(){
},
done: function() {
$("#dashboard").removeClass("loading");
}
}).done(function() {
$("#dashboard").removeClass("loading");
});
return false;
}
@@ -1067,21 +1066,21 @@ function resize() {
$('.answers:visible').height(Math.round(bodySize.y - $('.answers:visible').offset().top));
};
//update session
function sessionactive() {
function pollNotifications() {
$.ajax({
type: "POST",
url: "/session/update/",
url: "/session/notifications/",
dataType: 'json',
data: {
module: 10,
usr: usrId
},
error: function () {
window.setTimeout("sessionactive();", 10000);
window.setTimeout("pollNotifications();", 10000);
},
timeout: function () {
window.setTimeout("sessionactive();", 10000);
window.setTimeout("pollNotifications();", 10000);
},
success: function (data) {
if (data) {
@@ -1091,10 +1090,10 @@ function sessionactive() {
if (data.apps && parseInt(data.apps) > 1) {
t = Math.round((Math.sqrt(parseInt(data.apps) - 1) * 1.3 * 120000));
}
window.setTimeout("sessionactive();", t);
window.setTimeout("pollNotifications();", t);
return;
}
});
};
sessionactive();
window.setTimeout("pollNotifications();", 10000);