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

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

Browse Source
This commit is contained in:
Toks
2015-06-09 23:56:27 -04:00
parent 99f55c32a4 c1d220e422
commit 76dd4bac22
2 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/notes.js
View File

@@ -315,7 +315,7 @@ Danbooru.Note = {
set_text: function($note_body, $note_box, text) { set_text: function($note_body, $note_box, text) {
Danbooru.Note.Body.display_text($note_body, text); Danbooru.Note.Body.display_text($note_body, text);
if (Danbooru.Note.embed) { if (Danbooru.Note.embed) {
Danbooru.Note.Body.display_text($note_box.children("div"), text); Danbooru.Note.Body.display_text($note_box.children("div.note-box-inner-border"), text);
} }
Danbooru.Note.Body.resize($note_body); Danbooru.Note.Body.resize($note_body);
Danbooru.Note.Body.bound_position($note_body); Danbooru.Note.Body.bound_position($note_body);
@@ -475,6 +475,7 @@ Danbooru.Note = {
Danbooru.Note.Body.set_text($note_body, $note_box, "Loading..."); Danbooru.Note.Body.set_text($note_body, $note_box, "Loading...");
$.get("/note_previews.json", {body: text}).success(function(data) { $.get("/note_previews.json", {body: text}).success(function(data) {
Danbooru.Note.Body.set_text($note_body, $note_box, data.body); Danbooru.Note.Body.set_text($note_body, $note_box, data.body);
Danbooru.Note.Box.resize_inner_border($note_box);
$note_body.show(); $note_body.show();
}); });
$this.dialog("close"); $this.dialog("close");
@@ -721,7 +722,7 @@ Danbooru.Note = {
Danbooru.Note.Box.scale($note_box); Danbooru.Note.Box.scale($note_box);
Danbooru.Note.Body.display_text($note_body, text); Danbooru.Note.Body.display_text($note_body, text);
if (Danbooru.Note.embed) { if (Danbooru.Note.embed) {
Danbooru.Note.Body.display_text($note_box.children("div"), text); Danbooru.Note.Body.display_text($note_box.children("div.note-box-inner-border"), text);
} }
}, },

8
app/views/uploads/new.html.erb
View File

@@ -2,14 +2,11 @@
<div id="a-new"> <div id="a-new">
<h1>Upload</h1> <h1>Upload</h1>
<% if CurrentUser.user.can_upload? %>
<div id="upload-guide-notice"> <div id="upload-guide-notice">
<p>Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.</p> <p>Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.</p>
</div> </div>
<% unless CurrentUser.user.can_upload? %>
<h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>
<% end %>
<%= render "image" %> <%= render "image" %>
<%= render "post", :post => @post %> <%= render "post", :post => @post %>
<%= render "sources/info", :source => @source %> <%= render "sources/info", :source => @source %>
@@ -123,6 +120,9 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<% else %>
<h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>
<% end %>
</div> </div>
</div> </div>