Empty commit

5 files changed, 310 insertions, 176 deletions

diff --git a/static/functions/browse.js b/static/functions/browse.js
index 0dee27a..c53a08f 100644
--- a/static/functions/browse.js
+++ b/static/functions/browse.js
@@ -176,7 +176,7 @@ function AddArtistField() {
 	x.appendChild(document.createTextNode(' '));
 	var Importance = document.createElement("select");
 	Importance.name = "importance[]";
-	Importance.innerHTML = '<option value="1">Main</option><option value="2">Guest</option><option value="3">Remixer</option>';
+	Importance.innerHTML = '<option value="1">Main</option><option value="2">Guest</option><option value="4">Composer</option><option value="5">Conductor</option><option value="6">DJ / Compiler</option><option value="3">Remixer</option>';
 	x.appendChild(Importance);
 	ArtistFieldCount++;	
 }
diff --git a/static/functions/collage.js b/static/functions/collage.js
index 84860d3..cbf13fd 100644
--- a/static/functions/collage.js
+++ b/static/functions/collage.js
@@ -31,4 +31,102 @@ function CollageSubscribe(collageid) {
 			}
 		}
 	});
-}
\ No newline at end of file
+}
+
+var collageShow = {
+	pg:0,
+	pages:false,
+	wrap:false,
+	init:function(collagePages){
+		this.wrap = document.getElementById('coverart');
+		this.pages = collagePages;
+		this.max = this.pages.length-1;
+	},
+	selected:function(){
+		return $('.linkbox .selected').raw();
+	},
+	createUL:function(data){
+		var ul = document.createElement('ul');
+		$(ul).add_class('collage_images');
+		ul.id = 'collage_page'+this.pg;
+		$(ul).html(data);
+		this.wrap.appendChild(ul);
+		return ul;
+	},
+	page:function(num,el){
+		var ul = $('#collage_page'+num).raw(), s = this.selected(), covers, lists, i;
+		this.pg = num;
+		
+		if(!ul){
+			covers = this.pages[num];
+			if(covers){
+				ul = this.createUL(covers);
+			}
+		}
+		
+		lists = $('.collage_images').objects;
+		i = lists.length;
+		while(i--){ $(lists[i]).hide(); }
+		
+		$(ul).show();
+		if(s){ $(s).remove_class('selected'); }
+		if(el){ $(el.parentNode).add_class('selected'); }
+		
+				
+		// Toggle the page number links
+		first = Math.max(0, this.pg - 2);
+		if (this.max - this.pg < 2) {
+			first = Math.max(this.max - 4, 0);
+		}
+		last  = Math.min(first + 4, this.max);
+		for (i = 0; i < first; i++) {
+			$('#pagelink' + i).hide();
+		}
+		for (i = first; i <= last; i++) {
+			$('#pagelink' + i).show();
+		}
+		for (i = last + 1; i <= this.max; i++) {
+			$('#pagelink' + i).hide();
+		}
+		
+		// Toggle the first, prev, next, and last links
+		if (this.pg > 0) {
+			$('#prevpage').remove_class('invisible');
+		} else {
+			$('#prevpage').add_class('invisible');
+		}
+		if (this.pg > 1) {
+			$('#firstpage').remove_class('invisible');
+		} else {
+			$('#firstpage').add_class('invisible');
+		}
+		if (this.pg < this.max) {
+			$('#nextpage').remove_class('invisible');
+		} else {
+			$('#nextpage').add_class('invisible');
+		}
+		if (this.pg < this.max - 1) {
+			$('#lastpage').remove_class('invisible');
+		} else {
+			$('#lastpage').add_class('invisible');
+		}
+		
+		// Toggle the bar
+		if ((last == this.max) && (this.pg != this.max)) {
+			$('#nextbar').show();
+		} else {
+			$('#nextbar').hide();
+		}
+	},
+	nextPage:function(){
+		this.pg =  this.pg < this.max ? this.pg+1 : this.pg;
+		this.pager();
+	},
+	prevPage:function(){
+		this.pg = this.pg > 0 ? this.pg-1 : this.pg;
+		this.pager();
+	},
+	pager:function(){
+		this.page(this.pg,$('#pagelink'+this.pg).raw().firstChild);
+	}
+};
\ No newline at end of file
diff --git a/static/functions/requests.js b/static/functions/requests.js
index 685f03e..a02d365 100644
--- a/static/functions/requests.js
+++ b/static/functions/requests.js
@@ -80,7 +80,10 @@ function AddArtistField() {
 		ImportanceField.name = "importance[]";
 		ImportanceField.options[0] = new Option("Main", "1");
 		ImportanceField.options[1] = new Option("Guest", "2");
-		ImportanceField.options[2] = new Option("Remixer", "3");
+		ImportanceField.options[2] = new Option("Composer", "4");
+		ImportanceField.options[3] = new Option("Conductor", "5");
+		ImportanceField.options[4] = new Option("DJ / Compiler", "6");
+		ImportanceField.options[5] = new Option("Remixer", "3");
 		
 		var x = $('#artistfields').raw();
 		x.appendChild(document.createElement("br"));
diff --git a/static/functions/torrent.js b/static/functions/torrent.js
index 0ca15f4..e12207d 100644
--- a/static/functions/torrent.js
+++ b/static/functions/torrent.js
@@ -1,172 +1,202 @@
-function ChangeCategory(catid) {

-	if(catid == 1) {

-		$('#split_releasetype').show();

-		$('#split_artist').show();

-		$('#split_year').show();

-	} else if(catid == 4 || catid == 6) {

-		$('#split_releasetype').hide();

-		$('#split_year').show();

-		$('#split_artist').hide();

-	} else {

-		$('#split_releasetype').hide();

-		$('#split_artist').hide();

-		$('#split_year').hide();

-	}

-}

-

-function ArtistManager() {

-	var GroupID = window.location.search.match(/[?&]id=(\d+)/);

-	if(typeof GroupID == 'undefined') {

-		return;

-	} else {

-		GroupID = GroupID[1];

-	}

-	var ArtistList;

-	if(!(ArtistList = $('#artist_list').raw())) {

-		return false;

-	} else if($('#artistmanager').raw()) {

-		$('#artistmanager').toggle();

-		$('#artist_list').toggle();

-	} else {

-		MainArtistCount = 0;

-		var elArtistManager = document.createElement('div');

-		elArtistManager.id = 'artistmanager';

-

-		var elArtistList = ArtistList.cloneNode(true);

-		elArtistList.id = 'artistmanager_list';

-		for(var i=0, importance = 1; i<elArtistList.children.length; i++) {

-			if(elArtistList.children[i].children[0].tagName.toUpperCase() == 'A') {

-				var ArtistID = elArtistList.children[i].children[0].href.match(/[?&]id=(\d+)/)[1];

-				var elBox = document.createElement('input');

-				elBox.type = 'checkbox';

-				elBox.id = 'artistmanager_box'+(i-importance+1);

-				elBox.name = 'artistmanager_box';

-				elBox.value = importance+','+ArtistID;

-				elBox.onclick = function(e) { SelectArtist(e,this); };

-				elArtistList.children[i].insertBefore(elBox, elArtistList.children[i].children[0]);

-				if(importance == 1) {

-					MainArtistCount++;

-				}

-			} else {

-				importance++;

-			}

-		}

-		elArtistManager.appendChild(elArtistList);

-

-		var elArtistForm = document.createElement('form');

-		elArtistForm.id = 'artistmanager_form';

-		elArtistForm.method = 'post';

-		var elGroupID = document.createElement('input');

-		elGroupID.type = 'hidden';

-		elGroupID.name = 'groupid';

-		elGroupID.value = GroupID;

-		elArtistForm.appendChild(elGroupID);

-		var elAction = document.createElement('input');

-		elAction.type = 'hidden';

-		elAction.name = 'manager_action';

-		elAction.id = 'manager_action';

-		elAction.value = 'manage';

-		elArtistForm.appendChild(elAction);

-		var elAction = document.createElement('input');

-		elAction.type = 'hidden';

-		elAction.name = 'action';

-		elAction.value = 'manage_artists';

-		elArtistForm.appendChild(elAction);

-		var elAuth = document.createElement('input');

-		elAuth.type = 'hidden';

-		elAuth.name = 'auth';

-		elAuth.value = authkey;

-		elArtistForm.appendChild(elAuth);

-		var elSelection = document.createElement('input');

-		elSelection.type = 'hidden';

-		elSelection.id = 'artists_selection';

-		elSelection.name = 'artists';

-		elArtistForm.appendChild(elSelection);

-

-		var elSubmitDiv = document.createElement('div');

-		var elImportance = document.createElement('select');

-		elImportance.name = 'importance';

-		elImportance.id = 'artists_importance';

-		var elOpt = document.createElement('option');

-		elOpt.value = 1;

-		elOpt.innerHTML = 'Main artist';

-		elImportance.appendChild(elOpt);

-		elOpt = document.createElement('option');

-		elOpt.value = 2;

-		elOpt.innerHTML = 'Guest artist';

-		elImportance.appendChild(elOpt);

-		elOpt = document.createElement('option');

-		elOpt.value = 3;

-		elOpt.innerHTML = 'Remixer';

-		elImportance.appendChild(elOpt);

-		elSubmitDiv.appendChild(elImportance);

-		elSubmitDiv.appendChild(document.createTextNode(' '));

-

-		elSubmitDiv.className = 'body';

-		var elSubmit = document.createElement('input');

-		elSubmit.type = 'button';

-		elSubmit.value = 'Update';

-		elSubmit.onclick = ArtistManagerSubmit;

-		elSubmitDiv.appendChild(elSubmit);

-		elSubmitDiv.appendChild(document.createTextNode(' '));

-

-		var elDelButton = document.createElement('input');

-		elDelButton.type = 'button';

-		elDelButton.value = 'Delete';

-		elDelButton.onclick = ArtistManagerDelete;

-		elSubmitDiv.appendChild(elDelButton);

-

-		elArtistForm.appendChild(elSubmitDiv);

-		elArtistManager.appendChild(elArtistForm);

-		ArtistList.parentNode.appendChild(elArtistManager);

-		$('#artist_list').hide();

-	}

-}

-

-function SelectArtist(e,obj) {

-	if(window.event) {

-		e = window.event;

-	}

-	EndBox = Number(obj.id.substr(17));

-	if(!e.shiftKey || typeof StartBox == 'undefined') {

-		StartBox = Number(obj.id.substr(17));

-	}

-	Dir = (EndBox > StartBox ? 1 : -1);

-	var checked = obj.checked;

-	for(var i = StartBox; i != EndBox; i += Dir) {

-		var key, importance = obj.value.substr(0,1), id = obj.value.substr(2);

-		$('#artistmanager_box'+i).raw().checked = checked;

-	}

-	StartBox = Number(obj.id.substr(17));

-}

-

-function ArtistManagerSubmit() {

-	var Selection = new Array();

-	var MainSelectionCount = 0;

-	for(var i = 0, boxes = $('[name="artistmanager_box"]'); boxes.raw(i); i++) {

-		if(boxes.raw(i).checked) {

-			Selection.push(boxes.raw(i).value.substr(2));

-			if(boxes.raw(i).value.substr(0,1) == '1') {

-				MainSelectionCount++;

-			}

-		}

-	}

-	if(Selection.length == 0 || ($('#manager_action').raw().value == 'delete' && !confirm('Are you sure you want to delete '+Selection.length+' artists from this group?'))) {

-		return;

-	}

-	$('#artists_selection').raw().value = Selection.join(',');

-	if(($('#artists_importance').raw().value != 1 || $('#manager_action').raw().value == 'delete') && MainSelectionCount == MainArtistCount) {

-		if(!$('.error_message').raw()) {

-			error_message('All groups need to have at least one main artist.');

-		}

-		$('.error_message').raw().scrollIntoView();

-		return;

-	}

-	$('#artistmanager_form').raw().submit();

-}

-

-function ArtistManagerDelete() {

-	$('#manager_action').raw().value = 'delete';

-	ArtistManagerSubmit();

-	$('#manager_action').raw().value = 'manage';

-}

+function ChangeCategory(catid) {
+	if(catid == 1) {
+		$('#split_releasetype').show();
+		$('#split_artist').show();
+		$('#split_year').show();
+	} else if(catid == 4 || catid == 6) {
+		$('#split_releasetype').hide();
+		$('#split_year').show();
+		$('#split_artist').hide();
+	} else {
+		$('#split_releasetype').hide();
+		$('#split_artist').hide();
+		$('#split_year').hide();
+	}
+}
+
+function ArtistManager() {
+	var GroupID = window.location.search.match(/[?&]id=(\d+)/);
+	if(typeof GroupID == 'undefined') {
+		return;
+	} else {
+		GroupID = GroupID[1];
+	}
+	var ArtistList;
+	if(!(ArtistList = $('#artist_list').raw())) {
+		return false;
+	} else if($('#artistmanager').raw()) {
+		$('#artistmanager').toggle();
+		$('#artist_list').toggle();
+	} else {
+		MainArtistCount = 0;
+		var elArtistManager = document.createElement('div');
+		elArtistManager.id = 'artistmanager';
+
+		var elArtistList = ArtistList.cloneNode(true);
+		elArtistList.id = 'artistmanager_list';
+		for(var i=0; i<elArtistList.children.length; i++) {
+			switch (elArtistList.children[i].className) {
+				case 'artist_main':
+					importance = 1;
+					break;
+				case 'artists_with':
+					importance = 2;
+					break;
+				case 'artists_remix':
+					importance = 3;
+					break;
+				case 'artists_composers':
+					importance = 4;
+					break;
+				case 'artists_conductors':
+					importance = 5;
+					break;
+				case 'artists_dj':
+					importance = 6;
+					break;
+			}
+			if(elArtistList.children[i].children[0].tagName.toUpperCase() == 'A') {
+				var ArtistID = elArtistList.children[i].children[0].href.match(/[?&]id=(\d+)/)[1];
+				var elBox = document.createElement('input');
+				elBox.type = 'checkbox';
+				elBox.id = 'artistmanager_box'+(i-importance+1);
+				elBox.name = 'artistmanager_box';
+				elBox.value = importance+','+ArtistID;
+				elBox.onclick = function(e) { SelectArtist(e,this); };
+				elArtistList.children[i].insertBefore(elBox, elArtistList.children[i].children[0]);
+				if(importance == 1 || importance == 4 || importance == 6) {
+					MainArtistCount++;
+				}
+			}
+		}
+		elArtistManager.appendChild(elArtistList);
+
+		var elArtistForm = document.createElement('form');
+		elArtistForm.id = 'artistmanager_form';
+		elArtistForm.method = 'post';
+		var elGroupID = document.createElement('input');
+		elGroupID.type = 'hidden';
+		elGroupID.name = 'groupid';
+		elGroupID.value = GroupID;
+		elArtistForm.appendChild(elGroupID);
+		var elAction = document.createElement('input');
+		elAction.type = 'hidden';
+		elAction.name = 'manager_action';
+		elAction.id = 'manager_action';
+		elAction.value = 'manage';
+		elArtistForm.appendChild(elAction);
+		var elAction = document.createElement('input');
+		elAction.type = 'hidden';
+		elAction.name = 'action';
+		elAction.value = 'manage_artists';
+		elArtistForm.appendChild(elAction);
+		var elAuth = document.createElement('input');
+		elAuth.type = 'hidden';
+		elAuth.name = 'auth';
+		elAuth.value = authkey;
+		elArtistForm.appendChild(elAuth);
+		var elSelection = document.createElement('input');
+		elSelection.type = 'hidden';
+		elSelection.id = 'artists_selection';
+		elSelection.name = 'artists';
+		elArtistForm.appendChild(elSelection);
+
+		var elSubmitDiv = document.createElement('div');
+		var elImportance = document.createElement('select');
+		elImportance.name = 'importance';
+		elImportance.id = 'artists_importance';
+		var elOpt = document.createElement('option');
+		elOpt.value = 1;
+		elOpt.innerHTML = 'Main artist';
+		elImportance.appendChild(elOpt);
+		elOpt = document.createElement('option');
+		elOpt.value = 2;
+		elOpt.innerHTML = 'Guest artist';
+		elImportance.appendChild(elOpt);
+		elOpt = document.createElement('option');
+		elOpt.value = 4;
+		elOpt.innerHTML = 'Composer';
+		elImportance.appendChild(elOpt);
+		elOpt = document.createElement('option');
+		elOpt.value = 5;
+		elOpt.innerHTML = 'Conductor';
+		elImportance.appendChild(elOpt);
+		elOpt = document.createElement('option');
+		elOpt.value = 6;
+		elOpt.innerHTML = 'DJ / Compiler';
+		elImportance.appendChild(elOpt);
+		elOpt = document.createElement('option');
+		elOpt.value = 3;
+		elOpt.innerHTML = 'Remixer';
+		elImportance.appendChild(elOpt);
+		elSubmitDiv.appendChild(elImportance);
+		elSubmitDiv.appendChild(document.createTextNode(' '));
+
+		elSubmitDiv.className = 'body';
+		var elSubmit = document.createElement('input');
+		elSubmit.type = 'button';
+		elSubmit.value = 'Update';
+		elSubmit.onclick = ArtistManagerSubmit;
+		elSubmitDiv.appendChild(elSubmit);
+		elSubmitDiv.appendChild(document.createTextNode(' '));
+
+		var elDelButton = document.createElement('input');
+		elDelButton.type = 'button';
+		elDelButton.value = 'Delete';
+		elDelButton.onclick = ArtistManagerDelete;
+		elSubmitDiv.appendChild(elDelButton);
+
+		elArtistForm.appendChild(elSubmitDiv);
+		elArtistManager.appendChild(elArtistForm);
+		ArtistList.parentNode.appendChild(elArtistManager);
+		$('#artist_list').hide();
+	}
+}
+
+function SelectArtist(e,obj) {
+	if(window.event) {
+		e = window.event;
+	}
+	EndBox = Number(obj.id.substr(17));
+	if(!e.shiftKey || typeof StartBox == 'undefined') {
+		StartBox = Number(obj.id.substr(17));
+	}
+	Dir = (EndBox > StartBox ? 1 : -1);
+	var checked = obj.checked;
+	for(var i = StartBox; i != EndBox; i += Dir) {
+		var key, importance = obj.value.substr(0,1), id = obj.value.substr(2);
+		$('#artistmanager_box'+i).raw().checked = checked;
+	}
+	StartBox = Number(obj.id.substr(17));
+}
+
+function ArtistManagerSubmit() {
+	var Selection = new Array();
+	var MainSelectionCount = 0;
+	for(var i = 0, boxes = $('[name="artistmanager_box"]'); boxes.raw(i); i++) {
+		if(boxes.raw(i).checked) {
+			Selection.push(boxes.raw(i).value.substr(2));
+			if(boxes.raw(i).value.substr(0,1) == '1') {
+				MainSelectionCount++;
+			}
+		}
+	}
+	if(Selection.length == 0 || ($('#manager_action').raw().value == 'delete' && !confirm('Are you sure you want to delete '+Selection.length+' artists from this group?'))) {
+		return;
+	}
+	$('#artists_selection').raw().value = Selection.join(',');
+	if((($('#artists_importance').raw().value != 1 && $('#artists_importance').raw().value != 4 && $('#artists_importance').raw().value != 6) || $('#manager_action').raw().value == 'delete') && MainSelectionCount == MainArtistCount) {
+		if(!$('.error_message').raw()) {
+			error_message('All groups need to have at least one main artist, composer, or DJ.');
+		}
+		$('.error_message').raw().scrollIntoView();
+		return;
+	}
+	$('#artistmanager_form').raw().submit();
+}
+
+function ArtistManagerDelete() {
+	$('#manager_action').raw().value = 'delete';
+	ArtistManagerSubmit();
+	$('#manager_action').raw().value = 'manage';
+}
diff --git a/static/functions/upload.js b/static/functions/upload.js
index ec61b27..c062e15 100644
--- a/static/functions/upload.js
+++ b/static/functions/upload.js
@@ -191,7 +191,10 @@ function AddArtistField() {
 	ImportanceField.name = "importance[]";
 	ImportanceField.options[0] = new Option("Main", "1");
 	ImportanceField.options[1] = new Option("Guest", "2");
-	ImportanceField.options[2] = new Option("Remixer", "3");
+	ImportanceField.options[2] = new Option("Composer", "4");
+	ImportanceField.options[3] = new Option("Conductor", "5");
+	ImportanceField.options[4] = new Option("DJ / Compiler", "6");
+	ImportanceField.options[5] = new Option("Remixer", "3");
 	
 	var x = $('#artistfields').raw();
 	x.appendChild(document.createElement("br"));