deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

stuff and things.

Browse source
This commit is contained in:
Gordon Martin 2016-09-16 00:08:28 +01:00
parent dad6fbcbd9
commit 975491792f
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/views/forum/topic/show.scala.html
View file

@ -49,10 +49,11 @@ description = shorten(posts.currentPageResults.headOption.??(_.text).replace("\n
</div>
<p class="message">@autoLink(post.text)</p>
@if(post.canBeEditedBy(ctx.userId)) {
<a class="mod" id="edit-button-@post.number" data-icon="r" onclick="editForumPost(@post.number)">Edit</a>
<a class="mod button-hidden" id="edit-submit-button-@post.number" data-icon="t" onclick="submitEdit(@post.number, '@post.id')">Submit</a>
<a class="mod button-hidden" id="edit-cancel-button-@post.number" data-icon="s" onclick="cancelEdit(@post.number)">Cancel</a>
<div class="edit-buttons">
<a class="mod" id="edit-button-@post.number" data-icon="r" onclick="editForumPost(@post.number)">Edit</a>
<a class="mod button-hidden" id="edit-submit-button-@post.number" data-icon="t" onclick="submitEdit(@post.number, '@post.id')">Submit</a>
<a class="mod button-hidden" id="edit-cancel-button-@post.number" data-icon="s" onclick="cancelEdit(@post.number)">Cancel</a>
</div>
}
</div>
}

5
modules/forum/src/main/Post.scala
View file

@ -41,10 +41,7 @@ case class Post(
}
def editedTooSoonAfterLastEdit(currentTime: DateTime) = {
editHistory match {
case Nil => true
case lastEdit :: _ => lastEdit.createdAt.plus(coolOffBetweenEdits.toMillis).isAfter(currentTime)
}
editHistory.length > 3 && createdAt.plus(coolOffBetweenEdits.toMillis).isAfter(currentTime)
}
def canBeEditedBy(editingId: Option[String]) : Boolean = editingId.isDefined && editingId == userId

2
modules/forum/src/main/PostApi.scala
View file

@ -82,7 +82,7 @@ final class PostApi(
case Some((_, post)) if !post.canBeEditedBy(ctx.username) =>
fufail("You are not authorized to modify this post.")
case Some((_,post)) =>
val newPost = post.editPost(DateTime.now, newText)
val newPost = post.editPost(now, newText)
env.postColl.update($id(post.id), newPost) >> fuccess(newPost)
}
}

2
public/javascripts/forum-post.js
View file

@ -9,7 +9,7 @@ var editForumPost = function(postNumber) {
var postContents = oldContents.text();
var editableArea = $("<textarea id='post-edit-area-" + postNumber + "' style='width: 100%; height:300px'>");
var editableArea = $("<textarea id='post-edit-area-" + postNumber + "' class='edit-post-box'>");
editableArea.text(postContents);

7
public/stylesheets/forum.css
View file

@ -183,10 +183,15 @@ div.post .message {
line-height: 1.5em;
}
div.post .edit-button {
div.post .edit-buttons {
float: right;
}
div.post .edit-post-box {
width: 100%;
height: 250px;
}
div.post .button-hidden {
display: none;
}