mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-12-12 11:48:06 +00:00
Code Issues Releases Wiki Activity

Fix up the new import mechanism

Browse Source
This commit is contained in:
Jeremy Ruston
2013-10-25 21:16:53 +01:00
parent 75231fec39
commit 46bdc52261
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/ui/PageTemplate.tid
View File

@@ -3,7 +3,7 @@ title: $:/core/ui/PageTemplate
<!-- The navigator catches navigation events and updates the story and history tiddlers --> <!-- The navigator catches navigation events and updates the story and history tiddlers -->
<$navigator story="$:/StoryList" history="$:/HistoryList"> <$navigator story="$:/StoryList" history="$:/HistoryList">
<$import browse="no" class="tw-drop-zone-fullscreen"> <$dropzone>
<!-- The optional topbar --> <!-- The optional topbar -->
{{$:/TopSideBar}} {{$:/TopSideBar}}
@@ -31,7 +31,7 @@ title: $:/core/ui/PageTemplate
<!-- End of story river --> <!-- End of story river -->
</section> </section>
</$import> </$dropzone>
</$navigator> </$navigator>

2
core/ui/ToolsPanel.tid
View File

@@ -12,7 +12,7 @@ title: $:/core/ui/ToolsPanel
--- ---
Import: <$import class="tw-drop-zone"/> Import: <$browse/>
--- ---

2
core/wiki/ControlPanel.tid
View File

@@ -15,7 +15,7 @@ title: $:/ControlPanel
''Add plugins and tiddlers to your ~TiddlyWiki'' ''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'' ''Visual appearance''

16
themes/tiddlywiki/snowwhite/base.tid
View File

@@ -207,23 +207,11 @@ a.tw-tiddlylink-external {
background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##pagebackground}}; background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##pagebackground}};
} }
.tw-import { .tw-dropzone {
position: relative; position: relative;
} }
.tw-drop-zone-fullscreen.tw-dragover:before { .tw-dropzone.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 {
z-index: 10000; z-index: 10000;
display: block; display: block;
position: absolute; position: absolute;