<?php echo isset($title) ? $title : ''; ?>

From de02b8cb514a95c100d0ec11ab469acfc687ca00 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 22 Oct 2012 15:42:07 +0200 Subject: switch design to bootstrap; minor fixes along the way Initial-work-by: Oliver Mader Additional-work-by: Markus Cisler Signed-off-by: Florian Pritz --- application/views/file/footer.php | 3 - application/views/file/header.php | 28 ------- application/views/file/html_footer.php | 6 +- application/views/file/html_header.php | 131 +++++++++++++++++++----------- application/views/file/upload_form.php | 131 ++++++++++++++++-------------- application/views/file/upload_history.php | 53 ++++++------ application/views/footer.php | 8 ++ application/views/header.php | 51 ++++++++++++ application/views/user/footer.php | 1 - application/views/user/header.php | 1 - application/views/user/invite.php | 44 +++++++--- application/views/user/login.php | 8 +- application/views/user/register.php | 4 +- 13 files changed, 280 insertions(+), 189 deletions(-) delete mode 100644 application/views/file/footer.php delete mode 100644 application/views/file/header.php create mode 100644 application/views/footer.php create mode 100644 application/views/header.php delete mode 120000 application/views/user/footer.php delete mode 120000 application/views/user/header.php (limited to 'application/views') diff --git a/application/views/file/footer.php b/application/views/file/footer.php deleted file mode 100644 index eda863585..000000000 --- a/application/views/file/footer.php +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/application/views/file/header.php b/application/views/file/header.php deleted file mode 100644 index 3029e4579..000000000 --- a/application/views/file/header.php +++ /dev/null @@ -1,28 +0,0 @@ - - - - - <?php echo isset($title) ? $title : ''; ?> - " media="screen" /> - - - - - -

- | - | - - - -

- - - - - -

- -

diff --git a/application/views/file/html_footer.php b/application/views/file/html_footer.php index ddc460a39..a2a1cfec2 100644 --- a/application/views/file/html_footer.php +++ b/application/views/file/html_footer.php @@ -1,5 +1,7 @@ - - +

+ + + - - - <?php echo $title; ?> - - " /> - - " /> - - - -

- ">Code | - ">Render Markdown -

+ +

- + + +

+ +

+ -if ("onhashchange" in window) { - window.onload = function () { - update_anchor_highlight(); - } - window.onhashchange = function () { - update_anchor_highlight(); - } -} -/* ]]> */ - +

+ +

diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php index 20fb1a3d8..d92cbfb5c 100644 --- a/application/views/file/upload_form.php +++ b/application/views/file/upload_form.php @@ -1,67 +1,72 @@ - -

- -

- File: - -

- -

-
- -

- - - -

- -You have to to be able to upload/paste. -

- - - - - + +

+ +

Text paste

+ + + +

+ +

File upload

+
+ + +

Notice!

+ Uploads/pastes are deleted after days + 0) { + echo "unless they are smaller than ".format_bytes($small_upload_size); + } ?>. Maximum upload size is +

- -
-

Uploads/pastes are deleted after days 0): ?> - unless they are smaller than - . Maximum upload size is

Features

For shell uploading/pasting and download information for the client go to ">

You can use the to find old uploads.

How to link your pastes:

/<ID>/ automatically highlight the paste
/<ID> set the detected MIME type and let the browser do the rest
/<ID>/plain force the MIME type to be text/plain
/<ID>/<file extension> override auto detection and use the supplied file extension or language name for highlighting
/<ID>/qr display a qr code containing a link to /<ID>/
/<ID>/rmd convert markdown to HTML
/<ID>/ascii convert text with ANSI (shell) escape codes to HTML
/<ID>/info display some information about the ID

If your upload is not detected as text, only -/<ID>/qr, -/<ID>/plain and -/<ID>/info -will work as above and all others will simply return the file with the detected MIME type.

Information

This website's primary goal is aiding developers, power users, students and alike in solving problems, debugging software, sharing their configuration, etc. It is not intended to distribute confidential or harmful information, scripts or software.

- -

If you believe you deserve an account, ask someone who is already using this service to you.

+ + -

If you experience any problems feel free to contact me.

-
-

Icons by Yusuke Kamiyamane

This service is provided without warranty of any kind and may not be used to distribute copyrighted content.

