summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-04-11 13:42:51 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-04-11 15:59:02 +0200
commitccaacf44d01471670fa8650a8498dcd49c29b358 (patch)
tree2558d1619ee421283a79222a9c5580325a57dfc9
parentba9c11dce576becf8669a11519d69322066444c4 (diff)
Display login boxes on upload_form
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/views/file/header.php11
-rw-r--r--application/views/file/upload_form.php7
-rw-r--r--data/default.css16
3 files changed, 8 insertions, 26 deletions
diff --git a/application/views/file/header.php b/application/views/file/header.php
index 896b9c894..ca540c805 100644
--- a/application/views/file/header.php
+++ b/application/views/file/header.php
@@ -18,16 +18,7 @@
<?php if(isset($username) && $username) { ?>
<?=anchor("user/logout", "Logout"); ?>
<?php } else { ?>
- <a>
- Login
- <div id="login-form">
- <?=form_open("user/login"); ?>
- <input type="text" name="username" />
- <input type="password" name="password" />
- <input type="submit" value="Login" name="process" />
- </form>
- </div>
- </a>
+ <?=anchor("user/login", "Login"); ?>
<?php } ?>
</div>
</div>
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index d4a35c8ee..ce1d00498 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -25,6 +25,13 @@ document.write('\
</div>
<? } else { ?>
You have to <?=anchor("user/login", "log in"); ?> to be able to upload/paste.
+<div id="login-form">
+ <?=form_open("user/login"); ?>
+ <input type="text" name="username" />
+ <input type="password" name="password" />
+ <input type="submit" value="Login" name="process" />
+ </form>
+</div>
<? } ?>
<br />
<p>Uploads/pastes are deleted after <?php echo $upload_max_age; ?> days<?php if($small_upload_size > 0): ?>
diff --git a/data/default.css b/data/default.css
index cd8b1af8e..399ca1410 100644
--- a/data/default.css
+++ b/data/default.css
@@ -56,22 +56,6 @@ p, li {
padding-right: 10px;
}
-#login-form {
- visibility: hidden;
- position: absolute;
- right: 0;
- top: 0;
-
- /* these help to keep the box displayed once the user hovered over login*/
- padding-top: 35px;
- padding-left: 10px;
- padding-bottom: 10px;
-}
-
-a:hover #login-form {
- visibility: visible;
-}
-
.top a {
color: lightblue;
}