IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove last few curly-component invocations

Browse Source
This commit is contained in:
David Taylor
2022-07-04 17:01:01 +01:00
parent cfde4419f5
commit c011dd7b43
51 changed files with 582 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/poll/assets/javascripts/discourse/templates/modal/poll-breakdown.hbs
View File

@@ -1,4 +1,4 @@
{{#d-modal-body title="poll.breakdown.title"}}
<DModalBody @title="poll.breakdown.title">
<div class="poll-breakdown-sidebar">
<p class="poll-breakdown-title">
{{this.title}}
@@ -8,16 +8,7 @@
<ul class="poll-breakdown-options">
{{#each this.model.poll.options as |option index|}}
{{poll-breakdown-option
option=option
index=index
totalVotes=this.totalVotes
optionsCount=this.model.poll.options.length
displayMode=this.displayMode
highlightedOption=this.highlightedOption
onMouseOver=(fn (mut this.highlightedOption) index)
onMouseOut=(fn (mut this.highlightedOption) null)
}}
<PollBreakdownOption @option={{option}} @index={{index}} @totalVotes={{this.totalVotes}} @optionsCount={{this.model.poll.options.length}} @displayMode={{this.displayMode}} @highlightedOption={{this.highlightedOption}} @onMouseOver={{fn (mut this.highlightedOption) index}} @onMouseOut={{fn (mut this.highlightedOption) null}} />
{{/each}}
</ul>
</div>
@@ -26,25 +17,13 @@
<div class="poll-breakdown-body-header">
<label class="poll-breakdown-body-header-label">{{i18n "poll.breakdown.breakdown"}}</label>
{{combo-box
content=this.groupableUserFields
value=this.groupedBy
nameProperty="label"
class="poll-breakdown-dropdown"
onChange=(action this.setGrouping)
}}
<ComboBox @content={{this.groupableUserFields}} @value={{this.groupedBy}} @nameProperty="label" @class="poll-breakdown-dropdown" @onChange={{action this.setGrouping}} />
</div>
<div class="poll-breakdown-charts">
{{#each this.charts as |chart|}}
{{poll-breakdown-chart
group=(get chart "group")
options=(get chart "options")
displayMode=this.displayMode
highlightedOption=this.highlightedOption
setHighlightedOption=(fn (mut this.highlightedOption))
}}
<PollBreakdownChart @group={{get chart "group"}} @options={{get chart "options"}} @displayMode={{this.displayMode}} @highlightedOption={{this.highlightedOption}} @setHighlightedOption={{fn (mut this.highlightedOption)}} />
{{/each}}
</div>
</div>
{{/d-modal-body}}
</DModalBody>

85
plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
View File

@@ -1,4 +1,4 @@
{{#d-modal-body title="poll.ui_builder.title" class="poll-ui-builder"}}
<DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
<div class="input-group poll-type">
<a href {{action (mut pollType) "regular"}} class="poll-type-value {{if isRegular "active"}}">
{{i18n "poll.ui_builder.poll_type.regular"}}
@@ -18,7 +18,7 @@
{{#if showAdvanced}}
<div class="input-group poll-title">
<label class="input-group-label">{{i18n "poll.ui_builder.poll_title.label"}}</label>
{{input value=pollTitle}}
<Input @value={{pollTitle}} />
</div>
{{/if}}
@@ -26,27 +26,27 @@
<div class="poll-options">
{{#if showAdvanced}}
<label class="input-group-label">{{i18n "poll.ui_builder.poll_options.label"}}</label>
{{textarea value=pollOptionsText input=(action "onOptionsTextChange")}}
<Textarea @value={{pollOptionsText}} @input={{action "onOptionsTextChange"}} />
{{#if showMinNumOfOptionsValidation}}
{{#unless minNumOfOptionsValidation.ok}}
{{input-tip validation=minNumOfOptionsValidation}}
<InputTip @validation={{minNumOfOptionsValidation}} />
{{/unless}}
{{/if}}
{{else}}
{{#each pollOptions as |option|}}
<div class="input-group poll-option-value">
{{input value=option.value enter=(action "addOption" option)}}
<Input @value={{option.value}} @enter={{action "addOption" option}} />
{{#if canRemoveOption}}
{{d-button icon="trash-alt" action=(action "removeOption" option)}}
<DButton @icon="trash-alt" @action={{action "removeOption" option}} />
{{/if}}
</div>
{{/each}}
<div class="poll-option-controls">
{{d-button class="btn-default" icon="plus" label="poll.ui_builder.poll_options.add" action=(action "addOption" pollOptions.lastObject)}}
<DButton @class="btn-default" @icon="plus" @label="poll.ui_builder.poll_options.add" @action={{action "addOption" pollOptions.lastObject}} />
{{#if (and showMinNumOfOptionsValidation (not minNumOfOptionsValidation.ok))}}
{{input-tip validation=minNumOfOptionsValidation}}
<InputTip @validation={{minNumOfOptionsValidation}} />
{{/if}}
</div>
{{/if}}
@@ -57,69 +57,41 @@
<div class="options">
<div class="input-group poll-number">
<label class="input-group-label">{{i18n "poll.ui_builder.poll_config.min"}}</label>
{{input type="number"
value=pollMin
valueProperty="value"
class="poll-options-min"
min=1}}
<Input @type="number" @value={{pollMin}} @valueProperty="value" class="poll-options-min" @min={{1}} />
</div>
<div class="input-group poll-number">
<label class="input-group-label">{{i18n "poll.ui_builder.poll_config.max"}}</label>
{{input type="number"
value=pollMax
valueProperty="value"
class="poll-options-max"
min=1}}
<Input @type="number" @value={{pollMax}} @valueProperty="value" class="poll-options-max" @min={{1}} />
</div>
{{#if isNumber}}
<div class="input-group poll-number">
<label class="input-group-label">{{i18n "poll.ui_builder.poll_config.step"}}</label>
{{input type="number"
value=pollStep
valueProperty="value"
min="1"
class="poll-options-step"}}
<Input @type="number" @value={{pollStep}} @valueProperty="value" @min="1" class="poll-options-step" />
</div>
{{/if}}
</div>
{{#unless minMaxValueValidation.ok}}
{{input-tip validation=minMaxValueValidation}}
<InputTip @validation={{minMaxValueValidation}} />
{{/unless}}
{{/unless}}
{{#if showAdvanced}}
<div class="input-group poll-allowed-groups">
<label class="input-group-label">{{i18n "poll.ui_builder.poll_groups.label"}}</label>
{{group-chooser
content=siteGroups
value=pollGroups
onChange=(action (mut pollGroups))
labelProperty="name"
valueProperty="name"}}
<GroupChooser @content={{siteGroups}} @value={{pollGroups}} @onChange={{action (mut pollGroups)}} @labelProperty="name" @valueProperty="name" />
</div>
<div class="input-group poll-date">
<label class="input-group-label">{{i18n "poll.ui_builder.automatic_close.label"}}</label>
{{date-time-input
date=pollAutoClose
onChange=(action (mut pollAutoClose))
clearable=true
useGlobalPickerContainer=true
}}
<DateTimeInput @date={{pollAutoClose}} @onChange={{action (mut pollAutoClose)}} @clearable={{true}} @useGlobalPickerContainer={{true}} />
</div>
<div class="input-group poll-select">
<label class="input-group-label">{{i18n "poll.ui_builder.poll_result.label"}}</label>
{{combo-box
content=pollResults
value=pollResult
class="poll-result"
valueProperty="value"
onChange=(action (mut pollResult))
}}
<ComboBox @content={{pollResults}} @value={{pollResult}} @class="poll-result" @valueProperty="value" @onChange={{action (mut pollResult)}} />
</div>
{{#unless isNumber}}
@@ -127,12 +99,12 @@
<label class="input-group-label">{{i18n "poll.ui_builder.poll_chart_type.label"}}</label>
<div class="radio-group">
{{radio-button id="poll-chart-type-bar" name="poll-chart-type" value="bar" selection=chartType}}
<RadioButton @id="poll-chart-type-bar" @name="poll-chart-type" @value="bar" @selection={{chartType}} />
<label for="poll-chart-type-bar">{{d-icon "chart-bar"}} {{i18n "poll.ui_builder.poll_chart_type.bar"}}</label>
</div>
<div class="radio-group">
{{radio-button id="poll-chart-type-pie" name="poll-chart-type" value="pie" selection=chartType}}
<RadioButton @id="poll-chart-type-pie" @name="poll-chart-type" @value="pie" @selection={{chartType}} />
<label for="poll-chart-type-pie">{{d-icon "chart-pie"}} {{i18n "poll.ui_builder.poll_chart_type.pie"}}</label>
</div>
</div>
@@ -141,31 +113,18 @@
{{#unless isPie}}
<div class="input-group poll-checkbox column">
<label>
{{input type="checkbox" checked=publicPoll}}
<Input @type="checkbox" @checked={{publicPoll}} />
{{i18n "poll.ui_builder.poll_public.label"}}
</label>
</div>
{{/unless}}
{{/if}}
{{/d-modal-body}}
</DModalBody>
<div class="modal-footer">
{{d-button
action=(action "insertPoll")
icon="chart-bar"
class="btn-primary"
label="poll.ui_builder.insert"
disabled=disableInsert}}
<DButton @action={{action "insertPoll"}} @icon="chart-bar" @class="btn-primary" @label="poll.ui_builder.insert" @disabled={{disableInsert}} />
{{d-button
label="cancel"
class="btn-flat"
action=(route-action "closeModal")
}}
<DButton @label="cancel" @class="btn-flat" @action={{route-action "closeModal"}} />
{{d-button
action=(action "toggleAdvanced")
class="btn-default show-advanced"
icon="cog"
title=(if showAdvanced "poll.ui_builder.hide_advanced" "poll.ui_builder.show_advanced")}}
<DButton @action={{action "toggleAdvanced"}} @class="btn-default show-advanced" @icon="cog" @title={{if showAdvanced "poll.ui_builder.hide_advanced" "poll.ui_builder.show_advanced"}} />
</div>