Skip to content

Commit

Permalink
Fixed issues around subscription HTML and IE 7.
Browse files Browse the repository at this point in the history
  • Loading branch information
hoverlover committed Mar 10, 2011
1 parent d025622 commit 0336ec6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
29 changes: 14 additions & 15 deletions app/views/ideas/_subscription.html.haml
@@ -1,16 +1,15 @@
-if logged_in?
%li.subscription
-if @idea.inventor == current_user && current_user.notify_on_comments?
You will receive email notifications for new comments on your idea.
= link_to 'Account settings', edit_user_path
-elsif current_user.subscribed_ideas.include?(@idea)
You will receive email notifications for new comments on this idea.
= link_to_remote 'Stop watching',
:url => unsubscribe_idea_path(@idea),
:update => 'subscription',
:complete => visual_effect(:highlight, 'subscription', :duration => 0.8)
-else
= link_to_remote 'Watch this idea',
:url => subscribe_idea_path(@idea),
:update => 'subscription',
:complete => visual_effect(:highlight, 'subscription', :duration => 0.8)
-if @idea.inventor == current_user && current_user.notify_on_comments?
You will receive email notifications for new comments on your idea.
= link_to 'Account settings', edit_user_path
-elsif current_user.subscribed_ideas.include?(@idea)
You will receive email notifications for new comments on this idea.
= link_to_remote 'Stop watching',
:url => unsubscribe_idea_path(@idea),
:update => 'subscription',
:complete => visual_effect(:highlight, 'subscription', :duration => 0.8)
-else
= link_to_remote 'Watch this idea',
:url => subscribe_idea_path(@idea),
:update => 'subscription',
:complete => visual_effect(:highlight, 'subscription', :duration => 0.8)
3 changes: 1 addition & 2 deletions app/views/ideas/show.html.haml
Expand Up @@ -46,8 +46,7 @@
= link_to "Comments #{"(#{@idea.comment_count})" if @idea.comment_count > 0}", "#comments"
|
= link_to "Post a Comment", "#post-comment"
#subscription
= render :partial => 'subscription'
%li.subscription#subscription= render :partial => 'subscription'
%li.tags
= @idea.tags.map { |tag| link_to h(tag.name), idea_search_path(:search => ['tag', tag.name]) }.join(', ')
%li.sharethis= render :partial => 'sharethis'
Expand Down

0 comments on commit 0336ec6

Please sign in to comment.