diff --git a/design/privateheader.php b/design/privateheader.php index 3b592637..f8a7489b 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -85,7 +85,7 @@ ?> -> +

diff --git a/ocelot-0.6.tar.bz2 b/ocelot-0.6.tar.bz2 index 9cabe145..503a61b4 100644 Binary files a/ocelot-0.6.tar.bz2 and b/ocelot-0.6.tar.bz2 differ diff --git a/sections/collages/collage.php b/sections/collages/collage.php index 8f36b2a8..0565a556 100644 --- a/sections/collages/collage.php +++ b/sections/collages/collage.php @@ -203,12 +203,12 @@ function compare($X, $Y){ ?> - - [ DL + + DL | FL - | RP ] + | RP   »  @@ -245,12 +245,12 @@ function compare($X, $Y){
- - [ DL + + DL | FL - | RP ] + | RP
format()?>
diff --git a/static/functions/comments.js b/static/functions/comments.js index c21aaa0f..8b516452 100644 --- a/static/functions/comments.js +++ b/static/functions/comments.js @@ -36,8 +36,10 @@ function Quote(post, user, link) { } function Edit_Form(post,key) { - $('#reply_box').toggle(); - postid = post; + postid = post; + //If no edit is already going underway or a previous edit was finished, make the necessary dom changes. + if(!$('#editbox' + postid).objects[0] || $('#editbox' + postid + '.hidden').objects[0]) { + $('#reply_box').hide(); if (location.href.match(/torrents\.php/) || location.href.match(/artist\.php/)) { boxWidth="50"; @@ -59,7 +61,12 @@ function Edit_Form(post,key) { $('#bar' + postid).raw().oldbar = $('#bar' + postid).raw().innerHTML; $('#content' + postid).raw().innerHTML = "
"+pmbox+"
"; $('#bar' + postid).raw().innerHTML = ''; - ajax.get("?action=get_post&post=" + postid, function(response){ + } + /* If it's the initial edit, fetch the post content to be edited. + * If editing is already underway and edit is pressed again, reset the post + * (keeps current functionality, move into brackets to stop from happening). + */ + ajax.get("?action=get_post&post=" + postid, function(response){ $('#editbox' + postid).raw().value = html_entity_decode(response); resize('editbox' + postid); }); @@ -68,7 +75,7 @@ function Edit_Form(post,key) { function Cancel_Edit(postid) { var answer = confirm("Are you sure you want to cancel?"); if (answer) { - $('#reply_box').toggle(); + $('#reply_box').show(); $('#bar' + postid).raw().innerHTML = $('#bar' + postid).raw().oldbar; $('#content' + postid).raw().innerHTML = $('#bar' + postid).raw().cancel; } @@ -89,7 +96,7 @@ function Cancel_Preview(postid) { } function Save_Edit(postid) { - $('#reply_box').toggle(); + $('#reply_box').show(); if (location.href.match(/forums\.php/)) { ajax.post("forums.php?action=takeedit","form" + postid, function (response) { $('#bar' + postid).raw().innerHTML = "Report ↑"; diff --git a/static/functions/requests.js b/static/functions/requests.js index b51283c7..57b5e5b2 100644 --- a/static/functions/requests.js +++ b/static/functions/requests.js @@ -100,6 +100,7 @@ function AddArtistField() { var x = $('#artistfields').raw(); x.appendChild(document.createElement("br")); x.appendChild(ArtistField); + x.appendChild(document.createTextNode('\n')); x.appendChild(ImportanceField); ArtistCount++; } @@ -113,6 +114,7 @@ function RemoveArtistField() { x.removeChild(x.lastChild); } x.removeChild(x.lastChild); + x.removeChild(x.lastChild); //Remove trailing new line. ArtistCount--; } diff --git a/static/styles/global.css b/static/styles/global.css index 7560feaf..c80d6769 100644 --- a/static/styles/global.css +++ b/static/styles/global.css @@ -386,6 +386,10 @@ tr.torrent .bookmark>a:after { height: 100%; } +.brackets { + text-indent: 0px; +} + .votespan.brackets:before { content: "( "; } diff --git a/static/styles/white.cd/style.css b/static/styles/white.cd/style.css index 064bb79d..605a2643 100644 --- a/static/styles/white.cd/style.css +++ b/static/styles/white.cd/style.css @@ -488,7 +488,6 @@ table tr td.edition_info { text-align:right; position:absolute; top:0; - left:734px; right:0; width: 300px; }