diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js index 055ec38d..c257e4f1 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -55,6 +55,16 @@ $(document).ready(function () { } } + // initialize the famous ui + var callFamous = function(){ + if (Metamaps.Famous) { + Metamaps.Famous.build(); + } + else { + setTimeout(callFamous, 100); + } + } + callFamous(); }); Metamaps.GlobalUI = { diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 97f8fecb..ad91a880 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1887,45 +1887,35 @@ and it won't be important on password protected instances */ margin:10px auto; background-position: 0 0; } -.lightbox_links a:hover .lightboxAboutIcon { - background-position-y: -32px; -} #lightbox_metamapps .lightboxAboutIcon { - background-position-x: 0; -} -#lightbox_community .lightboxAboutIcon { - background-position-x: -32px; -} -#lightbox_source .lightboxAboutIcon { - background-position-x: -64px; -} -#lightbox_blog .lightboxAboutIcon { - background-position-x: -96px; -} -#lightbox_term .lightboxAboutIcon { - background-position-x: -128px; -} - - -.permIcon .mapCrePermIcon { - background-image: url(permissions64sprite.png); - background-repeat: no-repeat; - width:64px; - height:64px; - margin:10px auto; background-position: 0 0; } -.mapCrePermIcon:hover { - background-position-y: -64px; +#lightbox_community .lightboxAboutIcon { + background-position: -32px 0; } -#map_CO { - background-position-x: 0; +#lightbox_source .lightboxAboutIcon { + background-position: -64px 0; } -#map_PU { - background-position-x: -64px; +#lightbox_blog .lightboxAboutIcon { + background-position: -96px 0; } -#map_PR { - background-position-x: -128px; +#lightbox_term .lightboxAboutIcon { + background-position: -128px 0; +} +#lightbox_metamapps:hover .lightboxAboutIcon { + background-position: 0 -32px; +} +#lightbox_community:hover .lightboxAboutIcon { + background-position: -32px -32px; +} +#lightbox_source:hover .lightboxAboutIcon { + background-position: -64px -32px; +} +#lightbox_blog:hover .lightboxAboutIcon { + background-position: -96px -32px; +} +#lightbox_term:hover .lightboxAboutIcon { + background-position: -128px -32px; } /* jquery ui tabs */ @@ -2292,25 +2282,27 @@ and it won't be important on password protected instances */ height:64px; margin:10px auto 0; background-position: 0 0; -/* width: 60px; - height: 60px; - background-size: 48px 48px; - background-position: center center; - background-repeat: no-repeat; - margin: 0 auto; - cursor: pointer;*/ } .mapPermIcon:hover, .mapPermIcon.selected { - background-position-y: -64px; + background-position: -64px 0; } #newmap_co { - background-position-x: 0; + background-position: 0 0; } #newmap_pu { - background-position-x: -64px; + background-position: -64px 0; } #newmap_pr { - background-position-x: -128px; + background-position: -128px 0; +} +#newmap_co:hover, #newmap_co.selected { + background-position: 0 -64px; +} +#newmap_pu:hover, #newmap_co.selected { + background-position: -64px -64px; +} +#newmap_pr:hover, #newmap_pr.selected { + background-position: -128px -64px; } @@ -2337,7 +2329,7 @@ and it won't be important on password protected instances */ font-size: 14px; } .buttonWrapper { - width: 274px; + width: 286px; float:right; margin: 16px 0 0 0; } diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 691ca650..03889a5c 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -255,12 +255,12 @@ resize: none; .yourTopic .mapPerm:hover, .yourEdge .mapPerm:hover { background-image: url(arrowperms_sprite.png); - background-position-x: -32px; + background-position: -32px 0; cursor:pointer; } .yourTopic .mapPerm.minimize, .yourEdge .mapPerm.minimize { background-image: url(arrowperms_sprite.png) !important; -background-position-x: 0px; +background-position: 0 0; cursor: pointer; } .mapPerm .permissionSelect { @@ -731,13 +731,13 @@ font-family: 'din-regular', helvetica, sans-serif; right: 56px; } #edit_synapse_left.checked, #edit_synapse_right.checked { - background-position-y: -48px; + background-position: 0 -48px; } .canEdit #edit_synapse_left, .canEdit #edit_synapse_right { cursor: pointer; } .canEdit #edit_synapse_left:not(.checked):hover, .canEdit #edit_synapse_right:not(.checked):hover { - background-position-y: -24px; + background-position: 0 -24px; } /* Map Cards */ diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 95d96c02..6d0b907b 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -277,10 +277,10 @@ left: 410px; } .sidebarSearch .tt-dropdown-menu .minimizeResults { - background-position-x: 0; + background-position: 0 0; } .sidebarSearch .tt-dropdown-menu .maximizeResults { - background-position-x: -32px; + background-position: -32px 0; } .sidebarSearch .tt-suggestions { overflow: visible; @@ -427,7 +427,7 @@ height: 24px; background: url(topic16.png); background-repeat: no-repeat; - background-position-y: center; + background-position: 0 center; top: 0; left: 0; padding-left: 18px; @@ -440,7 +440,7 @@ height: 24px; background: url(metamap16.png); background-repeat: no-repeat; - background-position-y: center; + background-position: 0 center; left: 0; padding-left: 20px; font-size: 12px; @@ -451,7 +451,7 @@ height: 24px; background: url(synapse16.png); background-repeat: no-repeat; - background-position-y: center; + background-position: 0 center; top: 24px; left: 0; padding-left: 20px; @@ -588,28 +588,38 @@ background-repeat: no-repeat; cursor: pointer; } -.upperRightIcon:hover { - background-position-y: -32px; +.sidebarCollaborateIcon { + background-position: 0 0; + display: none; } .sidebarCollaborateIcon.blue { - background-position-x: -32px; + background-position: -32px 0; } -.sidebarCollaborateIcon { - background-position-x: 0; - display: none; +.sidebarCollaborateIcon.blue:hover { + background-position: -32px -32px; } /* only show the collaborate icon on commons */ .commonsMap .sidebarCollaborateIcon { display: block; } .sidebarFilterIcon { - background-position-x: -64px; + background-position: -64px 0; } .sidebarForkIcon { - background-position-x: -96px; + background-position: -96px 0; } .addMap { - background-position-x: -128px; + background-position: -128px 0; + margin-right:10px; +} +.sidebarFilterIcon:hover { + background-position: -64px -32px; +} +.sidebarForkIcon:hover { + background-position: -96px -32px; +} +.addMap:hover { + background-position: -128px -32px; margin-right:10px; } @@ -714,7 +724,7 @@ background-repeat:no-repeat; } .openCheatsheet:hover { - background-position-y: -32px; + background-position: 0 -32px; } .mapInfoIcon { position: relative; @@ -723,7 +733,7 @@ background-repeat:no-repeat; } .mapInfoIcon:hover { - background-position-y: -32px; + background-position: 0 -32px; } .mapPage .mapInfoIcon { top: 0; @@ -754,7 +764,7 @@ cursor:pointer; } .mapControl:hover { - background-position-x: -32px; + background-position: -32px 0; } .zoomExtents { margin-bottom:5px; @@ -824,22 +834,21 @@ position:absolute; top:5px; left:5px; - background-position-y: 0; } .exploreMapsCenter .myMaps .exploreMapsIcon { background-image: url(exploremaps_sprite.png); - background-position-x: 0; + background-position: 0 0; } .exploreMapsCenter .activeMaps .exploreMapsIcon { background-image: url(exploremaps_sprite.png); - background-position-x: -32px; + background-position: -32px 0; } .exploreMapsCenter .featuredMaps .exploreMapsIcon { background-image: url(exploremaps_sprite.png); - background-position-x: -64px; + background-position: -64px 0; } .exploreMapsButton:hover .exploreMapsIcon, .exploreMapsButton.active .exploreMapsIcon { - background-position-y: -32px; + background-position: -32px 0; } .mapsWrapper { diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb new file mode 100644 index 00000000..8679a258 --- /dev/null +++ b/app/helpers/devise_helper.rb @@ -0,0 +1,26 @@ +module DeviseHelper + def devise_error_messages! + + message = resource.errors.to_a[0] + #return "" if resource.errors.empty? + + #messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join + #sentence = I18n.t("errors.messages.not_saved", + # :count => resource.errors.count, + # :resource => resource.class.model_name.human.downcase) + + #html = <<-HTML + #
<%= notice %>
+ <% if devise_error_messages? %> +<%= devise_error_messages! %>
+ <% elsif notice %> +<%= notice %>
<% end %> <%= content_tag :div, class: authenticated? ? "main authenticated" : "main unauthenticated" do %> diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb index 2cec4812..109d2e25 100644 --- a/app/views/users/passwords/edit.html.erb +++ b/app/views/users/passwords/edit.html.erb @@ -2,7 +2,6 @@