accurator/commit

Improved stability domain adaption.

authorChris Dijkshoorn
Thu Feb 12 21:02:51 2015 +0000
committerChris Dijkshoorn
Thu Feb 12 21:02:51 2015 +0000
commit67932254bf2a0ba5f9f54a8f5f462a242897ad75
treefdec82373cc831607c6c06504b89b06dd0442e17
parentaf9c424b431f5ae83e2d9addba651ec99df50fd6
Diff style: patch stat
diff --git a/web/img/background/bible-dark.jpg b/web/img/background/bible.jpg
similarity index 100%
rename from web/img/background/bible-dark.jpg
rename to web/img/background/bible.jpg
diff --git a/web/js/accurator_about.js b/web/js/accurator_about.js
index c0c88d4..6a102e1 100644
--- a/web/js/accurator_about.js
+++ b/web/js/accurator_about.js
@@ -10,6 +10,7 @@ function aboutInit() {
 		populateUI(data.ui + "about");
 	}
 	var onLoggedIn = function(data){
+		setLinkLogo("profile");
 		userName = getUserName(data.user);
 		populateNavbar(userName, [{link:"profile.html", name:"Profile"}]);
 		domainSettings = domainSettings(domain, onDomain);
@@ -21,7 +22,6 @@ function aboutInit() {
 }
 
 function populateUI(ui) {
-	setLinkLogo("profile");
 	$.getJSON("ui_elements", {locale:locale, ui:ui, type:"labels"})
 		.done(function(data){
 			initLabels(data);});
diff --git a/web/js/accurator_intro.js b/web/js/accurator_intro.js
index fa5a943..da76332 100644
--- a/web/js/accurator_intro.js
+++ b/web/js/accurator_intro.js
@@ -23,10 +23,9 @@ function introInit() {
 }
 
 function setBackground(backgroundUrl, imageBrightness) {
-	if(imageBrightness=== "light") {
-		$(".backgroundImage").attr("src", backgroundUrl);
-	} else if (imageBrightness === "dark") {
-	   $(".backgroundImage").attr("src", backgroundDarkUrl);
+	$(".backgroundImage").attr("src", backgroundUrl);
+	
+	if (imageBrightness === "dark") {
 	   // Make font lighter
 	   $("#txtSlogan").css('color', '#FFFFFF');
 	   $("#btnLogin").css('color', '#BBBBBB');