diff --git a/app/assets/images/import.png b/app/assets/images/import.png deleted file mode 100644 index 29b5b896..00000000 Binary files a/app/assets/images/import.png and /dev/null differ diff --git a/app/assets/images/topright_sprite.png b/app/assets/images/topright_sprite.png index 36feb895..163dd6f7 100644 Binary files a/app/assets/images/topright_sprite.png and b/app/assets/images/topright_sprite.png differ diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index 2ac35019..6eee644e 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -192,24 +192,34 @@ background-repeat: no-repeat; cursor: pointer; } +.mapPage .mapElement .importDialog { + display: none; + background-position: 0 0; +} +.mapPage.canEditMap .mapElement .importDialog { + display: block; +} .sidebarFilterIcon { - background-position: -64px 0; + background-position: -32px 0; } .sidebarForkIcon { - background-position: -96px 0; + background-position: -64px 0; } .addMap { - background-position: -128px 0; + background-position: -96px 0; margin-right:10px; } +.importDialog:hover { + background-position: 0 -32px; +} .sidebarFilterIcon:hover { - background-position: -64px -32px; + background-position: -32px -32px; } .sidebarForkIcon:hover { - background-position: -96px -32px; + background-position: -64px -32px; } .addMap:hover { - background-position: -128px -32px; + background-position: -96px -32px; margin-right:10px; } @@ -382,12 +392,7 @@ .mapPage .mapInfoIcon { top: 0; } -.importDialog { - background-image: url(<%= asset_path('import.png') %>); - background-position: 0 0; - background-repeat: no-repeat; - width: 32px; -} + .starMap { background-image: url(<%= asset_path('starmap_sprite.png') %>); background-position: 0 0; @@ -464,7 +469,7 @@ } .zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .takeScreenshot:hover .tooltips, .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .authenticated .sidebarAccountIcon:hover .tooltipsUnder, - .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove, .chat-button:hover .tooltips, importDialog:hover .tooltipsAbove, .starMap:hover .tooltipsAbove, .openMetacodeSwitcher:hover .tooltipsAbove, .pinCarousel:not(.isPinned):hover .tooltipsAbove.helpPin, .pinCarousel.isPinned:hover .tooltipsAbove.helpUnpin { + .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove, .chat-button:hover .tooltips, .importDialog:hover .tooltipsUnder, .starMap:hover .tooltipsAbove, .openMetacodeSwitcher:hover .tooltipsAbove, .pinCarousel:not(.isPinned):hover .tooltipsAbove.helpPin, .pinCarousel.isPinned:hover .tooltipsAbove.helpUnpin { display: block; } @@ -520,6 +525,10 @@ font-style: normal; } +.importDialog .tooltipsUnder { + left: -22px; +} + .sidebarFilterIcon .tooltipsUnder { margin-left: -4px; } @@ -600,7 +609,7 @@ border-bottom: 5px solid transparent; } -.sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after { +.importDialog div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after { content: ''; position: absolute; right: 40%; diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index 1d26ced9..63de15fd 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -16,7 +16,7 @@ <% request = current_user && @map && @allrequests.find{|a| a.user == current_user} - className = (@map and not policy(@map).update?) ? 'isViewOnly ' : '' + className = (@map and not policy(@map).update?) ? 'isViewOnly ' : '' if @map className += 'sendRequest' if not request className += 'sentRequest' if request and not request.answered @@ -36,9 +36,13 @@
-
-
Import data
-
+ <% if current_user %> +
+
+ Import Data +
+
+ <% end %>