diff --git a/app/assets/images/import-example.png b/app/assets/images/import-example.png index 3f013d58..02d59dcd 100644 Binary files a/app/assets/images/import-example.png and b/app/assets/images/import-example.png differ diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb index 2797cbeb..5961c633 100644 --- a/app/assets/stylesheets/application.scss.erb +++ b/app/assets/stylesheets/application.scss.erb @@ -1555,8 +1555,14 @@ h3.filterBox { cursor: pointer; } .fileupload { + box-sizing: border-box; + margin: 0.75em; + padding: 0.75em; + height: 3em; + border: 3px dashed #AAB0FB; width: 75%; text-align: center; + cursor: pointer; } } .wrapper .mapInfoBox { diff --git a/app/views/layouts/_lowermapelements.html.erb b/app/views/layouts/_lowermapelements.html.erb index b8b7f868..82ec71f2 100644 --- a/app/views/layouts/_lowermapelements.html.erb +++ b/app/views/layouts/_lowermapelements.html.erb @@ -8,12 +8,11 @@
<%= render :partial => 'maps/mapinfobox' %> -
Import data
- <% starred = current_user && @map && current_user.starred_map?(@map) - starClass = starred ? 'starred' : '' - tooltip = starred ? 'Star' : 'Unstar' %> -
<%= tooltip %>
-
Map Info
-
Help
-
+ <% starred = current_user && @map && current_user.starred_map?(@map) + starClass = starred ? 'starred' : '' + tooltip = starred ? 'Star' : 'Unstar' %> +
<%= tooltip %>
+
Map Info
+
Help
+
diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index e393f767..c2344643 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -19,6 +19,10 @@
+
+
Import data
+
+
Filter
diff --git a/frontend/src/components/ImportDialogBox.js b/frontend/src/components/ImportDialogBox.js index 4d113ccc..9851fd07 100644 --- a/frontend/src/components/ImportDialogBox.js +++ b/frontend/src/components/ImportDialogBox.js @@ -41,7 +41,7 @@ class ImportDialogBox extends Component {

IMPORT

To upload a file, drop it here:

Drop files here! @@ -56,7 +56,7 @@ class ImportDialogBox extends Component { The file should be in comma-separated format (when you save, change the filetype from .xls to .csv).

- +

You can choose which columns to include in your data. Topics must have a name field. Synapses must have Topic 1 and Topic 2.

 

* There are many valid import formats. Try exporting a map to see what columns you can include in your import data. You can also copy-paste from Excel to import, or import JSON.