Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

display-settings: Move emoticons option after emoji style. 

This new position is clearer about its role.
This commit is contained in:
Tim Abbott 2018-03-23 14:38:00 -07:00
parent b42a7b1701
commit 4b8dda24d0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
static/templates/settings/display-settings.handlebars
View File

@ -85,19 +85,6 @@
<h3 class="inline-block light">Emoji style</h3> <h3 class="inline-block light">Emoji style</h3>
<div class="alert-notification" id="emoji-settings-status"></div> <div class="alert-notification" id="emoji-settings-status"></div>
<div class="input-group side-padded-container">
<label class="checkbox">
<input type="checkbox" name="translate_emoticons" id="translate_emoticons"
{{#if page_params.translate_emoticons}}
checked="checked"
{{/if}} />
<span></span>
</label>
<label for="translate_emoticons" class="inline-block">
{{t "Translate emoticons (convert <code>:)</code> to 😃 in messages)" }}
</label>
</div>
<div class="input-group side-padded-container"> <div class="input-group side-padded-container">
<div class="emojiset_choices grey-box"> <div class="emojiset_choices grey-box">
{{#each page_params.emojiset_choices }} {{#each page_params.emojiset_choices }}
@ -118,5 +105,18 @@
{{/each}} {{/each}}
</div> </div>
</div> </div>
<div class="input-group side-padded-container">
<label class="checkbox">
<input type="checkbox" name="translate_emoticons" id="translate_emoticons"
{{#if page_params.translate_emoticons}}
checked="checked"
{{/if}} />
<span></span>
</label>
<label for="translate_emoticons" class="inline-block">
{{t "Translate emoticons (convert <code>:)</code> to 😃 in messages)" }}
</label>
</div>
</form> </form>
</div> </div>