yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 10:19:25 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/customMetadata

Browse source
This commit is contained in:
René Bigler 2015-10-29 20:36:49 +01:00
commit 5f50341dff
2001 changed files with 8879 additions and 331819 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/javascript/.htaccess
View file

@ -1,9 +1,10 @@
# Apache 2.4
<IfModule mod_authz_core.c>
Require all granted
Require all granted
</IfModule>
# Apache 2.2
<IfModule mod_access.c>
Order deny,allow
Allow from all
</IfModule>

2
lib/javascript/base.js
View file

@ -45,10 +45,10 @@ function initTabs()
$(function() {
var rightmenu = $("#rightbar");
var rightsubmenu = $("#rightbar .submenu");
var pos = rightmenu.offset();
if (rightmenu.hasClass('rightbar-float')) {
$(window).scroll(function() {
var rightsubmenu = $("#rightbar .submenu");
if ($(this).scrollTop() > (pos.top)) {
rightmenu.addClass('fixedrightbar');
rightsubmenu.addClass('fixedrightbarsubmenu');

19
lib/javascript/tools.js
View file

@ -50,6 +50,10 @@ function showPlaylistDialog(e, item_type, item_ids) {
width: 300,
height: 100,
autoOpen: false,
position: {
my: "left+10 top",
of: e
},
open: function () {
closeplaylist = 1;
$(document).bind('click', overlayclickclose);
@ -67,7 +71,6 @@ function showPlaylistDialog(e, item_type, item_ids) {
}
});
$("#playlistdialog").dialog("option", "position", [e.clientX + 10, e.clientY]);
$("#playlistdialog").dialog("open");
closeplaylist = 0;
}
@ -104,6 +107,10 @@ function showBroadcastsDialog(e) {
width: 150,
height: 70,
autoOpen: false,
position: {
my: "left-180 top",
of: e
},
open: function () {
closebroadcasts = 1;
$(document).bind('click', broverlayclickclose);
@ -121,7 +128,6 @@ function showBroadcastsDialog(e) {
}
});
$("#broadcastsdialog").dialog("option", "position", [e.clientX - 180, e.clientY]);
$("#broadcastsdialog").dialog("open");
closebroadcasts = 0;
}
@ -158,6 +164,10 @@ function showShareDialog(e, object_type, object_id) {
width: 200,
height: 90,
autoOpen: false,
position: {
my: "left+10 top",
of: e
},
open: function () {
closeshare = 1;
$(document).bind('click', shoverlayclickclose);
@ -175,7 +185,6 @@ function showShareDialog(e, object_type, object_id) {
}
});
$("#sharedialog").dialog("option", "position", [e.clientX + 10, e.clientY]);
$("#sharedialog").dialog("open");
closeshare = 0;
}
@ -298,8 +307,6 @@ function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_ro
show: { effect: "fade", duration: 400 },
open: function () {
$(this).load(parent.contentUrl, function() {
$(this).dialog('option', 'position', 'center');
if ($('#edit_tags').length > 0) {
$("#edit_tags").tagit({
allowSpaces: true,
@ -329,7 +336,7 @@ function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_ro
}
$(window).resize(function() {
$("#editdialog").dialog("option", "position", ['center', 'center']);
$("#editdialog").dialog("option", "position", {my: "center", at: "center", of: window});
});
function check_inline_song_edit(type, song) {