diff --git a/js/app/studs.js b/js/app/studs.js index 7a32203aa43f27bd5d8e364236bae2cabd5e6c56..a41f1564895b74a428c6db1023d087655e591df1 100644 --- a/js/app/studs.js +++ b/js/app/studs.js @@ -6,12 +6,10 @@ $(document).ready(function() { var regex = new RegExp(regexContent[1], regexContent[2]); if (name.length == 0 || !regex.test(name)) { event.preventDefault(); - var errorMessage = $("#parameter_name_error").text(); - var addedDiv = "<div class='alert alert-dismissible alert-danger' role='alert'>"; - addedDiv += errorMessage; - addedDiv += "<button type='button' class='close' data-dismiss='alert' aria-label='Close'><span aria-hidden='true'>×</span></button></div>"; + var newMessage = $("#nameErrorMessage").clone(); $("#message-container").empty(); - $("#message-container").append(addedDiv); + $("#message-container").append(newMessage); + newMessage.removeClass("hidden"); $('html, body').animate({ scrollTop: $("#message-container").offset().top }, 750); diff --git a/studs.php b/studs.php index 461d86d92c310233014c0e5a2792179865d9aac3..1bfbb525bd99c0a569bd980c2626353376a407f1 100644 --- a/studs.php +++ b/studs.php @@ -203,5 +203,6 @@ $smarty->assign('editingVoteId', $editingVoteId); $smarty->assign('message', $message); $smarty->assign('admin', false); $smarty->assign('parameter_name_regex', NAME_REGEX); +$smarty->assign('parameter_name_error', _('Name is incorrect.')); $smarty->display('studs.tpl'); diff --git a/tpl/studs.tpl b/tpl/studs.tpl index b83f36ade6924782a106af06210f3feed65fd067..2c9b381939cb703e4a5560bdb79f4a60df237c7a 100644 --- a/tpl/studs.tpl +++ b/tpl/studs.tpl @@ -6,13 +6,16 @@ {block name=main} + <div id="message-container"> {if !empty($message)} <div class="alert alert-dismissible alert-{$message->type|html}" role="alert">{$message->message|html}<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button></div> {/if} </div> + <div id="nameErrorMessage" class="hidden alert alert-dismissible alert-danger" role="alert">{__('PollInfo\\The name is invalid.')}<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button></div> + -{* Global informations about the current poll *} + {* Global informations about the current poll *} {include 'part/poll_info.tpl' admin=$admin} @@ -45,7 +48,6 @@ <div class="hidden"> <p id="parameter_name_regex">{$parameter_name_regex}</p> - <p id="parameter_name_error">{__('Error','Name is incorrect.')|var_dump}</p> </div>