From 2dbe0d987f40f1f8533199f8b2d0bd6cf14ade16 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Mon, 2 Sep 2013 23:02:41 +0100 Subject: [PATCH] zeroClipboard --- index.php | 201 +--------------------------------------------- public/config.php | 5 -- public/style.css | 20 ----- 3 files changed, 1 insertion(+), 225 deletions(-) diff --git a/index.php b/index.php index f6b5dbb..773c57b 100755 --- a/index.php +++ b/index.php @@ -1,4 +1,3 @@ -<<<<<<< HEAD - -======= - -' . yourls__( 'An error has occured :(', 'isq_translation') . ''; - -if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { - $error = '

' . yourls__( 'URL shortened successfully', 'isq_translation') . '

' . yourls__( 'View the details of your short URL below.', 'isq_translation') . '

'; - } elseif ( $message = $url. yourls__( 'already exists in database', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'This URL already exists in this database. This website does not allow a single URL to have multiple short links.', 'isq_translation') . '

'; - } elseif ( $message = yourls__( 'Short URL', 'isq_translation') . $url . yourls__( 'already exists in database or is reserved', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'This short URL already exists in this database or is reserved. This website does not allow a single URL to have multiple short links. It could\'ve also been reserved by the admin.', 'isq_translation') . '

'; - } elseif ( $message = yourls__( 'Missing URL input', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'You did not enter the URL you want to shorten or the server lost it. Please try again.', 'isq_translation') . '

'; - } elseif ( $message = yourls__( 'This URL is a short URL', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'You cannot shorten a short URL!', 'isq_translation') . '

'; - } -?> - - - -<?php echo $ISQtitle; ?> - - - - - - - - - - - - - - - - - -
-
-

-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
- Facebook'; } - if (!empty(ISQ::$social['twitter'])) { $ISQtwitter = ''; } - if (!empty(ISQ::$social['plus'])) { $ISQplus = '
'; } - if (!empty(ISQ::$social['linkedin'])) { $ISQlinkedin = ''; } - if (!empty(ISQ::$general['qr'])) { $ISQqr = '

' . yourls__( 'QR code', 'isq-translation' ) . '

' . yourls__( 'Share your code with external devices', 'isq-translation' ) . '

QR'; } - - $output_original = yourls__( 'Original URL:', 'isq_translation'); - $output_short = yourls__( 'Short URL:', 'isq_translation'); - /* translators: This is short for statistics */ - $output_stats = yourls__( 'Stats:', 'isq_translation'); - $output_copy = yourls__( 'Click on a link and press Ctrl+C to quickly copy it', 'isq_translation'); - $output_share_h2 = yourls__( 'Share', 'isq_translation'); - $output_share_p = yourls__( 'Share your short URL', 'isq_translation'); - - echo << -

-

-

-

$output_copy

-
- - $ISQqr - -

$output_share_h2

-

$output_share_p

- $ISQfacebook - $ISQtwitter - $ISQplus - $ISQlinkedin -RESULT; - - // Part to be executed when no form has been submitted - } else { - - $site = YOURLS_SITE; - - $site_enter = yourls__( 'Enter a new URL to shorten', 'isq_translation'); - $site_hover = yourls__( 'Hover over the labels to see more information', 'isq_translation'); - $site_long = yourls__( 'Long URL (required):', 'isq_translation'); - $site_long_hover = yourls__( 'Paste the long URL here', 'isq_translation'); - $site_keyword = yourls__( 'Custom keyword:', 'isq_translation'); - $site_keyword_hover = yourls__( 'A keyword replaces the default short string', 'isq_translation'); - $site_title = yourls__( 'Optional title:', 'isq_translation'); - $site_title_hover = yourls__( 'Optional title used when sharing a link from YOURLS', 'isq_translation'); - $site_submit = yourls__( 'Shorten', 'isq_translation'); - - echo <<$site_enter -

$site_hover

-
-

-

-

-

-
-HTML; - - } - ?> -
- -
-

-

- - - - - -
- -
-

YOURLS. Design by Tom Slominski. Also used: Formalize and qTip². Find this theme on GitHub.', 'isq_translation') ?>

-
- - - ->>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49 + \ No newline at end of file diff --git a/public/config.php b/public/config.php index 47c9767..d4561a6 100755 --- a/public/config.php +++ b/public/config.php @@ -4,12 +4,7 @@ ISQ::$general = array( 'name' => 'kwl.me', // The name of your URL shortener 'qr' => 1, // Do you want to display a QR code? -<<<<<<< HEAD - 'mobile' => 0, // Do you want to enable the mobile version? 'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash) -======= - 'mobile' => 0 // Do you want to enable the mobile version? ->>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49 ); // Menu- The width of ∞² menu allows you to have about 10 links diff --git a/public/style.css b/public/style.css index 4bf8625..2007477 100755 --- a/public/style.css +++ b/public/style.css @@ -122,7 +122,6 @@ h1 a:hover { /* Main style */ .paragraph { padding: 0 2.5% 0 2.5%; -<<<<<<< HEAD:public/style.css } h2 { @@ -130,15 +129,6 @@ h2 { margin-bottom: -8px; } -======= -} - -h2 { - color: black; - margin-bottom: -8px; -} - ->>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49:public/style.css .right { width: 60%; float: right; @@ -179,7 +169,6 @@ a.bookmarklet { /* Output */ .output label { width: 30%; -<<<<<<< HEAD:public/style.css float:left; } @@ -187,15 +176,6 @@ a.bookmarklet { width: 70% } -======= - float: left; -} - -.output input { - width: 70% -} - ->>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49:public/style.css .error { color: red; }