jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing functional tests

Browse Source
This commit is contained in:
albert
2011-07-17 16:42:26 -04:00
parent 04ab2f4701
commit 72e9da01b5
26 changed files with 446 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/maintenance/user/login_reminder_mailer/notice.html.erb Normal file
View File

@@ -0,0 +1 @@
<p>Your username is <%= @user.name %>.</p>

9
app/views/maintenance/user/login_reminders/new.html.erb Normal file
View File

@@ -0,0 +1,9 @@
<div id="c-maintenance-user-login-reminders">
<div id="a-new">
<h1>Login Reminder</h1>
<p>If you supplied an email address when signing up, <%= Danbooru.config.app_name %> can email you your login information. Password details will not be provided and will not be changed.</p>
<p>If you didn't supply a valid email address, you are out of luck.</p>
</div>
</div>

14
app/views/maintenance/user/password_resets/edit.html.erb Normal file
View File

@@ -0,0 +1,14 @@
<div id="c-maintenance-user-password-resets">
<div id="a-edit">
<h1>Reset Password</h1>
<% if @nonce %>
<%= form_tag(maintenance_user_password_reset_path, :method => :put) do %>
<p>Do you wish to reset your password? A new password will be emailed to you.</p>
<%= submit_tag "Reset" %>
<% end %>
<% else %>
<p>Invalid key</p>
<% end %>
</div>
</div>

14
app/views/maintenance/user/password_resets/new.html.erb Normal file
View File

@@ -0,0 +1,14 @@
<div id="c-maintenance-user-password-resets">
<div id="a-new">
<h1>Reset Password</h1>
<p>If you supplied an email address when signing up, <%= Danbooru.config.app_name %> can reset your password. You will receive an email confirming your request for a new password.</p>
<p>If you didn't supply a valid email address, you are out of luck.</p>
<%= form_tag(maintenance_user_password_reset_path, :method => :post) do %>
<%= text_field :nonce, :email %>
<%= submit_tag "Submit" %>
<% end %>
</div>
</div>

14
app/views/users/index.html.erb
View File

@@ -4,12 +4,6 @@
<% simple_form_for(@search) do |f| %>
<%= f.input :name_contains, :label => "Name" %>
<%= f.input :is_banned_is_true, :label => "Banned" %>
<%= f.input :is_privileged_is_true, :label => "Privileged" %>
<%= f.input :is_contributor_is_true, :label => "Contributor" %>
<%= f.input :is_janitor_is_true, :label => "Janitor" %>
<%= f.input :is_moderator_is_true, :label => "Moderator" %>
<%= f.input :is_admin_is_true, :label => "Admin" %>
<%= f.sort_link "Name", :name %>
<%= f.sort_link "Date", :created_at_desc %>
<%= f.button :submit %>
@@ -47,18 +41,18 @@
<td></td>
<% end %>
<td><%= link_to user.note_versions.count, note_versions_path(:search => {:updater_id_eq => user.id}) %></td>
<td><%= user.pretty_level %></td>
<td><%= user.level_string %></td>
<td><span title="<%= user.created_at %>"><%= time_ago_in_words user.created_at %> ago</span></td>
</tr>
<% end %>
</tbody>
</table>
<div id="paginator">
<%= will_paginate(@users) %>
<div class="paginator">
<%= numbered_paginator(@users) %>
</div>
<%= render :partial => "footer" %>
<%= render "secondary_links" %>
</div>
</div>

2
app/views/wiki_pages/show.html.erb
View File

@@ -10,7 +10,7 @@
</div>
<div id="wiki-page-posts">
<%= @wiki_page.post_set.presenter.post_previews_html %>
<%= @wiki_page.post_set.presenter.post_previews_html(self) %>
</div>
</section>
</div>