From 64f99d71c9ff0d419fad080751ba02afe9f6f3df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 16:27:39 -0500
Subject: move tumblr load stuff into own modal; example tumblrs

---
 views/controls/editor/media-drawer.ejs | 15 +++++++++++++--
 views/partials/scripts.ejs             |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'views')

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>
-- 
cgit v1.2.3-70-g09d2