natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #231 from mozilla/ui 

move head and html tags to main template
This commit is contained in:
Danny Coates 2017-07-18 12:33:51 -07:00 committed by GitHub
parent e4a724422e 4068291f7c
commit 45eccc1cad
4 changed files with 183 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/main.css
View File

@ -23,7 +23,7 @@ body {
}
.all {
padding-top: 12%;
padding-top: 10%;
overflow-y: scroll;
}

121
views/download.handlebars
View File

@ -1,75 +1,60 @@
<!DOCTYPE html>
<html>
<head>
<title>Download your file</title>
{{#if dsn}}
{{> sentry dsn=dsn}}
{{/if}}
<script src="/bundle.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
{{#if trackerId}}
{{> analytics trackerId=trackerId}}
{{/if}}
</head>
<body>
<div class="send-logo">
<img src="/resources/send_logo.svg"/>
<img src="/resources/send_logo_type.svg"/>
</div>
<div class="all">
<div id="download">
{{#if filename}}
<div id="download-page-one">
<div class="title">
Download <span id="dl-filename">{{{filename}}}</span> ({{{filesize}}})
</div>
<div class="description">
Your friend is sending you a file with Firefox Send, a service that allows you to share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
</div>
<img src="/resources/illustration_download.svg" id="download-img" alt="Download"/>
<div>
<button id="download-btn" title="Download">Download</button>
</div>
</div>
<div id="download-progress">
<div class="title">
Downloading {{{filename}}} ({{{filesize}}})
</div>
<div class="description">
Please leave this tab open while we fetch your file and decrypt it.
</div>
<!-- progress bar here -->
<div class="progress-bar" id="dl-progress">
<div class="percentage">
<span class="percent-number"></span>
<span class="percent-sign">%</span>
</div>
</div>
<div class="upload">
<div class="progress-text">{{{filename}}}</div>
</div>
</div>
<div class="send-new" title="Try Firefox Send">
Try Firefox Send
</div>
{{else}}
<div class="send-logo">
<img src="/resources/send_logo.svg"/>
<img src="/resources/send_logo_type.svg"/>
</div>
<div class="all">
<div id="download">
{{#if filename}}
<div id="download-page-one">
<div class="title">
This link has expired or never existed in the first place.
Download <span id="dl-filename">{{{filename}}}</span> ({{{filesize}}})
</div>
<div class="share-window">
<img src="/resources/illustration_expired.svg" id="expired-img" alt="Link expired" />
<div class="description">
Your friend is sending you a file with Firefox Send, a service that allows you to share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
</div>
<div class="expired-description">
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
<img src="/resources/illustration_download.svg" id="download-img" alt="Download"/>
<div>
<button id="download-btn" title="Download">Download</button>
</div>
<div class="send-new" title="Try Firefox Send">
Try Firefox Send
</div>
{{/if}}
</div>
<div id="download-progress">
<div class="title">
Downloading {{{filename}}} ({{{filesize}}})
</div>
<div class="description">
Please leave this tab open while we fetch your file and decrypt it.
</div>
<!-- progress bar here -->
<div class="progress-bar" id="dl-progress">
<div class="percentage">
<span class="percent-number"></span>
<span class="percent-sign">%</span>
</div>
</div>
<div class="upload">
<div class="progress-text">{{{filename}}}</div>
</div>
</div>
<div class="send-new" title="Try Firefox Send">
Try Firefox Send
</div>
{{else}}
<div class="title">
This link has expired or never existed in the first place.
</div>
<div class="share-window">
<img src="/resources/illustration_expired.svg" id="expired-img" alt="Link expired" />
</div>
<div class="expired-description">
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
</div>
<div class="send-new" title="Try Firefox Send">
Try Firefox Send
</div>
{{/if}}
</div>
</body>
</html>
</div>

212
views/index.handlebars
View File

@ -1,131 +1,113 @@
<!DOCTYPE html>
<html>
<head>
<title>Firefox Send</title>
{{#if dsn}}
{{> sentry dsn=dsn}}
{{/if}}
<script src="/bundle.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
<link rel="stylesheet" type="text/css" href="/resources/fontello-24c5e6ad/css/fontello.css" />
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
{{#if trackerId}}
{{> analytics trackerId=trackerId}}
{{/if}}
</head>
<body>
<div class="send-logo">
<img src="/resources/send_logo.svg"/>
<img src="/resources/send_logo_type.svg"/>
<div class="send-logo">
<img src="/resources/send_logo.svg"/>
<img src="/resources/send_logo_type.svg"/>
</div>
<div class="all">
<div id="page-one">
<div class="title">
Private, Encrypted File Sharing
</div>
<div class="description">
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.<br> <a href="https://testpilot.firefox.com/experiments/send" class="link">Learn more</a>
</div>
<div class="upload-window" >
<div id="upload-img"><img src="/resources/upload.svg" alt="Upload"/></div>
<div id="upload-text">
Drop your files here to start uploading
</div>
<form method="post" action="upload" enctype="multipart/form-data">
<label for="file-upload" id="browse" title="Upload file">Select a file on your computer</label>
<input id="file-upload" type="file" name="fileUploaded" />
</form>
</div>
<div id="file-list">
<table id="uploaded-files">
<thead>
<tr>
<!-- htmllint attr-bans="false" -->
<th width="35%">File</th>
<th width="25%">Copy URL</th>
<th width="21%">Expires in</th>
<th width="12%">Delete</th>
<!-- htmllint tag-bans="$previous" -->
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
<div class="all">
<div id="page-one">
<div class="title">
Private, Encrypted File Sharing
</div>
<div class="description">
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.<br> <a href="https://testpilot.firefox.com/experiments/send" class="link">Learn more</a>
</div>
<div class="upload-window" >
<div id="upload-img"><img src="/resources/upload.svg" alt="Upload"/></div>
<div id="upload-text">
Drop your files here to start uploading
</div>
<form method="post" action="upload" enctype="multipart/form-data">
<label for="file-upload" id="browse" title="Upload file">Select a file on your computer</label>
<input id="file-upload" type="file" name="fileUploaded" />
</form>
</div>
<div id="upload-progress">
<div class="title" id="upload-filename">
Uploading Your File
</div>
<div class="description">
<div id="file-list">
<table id="uploaded-files">
<thead>
<tr>
<!-- htmllint attr-bans="false" -->
<th width="35%">File</th>
<th width="25%">Copy URL</th>
<th width="21%">Expires in</th>
<th width="12%">Delete</th>
<!-- htmllint tag-bans="$previous" -->
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
<!-- progress bar here -->
<div class="progress-bar" id="ul-progress">
<div class="percentage">
<span class="percent-number">0</span>
<span class="percent-sign">%</span>
</div>
</div>
<div id="upload-progress">
<div class="title" id="upload-filename">
Uploading Your File
</div>
<div class="description">
</div>
<!-- progress bar here -->
<div class="progress-bar" id="ul-progress">
<div class="percentage">
<span class="percent-number">0</span>
<span class="percent-sign">%</span>
</div>
</div>
<div class="upload">
<div class="progress-text"></div>
<div id="cancel-upload" title="Cancel Upload">Cancel Upload</div>
</div>
<div class="upload">
<div class="progress-text"></div>
<div id="cancel-upload" title="Cancel Upload">Cancel Upload</div>
</div>
</div>
<div id="share-link">
<div class="title">
This encrypted link will expire after 1 download or in 24 hours
</div>
<div id="share-window">
<div id="copy-text">
Copy and share the link to send your file:
</div>
<div id="copy">
<input id="link" type="url" value="" readonly/>
<button id="copy-btn" title="Copy to Clipboard">Copy to Clipboard</button>
</div>
<button id="delete-file" title="Delete file">Delete file</button>
<div class="send-new" title="Send another file">
Send another file
</div>
</div>
<div id="share-link">
<div class="title">
This encrypted link will expire after 1 download or in 24 hours
</div>
<div id="upload-error">
<div class="title">
Something went wrong!
<div id="share-window">
<div id="copy-text">
Copy and share the link to send your file:
</div>
<div class="expired-description">
There has been an error uploading the file.
<div id="copy">
<input id="link" type="url" value="" readonly/>
<button id="copy-btn" title="Copy to Clipboard">Copy to Clipboard</button>
</div>
<img id="upload-error-img" src="/resources/illustration_error.svg" alt="Upload error" />
<button id="delete-file" title="Delete file">Delete file</button>
<div class="send-new" title="Send another file">
Send another file
</div>
</div>
<div id="unsupported-browser">
<div class="title">
Your browser is not supported.
</div>
<div class="description">
Unfortunately this browser does not support the web technology that powers Firefox Send. You'll need to try another browser. We recommend Firefox!
</div>
<a id="dl-firefox" href="https://www.mozilla.org/firefox/new/?scene=2" target="_blank">
<img src="/resources/firefox_logo-only.svg" id="firefox-logo" alt="Firefox"/>
<div id="dl-firefox-text">Firefox<br><span>Free Download</span></div>
</a>
<div class="unsupported-description">
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
</div>
</div>
</div>
<div id="upload-error">
<div class="title">
Something went wrong!
</div>
<div class="expired-description">
There has been an error uploading the file.
</div>
<img id="upload-error-img" src="/resources/illustration_error.svg" alt="Upload error" />
<div class="send-new" title="Send another file">
Send another file
</div>
</div>
<div id="unsupported-browser">
<div class="title">
Your browser is not supported.
</div>
<div class="description">
Unfortunately this browser does not support the web technology that powers Firefox Send. You'll need to try another browser. We recommend Firefox!
</div>
<a id="dl-firefox" href="https://www.mozilla.org/firefox/new/?scene=2" target="_blank">
<img src="/resources/firefox_logo-only.svg" id="firefox-logo" alt="Firefox"/>
<div id="dl-firefox-text">Firefox<br><span>Free Download</span></div>
</a>
<div class="unsupported-description">
Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
</div>
</div>
</div>
</div>
</body>
</html>

46
views/layouts/main.handlebars
View File

@ -1,15 +1,33 @@
{{{body}}}
<div class="footer">
<div class="legal-links">
<a href="https://www.mozilla.org"><img class="mozilla-logo" src="/resources/mozilla-logo.svg"/></a>
<a href="https://www.mozilla.org/about/legal/">Legal</a>
<a href="https://testpilot.firefox.com/about">About Test Pilot</a>
<a href="https://testpilot.firefox.com/privacy">Privacy</a>
<a href="https://testpilot.firefox.com/terms">Terms</a>
<a href="https://www.mozilla.org/en-US/privacy/websites/#cookies">Cookies</a>
<!DOCTYPE html>
<html>
<head>
<title>Firefox Send</title>
{{#if dsn}}
{{> sentry dsn=dsn}}
{{/if}}
<script src="/bundle.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
<link rel="stylesheet" type="text/css" href="/resources/fontello-24c5e6ad/css/fontello.css" />
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
{{#if trackerId}}
{{> analytics trackerId=trackerId}}
{{/if}}
</head>
<body>
{{{body}}}
<div class="footer">
<div class="legal-links">
<a href="https://www.mozilla.org"><img class="mozilla-logo" src="/resources/mozilla-logo.svg"/></a>
<a href="https://www.mozilla.org/about/legal/">Legal</a>
<a href="https://testpilot.firefox.com/about">About Test Pilot</a>
<a href="https://testpilot.firefox.com/privacy">Privacy</a>
<a href="https://testpilot.firefox.com/terms">Terms</a>
<a href="https://www.mozilla.org/en-US/privacy/websites/#cookies">Cookies</a>
</div>
<div class="social-links">
<a href="https://github.com/mozilla/send" target="_blank"><img class="github" src="/resources/github-icon.svg"/></a>
<a href="https://twitter.com/FxTestPilot" target="_blank"><img class="twitter" src="/resources/twitter-icon.svg"/></a>
</div>
</div>
<div class="social-links">
<a href="https://github.com/mozilla/send" target="_blank"><img class="github" src="/resources/github-icon.svg"/></a>
<a href="https://twitter.com/FxTestPilot" target="_blank"><img class="twitter" src="/resources/twitter-icon.svg"/></a>
</div>
</div>
</body>
</html>