From 594d410207aae5936892ff564236fce0f17ef6ac Mon Sep 17 00:00:00 2001
From: Noel Dieschburg <noel@cblue.be>
Date: Wed, 28 Sep 2011 10:53:59 +0200
Subject: [PATCH] cusompages and firs login small modifications

---
 custompages/first_login.php           | 3 +++
 custompages/index-logged.php          | 2 +-
 custompages/index-unlogged.php        | 2 +-
 custompages/style-ie6.css             | 1 +
 custompages/style.css                 | 1 +
 main/inc/lib/loginredirection.lib.php | 3 ++-
 main/lang/english/trad4all.inc.php    | 4 +++-
 main/lang/french/trad4all.inc.php     | 4 +++-
 8 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/custompages/first_login.php b/custompages/first_login.php
index 4a671073d9..c9fac4562e 100644
--- a/custompages/first_login.php
+++ b/custompages/first_login.php
@@ -67,7 +67,10 @@ if ($_GET['invalid'] == 2) {
 		<div id="header">
 			<img src="/custompages/images/header.png" alt="Logo" />
 		</div> <!-- #header -->
+    <h2> <?php echo cblue_get_lang('FirstLogin');?> </h2>
+        
 		<div id="changepassword-form-box" class="form-box">
+      <div class="info"> <?php echo cblue_get_lang('FirstLoginChangePassword');?> </div>
 		<?php if (isset($error_message)) {
 			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
 		}?> 
diff --git a/custompages/index-logged.php b/custompages/index-logged.php
index 6c76ed80ad..3f3a39f971 100644
--- a/custompages/index-logged.php
+++ b/custompages/index-logged.php
@@ -1,5 +1,5 @@
 <?php 
-require_once('main/inc/global.inc.php');
+require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
 //require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
 header("Location: /user_portal.php");
diff --git a/custompages/index-unlogged.php b/custompages/index-unlogged.php
index 40616e7345..5906466f23 100644
--- a/custompages/index-unlogged.php
+++ b/custompages/index-unlogged.php
@@ -67,7 +67,7 @@ if (isset($_GET['loginFailed'])){
 		}?> 
 			<form id="login-form" class="form" action="/index.php" method="post">
 				<div>
-        <label for="login">*<?php echo cblue_get_lang('Username');?></label>
+        <label for="login">*<?php echo cblue_get_lang('User');?></label>
 					<input name="login" type="text" /><br />
           <label for="password">*<?php echo cblue_get_lang('langPass');?></label>
 					<input name="password" type="password" /><br />
diff --git a/custompages/style-ie6.css b/custompages/style-ie6.css
index 98c34b7b1c..ed93d6ccec 100644
--- a/custompages/style-ie6.css
+++ b/custompages/style-ie6.css
@@ -6,6 +6,7 @@ html, body {
 body {
 	font-family: "Arial Black",sans-serif;
 	font-size: 10pt;
+	color: #1F3660;
 	width: 100%;
 	text-align: center;
 	/*
diff --git a/custompages/style.css b/custompages/style.css
index 37ab87151c..eb32456c4d 100644
--- a/custompages/style.css
+++ b/custompages/style.css
@@ -8,6 +8,7 @@ body {
 	font-size: 10pt;
 	width: 100%;
 	text-align: center;
+	color: #1F3660;
 	/*background-image: url(images/page-background.png);
 	background-repeat: no-repeat;
 	background-size: 100%;
diff --git a/main/inc/lib/loginredirection.lib.php b/main/inc/lib/loginredirection.lib.php
index e1821cc36c..919efae272 100644
--- a/main/inc/lib/loginredirection.lib.php
+++ b/main/inc/lib/loginredirection.lib.php
@@ -11,7 +11,7 @@ Class LoginRedirection {
     global $param;
     $param = isset($param) ? $param : '';
     $redirect_url = '';
-
+/*
     //If session request url is setted, we go there
     if (!empty($_SESSION['request_uri'])) {
       $req = $_SESSION['request_uri'];
@@ -19,6 +19,7 @@ Class LoginRedirection {
       header('location: '.$req);
       exit();
     }
+ */
 
     if ( api_is_student() && !api_get_setting('student_page_after_login') == '' ){
       $redirect_url = html_entity_decode(api_get_setting('student_page_after_login'));
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 9e71c6c9af..dc1baa9c50 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -1109,4 +1109,6 @@ $SelectFilter = "Select filter";
 $ThereIsNoClassScheduledTodayTryPickingAnotherDay = "There is no class scheduled today, try picking another day or add your attendance entry yourself using the action icons.";
 $AddToCalendar = "Add to calendar";
 $RandomPick = "Random pick";
-?>
\ No newline at end of file
+$FirstLogin = "First login";
+$FirstLoginChangePassword = "This is your first login. Please change your password";
+?>
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
index 7b47c7c3ac..87fa7f591b 100644
--- a/main/lang/french/trad4all.inc.php
+++ b/main/lang/french/trad4all.inc.php
@@ -1107,4 +1107,6 @@ $SelectFilter = "Sélectionner le filtre";
 $ThereIsNoClassScheduledTodayTryPickingAnotherDay = "Aucune classe n'a été programmée aujourd'hui. Choisissez un autre you ou ajoutez votre classe vous-même en utilisant les icônes d'action.";
 $AddToCalendar = "Ajouter au calendrier";
 $RandomPick = "Sélection aléatoire";
-?>
\ No newline at end of file
+$FirstLogin = "Première connexion";
+$FirstLoginChangePassword = "C'est votre première connexion, veuillez changer votre mot de passe";
+?>