github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-20 23:31:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add spinner to composer saving

Browse Source
This commit is contained in:
Robin Ward
2015-10-13 13:05:55 -04:00
parent 7ceecb0989
commit ae4ef1e70f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/composer.hbs
View File

@ -113,7 +113,6 @@
<a href {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a> <a href {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{else}} {{else}}
<div class='row'> <div class='row'>
@ -122,7 +121,7 @@
{{#if model.createdPost}} {{#if model.createdPost}}
{{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a> {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
{{else}} {{else}}
{{i18n 'composer.saving'}} {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
{{/if}} {{/if}}
</div> </div>
<div class='draft-text'> <div class='draft-text'>

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

@ -38,6 +38,12 @@
} }
} }
.saving-text .spinner {
display: inline-block;
left: 5px;
top: 4px;
}
div.ac-wrap.disabled { div.ac-wrap.disabled {
input { input {
display:none; display:none;
@ -47,7 +53,6 @@ div.ac-wrap.disabled {
} }
} }
div.ac-wrap { div.ac-wrap {
background-color: $secondary; background-color: $secondary;
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);

2
config/locales/client.en.yml
View File

@ -870,7 +870,7 @@ en:
show_edit_reason: "(add edit reason)" show_edit_reason: "(add edit reason)"
reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images." reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."
view_new_post: "View your new post." view_new_post: "View your new post."
saving: "Saving..." saving: "Saving"
saved: "Saved!" saved: "Saved!"
saved_draft: "Post draft in progress. Select to resume." saved_draft: "Post draft in progress. Select to resume."
uploading: "Uploading..." uploading: "Uploading..."