diff --git a/cas_auth/views/default/account/forms/login.php b/cas_auth/views/default/account/forms/login.php
index 99d361d88f717f8d9080ae8b602510ba1fc8e9d8..d71c56d23e9cb34a80579c25bbd7c60a9704ade8 100644
--- a/cas_auth/views/default/account/forms/login.php
+++ b/cas_auth/views/default/account/forms/login.php
@@ -12,6 +12,7 @@
global $CONFIG;
+ /*
$form_body = "<p class=\"login-box\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";
$form_body .= "<br />";
$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
@@ -19,13 +20,28 @@
$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=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
-
+ */
//<input name=\"username\" type=\"text\" class="general-textarea" /></label>
?>
- <div id="login-box">
- <h2><?php echo elgg_echo('login'); ?></h2>
- <!-- Comment the line below to allow only CAS authentification -->
- <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/login")); ?>
- <a href="?loginwith=UNLlogin" alt="Login using your my.UNL credentials"><img src="<?php echo $CONFIG->wwwroot; ?>mod/cas_auth/images/connex_cas.gif" title="Login using your my.UNL credentials""></a>
- </div>
+<div id="login" class="loginPage">
+ <div class="two_col left">
+ <h2 class="sec_main">Students, Faculty, Staff</h2>
+
+ <p>If you are a student, faculty or staff member, you already have an account. Use your my.UNL Single Sign-on account to begin.</p>
+ <p style="margin-top: 50px; text-align:center;"><a class="wdn_loginLink" href="http://ucommjuhl.unl.edu/planetred/elgg/?loginwith=UNLlogin"><span>UNL Login</span></a></p>
+
+ <p style="margin-top: 40px;"><a title="Find your my.UNL password" href="https://login.unl.edu/faq/account-resetpw.shtml">Lost your my.UNL password?</a></p>
+
+ </div>
+ <div class="two_col right">
+ <h2 class="sec_main">Huskers Worldwide</h2>
+ <?php
+ $form_body = "<p class=\"login-box\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label><br />";
+ $form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
+ $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "</p>";
+ $form_body .= "<p><a href=\"". $vars['url'] ."account/register.php\">" . elgg_echo('register') . "</a> | <a href=\"". $vars['url'] ."account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+ echo elgg_view('input/form', array('body' => $form_body, 'action' => "". $vars['url'] ."action/login"));
+ ?>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/unl_theme/scripts/JS/actionNotice.js b/unl_theme/scripts/JS/actionNotice.js
index 5d272439521a151c8ed9a3b3082786048a75a6c7..8d96c7f27fd8510617b6180d1a30aba7bc6ba9ce 100644
--- a/unl_theme/scripts/JS/actionNotice.js
+++ b/unl_theme/scripts/JS/actionNotice.js
@@ -1,3 +1,3 @@
$(document).ready(function(){
- $("a#loginLink").colorbox({width:"55%", inline:true, href:"#login", height:"300px"});
+ $("a#loginLink").colorbox({width:"67%", inline:true, href:"#login", height:"300px"});
});
\ No newline at end of file
diff --git a/unl_theme/views/default/account/forms/login.php b/unl_theme/views/default/account/forms/login.php
index 5b91b1433d42f3a6bb5956b4e5ba09b7b7c8482f..39ac993dd90417ae7a7403aad08345bf3cc273e7 100644
--- a/unl_theme/views/default/account/forms/login.php
+++ b/unl_theme/views/default/account/forms/login.php
@@ -1 +1 @@
-This is the login page.
\ No newline at end of file
+<?php /* Use the login view in the CAS auth plugin directory. */ ?>
\ No newline at end of file
diff --git a/unl_theme/views/default/css.php b/unl_theme/views/default/css.php
index b9309936b6c215fb8f4f9eb1fdd511e9e5fca5fe..eda46ec435e3ee806bfd4733494f731bb2b63ad0 100644
--- a/unl_theme/views/default/css.php
+++ b/unl_theme/views/default/css.php
@@ -58,21 +58,25 @@
float:left;
padding-top:20px;
}
- #maincontent .wdn_notice div.message .message_action, #colorbox #login a.wdn_loginLink {
+ #maincontent .wdn_notice div.message .message_action, #colorbox #login a.wdn_loginLink {
float:left;
margin-left:60px;
font-size:1.8em;
padding-top:33px;
text-decoration:none;
}
- #maincontent .wdn_notice div.message .message_action span, #colorbox #login span {
+ #login.loginPage a.wdn_loginLink {
+ font-size:1.8em;
+ text-decoration:none;
+ }
+ #maincontent .wdn_notice div.message .message_action span, #colorbox #login span, #login.loginPage span {
background: url('<?php echo $vars['url']; ?>mod/unl_theme/views/default/images/wdn_notice_ActionBG.png') no-repeat;
width:167px;
height:45px;
display:inline;
padding:9px 50px 15px 25px;
}
- #maincontent .wdn_notice div.message .message_action a span, #colorbox #login a span {
+ #maincontent .wdn_notice div.message .message_action a span, #colorbox #login a span, #login.loginPage a span {
color:white !important;
}
#maincontent .wdn_notice div.message .message_action a strong {
diff --git a/unl_theme/views/default/page_elements/unl_nav.php b/unl_theme/views/default/page_elements/unl_nav.php
index 23fadc8e35297f971443498808934f8bbc4cd07e..a249f537edda416accc2d535c5a5b6686e8c316a 100644
--- a/unl_theme/views/default/page_elements/unl_nav.php
+++ b/unl_theme/views/default/page_elements/unl_nav.php
@@ -28,11 +28,12 @@
<a href="<?php echo $vars['url']; ?>account/register.php" title="Register to join Planet Red"><span>Join now</span></a>
</div>
<div class="message_action" style="margin-left:28px;font-size:1.3em;">
- or <a href="<?php echo $vars['url']; ?>account/login.php" id="loginLink"><strong>Sign in</strong></a>
+ or <a href="<?php echo $vars['url']; ?>account/login.php" id="loginLink"><strong>Login</strong></a>
</div>
</div>
</div>
<?php //This is the login details hidden with CSS and displayed in the colorbox.?>
+
<div class="hidden">
<div id="login">
<div class="two_col left">
@@ -53,6 +54,7 @@
</div>
</div>
</div>
+
<?php }?>
<?php
if (isloggedin()) {