+ + + + + + + +

+ +

For shell uploading/pasting and download information for the client go to ">

You can use the to find old uploads.

How to link your pastes:

/<ID>/: automatically highlight the paste
/<ID>: set the detected MIME type and let the browser do the rest
/<ID>/plain: force the MIME type to be text/plain
/<ID>/<file extension>: override auto detection and use the supplied file extension or language name for highlighting
/<ID>/qr: display a qr code containing a link to /<ID>/
/<ID>/rmd: convert markdown to HTML
/<ID>/ascii: convert text with ANSI (shell) escape codes to HTML
/<ID>/info: display some information about the ID

If your upload is not detected as text, only /<ID>/qr, /<ID>/plain and /<ID>/info will work as above and all others will simply return the file with the detected MIME type.

+ +

If you believe you deserve an account, ask someone who is already using this service to invite you.

+ +

If you experience any problems feel free to contact me.

+ +

diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php index 41b055792..2f09240a1 100644 --- a/application/views/file/upload_history.php +++ b/application/views/file/upload_history.php @@ -1,28 +1,31 @@ - - - - - - - - - - - - $item): ?> - - - - - - - - - - -

	ID	Filename	Mimetype -	Date	Hash	Size
]" value="" />	/">

- + + + + + + + + + + + + + + $item): ?> + + + + + + + + + + + +

	ID	Filename	Mimetype +	Date	Hash	Size
]" value="" class="delete-history">	/">

Total sum of your distinct uploads: .

diff --git a/application/views/footer.php b/application/views/footer.php new file mode 100644 index 000000000..92b305999 --- /dev/null +++ b/application/views/footer.php @@ -0,0 +1,8 @@ +

+ + + + + + + diff --git a/application/views/header.php b/application/views/header.php new file mode 100644 index 000000000..4f2c46e79 --- /dev/null +++ b/application/views/header.php @@ -0,0 +1,51 @@ + + + + + + <?php echo isset($title) ? $title : 'FileBin'; ?> + + + + + " rel="stylesheet"> + " rel="stylesheet"> + " rel="stylesheet"> + " rel="stylesheet"> + + + + + +

diff --git a/application/views/user/footer.php b/application/views/user/footer.php deleted file mode 120000 index e3a4d3fca..000000000 --- a/application/views/user/footer.php +++ /dev/null @@ -1 +0,0 @@ -../file/footer.php \ No newline at end of file diff --git a/application/views/user/header.php b/application/views/user/header.php deleted file mode 120000 index 7b5e4d759..000000000 --- a/application/views/user/header.php +++ /dev/null @@ -1 +0,0 @@ -../file/header.php \ No newline at end of file diff --git a/application/views/user/invite.php b/application/views/user/invite.php index 5be8b48a3..eba77ead0 100644 --- a/application/views/user/invite.php +++ b/application/views/user/invite.php @@ -1,15 +1,37 @@ - - - +

+ Watch out! +

+ You are free to invite anyone you want to, but please keep in + mind that if this person violates the rules and is banned, your + account will also be disabled. +

-You are free to invite anyone you want to, but please keep in -mind that if this person violates the rules and is banned, your account will also be disabled. -

Unused invitation keys

+ + + + + + + + + + + $item): ?> + + + + + + + +

#	Key	Created on

Unused invitation keys:

- $item): ?> -
- + + +

diff --git a/application/views/user/login.php b/application/views/user/login.php index ca6f01b88..21264a404 100644 --- a/application/views/user/login.php +++ b/application/views/user/login.php @@ -1,7 +1,7 @@ The entered credentials are invalid.'; -} ?> +if (isset($login_error)) { ?> +

The entered credentials are invalid.

+ @@ -14,5 +14,5 @@ if (isset($login_error)) {

- + diff --git a/application/views/user/register.php b/application/views/user/register.php index 78af46e96..2b15175a3 100644 --- a/application/views/user/register.php +++ b/application/views/user/register.php @@ -7,10 +7,10 @@ - + - + -- cgit v1.2.3-24-g4f1b

Username	" />	" />
Email	" />	" />
Password

Filename:
Size:
Mimetype:
Uploaded:
Removal:

Paste Information

Text paste

File upload

Notice!

Features

Information

Features

How to link your pastes:

Information

Unused invitation keys