aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php5
-rw-r--r--view/css/conversation.css1
-rwxr-xr-xview/tpl/jot.tpl14
3 files changed, 12 insertions, 8 deletions
diff --git a/include/conversation.php b/include/conversation.php
index ba0f61196..62d4b405f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1442,7 +1442,10 @@ function hz_status_editor($a, $x, $popup = false) {
'$setloc' => $setloc,
'$voting' => t('Toggle voting'),
'$poll' => t('Toggle poll'),
- '$multiple_answers' => ['poll_multiple_answers', t("Allow multiple answers")],
+ '$poll_option_label' => t('Option'),
+ '$poll_add_option_label' => t('Add option'),
+ '$poll_expire_unit_label' => [t('Minutes'), t('Hours'), t('Days')],
+ '$multiple_answers' => ['poll_multiple_answers', t("Allow multiple answers"), '', '', [t('No'), t('Yes')]],
'$feature_voting' => $feature_voting,
'$consensus' => ((array_key_exists('item',$x)) ? $x['item']['item_consensus'] : 0),
'$nocommenttitle' => t('Disable comments'),
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 287d662ae..77e56e200 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -13,6 +13,7 @@
right: 0;
top: 0;
padding: 0.25rem 0 0.25rem 0.5rem;
+ cursor: pointer;
}
#jot-title-wrap,
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 9f2860b2f..4a9717c01 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -62,26 +62,26 @@
<div id="jot-poll-wrap" class="p-2 d-none">
<div id="jot-poll-options">
<div class="jot-poll-option form-group">
- <input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="Option">
+ <input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="{{$poll_option_label}}">
</div>
<div class="jot-poll-option form-group">
- <input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="Option">
+ <input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="{{$poll_option_label}}">
</div>
</div>
{{include file="field_checkbox.tpl" field=$multiple_answers}}
<div id="jot-poll-tools" class="clearfix">
<div id="poll-tools-left" class="float-left">
- <button id="jot-add-option" class="btn btn-outline-secondary btn-sm" type="button" title="" onclick="">
- <i class="fa fa-plus"></i> Add option
+ <button id="jot-add-option" class="btn btn-outline-secondary btn-sm" type="button">
+ <i class="fa fa-plus"></i> {{$poll_add_option_label}}
</button>
</div>
<div id="poll-tools-right" class="float-right">
<div class="input-group">
<input type="text" name="poll_expire_value" class="form-control" value="10" size="3">
<select class="form-control" id="duration-select" name="poll_expire_unit">
- <option value="Minutes">min</option>
- <option value="Hours">h</option>
- <option value="Days" selected="selected">d</option>
+ <option value="Minutes">{{$poll_expire_unit_label.0}}</option>
+ <option value="Hours">{{$poll_expire_unit_label.1}}</option>
+ <option value="Days" selected="selected">{{$poll_expire_unit_label.2}}</option>
</select>
</div>
</div>