Fixed the issue where the 'participate at' link was always hardcoded.…

… Should load from the DB now, though I have to post-load insert it with JS. Annoying, but works and was easy to do.
drewww · Jun 6, 2011 · 380ad09 · 380ad09
1 parent 2870173
commit 380ad09
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/views/layouts/screen.ctp b/views/layouts/screen.ctp
@@ -75,7 +75,7 @@
 			<h2>
 				<?php
 					echo $html->link(
-						__('backchan.nl - participate at http://fc2008.backchan.nl/', true),
+						__('backchan.nl - participate at http://backchan.nl/', true),
 						'http://backchan.nl/'
 					);
 				?>

diff --git a/views/meetings/screen.ctp b/views/meetings/screen.ctp
@@ -20,6 +20,9 @@ $scriptContent .= $javascript->object(
 	"postfix"=>";\n")
 	);
 
+$scriptContent .= "var conferenceUsername=\"". $meeting['Conference']['username'] . "\";\n";
+
+
 // This magic "inline"=false bit is a queue for cake to put the scripts
 // into the header where they belong. Yay.
 $javascript->codeBlock($scriptContent, array("inline"=>false));

diff --git a/views/meetings/view.ctp b/views/meetings/view.ctp
@@ -31,6 +31,9 @@ $scriptContent .= $javascript->object(
 	);
 $scriptContent .= "var showAdmin=" . $adminInterface . ";\n";
 
+
+$scriptContent .= "var conferenceUsername=\"". $meeting['Conference']['username'] . "\";\n";
+
 if ($user == false) $scriptContent .= "var showIdentityDialog=true;\n";
 else 				 $scriptContent .= "var showIdentityDialog=false;\n";
 

diff --git a/webroot/js/meetings_screen.js b/webroot/js/meetings_screen.js
@@ -31,7 +31,12 @@ function init()
 		{
 			success: refreshSuccessScreen,
 		}
-	);	
+	);
+
+	header = document.getElementById("header");
+	baseURL = conferenceUsername + ".backchan.nl";
+	header.innerHTML = "<h2><a href='http://" + baseURL +"'>participate at http://" + baseURL + "</a></h2>";
+
 }
 
 function refreshSuccessScreen(o, response)

diff --git a/webroot/js/meetings_view.js b/webroot/js/meetings_view.js
@@ -34,6 +34,11 @@ function init() {
 
 	// Post Table
 	initDataTable();
+
+	// Now, mess with the header so it has the right name + link on it.
+	header = document.getElementById("header");
+	baseURL = conferenceUsername + ".backchan.nl";
+	header.innerHTML = "<h2><a href='http://" + baseURL +"'>" + baseURL + "</a></h2>";
 }
 
 function refreshMeeting() {