Commit c6ad2fc5 authored by Clément Damiens's avatar Clément Damiens
Browse files

Merged branch master into development

parents 383c9dec 0dc657db
......@@ -694,9 +694,9 @@ function initPageTable(number){
mylog.log(".openCoopPanelHtml vote");
afterLoad = function() {
setTimeout(function(){
$("#coop-container").animate({
scrollTop: $("#podVote").offset().top
}, 1000);
// $("#coop-container").animate({
// scrollTop: $("#podVote").offset().top
// }, 1000);
}, 1000);
};
}
......@@ -752,6 +752,7 @@ function initPageTable(number){
mylog.log("send vote",voteValue);
uiCoop.sendVote("proposal", idParentProposal, voteValue, idParentRoom, null, true);
});
}
function initBtnShare(){
......
......@@ -565,6 +565,7 @@ var trad = {
"isupport":"<?php echo Yii::t("common","I support") ?>",
"cool":"<?php echo Yii::t("common","Cool") ?>",
"answer":"<?php echo Yii::t("comment","answer") ?>",
"answerOn":"<?php echo Yii::t("common","Answer") ?>",
"answers":"<?php echo Yii::t("comment","answers") ?>",
"burk":"<?php echo Yii::t("common", "Buuurk") ?>",
"what":"<?php echo Yii::t("common", "What ?") ?>",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment