fixed mixed indent style (should be 2 soft spaces as per project guidelines)
This commit is contained in:
parent
c8e5aa3cac
commit
6dcb7bbf6b
|
@ -2,10 +2,10 @@
|
|||
class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
|
||||
"upvoted" : "downvoted") : "" %>
|
||||
<%= comment.highlighted ? "highlighted" : "" %>
|
||||
<%= comment.score <= 0 ? "negative" : "" %>
|
||||
<%= comment.score <= -3 ? "negative_3" : "" %>
|
||||
<%= comment.score <= -5 ? "negative_5" : "" %>
|
||||
<%= comment.score <= -7 ? "negative_7" : "" %>">
|
||||
<%= comment.score <= 0 ? "negative" : "" %>
|
||||
<%= comment.score <= -3 ? "negative_3" : "" %>
|
||||
<%= comment.score <= -5 ? "negative_5" : "" %>
|
||||
<%= comment.score <= -7 ? "negative_7" : "" %>">
|
||||
<% if !comment.is_gone? %>
|
||||
<div class="voters">
|
||||
<a class="upvoter"></a>
|
||||
|
@ -15,8 +15,8 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
|
|||
<a class="downvoter"></a>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="details">
|
||||
<div class="byline">
|
||||
<div class="details">
|
||||
<div class="byline">
|
||||
<% if comment.previewing %>
|
||||
<a><%= comment.user.username %></a>
|
||||
previewed
|
||||
|
@ -68,8 +68,8 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
|
|||
| on:
|
||||
<a href="<%= story.comments_url %>"><%= story.title %></a>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="comment_text">
|
||||
</div>
|
||||
<div class="comment_text">
|
||||
<% if comment.is_gone? %>
|
||||
<p>
|
||||
<span class="na">
|
||||
|
@ -79,8 +79,8 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
|
|||
<% else %>
|
||||
<%= raw comment.markeddown_comment %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="comment_reply"></div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial => "comments/comment", :locals => { :story => cur_story,
|
||||
<%= render :partial => "comments/comment", :locals => { :story => cur_story,
|
||||
:comment => comment, :show_story => (comment.indent_level == 1) } %>
|
||||
|
||||
<% indent_level = comment.indent_level %>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<div class="box wide">
|
||||
<div class="legend">
|
||||
Filtered Tags
|
||||
</div>
|
||||
Filtered Tags
|
||||
</div>
|
||||
|
||||
<p>
|
||||
To hide stories from the home page that have been tagged with certain tags,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<ol class="stories list">
|
||||
<%= render :partial => "stories/listdetail", :collection => @stories,
|
||||
<%= render :partial => "stories/listdetail", :collection => @stories,
|
||||
:as => :story %>
|
||||
</ol>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<div class="box wide">
|
||||
<div class="legend">
|
||||
Reset Password
|
||||
</div>
|
||||
<div class="legend">
|
||||
Reset Password
|
||||
</div>
|
||||
|
||||
<p>
|
||||
If you've forgotten your password, enter your e-mail address or username
|
||||
|
|
|
@ -1,24 +1,24 @@
|
|||
<div class="box wide">
|
||||
<div class="legend">
|
||||
Set New Password
|
||||
</div>
|
||||
<div class="legend">
|
||||
Set New Password
|
||||
</div>
|
||||
|
||||
<%= form_tag set_new_password_url, { :autocomplete => "off" } do %>
|
||||
<%= error_messages_for(@reset_user) %>
|
||||
|
||||
<%= hidden_field_tag "token", params[:token] %>
|
||||
<%= hidden_field_tag "token", params[:token] %>
|
||||
|
||||
<p>
|
||||
<%= label_tag :username, "Username:" %>
|
||||
<%= @reset_user.username %>
|
||||
<br />
|
||||
<p>
|
||||
<%= label_tag :username, "Username:" %>
|
||||
<%= @reset_user.username %>
|
||||
<br />
|
||||
|
||||
<%= label_tag :password, "New Password:" %>
|
||||
<%= password_field_tag :password, "", :size => 30 %>
|
||||
<br />
|
||||
<%= label_tag :password, "New Password:" %>
|
||||
<%= password_field_tag :password, "", :size => 30 %>
|
||||
<br />
|
||||
|
||||
<%= label_tag :password_confirmation, "(Again):" %>
|
||||
<%= password_field_tag :password_confirmation, "", :size => 30 %>
|
||||
<%= label_tag :password_confirmation, "(Again):" %>
|
||||
<%= password_field_tag :password_confirmation, "", :size => 30 %>
|
||||
<br />
|
||||
|
||||
<p>
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
<% end %>
|
||||
</div>
|
||||
<div class="legend">
|
||||
Private Messages
|
||||
Private Messages
|
||||
<% if @direction == :out %>
|
||||
Sent
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% if @messages.any? %>
|
||||
<table class="data zebra" width="100%" cellspacing=0>
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
@message.recipient.username %></a>
|
||||
<%= raw(time_ago_in_words_label(@message.created_at)) %> ago
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="boxline">
|
||||
<%= raw @message.linkified_body %>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<div class="box wide">
|
||||
<div class="legend">
|
||||
Moderation Log
|
||||
</div>
|
||||
<div class="legend">
|
||||
Moderation Log
|
||||
</div>
|
||||
|
||||
<table class="data" width="100%" cellspacing=0>
|
||||
<tr>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<div class="box wide">
|
||||
<div class="legend right">
|
||||
<a href="/u/<%= @user.username %>">View Profile</a>
|
||||
<a href="/u/<%= @user.username %>">View Profile</a>
|
||||
</div>
|
||||
<div class="legend">
|
||||
Account Settings
|
||||
</div>
|
||||
<div class="legend">
|
||||
Account Settings
|
||||
</div>
|
||||
|
||||
<%= form_for @edit_user, :url => settings_url, :method => :post do |f| %>
|
||||
<%= error_messages_for f.object %>
|
||||
|
@ -166,8 +166,8 @@
|
|||
|
||||
<a name="invite"></a>
|
||||
<div class="legend">
|
||||
Invite a New User
|
||||
</div>
|
||||
Invite a New User
|
||||
</div>
|
||||
|
||||
<%= render :partial => "users/invitationform" %>
|
||||
</div>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<div class="box" id="story_box">
|
||||
<div class="legend">
|
||||
Edit Story
|
||||
</div>
|
||||
<div class="legend">
|
||||
Edit Story
|
||||
</div>
|
||||
|
||||
<%= form_for @story, :url => story_url(@story.short_id),
|
||||
<%= form_for @story, :url => story_url(@story.short_id),
|
||||
:method => :put do |f| %>
|
||||
<%= render :partial => "stories/form", :locals => { :story => @story,
|
||||
<%= render :partial => "stories/form", :locals => { :story => @story,
|
||||
:f => f } %>
|
||||
|
||||
<% if @story.user_id != @user.id %>
|
||||
|
@ -36,5 +36,5 @@
|
|||
:locals => { :allow_images => true } %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
<ol class="stories">
|
||||
<%= render :partial => "stories/listdetail",
|
||||
<%= render :partial => "stories/listdetail",
|
||||
:locals => { :story => @story, :single_story => true } %>
|
||||
</ol>
|
||||
|
||||
<div class="story_content">
|
||||
<% if @story.markeddown_description.present? %>
|
||||
<div class="story_text">
|
||||
<%= raw @story.markeddown_description %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if @story.markeddown_description.present? %>
|
||||
<div class="story_text">
|
||||
<%= raw @story.markeddown_description %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<p></p>
|
||||
<% if @user && !@story.is_gone? && !@story.previewing %>
|
||||
|
|
|
@ -4,6 +4,6 @@
|
|||
<title>404</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>gone fishin'</h1>
|
||||
<h1>gone fishin'</h1>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -83,10 +83,10 @@ describe Story do
|
|||
u = User.make!
|
||||
|
||||
s = Story.make!(:user_id => u.id)
|
||||
s.is_editable_by_user?(u).should == true
|
||||
s.is_editable_by_user?(u).should == true
|
||||
|
||||
u = User.make!
|
||||
s.is_editable_by_user?(u).should == false
|
||||
s.is_editable_by_user?(u).should == false
|
||||
end
|
||||
|
||||
it "can fetch its title properly" do
|
||||
|
|
Loading…
Reference in a new issue