Merge branch 'master' of github.com:flxw/codeocean

This commit is contained in:
Ralf Teusner
2015-04-10 20:23:58 +02:00
5 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,4 @@
<h1>Listing comment requests</h1>
<h1><%= t('exercises.implement.comment.listing') %></h1>
<div class="list-group">
<% @request_for_comments.each do |request_for_comment| %>

View File

@ -7,14 +7,14 @@
<form class="form-inline">
<div class="form-group">
<p style='display:inline-block'>Line</p>
<p style='display:inline-block'><%= t('exercises.implement.comment.line') %></p>
<input type="number" class="form-control" id="lineInput" placeholder="1" required>
</div>
<div class="form-group">
<p style='display:inline-block'>Comment</p>
<p style='display:inline-block'><%= t('exercises.implement.comment.a_comment') %></p>
<input type="text" class="form-control" id="commentInput" placeholder="I'd suggest a variable here" required>
</div>
<button id='submitComment' type="submit" class="btn btn-default">Comment!</button>
<button id='submitComment' type="submit" class="btn btn-default"><%= t('exercises.implement.comment.addComment') %>!</button>
</form>
<div id='commentitor' class='editor' data-read-only='true' data-file-id='<%=@request_for_comment.fileid%>'>