Merge lp:~lenasysimpl1/lenasys/GammaBear into lp:lenasys

[Victor Nagy]

[Gustav Hartvigsson (gustav-hartvigsson)]

I saw Nagy code.
I can not disapprove this.
:3

review: Approve

=== added file 'DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js'
--- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js	1970-01-01 00:00:00 +0000
+++ DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js	2013-04-12 15:59:33 +0000
@@ -0,0 +1,235 @@
+var account="<?php echo $accountname ?>";		
+var duggaNr="<?php echo $duggaNr ?>";		
+var courseName="<?php echo $courseName ?>";		
+var courseOccasion="<?php echo $courseOccasion ?>";	
+
+$(document).ready(function() {
+	fetchQuiz();
+	fetchQuizObject("ObjDesc");
+});
+
+/* login, courseName, courseOccasion, quizNr */
+function fetchQuiz(){
+	console.log("post fetchQuiz ");
+	$.post("../quizAjax/getQuiz.php", 
+		   {loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr }, 
+			fetchQuizCallBack,
+			"json"
+	);
+}
+
+function fetchQuizCallBack(data){
+	console.log(data);
+	if (typeof data.Error != 'undefined') {
+		$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
+	} else {
+		$("#result").append("<br/>Dugga nr:"+data.quizNr);
+		$("#result").append("<br/>Kursnamn:"+data.quizCourseName);
+		$("#result").append("<br/>Lista över dugga-objekt:"+data.quizObjectIDs);
+		$("#result").append("<br/>Data:"+data.quizData);
+	}
+}
+
+/* Evaluate the submited answer
+ * (Alternativly, it just saves it if the dugga does not correct it self. )
+ */
+function checkAnswer(submitstr){
+	$.post("../quizAjax/answerQuiz.php", 
+		{loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, quizAnswer: submitstr}, 
+		checkAnswerCallBack,
+		"json"
+	);
+}
+
+function checkAnswerCallBack(data){
+	console.log("checkAnswerCallBack:");
+	console.log(data);
+	if (typeof data.Error != 'undefined') {
+		$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
+	} else {
+		for (var key in data) {
+		  $("#result").append("<br />"+data[key]);
+		}
+	}
+}
+
+/* Get a dugga object (object id's are fetched from the list with object ids which comes with the dugga)
+ * Parameters: (POST) objectID, courseName, courseOccasion, quizNr, loginName
+ */
+function fetchQuizObject(objectName){
+	console.log("post fetchQuizObject");
+	$.post("../quizAjax/getQuizObject.php", 
+		   {objectID: objectName, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, loginName: account}, 
+			fetchQuizObjectCallBack,
+			"json"
+	);
+}
+
+function fetchQuizObjectCallBack(data){
+	if (typeof data.Error != 'undefined') {
+		$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
+	} else {
+		$("#result").append(data.objectData);
+	}
+}
+
+function newbutton() {
+	var funclist;
+	var oplist;
+	
+	funclist = document.getElementById('function');
+	oplist = document.getElementById('operations');
+	
+	oplist.innerHTML+="<option value='"+funclist.options[funclist.selectedIndex].value+"'>"+funclist.options[funclist.selectedIndex].text+"</option>";
+}
+
+function deletebutton() {
+	var elSel = document.getElementById('operations');
+	var i=0;
+	for (i = elSel.length-1; i >= 0; i--) {
+		if (elSel.options[i].selected) {
+			elSel.remove(i);
+		}
+	}
+}
+
+function moveupbutton() {
+	var elSel = document.getElementById('operations');
+	var ind=elSel.selectedIndex;
+	var val;
+	var tex;
+	
+	if( elSel.selectedIndex>0) {
+		
+		val=elSel.options[ind].value;
+		tex=elSel.options[ind].text;
+	
+		elSel.options[ind].value=elSel.options[ind-1].value;
+		elSel.options[ind].text=elSel.options[ind-1].text;
+		
+		elSel.options[ind-1].value=val;
+		tex=elSel.options[ind-1].text=tex;
+			
+		elSel.selectedIndex--;				
+	}
+}
+
+function movedownbutton() {
+	var elSel = document.getElementById('operations');
+	var ind=elSel.selectedIndex;
+	var val;
+	var tex;
+	
+	if(elSel.selectedIndex < elSel.length-1){
+		
+		val=elSel.options[ind].value;
+		tex=elSel.options[ind].text;
+	
+		elSel.options[ind].value=elSel.options[ind+1].value;
+		elSel.options[ind].text=elSel.options[ind+1].text;
+		
+		elSel.options[ind+1].value=val;
+		tex=elSel.options[ind+1].text=tex;
+			
+		elSel.selectedIndex++;				
+	}
+}
+
+function submbutton() {
+	var submitstr="";
+	
+	var elSel = document.getElementById('operations');
+	var i=0;
+	
+	for (i=elSel.length-1; i >= 0;i--) {
+	submitstr+=elSel.options[i].value; 
+	}				
+	
+	alert(submitstr);
+	checkAnswer(submitstr);
+}
+
+function handler_mouseup() {
+	clickstate=0;
+}
+
+function handler_mousedown() {
+	clickstate=1;
+}
+
+function handler_mousemove (cx,cy) {
+// Make use of cx and cy... right now no use as this app does not use clicks
+}
+
+var v=0;
+
+function foo() {
+	acanvas.width = acanvas.width;				
+	
+	v+=0.1;
+	
+	context.translate(300,300);
+	context.save(); 
+				
+	var elSel = document.getElementById('operations');
+	var i=0;
+	for (i=0;i<=elSel.length-1;i++) {
+		if (elSel.options[i].value == "T1") {
+			context.translate(100,0);
+		}
+		if (elSel.options[i].value == "T2") {
+			context.translate(150,0);
+		}
+		if (elSel.options[i].value == "T3") {
+			context.translate(200,0);
+		}
+		if (elSel.options[i].value == "RP") {
+			context.rotate(v);
+		}
+		if (elSel.options[i].value == "RN") {
+			context.rotate(-v);
+		}
+		if (elSel.options[i].value == "S1") {
+			context.scale(0.25,0.25);
+		}
+		if (elSel.options[i].value == "S2") {
+			context.scale(0.5,0.5);
+		}
+		if (elSel.options[i].value == "S3") {
+			context.scale(0.75,0.75);
+		}
+		if (elSel.options[i].value == "S4") {
+			context.scale(1.5,1.5);
+		}
+		if (elSel.options[i].value == "D1") {
+			drawball(0,0,40,30,10,"#f84",45.0,22.5);
+		}
+		if (elSel.options[i].value == "D2") {
+			drawball(0,0,40,30,10,"#4f8",45.0,22.5);
+		}
+		if (elSel.options[i].value == "D3") {
+			drawball(0,0,40,30,10,"#84f",45.0,22.5);
+		}
+	}
+	
+	// Must count saves
+	// Restore equal amount of times
+	
+	/*
+	context.beginPath();
+	drawcircle(40,'#f0f');
+	
+	context.lineWidth   = 0.5;
+	
+	context.moveTo(0,0);
+	context.rect(0,0,30,30);
+	
+	context.stroke();
+	*/
+	context.restore();
+	context.globalAlpha = 0.5				
+	context.rotate(-v*0.6);								
+	drawsun();
+	
+	setTimeout("foo();",100);
+}
\ No newline at end of file

