Permalink
Browse files

Merge branch 'develop' of github.com:dblaichinger/jacob_joins into de…

…velop
  • Loading branch information...
Martina Edelhofer
Martina Edelhofer committed Jun 3, 2012
2 parents 15a711c + 894ca33 commit 697231e216ddad8a99f75e8bf263c922290e4a8c
@@ -143,7 +143,7 @@ Path.map("/recipes/search").to () ->
if Path.routes.previous
match = Path.match(Path.routes.previous)
- if match and match.path == "/recipes/:recipe_slug"
+ if match and (match.path == "/recipes/:recipe_slug" or match.path == "#/recipes/:recipe_slug")
getSearchSidebar("", false)
else
getSearchSidebar("", true)
@@ -144,9 +144,7 @@ label.error
span
opacity: 0
-
-
-.ui-widget-overlay
+.ui-widget-overlay, .noscript_overlay
position: absolute
top: 0
left: 0
@@ -156,4 +154,20 @@ label.error
opacity: .6
filter: Alpha(Opacity=60)
-
+.noscript_overlay
+ z-index: 1000
+ opacity: 1
+ background-color: rgba(255, 255, 255, 0.6)
+
+.noscript_message
+ position: absolute
+ background-color: rgba(255, 255, 255, 1)
+ border: $braun solid 2px
+ padding: 20px
+ margin: auto
+ width: 440px
+ position: relative
+ top: 200px
+ opacity: 1
+ filter: Alpha(Opacity=100)
+ z-index: 1001
@@ -64,11 +64,20 @@
#fb-root
= render "layouts/newsbar_new"
-
= render "layouts/contactable"
+ %noscript
+ .noscript_overlay
+ .noscript_message
+ %h1
+ PLEASE ACTIVATE JAVASCRIPT !!!
+ %p
+ Ohterwise this website can not be used properly!
+ %p
+ Jacob says "Brigitte, no, no, no"
+
+
= yield :scripts
= content_for?(:content) ? yield(:content) : yield
-
@@ -10,7 +10,11 @@
$('.search #ingredients_search').autocomplete({
source: '/ingredients/names',
minLength: 2,
- select: recipesSearch.ingredientsSearchSelectHandler
+ select: recipesSearch.ingredientsSearchSelectHandler,
+ open: function(event, ui){
+ if($('#ingredients_search').val() == "")
+ $('.search #ingredients_search').autocomplete('close');
+ }
});
$('#search_selection').on("click", "a.search_remove_ingredient", recipesSearch.removeIngredientClickHandler);

0 comments on commit 697231e

Please sign in to comment.