Merge branch 'master' of github.com:r888888888/danbooru

2013-05-20 16:28:29 -07:00
parent e936963005 2c0501a5c3
commit 27a6136aee
64 changed files with 271 additions and 101 deletions
--- a/app/views/users/_dmail_notice.html.erb
+++ b/app/views/users/_dmail_notice.html.erb
@@ -1,3 +1,4 @@
-<div class="ui-corner-all ui-state-highlight" id="dmail-notice">
+<div class="ui-corner-all ui-state-highlight" id="dmail-notice" data-id="<%= CurrentUser.dmails.unread.first.id %>">
  <h1>You have <%= link_to "unread mail", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received") %>.</h1>
+  <p><%= link_to "Close this", "#", :id => "hide-dmail-notice" %></p>
 </div>