From 6603f3be3997cf48aa7595f7ddd40810f69df093 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 8 Jun 2014 13:15:39 -0400 Subject: [PATCH] remaking the GUI --- onionshare_gui/onionshare_gui.py | 2 +- onionshare_gui/static/logo.png | Bin 0 -> 14524 bytes onionshare_gui/static/onionshare.js | 17 ++----- onionshare_gui/static/style.css | 71 ++++++++++++++++------------ onionshare_gui/templates/index.html | 30 +++++++----- 5 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 onionshare_gui/static/logo.png diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 9adc7a4c..8998cefe 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -54,7 +54,7 @@ def launch_window(webapp_port, onionshare_port): window = gtk.Window() window.set_title('OnionShare') - window.resize(550, 300) + window.resize(520, 400) window.set_resizable(False) window.connect('destroy', on_destroy) diff --git a/onionshare_gui/static/logo.png b/onionshare_gui/static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..87bbec8d47b49f34d6cd375aab1e4de0857371a0 GIT binary patch literal 14524 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 OAy6qr$qI3OzyAep0ub#0 literal 0 HcmV?d00001 diff --git a/onionshare_gui/static/onionshare.js b/onionshare_gui/static/onionshare.js index d30b7fc1..9f467e93 100644 --- a/onionshare_gui/static/onionshare.js +++ b/onionshare_gui/static/onionshare.js @@ -2,15 +2,11 @@ $(function(){ var onionshare = {} function update($msg) { - var $line = $('

').append($msg); - $('#output').append($line); + var $line = $('
  • ').append($msg); + $('#log').append($line); // scroll to bottom - $('#output').scrollTop($('#output').height()); - } - - function linebreak() { - update($('
    ')); + $('#log').scrollTop($('#log').height()); } function copy_to_clipboard() { @@ -54,18 +50,13 @@ $(function(){ onionshare = JSON.parse(data); $('#basename').html(onionshare.basename); - update(onionshare.strings['sha1_checksum']+": "+onionshare.filehash); - linebreak(); + //update(onionshare.strings['sha1_checksum']+": "+onionshare.filehash); update(onionshare.strings['give_this_url']); update($('').html(onionshare.url)); - linebreak(); copy_to_clipboard(); $('#copy-button').show(); setTimeout(check_for_requests, 1000); - - $('#loading').hide(); - $('#content').show(); } }); diff --git a/onionshare_gui/static/style.css b/onionshare_gui/static/style.css index 9004c352..061be0d8 100644 --- a/onionshare_gui/static/style.css +++ b/onionshare_gui/static/style.css @@ -2,41 +2,56 @@ body { background-color: #ffffff; color: #000000; font-family: arial; - width: 550px; - height: 300px; - margin: 0 auto; - padding: 0; -} - -h1 { - background-color: #222222; - color: #ffffff; - text-align: center; - font-size: 20px; + width: 520px; + height: 400px; margin: 0; - padding: 10px; - height: 20px; -} - -p { padding: 0; - margin: 0 0 .5em 0; } -#output { +#wrapper { + width: 520px; + height: 400px; +} + +#metadata { + float: left; + width: 200px; + height: 400px; padding: 10px; +} +#metadata #basename { + font-family: sans-serif; + font-size: 18px; + font-weight: bold; + margin: 10px 0; + color: #000000; + text-align: center; word-wrap: break-word; - height: 260px; +} + +ul#log { + float: left; + width: 300px; + height: 400px; + margin: 0; + padding: 0; + list-style: none; + background-color: #e0e0e0; overflow: auto; + word-wrap: break-word; font-family: monospace; } - -#output .weblog { +ul#log li { + margin: 0; + padding: 10px; + border-bottom: 1px solid #aaaaaa; +} +ul#log .weblog { color: #009900; font-weight: bold; } -#output .weblog-error { +ul#log .weblog-error { color: #990000; font-weight: bold; } @@ -80,11 +95,11 @@ p { background-color:#ce0100; } +#button-wrapper { + text-align: center; +} #copy-button { display: none; - position: absolute; - right: 20px; - bottom: 10px; } #loading { @@ -95,9 +110,3 @@ p { background-repeat: no-repeat; background-position: center center; } - -#content { - width: 550px; - height: 300px; - display: none; -} diff --git a/onionshare_gui/templates/index.html b/onionshare_gui/templates/index.html index cdeda357..565b1eb7 100644 --- a/onionshare_gui/templates/index.html +++ b/onionshare_gui/templates/index.html @@ -1,17 +1,23 @@ - - - - -
    -
    -

    -
    - - + + + + +
    +
    + +

    +

    +

    +
    +
    +
    - - - +
      +
      + + +