More cleanup of login/forms css -- converted login_dropdown to use elgg-toggler pattern

git-svn-id: http://code.elgg.org/elgg/trunk@8229 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php
index 40482c3df06d0306e1488b21b06364cd64eba144..40b5f5637b75318bb1cf67c77640bb4421e597d7 100644 (file)
--- a/views/default/core/account/login_box.php
+++ b/views/default/core/account/login_box.php
@@ -14,7 +14,7 @@ if (elgg_get_config('https_login')) {
 $title = elgg_echo('login');
 $body = elgg_view_form('login', array('action' => "{$login_url}action/login"));
 
-echo elgg_view_module('login', $title, $body);
+echo elgg_view_module('aside', $title, $body);
 
 ?>
 

diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index 4bb373caf4b65869315d8a0200d3d42b889da9e3..d188364c07e8c1ce87dee523b75d424e91987642 100644 (file)
--- a/views/default/core/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
@@ -9,13 +9,6 @@ if (elgg_is_logged_in()) {
        return true;
 }
 
-/**
- * @todo forms/login should take a "forward_to" argument, or something similar
- * Enter description here ...
- * @var unknown_type
- */
-$form_body = elgg_view('forms/login');
-
 $login_url = elgg_get_site_url();
 if (elgg_get_config('https_login')) {
        $login_url = str_replace("http", "https", elgg_get_site_url());
@@ -23,17 +16,9 @@ if (elgg_get_config('https_login')) {
 
 $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE));
 ?>
-
 <div id="login-dropdown">
-       <a href="#" class="elgg-toggle elgg-button-dropdown" id="elgg-toggler-login-dropdown-box">
+       <a href="<?php echo $vars['url']; ?>pg/login" class="elgg-toggler elgg-toggles-login-dropdown-box elgg-button-dropdown">
                <?php echo elgg_echo('login') ?>
        </a>
-       <?php echo elgg_view_module('dropdown', '', $body, array('id' => 'elgg-togglee-login-dropdown-box', 'class' => 'hidden')); ?>
-</div>
-<script>
-$(function() {
-       $('.signin').live('click', function() {
-               e.preventDefault();
-       });
-});
-</script>
\ No newline at end of file
+       <?php echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); ?>
+</div>
\ No newline at end of file

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 2e0022ca821767b08a877c824a5dadcac4c7f624..b56aeddcbc8af37868619a02611c441b69fdc768 100644 (file)
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -10,43 +10,47 @@
 /* ***************************************
        Form Elements
 *************************************** */
-.elgg-fieldset {
-}
+<?php //@todo not comfortable with these... ?>
 fieldset > div {
        margin-bottom: 15px;
 }
 fieldset > div:last-child {
        margin-bottom: 0;
 }
+
 label {
        font-weight: bold;
        color: #333333;
        font-size: 110%;
 }
+
 input, textarea {
        font: 120% Arial, Helvetica, sans-serif;
+       color: #666666;
+       
        padding: 5px;
+       
        border: 1px solid #cccccc;
-       color: #666666;
        -webkit-border-radius: 5px;
        -moz-border-radius: 5px;
+       
+       width: 100%;
+       -moz-box-sizing: border-box;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
 }
