Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 05:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into 'dev'

Browse source 
poll UI strings

See merge request zot/zap!25
This commit is contained in:
Zot 2020-03-02 03:08:47 +01:00
commit 427490ff35
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/conversation.php
View file

@ -1386,7 +1386,10 @@ function z_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'),

1
view/css/conversation.css
View file

@ -13,6 +13,7 @@
right: 0;
top: 0;
padding: 0.25rem 0 0.25rem 0.5rem;
cursor: pointer;
}
#jot-title-wrap,

14
view/tpl/jot.tpl
View file

@ -60,26 +60,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>