Chapril/date.chapril.org-framadate
Chapril
/
date.chapril.org-framadate
23
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'feature/ask-name-and-comment-before-sending' into 'develop' 

feature/ask name and comment before sending

See merge request framasoft/framadate!285
This commit is contained in:
Thomas Citharel 2018-04-19 15:21:49 +02:00
parent aa690bb6d8 0841675577
commit 4c4fb1557f
3 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
js/app/studs.js
View File

@ -16,6 +16,9 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
var form;
$(document).ready(function () {
@ -108,7 +111,19 @@ $(document).ready(function () {
}
});
var form = $('#comment_form');
form = $('#comment_form');
checkCommentSending();
$("#comment_name").on("keyup change", checkCommentSending);
$("#comment").on("keyup change", checkCommentSending);
$("#comment_name").on("change", formatValues);
$("#comment").on("change", formatValues);
form.submit(function(event) {
event.preventDefault();
@ -168,3 +183,31 @@ $(document).ready(function () {
}
});
});
function formatValues() {
var value = $(this).val().trim();
if (0 === value.length) {
$(this).val("");
}
}
function checkCommentSending() {
var button = $("#add_comment");
// on page load, "textSend" is not set
if ("undefined" === typeof button.data("textSend")) {
button.data("textSend", button.val());
}
if (!form.get(0).checkValidity()) {
button.prop("disabled", true);
button.val(button.data("textWait"));
} else {
button.prop("disabled", false);
button.val(button.data("textSend"));
}
}

1
locale/en.json
View File

@ -84,6 +84,7 @@
"Remove the comment": "Remove comment",
"Send the comment": "Submit comment",
"Your comment": "Comment",
"Type your name and a comment to send it" : "Type your name and a comment to send it",
"anonyme": "anonymous"
},
"Date": {

18
tpl/part/comments.tpl
View File

@ -13,17 +13,23 @@
{/if}
<div class="hidden-print jumbotron">
<div class="col-md-6 col-md-offset-3">
<fieldset id="add-comment"><legend>{__('Comments', 'Add a comment to the poll')}</legend>
<fieldset id="add-comment"><legend>{__('Comments', 'Add a comment to the poll')|html}</legend>
<div class="form-group">
<label for="comment_name" class="control-label">{__('Generic', 'Your name')}</label>
<input type="text" name="name" id="comment_name" class="form-control" maxlength="60" />
<label for="comment_name" class="control-label">{__('Generic', 'Your name')|html}</label>
<input type="text" name="name" id="comment_name" class="form-control" maxlength="60" required>
</div>
<div class="form-group">
<label for="comment" class="control-label">{__('Comments', 'Your comment')}</label>
<textarea name="comment" id="comment" class="form-control" rows="2" cols="40"></textarea>
<label for="comment" class="control-label">{__('Comments', 'Your comment')|html}</label>
<textarea name="comment" id="comment" class="form-control" rows="2" cols="40" required></textarea>
</div>
<div class="pull-right">
<input type="submit" id="add_comment" name="add_comment" value="{__('Comments', 'Send the comment')}" class="btn btn-success">
<button
type="submit"
id="add_comment"
value="{__('Comments', 'Send the comment')|html}"
class="btn btn-success"
data-text-wait="{__('Comments', 'Type your name and a comment to send it')|html}"
>
</div>
</fieldset>
</div>