-textarea {
-       height: 200px;
-       width: 98%;
-}
-input[type="text"], textarea {
-       width: 98%;
-}
-input[type="password"] {
-       width: 200px;
-}
-input[type="text"]:focus, input[type="password"]:focus {
+
+input:focus, textarea:focus {
        border: solid 1px #4690d6;
        background: #e4ecf5;
        color:#333333;
 }
 
+textarea {
+       height: 200px;
+}
+
+
 a.elgg-longtext-control {
        float: right;
        margin-left: 14px;
@@ -58,11 +62,13 @@ a.elgg-longtext-control {
 .elgg-input-access {
        margin:5px 0 0 0;
 }
+
 input[type="checkbox"],
 input[type="radio"] {
        margin:0 3px 0 0;
        padding:0;
        border:none;
+       width:auto;
 }
 .elgg-input-checkboxes.elgg-horizontal li,
 .elgg-input-radio.elgg-horizontal li {

diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index dd1b01e660947ef641bf29b2f65e14b3bb3fe74f..5f6d0599cf57aaf3de04664ac2c920a8b418fc22 100644 (file)
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -14,14 +14,15 @@
 *************************************** */
 #login-dropdown {
        position: absolute;
-       top:0;
+       top:10px;
        right:0;
        z-index: 9599;
 }
 
 .elgg-button-dropdown {
-       padding:2px 6px 3px 6px;
+       padding:3px 6px;
        text-decoration:none;
+       display:block;
        font-weight:bold;
        position:relative;
        margin-left:0;
@@ -30,29 +31,30 @@
        -webkit-border-radius:4px;
        -moz-border-radius:4px;
        border-radius:4px;
+       /*background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
+       background-position:-150px -51px;
+       background-repeat:no-repeat;*/
 }
 
-.elgg-button-dropdown span {
-       padding:4px 0 6px 12px;
-       background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
-       background-position:-150px -51px;
-       background-repeat:no-repeat;
+.elgg-button-dropdown:after {
+       content: " \25BC ";
+       font-size:smaller;
 }
 
 .elgg-button-dropdown:hover {
        background-color:#71B9F7;
-       /* color:black; */
-}
-.elgg-button-dropdown:hover span {
-       /* background-position:-150px -71px; */
+       text-decoration:none;
 }
+
 .elgg-button-dropdown.elgg-state-active {
-       background:#cccccc !important;
-       color:#666666 !important;
+       background: #cccccc;
+       outline: none;
+       color: #333333;
+       
        border:1px solid #cccccc;
-       outline:none;
-       background-position: -150px -71px;
-       color:#333333;
+       -webkit-border-radius:4px 4px 0 0;
+       -moz-border-radius:4px 4px 0 0;
+       border-radius:4px 4px 0 0;
 }
 
 <?php //@todo needs revamp ?>

diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index b16a99d83ccd6bfed79ded51aaa636f4f60afa46..1ed0d03128f7a7d9095e5eb0bd326c39e82d0529 100644 (file)
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -8,6 +8,7 @@
 /* Aside */
 .elgg-module-aside .elgg-head {
        border-bottom: 1px solid #CCCCCC;
+       
        margin-bottom: 5px;
        padding-bottom: 5px;
 }
@@ -28,13 +29,17 @@
 .elgg-module-popup {
        background-color: white;
        border: 1px solid #cccccc;
+       
        z-index: 9999;
        margin-bottom: 0;
        padding: 5px;
        -webkit-border-radius: 6px;
        -moz-border-radius: 6px;
+       border-radius: 6px;
+       
        -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
        -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+       box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
 }
 .elgg-module-popup > .elgg-head {
        margin-bottom: 5px;
@@ -43,28 +48,30 @@
        color: #0054A7;
 }
 
+/* Dropdown */
 .elgg-module-dropdown {
-       -moz-border-radius-topleft:5px;
-       -moz-border-radius-bottomleft:5px;
-       -moz-border-radius-bottomright:5px;
-       -webkit-border-top-left-radius:5px;
-       -webkit-border-bottom-left-radius:5px;
-       -webkit-border-bottom-right-radius:5px;
-       display:none;
        background-color:white;
-       position:absolute;
-       width:210px;
-       z-index:100;
+       
        border:5px solid #CCCCCC;
-       text-align:left;
+       -webkit-border-radius: 5px 0 5px 5px;
+       -moz-border-radius: 5px 0 5px 5px;
+       border-radius: 5px 0 5px 5px;
+       
+       display:none;
+       
+       width: 210px;
        padding:12px;
-       top: 26px;
-       right: 0px;
-       margin-top:5px;
        margin-right: 0px;
-       color:#333333;
+       
+       z-index:100;
        -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
        -moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+       
+       position:absolute;
+       right: 0px;
+       
+       <?php //@todo cleaner way to do this? ?>
+       top: 26px;
 }
 
 /* Featured */