summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/editor/media-drawer.ejs15
-rw-r--r--views/partials/scripts.ejs1
2 files changed, 14 insertions, 2 deletions
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 3db71d5..f9bce61 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -23,7 +23,6 @@
</div>
<div class="foundMedia">
- <input type="text" id="tumblr-url" placeholder="Enter a Tumblr URL to add images from it!">
<span class="container"></span>
</div>
@@ -33,7 +32,7 @@
</div>
-<span class="fileUpload">
+<span class="fileUpload" id="fileUpload">
<input type="hidden" name="_csrf" value="[[- token ]]">
<form>
<span class="ion-ios7-upload-outline upload-icon"></span><br>
@@ -43,3 +42,15 @@
<small>~ or ~</small><br>
<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
</span>
+
+<span class="fileUpload" id="tumblrUpload">
+ <input type="hidden" name="_csrf" value="[[- token ]]">
+ <input type="text" class="url" placeholder="Enter a Tumblr URL to add images from it!">
+ <br>
+ <span class="exampleTumblrs">
+ or try one of these:
+ <a href="#" class="exampleTumblr">risingtensions</a>
+ <a href="#" class="exampleTumblr">fixoid</a>
+ <a href="#" class="exampleTumblr">nopattern</a>
+ </span>
+</span>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 61659f7..fc94992 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -113,6 +113,7 @@
<script type="text/javascript" src="/assets/javascripts/ui/editor/ColorControl.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaTumblr.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/Presets.js"></script>