=== modified file 'DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php'
--- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php	2013-04-04 11:30:02 +0000
+++ DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php	2013-04-12 15:59:33 +0000
@@ -9,250 +9,9 @@
 <html>
 	<head>
 		<meta charset="UTF-8"/>			
-		<script type="text/javascript" src="../../../../js/jquery.js"></script>	
-		<script lang='Javascript'>
-			var account="<?php echo $accountname ?>";		
-					var duggaNr="<?php echo $duggaNr ?>";		
-					var courseName="<?php echo $courseName ?>";		
-					var courseOccasion="<?php echo $courseOccasion ?>";	
-					
-					$(document).ready(function() {
-						fetchQuiz();
-						fetchQuizObject("ObjDesc");
-					});
-					
-					//login, courseName, courseOccasion, quizNr
-					function fetchQuiz(){
-						console.log("post fetchQuiz ");
-						$.post("../quizAjax/getQuiz.php", 
-							   {loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr }, 
-								fetchQuizCallBack,
-								"json"
-						);
-					}
-					
-					function fetchQuizCallBack(data){
-						console.log(data);
-						if (typeof data.Error != 'undefined') {
-							$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
-						} else {
-							$("#result").append("<br/>Dugga nr:"+data.quizNr);
-							$("#result").append("<br/>Kursnamn:"+data.quizCourseName);
-							$("#result").append("<br/>Lista över dugga-objekt:"+data.quizObjectIDs);
-							$("#result").append("<br/>Data:"+data.quizData);
-						}
-					}
-					
-					//Kontrollera om inskickat svar är rätt (alternativt bara spara det om duggan inte rättas automatiskt) 
-					function checkAnswer(submitstr){
-						$.post("../quizAjax/answerQuiz.php", 
-							{loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, quizAnswer: submitstr}, 
-							checkAnswerCallBack,
-							"json"
-						);
-					}
-					
-					function checkAnswerCallBack(data){
-						console.log("checkAnswerCallBack:");
-						console.log(data);
-						if (typeof data.Error != 'undefined') {
-							$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
-						} else {
-							for (var key in data) {
-							  $("#result").append("<br />"+data[key]);
-							}
-						}
-					}
-					
-					//Hämta ett dugga objekt (objekt id:n hämtas från listan med objekt id:n som kommer med duggan)
-					//////Parameters: (POST) objectID, courseName, courseOccasion, quizNr, loginName
-					function fetchQuizObject(objectName){
-						console.log("post fetchQuizObject");
-						$.post("../quizAjax/getQuizObject.php", 
-							   {objectID: objectName, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, loginName: account}, 
-								fetchQuizObjectCallBack,
-								"json"
-						);
-					}
-
-					function fetchQuizObjectCallBack(data){
-						if (typeof data.Error != 'undefined') {
-							$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
-						} else {
-							$("#result").append(data.objectData);
-						}
-					}
-		</script>
-	
+		<script type="text/javascript" src="../../../../js/jquery.js"></script>
 		<script type="text/javascript" src="../../../../js/dugga.js"></script>	
