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

Rename auto-update-input to more accurate future-date-input

Browse Source
This commit is contained in:
Robin Ward 2017-09-14 10:19:52 -04:00
parent 6bce3004d9
commit 8323e22d0c
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
View File

@ -1,7 +1,7 @@
{{#d-modal-body title="admin.user.suspend_modal_title"}} {{#d-modal-body title="admin.user.suspend_modal_title"}}
<div class='until-controls'> <div class='until-controls'>
<label> <label>
{{auto-update-input {{future-date-input
class="suspend-until" class="suspend-until"
label="admin.user.suspend_duration" label="admin.user.suspend_duration"
input=suspendUntil}} input=suspendUntil}}

6
app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6 → app/assets/javascripts/discourse/components/future-date-input-selector.js.es6
View File

@ -15,7 +15,7 @@ export const SET_BASED_ON_LAST_POST = 'set_based_on_last_post';
export const FORMAT = 'YYYY-MM-DD HH:mm'; export const FORMAT = 'YYYY-MM-DD HH:mm';
export default Combobox.extend({ export default Combobox.extend({
classNames: ['auto-update-input-selector'], classNames: ['future-date-input-selector'],
isCustom: Ember.computed.equal("value", PICK_DATE_AND_TIME), isCustom: Ember.computed.equal("value", PICK_DATE_AND_TIME),
@computed() @computed()
@ -128,13 +128,13 @@ export default Combobox.extend({
let output = ""; let output = "";
if (!Ember.isEmpty(icons)) { if (!Ember.isEmpty(icons)) {
output += `<span class='auto-update-input-selector-icons'>${icons}</span>`; output += `<span class='future-date-input-selector-icons'>${icons}</span>`;
} }
output += `<span>${state.text}</span>`; output += `<span>${state.text}</span>`;
if (time) { if (time) {
output += `<span class='auto-update-input-selector-datetime'>${time}</span>`; output += `<span class='future-date-input-selector-datetime'>${time}</span>`;
} }
return output; return output;

2
app/assets/javascripts/discourse/components/auto-update-input.js.es6 → app/assets/javascripts/discourse/components/future-date-input.js.es6
View File

@ -3,7 +3,7 @@ import {
FORMAT, FORMAT,
PICK_DATE_AND_TIME, PICK_DATE_AND_TIME,
SET_BASED_ON_LAST_POST SET_BASED_ON_LAST_POST
} from "discourse/components/auto-update-input-selector"; } from "discourse/components/future-date-input-selector";
import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer'; import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';

4
app/assets/javascripts/discourse/templates/components/auto-update-input.hbs → app/assets/javascripts/discourse/templates/components/future-date-input.hbs
View File

@ -1,8 +1,8 @@
<div class="auto-update-input"> <div class="future-date-input">
<div class="control-group"> <div class="control-group">
<label>{{displayLabel}}</label> <label>{{displayLabel}}</label>
{{auto-update-input-selector {{future-date-input-selector
valueAttribute="id" valueAttribute="id"
minimumResultsForSearch=-1 minimumResultsForSearch=-1
statusType=statusType statusType=statusType

6
app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
View File

@ -6,7 +6,7 @@
<div> <div>
{{#if showTimeOnly}} {{#if showTimeOnly}}
{{auto-update-input {{future-date-input
input=updateTime input=updateTime
statusType=selection statusType=selection
basedOnLastPost=false}} basedOnLastPost=false}}
@ -18,13 +18,13 @@
excludeCategoryId=excludeCategoryId}} excludeCategoryId=excludeCategoryId}}
</div> </div>
{{auto-update-input {{future-date-input
input=updateTime input=updateTime
statusType=selection statusType=selection
categoryId=topicTimer.category_id categoryId=topicTimer.category_id
basedOnLastPost=false}} basedOnLastPost=false}}
{{else if autoClose}} {{else if autoClose}}
{{auto-update-input {{future-date-input
input=updateTime input=updateTime
statusType=selection statusType=selection
basedOnLastPost=topicTimer.based_on_last_post basedOnLastPost=topicTimer.based_on_last_post

2
app/assets/stylesheets/common/base/compose.scss
View File

@ -135,7 +135,7 @@ div.ac-wrap {
} }
} }
.auto-update-input { .future-date-input {
.examples { .examples {
color: lighten($primary, 40%); color: lighten($primary, 40%);
} }

2
app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
View File

@ -16,7 +16,7 @@
margin-right: 10px; margin-right: 10px;
} }
.auto-update-input { .future-date-input {
input { input {
margin: 0; margin: 0;
} }

2
app/assets/stylesheets/common/base/modal.scss
View File

@ -298,7 +298,7 @@
} }
.edit-category-modal { .edit-category-modal {
.auto-update-input, .num-featured-topics-fields, .position-fields { .future-date-input, .num-featured-topics-fields, .position-fields {
input[type=text] { input[type=text] {
width: 50px; width: 50px;
} }

4
app/assets/stylesheets/common/components/auto-update-input-selector.scss → app/assets/stylesheets/common/components/future-date-input-selector.scss
View File

@ -1,9 +1,9 @@
.auto-update-input-selector-datetime { .future-date-input-selector-datetime {
float: right; float: right;
color: lighten($primary, 40%); color: lighten($primary, 40%);
font-size: 13px; font-size: 13px;
} }
.auto-update-input-selector-icons { .future-date-input-selector-icons {
margin-right: 10px; margin-right: 10px;
} }

2
app/assets/stylesheets/desktop/compose.scss
View File

@ -305,7 +305,7 @@
display: block; display: block;
bottom: 8px; bottom: 8px;
} }
.auto-update-input .examples { .future-date-input .examples {
margin-top: 0; margin-top: 0;
padding-bottom: 8px; padding-bottom: 8px;
} }

2
app/assets/stylesheets/mobile/topic.scss
View File

@ -207,7 +207,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
} }
.edit-topic-timer-modal { .edit-topic-timer-modal {
.auto-update-input { .future-date-input {
.alert-info { .alert-info {
margin: 0 -10px -10px -10px; margin: 0 -10px -10px -10px;
padding: 10px; padding: 10px;