Merge branch 'master' of https://github.com/diversify/janu

# By scanniza (3) and Yoav Zimmerman (2)
# Via scanniza
* 'master' of https://github.com/diversify/janu:
  changed ending screen
  load scripts in https
  removed psds
  unbroke it
  end screen

app/controllers/controllers.js

@@ -1,7 +1,7 @@
 
 var app = angular.module('janu');
 
-app.controller('januController', ['$scope','$http','$interval', function ($scope,$http,$interval){
+app.controller('januController', ['$scope','$http','$interval','$location', function ($scope,$http,$interval,$location){
 	var janu = $scope;
 
 
@@ -212,6 +212,9 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
       $('#album-cover').removeClass('correct');
       $('#album-cover').removeClass('wrong');
       $("#song-details").hide();
+      if($scope.timelineSongs.length===10){
+        $location.path('/win');
+      }
       newSong = fetchNewSong();
       playSong(newSong);
       $scope.markerSet = false;

app/partials/end.html

@@ -1 +1 @@
-<h1>Game over</h1>
+<h1>Game over</h1>

app/partials/game.html

@@ -33,5 +33,9 @@ <h2 id="question">Which timespan?</h2>
 
 <div id="game-footer"><h2 id="score">SCORE <em>{{score.total}}</em><em class="emergency">{{(score.round!=0 && ' + ' + score.round + (' x ' + comboplyer)|| '')}}</em></h2><h2 id="round">CORRECT GUESSES {{timelineSongs.length}} / 10</h2></div>
 <div id="combo-div"><img src="content/image/combo-icon.png" alt="COMBO" id="combo" /><h2>{{comboplyer}}</h2></div>
+<div id="ending-screen" class="hidden-element">
+	<h1>Game Over</h1>
+	<h1>Your score was: {{score.total}}</h1>
+</div>
 
 

content/style.css

@@ -425,3 +425,15 @@ button {
  0%   { color: #eee;}
  100% { color: #c66;}
 }
+#ending-screen{
+    background-color: #eee;
+    border-radius: 10px;
+    position: fixed;
+    top:0;
+    width:80%;
+    height:80%;
+    margin: 10% 10%;
+}
+.hidden-element{
+    display: none;
+}

index.html

@@ -9,9 +9,9 @@
 
 	<link rel="stylesheet" href="content/style.css" type="text/css" />
 
-	<link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
+	<link href='https://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
 
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 
 	<script src="scripts/underscore-min.js" type="text/javascript"></script>
 	<script src="scripts/musicPlayer.js" type="text/javascript"></script>