-	
-	<script lang='Javascript'>
-				
-		function newbutton()
-		{
-				var funclist;
-				var oplist;
-				
-				funclist=document.getElementById('function');
-				oplist=document.getElementById('operations');
-				
-				oplist.innerHTML+="<option value='"+funclist.options[funclist.selectedIndex].value+"'>"+funclist.options[funclist.selectedIndex].text+"</option>";
-								
-		}
-		
-		function deletebutton()
-		{
-				var elSel = document.getElementById('operations');
-  			var i=0;
-  			for (i=elSel.length-1;i>=0;i--) {
-    				if (elSel.options[i].selected) {
-      				elSel.remove(i);
-    				}
-  			}
-		}
-		
-		function moveupbutton()
-		{
-				var elSel = document.getElementById('operations');
-				var ind=elSel.selectedIndex;
-				var val;
-				var tex;
-
-				if(elSel.selectedIndex>0){
-						
-						val=elSel.options[ind].value;
-						tex=elSel.options[ind].text;
-
-						elSel.options[ind].value=elSel.options[ind-1].value;
-						elSel.options[ind].text=elSel.options[ind-1].text;
-						
-						elSel.options[ind-1].value=val;
-						tex=elSel.options[ind-1].text=tex;
-							
-						elSel.selectedIndex--;				
-				}
-		}
-
-		function movedownbutton()
-		{
-				var elSel = document.getElementById('operations');
-				var ind=elSel.selectedIndex;
-				var val;
-				var tex;
-
-				if(elSel.selectedIndex<elSel.length-1){
-						
-						val=elSel.options[ind].value;
-						tex=elSel.options[ind].text;
-
-						elSel.options[ind].value=elSel.options[ind+1].value;
-						elSel.options[ind].text=elSel.options[ind+1].text;
-						
-						elSel.options[ind+1].value=val;
-						tex=elSel.options[ind+1].text=tex;
-							
-						elSel.selectedIndex++;				
-				}
-				
-		}
-
-		function submbutton()
-		{
-				var submitstr="";
-				
-				var elSel = document.getElementById('operations');
-  			var i=0;
-  			
-  			for (i=elSel.length-1;i>=0;i--) {
-    				submitstr+=elSel.options[i].value; 
-  			}				
-		
-				alert(submitstr);
-			checkAnswer(submitstr);
-		}
-
-		function handler_mouseup()
-		{
-				clickstate=0;
-		}
-		
-		function handler_mousedown()
-		{
-				clickstate=1;
-		}
-		
-		function handler_mousemove (cx,cy) 
-		{
-				// Make use of cx and cy... right now no use as this app does not use clicks
-		}
-				
-		var v=0;
-
-		function foo()
-		{
-				acanvas.width = acanvas.width;				
-				
-				v+=0.1;
-
-				context.translate(300,300);
-				context.save(); 
-				                
-				var elSel = document.getElementById('operations');
-  			var i=0;
-  			for (i=0;i<=elSel.length-1;i++) {
-						if(elSel.options[i].value=="T1"){
-									context.translate(100,0);
-						}if(elSel.options[i].value=="T2"){
-									context.translate(150,0);
-						}if(elSel.options[i].value=="T3"){
-									context.translate(200,0);
-						}if(elSel.options[i].value=="RP"){
-									context.rotate(v);
-						}if(elSel.options[i].value=="RN"){
-									context.rotate(-v);
-						}if(elSel.options[i].value=="S1"){
-									context.scale(0.25,0.25);
-						}if(elSel.options[i].value=="S2"){
-									context.scale(0.5,0.5);
-						}if(elSel.options[i].value=="S3"){
-									context.scale(0.75,0.75);
-						}if(elSel.options[i].value=="S4"){
-									context.scale(1.5,1.5);
-						}if(elSel.options[i].value=="D1"){
-								drawball(0,0,40,30,10,"#f84",45.0,22.5);
-						}if(elSel.options[i].value=="D2"){
-								drawball(0,0,40,30,10,"#4f8",45.0,22.5);
-						}if(elSel.options[i].value=="D3"){
-								drawball(0,0,40,30,10,"#84f",45.0,22.5);
-						}
-  			}
-
-  			
-
-				// Must count saves
-				// Restore equal amount of times
-				
-/*
-				context.beginPath();
-				drawcircle(40,'#f0f');
-				
-				context.lineWidth   = 0.5;
-
-				context.moveTo(0,0);
-				context.rect(0,0,30,30);
-
-				context.stroke();
-*/
-				context.restore();
-				context.globalAlpha = 0.5				
-				context.rotate(-v*0.6);								
-				drawsun();
-
-				setTimeout("foo();",100);
-				
-	  }	  
-					
-	</script>
+		<script type="text/javascript" src="johan_dugga_datorgrafik_1_transforms.js"></script>
 
 	</head>
 	<body onload="setupcanvas();">

=== modified file 'Widget Library/sliderdemo.html'
--- Widget Library/sliderdemo.html	2013-04-03 14:29:36 +0000
+++ Widget Library/sliderdemo.html	2013-04-12 15:59:33 +0000
@@ -3,19 +3,9 @@
 	<head>
 		<title>Slider Demo</title>
 		<link rel="stylesheet" type="text/css" media="screen" href="sliders.css">
+		<script type="text/javascript" src="../etc/PIE/PIE.js"></script>
+		<script type="text/javascript" src="../js/jquery.js"></script>
 		<script type="text/javascript" src="sliders.js"></script>
-		<script>
-			function createDemoSliders() {
-				str = "";
-				str += makePanel(250, 200);
-				str += makeLabel("Slider");
-				str += makeSlider("slider", 1, 2, 7, 4.5, 160, 5);
-				str += makeLabel("Binary");
-				str += makeBinary("binary", 0);
-				str += makePanelEnd();
-				document.getElementById("container").innerHTML = str;
-			}
-		</script>
 	</head>
 	<body onload="createDemoSliders();" onmousedown="mbPress(event);" onmouseup="mbRelease(event);">
 		<div id="container">

