From fd3e16a2d22e141f5d196549713879e5a20d291f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 19 Sep 2011 09:41:33 +0000
Subject: [PATCH] Fix text for geo location. Add subtitle optional

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2908 44740490-163a-0410-bde0-09ae8108e29a
---
 modules/discojuice/www/discojuice/discojuice.ui.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/discojuice/www/discojuice/discojuice.ui.js b/modules/discojuice/www/discojuice/discojuice.ui.js
index 745d47a27..06d96f7e6 100644
--- a/modules/discojuice/www/discojuice/discojuice.ui.js
+++ b/modules/discojuice/www/discojuice/discojuice.ui.js
@@ -197,11 +197,14 @@ DiscoJuice.UI = {
 		var textHelp = this.parent.Utils.options.get('textHelp', 'Help me, I cannot find my provider');
 		var textHelpMore = this.parent.Utils.options.get('textHelpMore', 'If your institusion is not connected to Foodle, you may create a new account using any of the Guest providers, such as <strong>OpenIdP (Guest users)</strong>.');
 	
+		var subtitleText = this.parent.Utils.options.get('subtitle', null);
+		var subtitleHTML = (subtitleText !== null ? '<p class="discojuice_subtitle">' + subtitleText + '</p>' : '');
+	
 		var html = 	'<div style="display: none" class="discojuice">' +
 			'<div class="top">' +
 				'<a href="#" class="discojuice_close">&nbsp;</a>' +
 				'<p class="discojuice_maintitle">' + this.parent.Utils.options.get('title', 'Title')  +  '</p>' +
-				'<p class="discojuice_subtitle">' + this.parent.Utils.options.get('subtitle', 'Subtitle') + '</p>' +
+				subtitleHTML +
 			'</div>' +
 			
 			'<div class="discojuice_listContent" style="">' +
@@ -223,7 +226,7 @@ DiscoJuice.UI = {
 				'<div class="locatemebefore">' +
 					'<p style="margin-top: 10px"><a id="locateme" href="">' +
 						'<img style="float: left; margin-right: 5px; margin-top: -10px" src="' + imgpath + 'target.png" alt="locate me..." />' +
-						'Locate me more accurately using HTML5 Geo-Location</a>' +
+						'Locate me and show nearby providers</a>' +
 					'</p>' +
 					'<p style="color: #999" id="locatemeinfo"></p>' +
 				'</div>' +
-- 
GitLab