From 0c80a76afec44ad17578d509b88aa1b5d5f23961 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Tue, 10 Oct 2017 10:14:43 -0700 Subject: [PATCH] updated show page to match upload --- public/assets/css/general.css | 19 +-- public/assets/js/constants.js | 1 + public/assets/js/generalFunctions.js | 12 ++ public/assets/js/validationFunctions.js | 1 + views/about.handlebars | 53 ++++---- views/index.handlebars | 21 ++-- views/layouts/main.handlebars | 6 +- views/layouts/show.handlebars | 8 +- views/login.handlebars | 3 - views/partials/asset.handlebars | 6 +- views/partials/assetInfo.handlebars | 118 ++++++++---------- views/partials/publishForm-Details.handlebars | 11 +- views/show.handlebars | 26 ++-- 13 files changed, 152 insertions(+), 133 deletions(-) create mode 100644 public/assets/js/constants.js diff --git a/public/assets/css/general.css b/public/assets/css/general.css index 09c2b03e..3bc00ad1 100644 --- a/public/assets/css/general.css +++ b/public/assets/css/general.css @@ -102,6 +102,9 @@ h3 { font-weight: normal; } +.input-text--large, .textarea--large, .title-show, .description-show { + font-size: 1.5rem; +} /* COLUMNS AND ROWS */ .row { @@ -212,12 +215,13 @@ input:-webkit-autofill { -webkit-box-shadow: 0 0 0px 1000px white inset; } -.label, .input-text, .select, .textarea { +.label, .input-text, .select, .textarea, .title-show { margin: 0px; padding: 0.3em; outline: none; border: 0px; background-color: white; + display: inline-block; } .input-disabled { @@ -234,7 +238,7 @@ option { .input-checkbox { - border: 1px solid grey; + border: 1px solid lightgrey; background: white; } @@ -252,7 +256,7 @@ option { text-decoration: underline; cursor: pointer; } - +/* modifiers */ .select--no-arrow { -moz-appearance:none; -webkit-appearance: none; @@ -265,8 +269,6 @@ option { background: url('../img/down_triangle.png') no-repeat right; padding-right: 1em; } - -/* modifiers */ .input-text--primary, .select--primary, .textarea--primary { border-bottom: 1px solid grey; } @@ -276,7 +278,6 @@ option { } .input-text--large, .select--large, .textarea--large { - font-size: 1.5rem; border-left: 1px solid grey; } @@ -428,11 +429,15 @@ table { /* Show page */ -.asset-display { +.video-show, .gifv-show, .image-show { display: block; width: 100%; } +.video-show { + +} + /* item lists */ .content-list-item { diff --git a/public/assets/js/constants.js b/public/assets/js/constants.js new file mode 100644 index 00000000..b37ed213 --- /dev/null +++ b/public/assets/js/constants.js @@ -0,0 +1 @@ +const EMAIL_FORMAT = 'ERROR_EMAIL_FORMAT'; diff --git a/public/assets/js/generalFunctions.js b/public/assets/js/generalFunctions.js index 953eb3b8..bef9cae5 100644 --- a/public/assets/js/generalFunctions.js +++ b/public/assets/js/generalFunctions.js @@ -105,6 +105,18 @@ function checkCookie() { } } +function copyToClipboard(event){ + var elementToCopy = event.target.dataset.elementtocopy; + var element = document.getElementById(elementToCopy); + var errorElement = 'input-error-copy-text' + elementToCopy; + element.select(); + try { + document.execCommand('copy'); + } catch (err) { + showError(errorElement, 'Oops, unable to copy'); + } +} + // Create new error objects, that prototypically inherit from the Error constructor function FileError(message) { this.name = 'FileError'; diff --git a/public/assets/js/validationFunctions.js b/public/assets/js/validationFunctions.js index 83f6ff71..8c991cf4 100644 --- a/public/assets/js/validationFunctions.js +++ b/public/assets/js/validationFunctions.js @@ -35,6 +35,7 @@ function validateFile(file) { throw new Error(file.type + ' is not a supported file type. Only, .jpeg, .png, .gif, and .mp4 files are currently supported.') } } + // validation function that checks to make sure the claim name is valid function validateClaimName (name) { // ensure a name was entered diff --git a/views/about.handlebars b/views/about.handlebars index 05d17b87..eb3bfc6c 100644 --- a/views/about.handlebars +++ b/views/about.handlebars @@ -1,31 +1,28 @@ - {{> topBar}} -
-
-
- Open-source, decentralized image and video hosting -
-
-

- GITHUB -

-

- SLACK CHANNEL -

-

- DOCUMENTATION -

-
-
+{{> topBar}} +
+
-

Spee.ch is a media-hosting site that reads and publishes content from the LBRY blockchain.

-

Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the LBRY network. This means that your images are stored in multiple locations without a single point of failure.

-

[Contribute]

-

Spee.ch is an open source project. Please contribute to the existing site, or fork it and make your own!

-

If you have an idea for your own spee.ch-like site on top of LBRY, fork our github repo and go to town!

-

If you want to improve spee.ch, join our slack channel or solve one of our github issues.

+ Open-source, decentralized image and video hosting
+
+

+ GITHUB +

+

+ SLACK CHANNEL +

+

+ DOCUMENTATION +

+
+
+
+

Spee.ch is a media-hosting site that reads and publishes content from the LBRY blockchain.

+

Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the LBRY network. This means that your images are stored in multiple locations without a single point of failure.

+

[Contribute]

+

Spee.ch is an open source project. Please contribute to the existing site, or fork it and make your own!

+

If you have an idea for your own spee.ch-like site on top of LBRY, fork our github repo and go to town!

+

If you want to improve spee.ch, join our slack channel or solve one of our github issues.

-
- - - \ No newline at end of file +
+
\ No newline at end of file diff --git a/views/index.handlebars b/views/index.handlebars index 4eba356a..d332f025 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -1,5 +1,3 @@ - - {{> topBar}}
@@ -43,14 +41,15 @@
- - -
- {{> publishForm-Channel}} - {{> publishForm-Url}} - {{> publishForm-Thumbnail}} - {{> publishForm-Details}} - {{> publishForm-Submit}} + + +
+ {{> publishForm-Channel}} + {{> publishForm-Url}} + {{> publishForm-Thumbnail}} + {{> publishForm-Details}} + {{> publishForm-Submit}} +
@@ -58,8 +57,6 @@ - - + + + + {{{ body }}} \ No newline at end of file diff --git a/views/layouts/show.handlebars b/views/layouts/show.handlebars index 2b001897..ac327aa9 100644 --- a/views/layouts/show.handlebars +++ b/views/layouts/show.handlebars @@ -17,10 +17,10 @@ {{ googleAnalytics }} - {{{ body }}} + + + + {{{ body }}} - \ No newline at end of file diff --git a/views/login.handlebars b/views/login.handlebars index 5a60183a..fed59709 100644 --- a/views/login.handlebars +++ b/views/login.handlebars @@ -10,6 +10,3 @@
- - - \ No newline at end of file diff --git a/views/partials/asset.handlebars b/views/partials/asset.handlebars index 3b903df2..0fc42a3d 100644 --- a/views/partials/asset.handlebars +++ b/views/partials/asset.handlebars @@ -1,19 +1,19 @@ {{#ifConditional fileInfo.fileType '===' 'video/mp4'}} {{#ifConditional fileInfo.fileExt '===' 'gifv'}} - \ No newline at end of file diff --git a/views/partials/assetInfo.handlebars b/views/partials/assetInfo.handlebars index abe7c7f0..a639b082 100644 --- a/views/partials/assetInfo.handlebars +++ b/views/partials/assetInfo.handlebars @@ -1,60 +1,66 @@ -

Title

-
- {{fileInfo.title}} -
- -

Share

-
- - twitter - - - facebook - - - tublr - - - reddit - -
- -

Links

-{{!-- short direct link to asset --}} -
-
-

Short Link

- -
- -
- +
+
+
+

Share:

+
+
+
+ twitter +
+
+ facebook +
+
+ tublr +
+
+ reddit +
+
+
-{{!-- html text for embedding asset--}} -
-
-

Embed HTML

- -
- {{#ifConditional fileInfo.fileType '===' 'video/mp4'}} - - {{else}} - - {{/ifConditional}} -
- + -

Description

-
- {{fileInfo.description}} +
+
+
+

Embed:

+
+
+
+ + {{#ifConditional fileInfo.fileType '===' 'video/mp4'}} + + {{else}} + + {{/ifConditional}} +
+ +
+
+
+
-

Metadata

-
+

[more]

+ - - diff --git a/views/partials/publishForm-Details.handlebars b/views/partials/publishForm-Details.handlebars index 9f42a08f..9472e217 100644 --- a/views/partials/publishForm-Details.handlebars +++ b/views/partials/publishForm-Details.handlebars @@ -1,3 +1,9 @@ +
+
+ [more] +
+
+ -
-
-
- [more] -
diff --git a/views/show.handlebars b/views/show.handlebars index cf291e58..1d53ec79 100644 --- a/views/show.handlebars +++ b/views/show.handlebars @@ -1,11 +1,23 @@ {{> topBar}} -
-
- {{> asset}} -
-
- {{> assetInfo}} +
+
+ + {{fileInfo.title}}
-
+
+ +
+ {{> asset}} +
+
+ {{fileInfo.description}} +
+
+ +
+ {{> assetInfo}} +
+
+
\ No newline at end of file