=== modified file 'Widget Library/sliders.css'
--- Widget Library/sliders.css	2013-04-03 14:29:36 +0000
+++ Widget Library/sliders.css	2013-04-12 15:59:33 +0000
@@ -9,6 +9,7 @@
 	font-family: Arial;
 	background-color: #d0d0d4;
 	background: linear-gradient(to bottom, #f0f0e8 0%, #e8e8e8 1%, #b8b8b0 17%);
+	-pie-background: linear-gradient(top, #f0f0e8 0%, #e8e8e8 1%, #b8b8b0 17%);
 	border-radius: 10px;
 	padding:6px;
 }
@@ -79,4 +80,5 @@
 	border-width: 1px;
 	box-shadow: 2px 2px 2px #444;
 	background: linear-gradient(to bottom, #fff 0%,#e0e0d8 60%);
+	-pie-background: linear-gradient(top, #fff 0%,#e0e0d8 60%);
 }
\ No newline at end of file

=== modified file 'Widget Library/sliders.js'
--- Widget Library/sliders.js	2013-04-03 14:29:36 +0000
+++ Widget Library/sliders.js	2013-04-12 15:59:33 +0000
@@ -4,13 +4,34 @@
 
 */
 
+// Fixes css3 for IE
+function attachPIE() {
+	$('*').each(function() {
+		PIE.attach(this);
+	});
+}
+
+// Creates a demo
+function createDemoSliders() {
+	str = "";
+	str += makePanel(250, 200);
+	str += makeLabel("Slider");
+	str += makeSlider("slider", 1, 2, 7, 4.5, 160, 5);
+	str += makeLabel("Binary");
+	str += makeBinary("binary", 0);
+	str += makePanelEnd();
+	document.getElementById("container").innerHTML = str;
+	attachPIE();
+
+}
+
 // Recursive Pos of div in document - should work in most browsers
 function findPos(obj) {
 	var curLeft = curTop = 0;
-	if(obj.offsetParent) {
+	if (obj.offsetParent) {
 		curLeft = obj.offsetLeft
 		curTop = obj.offsetTop
-		while(obj = obj.offsetParent) {
+		while (obj = obj.offsetParent) {
 			curLeft += obj.offsetLeft
 			curTop += obj.offsetTop
 		}
@@ -29,7 +50,7 @@
 
 function readSlider(sliderId) {
 	var value = parseFloat(document.getElementById(sliderId + "box").value);
-	if(isNaN(value)) {
+	if (isNaN(value)) {
 		value = 0.0;
 	}
 	return value;
@@ -37,7 +58,7 @@
 
 function readBinary(binaryId) {
 	lf = document.getElementById(binaryId + "marker").style.left;
-	if(lf == "2px") {
+	if (lf == "2px") {
 		return 0;
 	} else {
 		return 1;
@@ -52,7 +73,7 @@
 
 // The idea is to have a few functions like this one and minimum javascript intervention		
 function updateBinary(event, binaryId) {
-	if(mb) {
+	if (mb) {
 		coords = findPos(event.currentTarget);
 		coords.x = event.clientX - coords.x;
 		coords.y = event.clientY - coords.y;
@@ -68,24 +89,24 @@
 
 // The idea is to have a few functions like this one and minimum javascript intervention		
 function updateSlider(event, kind, min, max, length, sliderId, boxId) {
-	if(mb) {
+	if (mb) {
 		coords = findPos(event.currentTarget);
 		coords.x = event.clientX - coords.x;
 		coords.y = event.clientY - coords.y;
 		cx = coords.x / length;
 		sd = max - min;
 		value = min + (sd * cx);	
-		if(value > max) value = max;
-		if(kind == 0) {
+		if (value > max) value = max;
+		if (kind == 0) {
 			value = Math.round(value);
 		}
-		if(kind == 1) {
+		if (kind == 1) {
 			value = Math.round(value * 10.0) / 10.0;
 		}
-		if(kind == 2) {
+		if (kind == 2) {
 			value = Math.round(value * 100.0) / 100.0;
 		}
-		if(kind == 3) {
+		if (kind == 3) {
 			value = Math.round(value * 1000.0) / 1000.0;
 		}
 		document.getElementById(boxId).value = value;				
@@ -94,10 +115,10 @@
 }
 		
 function sliderPosition(value, min, max, length) {
-		if(value < min) {
+		if (value < min) {
 			value = min;
 		}
-		if(value > max) {
+		if (value > max) {
 			value = max;
 		}
 		pos = Math.round(((value - min) / (max - min)) * length);
@@ -106,25 +127,25 @@
 
 function changeSlider(value, sliderId, kind, min, max, length) {
 		value = parseFloat(value);		
-		if(isNaN(value)) {
+		if (isNaN(value)) {
 			value = 0.0;
 		}
-		if(value < min) {
+		if (value < min) {
 			value = min;
 		}
-		if(value > max) {
+		if (value > max) {
 			value = max;
 		}
-		if(kind == 0) {
+		if (kind == 0) {
 			value = Math.round(value);
 		}
-		if(kind == 1) {
+		if (kind == 1) {
 			value = Math.round(value * 10.0) / 10.0;
 		}
-		if(kind == 2) {
+		if (kind == 2) {
 			value = Math.round(value * 100.0) / 100.0;
 		}
-		if(kind == 3) {
+		if (kind == 3) {
 			value = Math.round(value * 1000.0) / 1000.0;
 		}
 		pos = sliderPosition(value, min, max, length);
@@ -158,10 +179,10 @@
 function makeSlider(sliderId, kind, minValue, maxValue, midValue, sliderWidth, defaultValue) {
 	s = "";
 	defaultPosition = sliderPosition(defaultValue, minValue, maxValue, sliderWidth);
-	if(defaultValue < minValue) {
+	if (defaultValue < minValue) {
 		defaultValue = minValue;
 	}
-	if(defaultValue > maxValue) {
+	if (defaultValue > maxValue) {
 		defaultValue = maxValue;
 	}					
 	s += "<input id='" + sliderId + "box' value='" + defaultValue + "' type='text' class='sliderBox' onBlur='changeSlider(this.value,\"" + sliderId + "\"," + kind + "," + minValue + "," + maxValue + "," + sliderWidth + ");'>";
@@ -178,7 +199,7 @@
 
 function makeBinary(binaryId, defaultValue) {
 	s = "";
-	if(defaultValue == 1) {
+	if (defaultValue == 1) {
 		defaultPosition = 20;
 		defaultColor = "#ddd";
 	} else {

=== modified file 'codeigniter/application/controllers/admin.php'
--- codeigniter/application/controllers/admin.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/controllers/admin.php	2013-04-12 15:59:33 +0000
@@ -2,7 +2,10 @@
 
 class Admin extends CI_Controller {
 
-
+	/*
+	* This is the index function. It will be the one called if you do not specify a
+	* function in the url, example: /admin/
+	*/
 	public function index() {
 		$this->load->model('admin/Admin_model');
 		$courses = $this->Admin_model->getCourses();
@@ -38,7 +41,7 @@
 			$this->load->view('admin/add_example', array("cid" => $cid));
 		} else {
 			$this->load->model('admin/Admin_model');
-			$this->Admin_model->addExample($_POST['cid'], $_POST['example']);
+			$this->Admin_model->addExample($_POST['cid'], $_POST['example'], $_POST['description']);
 			redirect("admin/");
 		}
 	}
@@ -58,7 +61,7 @@
 			$this->load->view('admin/add_page', array("cid" => $cid, "example" => $example));
 		} else {
 			$this->load->model('admin/Admin_model');
-			$this->Admin_model->addPage($_POST['cid'], $_POST['example'],$_POST['page'], $_POST['documentation']);
+			$this->Admin_model->addPage($_POST['cid'], $_POST['example'],$_POST['page']);
 			redirect("admin/");
 		}
 	}
@@ -69,19 +72,16 @@
 
 			$this->load->model('codeviewer/Codeviewer_model');
 
-			$files = $this->Codeviewer_model->getFiles($cid, $example,$page);
-			$editorHTML = "";
-			foreach ($files as $file) {
-				$editorHTML .= $this->Codeviewer_model->showFile($file, "html");
-			}
+			
+			$editorHTML = $this->Codeviewer_model->getCode($cid, $example, $page);
 
-			$doc = $this->Codeviewer_model->getDoc($cid, $example, $page);
+			//$doc = $this->Codeviewer_model->getDoc($cid, $example, $page);
 
 			$this->load->view('admin/header', array("editors" => $editorHTML, "title" => "Manage page - ".$page." - ".$example." - ".$cid));
-			$this->load->view('admin/manage_page', array("cid" => $cid, "example" => $example, "page" => $page, "documentation" => $doc));
+			$this->load->view('admin/manage_page', array("cid" => $cid, "example" => $example, "page" => $page /*,"documentation" => $doc*/));
 		} else {
 			$this->load->model('admin/Admin_model');
-			$this->Admin_model->updatePage($_POST['cid'], $_POST['example'],$_POST['page'], $_POST['documentation']);
+			$this->Admin_model->updatePage($_POST['cid'], $_POST['example'],$_POST['page'], $_POST['documentation'], $_POST['files']);
 			redirect("admin/");
 		}
 	}

=== modified file 'codeigniter/application/controllers/codeviewer.php'
--- codeigniter/application/controllers/codeviewer.php	2013-04-10 15:49:32 +0000
+++ codeigniter/application/controllers/codeviewer.php	2013-04-12 15:59:33 +0000
@@ -1,18 +1,30 @@
 <?php
-
+/**
+* This is a controller. It links the views related to the codeviewer together with the model, which holds
+* the logic.  
+*
+* Function names equals path. Example: codeviewer/show in the url calls the function show in the controller
+* codeviewer (this file below).
+*
+* The params after the url equals the input arguments of the function. Function show() has 3 arguments
+* and therefore requires 3 arguments to be given in the url, like so: codeviewer/show/courseid/exampleid/pageid
+*/
 class Codeviewer extends CI_Controller {
 
+	/**
+	* This shows the codeviewer page
+	*/
 	public function show($course, $example, $page){
 		$this->load->model('codeviewer/Codeviewer_model');
 
-		$files = $this->Codeviewer_model->getFiles($course, $example,$page);
-		$editorHTML = "";
-		foreach ($files as $file) {
-			$editorHTML .= $this->Codeviewer_model->showFile($file, "html");
-		}
+		$editorHTML = $this->Codeviewer_model->getCode($course, $example, $page);
 
 		$doc = $this->Codeviewer_model->getDoc($course, $example, $page);
 
+		// This loads the view. It's stored in application/views/codeviewer/codeviewer.php
+		// Do note that application/views should not be in the first argument of view()
+		// The second argument is data to be shown in the view. "editors" => "test" would
+		// generate an $editors variable in the view containing "test"
 		$this->load->view('codeviewer/codeviewer', array("editors" => $editorHTML, "documentation" => $doc));
 	}
 }
\ No newline at end of file

=== modified file 'codeigniter/application/models/admin/admin_model.php'
--- codeigniter/application/models/admin/admin_model.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/models/admin/admin_model.php	2013-04-12 15:59:33 +0000
@@ -1,4 +1,11 @@
 <?php
+/**
+* This is a model. It holds the logic.
+* It's loaded like this in the controllers: $this->load->model("path/to/model");
+* This specific model is: $this->load->model("admin/admin_model")
+*
+* This model is the logic behind the admin panel. It let's you manage courses, pages etc
+*/
 class Admin_model extends CI_Model {
 
 	function __construct() {
@@ -12,9 +19,9 @@
 
 	function addCourse($cid, $name){
 		$data = array(
-			'cid' => $cid ,
-			'name' => $name
-		);
+			'courseID' => $cid ,
+			'courseName' => $name
+			);
 
 		$this->db->insert('courses', $data); 
 		mkdir("../courses/".$cid);
@@ -22,15 +29,16 @@
 	}
 
 	function getExamples($cid) {
-		$query = $this->db->get_where('examples', array("cid" => $cid));
+		$query = $this->db->get_where('examples', array("Courses_courseID" => $cid));
 		return $query->result();
 	}
 
-	function addExample($cid, $example){
+	function addExample($cid, $example, $description){
 		$data = array(
-			'cid' => $cid ,
-			'example' => $example
-		);
+			'Courses_courseID' => $cid ,
+			'Name' => $example,
+			'description' => $description
+			);
 
 		$this->db->insert('examples', $data); 
 		mkdir("../courses/".$cid."/".$example);
@@ -38,32 +46,90 @@
 	}
 
 	function getPages($cid, $example) {
-		$query = $this->db->get_where('pages', array("cid" => $cid, "example" => $example));
+		$query = $this->db->get_where('pages', array("Examples_Courses_courseID" => $cid, "Examples_Name" => $example));
 		return $query->result();
 	}
 
-	function addPage($cid, $example, $page, $documentation){
+	function addPage($cid, $example, $page){
 		$data = array(
-			'cid' => $cid ,
-			'example' => $example,
-			'page' => $page ,
-			'documentation' => $documentation 
-		);
+			'Examples_Courses_courseID' => $cid ,
+			'Examples_Name' => $example,
+			'name' => $page
+			);
 
 		$this->db->insert('pages', $data); 
 		mkdir("../courses/".$cid."/".$example."/".$page);
 
+		$data = array(
+			'fileName' => $cid."/".$example."/".$page."/documentation",
+			'language' => $file->lang,
+			'fileType' => $file->type,
+			'dataBlob' => $output
+			);
+
+		$this->db->insert('files', $data); 
+
+		$data = array(
+			'Files_fileName' =>  $cid."/".$example."/".$page."/documentation"  ,
+			'Pages_name' => $page,
+			'Pages_Examples_Name' => $example,
+			'Pages_Examples_Courses_courseID' => $cid
+			);
+
+		$this->db->insert('pagesfiles', $data); 
+
 	}
 
-	function updatePage($cid, $example, $page, $documentation){
+	function updatePage($cid, $example, $page, $documentation, $files){
+
+		$filearr = json_decode($files);
+
+		foreach ($filearr as $file) {
+			$output = "";
+			$handle = @fopen("../courses/".$cid."/".$example."/".$page."/".$file->filename, "r");
+			if ($handle) {
+
+				while (($buffer = fgets($handle, 4096)) !== false) {
+
+					$buffer = str_replace("&", "&amp;", $buffer);
+					$buffer = str_replace("<", "&lt;", $buffer);
+					$buffer = str_replace(">", "&gt;", $buffer);
+
+					$output .= $buffer;
+				}
+				if (!feof($handle)) {
+					$output .= "Error: unexpected fgets() fail\n";
+				}
+				fclose($handle);
+			}
+			
+			$data = array(
+				'fileName' => $file->filename ,
+				'language' => $file->lang,
+				'fileType' => $file->type,
+				'dataBlob' => $output
+				);
+
+			$this->db->insert('files', $data); 
+
+			$data = array(
+				'Files_fileName' =>  $file->filename  ,
+				'Pages_name' => $page,
+				'Pages_Examples_Name' => $example,
+				'Pages_Examples_Courses_courseID' => $cid
+				);
+
+			$this->db->insert('pagesfiles', $data); 
+		}
+
 		$data = array(
-			'documentation' => $documentation 
-		);
-
-		$this->db->where('cid', $cid);
-		$this->db->where('example', $example);
-		$this->db->where('page', $page);
-		$this->db->update('pages', $data); 
+			'dataBlob' => $documentation
+			);
+
+		$this->db->where("fileName",$cid."/".$example."/".$page."/"."documentation" );
+		$this->db->update('files', $data); 
+		
+
 	}
 
 	function uploadFile($files, $cid, $example, $page){

=== modified file 'codeigniter/application/models/codeviewer/codeviewer_model.php'
--- codeigniter/application/models/codeviewer/codeviewer_model.php	2013-04-10 15:49:32 +0000
+++ codeigniter/application/models/codeviewer/codeviewer_model.php	2013-04-12 15:59:33 +0000
@@ -5,66 +5,61 @@
 		$this->load->database();
 	}
 
-	function showFile($filename, $lang, $interestingrows = array()) {
+	function getCode($cid, $example, $page) {
+
+		$this->db->from('files');
+		$this->db->join("pagesfiles", "pagesfiles.Files_fileName = files.fileName");
+		$this->db->where("pagesfiles.Pages_name", $page);
+		$this->db->where("pagesfiles.Pages_Examples_Name", $example);
+		$this->db->where("pagesfiles.Pages_Examples_Courses_courseID", $cid);
+		$this->db->not_like("pagesfiles.Files_fileName", $cid."/".$example."/".$page."/"."documentation");
+
+		$query = $this->db->get();
 		$output = "";
-		$output .= '<div class="editorinfo">'.$lang.'&nbsp;&nbsp;&nbsp;&nbsp;'.$filename.'</div>';
-		$output .= '<div id="ace_'.str_replace(".", "", $filename).'" class="ace">';
-		$handle = @fopen($filename, "r");
-		if ($handle) {
-
-			while (($buffer = fgets($handle, 4096)) !== false) {
-
-				$buffer = str_replace("&", "&amp;", $buffer);
-				$buffer = str_replace("<", "&lt;", $buffer);
-				$buffer = str_replace(">", "&gt;", $buffer);
-
-				$output .= $buffer;
-			}
-			if (!feof($handle)) {
-				$output .= "Error: unexpected fgets() fail\n";
-			}
-			fclose($handle);
-		}
-		$output .= '</div>';
-
-		$output .=  '<script type="text/javascript">
-		var Range = require("ace/range").Range;
-		var editor = ace.edit("ace_'.str_replace(".", "", $filename).'");
-		editor.setTheme("ace/theme/merbivore");
-		editor.getSession().setMode("ace/mode/'.$lang.'");
-		editor.setReadOnly(true);
-		editor.setShowPrintMargin(false);
-		editor.setDisplayIndentGuides(false);
-		editor.setHighlightSelectedWord(true);
-		lines = editor.getSession().getLength();
-		$("#ace_'.str_replace(".", "", $filename).'").height(Math.min(500,lines*16));
-		aceeditors.push("ace_'.str_replace(".", "", $filename).'");';
-		for($i = 0; $i < count($interestingrows); $i++) {
+		foreach ($query->result() as $row) {
+			$output .= '<div class="editorinfo">'.$row->language.'&nbsp;&nbsp;&nbsp;&nbsp;'.$row->fileName.'</div>';
+			$output .= '<div id="ace_'.str_replace(".", "", $row->fileName).'" class="ace">';
+			$output .= $row->dataBlob;
+			$output .= '</div>';
+
+			$output .=  '<script type="text/javascript">
+			var Range = require("ace/range").Range;
+			var editor = ace.edit("ace_'.str_replace(".", "", $row->fileName).'");
+			editor.setTheme("ace/theme/merbivore");
+			editor.getSession().setMode("ace/mode/'.$row->language.'");
+			editor.setReadOnly(true);
+			editor.setShowPrintMargin(false);
+			editor.setDisplayIndentGuides(false);
+			editor.setHighlightSelectedWord(true);
+			lines = editor.getSession().getLength();
+			$("#ace_'.str_replace(".", "", $row->fileName).'").height(Math.min(500,lines*16));
+			aceeditors.push("ace_'.str_replace(".", "", $row->fileName).'");';
+
+			/*
+			for($i = 0; $i < count($interestingrows); $i++) {
 			$output .= 'editor.getSession().addMarker(new Range('.$interestingrows[$i][0].', 0, '
 				.$interestingrows[$i][1].', Number.POSITIVE_INFINITY), "interesting", "text",false);';
+			}
+			*/
+			$output .= '</script>';
+
 		}
-		$output .= '</script>';
 
 		return $output;
 	}
 
-	function getFiles($course, $example, $page){
-		$files = array();
-		if ($handle = opendir("../courses/".$course."/". $example."/".$page."/")) {
-			while (false !== ($entry = readdir($handle))) {
-				if($entry == "." || $entry == "..") continue;
-				$files[] = "../courses/".$course."/". $example."/".$page."/".$entry;
-			}
-		}
-
-		return $files;
-	}
-
 	function getDoc($cid, $example, $page){
-		$this->db->select('documentation');
-		$query = $this->db->get_where('pages', array('cid' => $cid, 'example' => $example, 'page' => $page));
+		$this->db->select('dataBlob');
+		$this->db->from('files');
+		$this->db->join("pagesfiles", "pagesfiles.Files_fileName = files.fileName");
+		$this->db->where("pagesfiles.Pages_name", $page);
+		$this->db->where("pagesfiles.Pages_Examples_Name", $example);
+		$this->db->where("pagesfiles.Pages_Examples_Courses_courseID", $cid);
+		$this->db->where("pagesfiles.Files_fileName", $cid."/".$example."/".$page."/"."documentation");
+
+		$query = $this->db->get();
 		$result = $query->result();
-		return $result[0]->documentation;
+		return $result[0]->dataBlob;
 	}
 
 }

=== modified file 'codeigniter/application/views/admin/add_example.php'
--- codeigniter/application/views/admin/add_example.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/admin/add_example.php	2013-04-12 15:59:33 +0000
@@ -31,6 +31,8 @@
 								echo form_open(base_url().'admin/addexample');
 			                                   			echo form_label('Example name', 'example');
 			                                   			echo form_input(array('name' => 'example', 'required' => 'required'));
+			                                   			echo form_label('Description', 'description');
+			                                   			echo form_input(array('name' => 'description', 'required' => 'required'));
 			                                   			echo form_hidden('cid',$cid); 
 			                                   			echo "<br>";
 			                                   			echo form_submit(array('name' => 'submit', 'value' => 'Add example', "class" => "btn btn-primary")); 

=== modified file 'codeigniter/application/views/admin/add_page.php'
--- codeigniter/application/views/admin/add_page.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/admin/add_page.php	2013-04-12 15:59:33 +0000
@@ -31,8 +31,6 @@
 								echo form_open(base_url().'admin/addpage');
 			                                   			echo form_label('Page name', 'page');
 			                                   			echo form_input(array('name' => 'page', 'required' => 'required'));
-			                                   			echo form_label('Documentation', 'documentation');
-			                                   			echo form_input(array('name' => 'documentation', 'required' => 'required'));
 			                                   			echo form_hidden('cid',$cid); 
 			                                   			echo form_hidden('example',$example); 
 			                                   			echo "<br>";

=== modified file 'codeigniter/application/views/admin/index.php'
--- codeigniter/application/views/admin/index.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/admin/index.php	2013-04-12 15:59:33 +0000
@@ -47,9 +47,9 @@
 										foreach ($courses as $item):
 									?>
 									<tr>
-										<td><?php echo $item->cid ?></td>
-										<td><?php echo $item->name ?></td>
-										<td><button class="btn btn-primary" onClick="window.location.href='<?php echo base_url();?>admin/managecourse/<?php echo $item->cid ?>'"><i class="icon-cog icon-white"></i> Manage</button></td>
+										<td><?php echo $item->courseID ?></td>
+										<td><?php echo $item->courseName ?></td>
+										<td><button class="btn btn-primary" onClick="window.location.href='<?php echo base_url();?>admin/managecourse/<?php echo $item->courseID?>'"><i class="icon-cog icon-white"></i> Manage</button></td>
 									</tr>
 									<?php endforeach;?>
 								</tbody>

=== modified file 'codeigniter/application/views/admin/manage_course.php'
--- codeigniter/application/views/admin/manage_course.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/admin/manage_course.php	2013-04-12 15:59:33 +0000
@@ -33,7 +33,7 @@
 					<div class="span9">
 						
 						<div class="span9" id="content">
-							<h2>Manage example - <?php echo $cid ?></h2>
+							<h2>Manage course - <?php echo $cid ?></h2>
 							<table  class="table table-striped">
 								<thead>
 									<tr>
@@ -46,8 +46,8 @@
 										foreach ($examples as $item):
 									?>
 									<tr>
-										<td><?php echo $item->example ?></td>
-										<td><button class="btn btn-primary" onClick="window.location.href='<?php echo base_url();?>admin/manageexample/<?php echo $item->cid ?>/<?php echo $item->example ?>'"><i class="icon-cog icon-white"></i> Manage</button></td>
+										<td><?php echo $item->Name ?></td>
+										<td><button class="btn btn-primary" onClick="window.location.href='<?php echo base_url();?>admin/manageexample/<?php echo $cid ?>/<?php echo $item->Name ?>'"><i class="icon-cog icon-white"></i> Manage</button></td>
 									</tr>
 									<?php endforeach;?>
 								</tbody>

=== modified file 'codeigniter/application/views/admin/manage_example.php'
--- codeigniter/application/views/admin/manage_example.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/admin/manage_example.php	2013-04-12 15:59:33 +0000
@@ -46,8 +46,8 @@
 										foreach ($pages as $item):
 									?>
 									<tr>
-										<td><?php echo $item->page ?></td>
-										<td><button class="btn btn-primary" onClick="window.location.href='<?php echo base_url();?>admin/managepage/<?php echo $item->cid ?>/<?php echo $item->example ?>/<?php echo $item->page ?>'"><i class="icon-cog icon-white"></i> Manage</button></td>
+										<td><?php echo $item->name ?></td>
+										<td><button class="btn btn-primary" onClick="window.location.href='<?php echo base_url();?>admin/managepage/<?php echo $cid ?>/<?php echo $example ?>/<?php echo $item->name ?>'"><i class="icon-cog icon-white"></i> Manage</button></td>
 									</tr>
 									<?php endforeach;?>
 								</tbody>

=== modified file 'codeigniter/application/views/admin/manage_page.php'
--- codeigniter/application/views/admin/manage_page.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/admin/manage_page.php	2013-04-12 15:59:33 +0000
@@ -16,32 +16,31 @@
 						
 						
 							<h3>Managing page - <?php echo $page?> </h3>
+						
 							
+							<div id="dropbox">
+								<span class="message"><i>Drop files here to upload</i></span>
+
+								<div class="progressHolder">
+									<div class="progress"></div>
+								</div>
+							</div>
+							<div id="filelist">
+							</div>
 							<?php 
 	
 								echo form_open(base_url().'admin/managepage');
 			                                   			echo form_label('Documentation', 'documentation');
-			                                   			echo form_textarea(array('name' => 'documentation',  'class' => 'ckeditor', 'required' => 'required', 'value' => $documentation));
+			                                   			echo form_textarea(array('name' => 'documentation',  'class' => 'ckeditor'/*, 'value' => $documentation*/));
 			                                   			echo form_hidden('cid',$cid); 
 			                                   			echo form_hidden('example',$example); 
 			                                   			echo form_hidden('page',$page); 
+			                                   			echo form_hidden('files'); 
 			                                   			echo "<br>";
-			                                   			echo form_submit(array('name' => 'submit', 'value' => 'Add page', "class" => "btn btn-primary")); 
+			                                   			echo form_submit(array('name' => 'submit', 'value' => 'Update page', "class" => "btn btn-primary")); 
 								echo form_close(); 
 								
 							 ?>
-							
-							<div id="dropbox">
-								<span class="message"><i>Drop files here to upload</i></span>
-
-								<div class="progressHolder">
-									<div class="progress"></div>
-								</div>
-							</div>
-							<div id="filelist">
-								<ul id="flist">
-								</ul>
-							</div>
 						
 					</div>
 					<div class="span6">

=== modified file 'codeigniter/application/views/codeviewer/codeviewer.php'
--- codeigniter/application/views/codeviewer/codeviewer.php	2013-04-11 13:59:06 +0000
+++ codeigniter/application/views/codeviewer/codeviewer.php	2013-04-12 15:59:33 +0000
@@ -1,5 +1,24 @@
 <!DOCTYPE html>
 <html>
+<!--	 
+	Created by
+____    __    ____  _______  ______    __    __    _______ __   __   __    __  
+\   \  /  \  /   / |   ____||   _  \  |  |  |  |  /  _____/_ | /_ | |  |  |  | 
+ \   \/    \/   /  |  |__   |  |_)  | |  |  |  | |  |  __  | |  | | |  |__|  | 
+  \            /   |   __|  |   _  <  |  |  |  | |  | |_ | | |  | | |   __   | 
+   \    /\    /    |  |____ |  |_)  | |  `--'  | |  |__| | | |  | | |  |  |  | 
+    \__/  \__/     |_______||______/   \______/   \______| |_|  |_| |__|  |__| 
+                                                                               
+ _______  ____    ____  ______    __   __   __    __  
+|       \ \   \  /   / |   _  \  /_ | /_ | |  |  |  | 
+|  .--.  | \   \/   /  |  |_)  |  | |  | | |  |__|  | 
+|  |  |  |  \      /   |   ___/   | |  | | |   __   | 
+|  '--'  |   \    /    |  |       | |  | | |  |  |  | 
+|_______/     \__/     | _|       |_|  |_| |__|  |__| 
+
+	Spring 2013
+
+ -->
 <head>
 	<script src="<?php echo base_url();?>js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
 	<script src="<?php echo base_url();?>js/jquery-1.8.0.min.js" type="text/javascript" charset="utf-8"></script>

=== modified file 'codeigniter/css/adminstyle.css'
--- codeigniter/css/adminstyle.css	2013-04-11 13:59:06 +0000
+++ codeigniter/css/adminstyle.css	2013-04-12 15:59:33 +0000
@@ -174,4 +174,8 @@
 	opacity: 0.5;
 	position: absolute;
 	z-index: 4;
+}
+
+.file {
+	background-color: #ccc;
 }
\ No newline at end of file

=== modified file 'codeigniter/js/script.js'
--- codeigniter/js/script.js	2013-04-10 15:49:32 +0000
+++ codeigniter/js/script.js	2013-04-12 15:59:33 +0000
@@ -1,13 +1,4 @@
 $(function(){
-	var $_GET = {};
-
-	document.location.search.replace(/\??(?:([^=]+)=([^&]*)&?)/g, function () {
-	    function decode(s) {
-	        return decodeURIComponent(s.split("+").join(" "));
-	    }
-
-	    $_GET[decode(arguments[1])] = decode(arguments[2]);
-	});
 
 	var dropbox = $('#dropbox'),
 		message = $('.message', dropbox);
@@ -20,7 +11,14 @@
 		
 		uploadFinished:function(i,file,response){
 			$('.progress').addClass('done');
-			$('#flist').append("<li>"+file.name+"</li>")
+			html = "";
+			html += '<div class="file">';
+			html += "<strong>"+file.name+"</strong>";
+			html += '<input type="hidden" value="'+file.name+'">';
+			html += '<label>Language</label><input type="text" name="'+file.name.replace(/\s/g,"")+'_lang" onChange="fileupdated()">';
+			html += '<label>Type</label><input type="text"  name="'+file.name.replace(/\s/g,"")+'_type" onChange="fileupdated()">';
+			html += "</div>";
+			$('#filelist').append(html);
 
 		},
 		
@@ -54,4 +52,13 @@
 		message.html(msg);
 	}
 
-});
\ No newline at end of file
+});
+
+function fileupdated(){
+	var fileinfo = [];
+	$('.file').each(function() {
+		inputs = $(this).find("input");
+		fileinfo.push({"filename":inputs.get(0).value, "lang": inputs.get(1).value, "type": inputs.get(2).value});
+	});
+	$("input[name='files']").val(JSON.stringify(fileinfo));
+}
\ No newline at end of file