From 46bdc5226164bd270c71db106ce88546766a026e Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremyruston@SilverSlim.local>
Date: Fri, 25 Oct 2013 21:16:53 +0100
Subject: [PATCH] Fix up the new import mechanism

---
 core/ui/PageTemplate.tid             |  4 ++--
 core/ui/ToolsPanel.tid               |  2 +-
 core/wiki/ControlPanel.tid           |  2 +-
 themes/tiddlywiki/snowwhite/base.tid | 16 ++--------------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index c2c37dce7..56d795e4c 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -3,7 +3,7 @@ title: $:/core/ui/PageTemplate
 <!-- The navigator catches navigation events and updates the story and history tiddlers -->
 <$navigator story="$:/StoryList" history="$:/HistoryList">
 
-<$import browse="no" class="tw-drop-zone-fullscreen">
+<$dropzone>
 
 <!-- The optional topbar -->
 {{$:/TopSideBar}}
@@ -31,7 +31,7 @@ title: $:/core/ui/PageTemplate
 <!-- End of story river -->
 </section>
 
-</$import>
+</$dropzone>
 
 </$navigator>
 
diff --git a/core/ui/ToolsPanel.tid b/core/ui/ToolsPanel.tid
index f460a9f75..79584d084 100644
--- a/core/ui/ToolsPanel.tid
+++ b/core/ui/ToolsPanel.tid
@@ -12,7 +12,7 @@ title: $:/core/ui/ToolsPanel
 
 ---
 
-Import: <$import class="tw-drop-zone"/>
+Import: <$browse/>
 
 ---
 
diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid
index b367a3a39..a46166500 100644
--- a/core/wiki/ControlPanel.tid
+++ b/core/wiki/ControlPanel.tid
@@ -15,7 +15,7 @@ title: $:/ControlPanel
 
 ''Add plugins and tiddlers to your ~TiddlyWiki''
 
-:Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). <$import class="tw-drop-zone"/>
+:Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). <$browse/>
 
 ''Visual appearance''
 
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 5c3fd9a70..0abe08c69 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -207,23 +207,11 @@ a.tw-tiddlylink-external {
 	background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##pagebackground}};
 }
 
-.tw-import {
+.tw-dropzone {
 	position: relative;
 }
 
-.tw-drop-zone-fullscreen.tw-dragover:before {
-	z-index: 10000;
-	display: block;
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	background: rgba(0,200,0,0.7);
-	text-align: center;
-	content: "Drop here";
-}
-
-.tw-drop-zone.tw-dragover:before {
+.tw-dropzone.tw-dragover:before {
 	z-index: 10000;
 	display: block;
 	position: absolute;