From 37235af003b133fd84dded5cec886ce3d169521f Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 23 Apr 2010 10:40:37 +0000
Subject: small walled garden tweak

git-svn-id: http://code.elgg.org/elgg/trunk@5859 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/walledgarden/index.php                         |   2 +-
 .../views/default/account/forms/login.php          | 111 +++++++++++++++++++++
 .../default/account/forms/login_walledgarden.php   | 111 ---------------------
 3 files changed, 112 insertions(+), 112 deletions(-)
 create mode 100644 mod/walledgarden/views/default/account/forms/login.php
 delete mode 100644 mod/walledgarden/views/default/account/forms/login_walledgarden.php

diff --git a/mod/walledgarden/index.php b/mod/walledgarden/index.php
index 98ed8479f..c0ba1681c 100644
--- a/mod/walledgarden/index.php
+++ b/mod/walledgarden/index.php
@@ -13,7 +13,7 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 //grab the login form
-$login = elgg_view("account/forms/login_walledgarden");
+$login = elgg_view("account/forms/login");
 	
 //display the contents in our new canvas layout
 $body = elgg_view_layout('walled_garden',$login);
diff --git a/mod/walledgarden/views/default/account/forms/login.php b/mod/walledgarden/views/default/account/forms/login.php
new file mode 100644
index 000000000..7cb38faed
--- /dev/null
+++ b/mod/walledgarden/views/default/account/forms/login.php
@@ -0,0 +1,111 @@
+<?php
+
+     /**
+	 * Elgg login form for walled garden
+	 */
+	 
+	global $CONFIG;
+
+	//login form
+	$form_body = "<h2 class='master'>" . elgg_echo('login') . "</h2>";
+	$form_body .= "<label>".elgg_echo('username')."</label>".elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea username master'));
+	$form_body .= "<br /><label>".elgg_echo('password')."</label>".elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea password master' ));	
+
+	
+	$form_body .= "<br />" . elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div>";
+	$form_body .= "<p class=\"loginbox\">";
+	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";
+	$form_body .= "<a href='#forgotten_password' class='forgotten_password_link'>" . elgg_echo('user:password:lost') . "</a></p>";  
+
+
+		
+	$login_url = $vars['url'];
+	if ((isset($CONFIG->https_login)) && ($CONFIG->https_login))
+		$login_url = str_replace("http", "https", $vars['url']);
+?>
+	
+	<div id="login-box">
+		<?php 
+			echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
+			echo elgg_view('login/extend'); //a view for plugins to extend
+		?>			
+		<div class="clearfloat"></div>
+	</div>
+
+	
+<script type="text/javascript"> 
+	$(document).ready(function() { 
+	
+		$('.login-textarea.username.master').focus(); // only put cursor in textfirld if master login
+	
+		$('.login-textarea.name').focus(function() {
+			if (this.value=='<?php echo elgg_echo('username'); ?>') {
+				this.value='';
+			}
+		});
+		$('.login-textarea.name').blur(function() {
+			if (this.value=='') {
+				this.value='<?php echo elgg_echo('username'); ?>';
+			}
+		});
+		$('.login-textarea.password').focus(function() {
+			if (this.value=='<?php echo elgg_echo('password'); ?>') {
+				this.value='';
+			}
+		});
+		
+			
+	//select all the a tag with name equal to modal
+	$('a.forgotten_password_link').click(function(e) {
+		//Cancel the link behavior
+		e.preventDefault();
+		
+		//Get the A tag
+		var id = $(this).attr('href');
+	
+		//Get the screen height and width
+		//var maskHeight = $(document).height();
+		//var maskWidth = $(window).width();
+	
+		//Set height and width to mask to fill up the whole screen
+		//$('#mask').css({'width':maskWidth,'height':maskHeight});
+		
+		//transition effect		
+		$('#mask').fadeIn(500);	
+		$('#mask').fadeTo("slow",0.8);	
+	
+		//Get the window height and width
+		var winH = $(window).height();
+		var winW = $(window).width();
+              
+		//Set the popup window to center
+		$(id).css('top',  winH/4-$(id).height()/2);
+		$(id).css('left', (winW-20)/2-$(id).width()/2);
+	
+		//transition effect
+		$(id).fadeIn(1000); 
+	
+	});
+	
+	//if close button is clicked
+	$('.window .close').click(function (e) {
+		//Cancel the link behaviour
+		e.preventDefault();
+		
+		$('#mask').hide();
+		$('.window').hide();
+	});		
+	
+	//if mask is clicked
+	$('#mask').click(function () {
+		$(this).hide();
+		$('.window').hide();
+	});	
+			
+});			
+</script>
+	
+	
+	
+	
+	
\ No newline at end of file
diff --git a/mod/walledgarden/views/default/account/forms/login_walledgarden.php b/mod/walledgarden/views/default/account/forms/login_walledgarden.php
deleted file mode 100644
index 7cb38faed..000000000
--- a/mod/walledgarden/views/default/account/forms/login_walledgarden.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-     /**
-	 * Elgg login form for walled garden
-	 */
-	 
-	global $CONFIG;
-
-	//login form
-	$form_body = "<h2 class='master'>" . elgg_echo('login') . "</h2>";
-	$form_body .= "<label>".elgg_echo('username')."</label>".elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea username master'));
-	$form_body .= "<br /><label>".elgg_echo('password')."</label>".elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea password master' ));	
-
-	
-	$form_body .= "<br />" . elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div>";
-	$form_body .= "<p class=\"loginbox\">";
-	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";
-	$form_body .= "<a href='#forgotten_password' class='forgotten_password_link'>" . elgg_echo('user:password:lost') . "</a></p>";  
-
-
-		
-	$login_url = $vars['url'];
-	if ((isset($CONFIG->https_login)) && ($CONFIG->https_login))
-		$login_url = str_replace("http", "https", $vars['url']);
-?>
-	
-	<div id="login-box">
-		<?php 
-			echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
-			echo elgg_view('login/extend'); //a view for plugins to extend
-		?>			
-		<div class="clearfloat"></div>
-	</div>
-
-	
-<script type="text/javascript"> 
-	$(document).ready(function() { 
-	
-		$('.login-textarea.username.master').focus(); // only put cursor in textfirld if master login
-	
-		$('.login-textarea.name').focus(function() {
-			if (this.value=='<?php echo elgg_echo('username'); ?>') {
-				this.value='';
-			}
-		});
-		$('.login-textarea.name').blur(function() {
-			if (this.value=='') {
-				this.value='<?php echo elgg_echo('username'); ?>';
-			}
-		});
-		$('.login-textarea.password').focus(function() {
-			if (this.value=='<?php echo elgg_echo('password'); ?>') {
-				this.value='';
-			}
-		});
-		
-			
-	//select all the a tag with name equal to modal
-	$('a.forgotten_password_link').click(function(e) {
-		//Cancel the link behavior
-		e.preventDefault();
-		
-		//Get the A tag
-		var id = $(this).attr('href');
-	
-		//Get the screen height and width
-		//var maskHeight = $(document).height();
-		//var maskWidth = $(window).width();
-	
-		//Set height and width to mask to fill up the whole screen
-		//$('#mask').css({'width':maskWidth,'height':maskHeight});
-		
-		//transition effect		
-		$('#mask').fadeIn(500);	
-		$('#mask').fadeTo("slow",0.8);	
-	
-		//Get the window height and width
-		var winH = $(window).height();
-		var winW = $(window).width();
-              
-		//Set the popup window to center
-		$(id).css('top',  winH/4-$(id).height()/2);
-		$(id).css('left', (winW-20)/2-$(id).width()/2);
-	
-		//transition effect
-		$(id).fadeIn(1000); 
-	
-	});
-	
-	//if close button is clicked
-	$('.window .close').click(function (e) {
-		//Cancel the link behaviour
-		e.preventDefault();
-		
-		$('#mask').hide();
-		$('.window').hide();
-	});		
-	
-	//if mask is clicked
-	$('#mask').click(function () {
-		$(this).hide();
-		$('.window').hide();
-	});	
-			
-});			
-</script>
-	
-	
-	
-	
-	
\ No newline at end of file
-- 
cgit v1.2.3