UX: Changed error draft status to icon (#7369)
This commit is contained in:
parent
cbe7166d87
commit
1d0816b2cf
|
@ -164,7 +164,9 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
|
{{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
|
||||||
{{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
|
{{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
|
||||||
{{model.draftStatus}}
|
{{#if model.draftStatus}}
|
||||||
|
<span title="{{model.draftStatus}}">{{d-icon 'user-edit'}}</span>
|
||||||
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -307,6 +307,11 @@
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#draft-status .d-icon-user-edit {
|
||||||
|
color: $danger;
|
||||||
|
font-size: 20px;
|
||||||
|
vertical-align: -5.5px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.composer-bottom-right {
|
.composer-bottom-right {
|
||||||
|
|
|
@ -181,6 +181,7 @@ module SvgSprite
|
||||||
"unlock-alt",
|
"unlock-alt",
|
||||||
"upload",
|
"upload",
|
||||||
"user",
|
"user",
|
||||||
|
"user-edit",
|
||||||
"user-plus",
|
"user-plus",
|
||||||
"user-secret",
|
"user-secret",
|
||||||
"user-times",
|
"user-times",
|
||||||
|
|
|
@ -4,7 +4,7 @@ acceptance("Composer - Edit conflict", {
|
||||||
loggedIn: true
|
loggedIn: true
|
||||||
});
|
});
|
||||||
|
|
||||||
QUnit.skip("Edit a post that causes an edit conflict", async assert => {
|
QUnit.test("Edit a post that causes an edit conflict", async assert => {
|
||||||
// prettier-ignore
|
// prettier-ignore
|
||||||
server.put("/posts/398", () => [ // eslint-disable-line no-undef
|
server.put("/posts/398", () => [ // eslint-disable-line no-undef
|
||||||
409, { "Content-Type": "application/json" }, { errors: ["edit conflict"] }
|
409, { "Content-Type": "application/json" }, { errors: ["edit conflict"] }
|
||||||
|
@ -21,6 +21,11 @@ QUnit.skip("Edit a post that causes an edit conflict", async assert => {
|
||||||
I18n.t("composer.overwrite_edit"),
|
I18n.t("composer.overwrite_edit"),
|
||||||
"it shows the overwrite button"
|
"it shows the overwrite button"
|
||||||
);
|
);
|
||||||
|
assert.ok(
|
||||||
|
find("#draft-status .d-icon-user-edit"),
|
||||||
|
"error icon should be there"
|
||||||
|
);
|
||||||
|
await click(".modal .btn-primary");
|
||||||
});
|
});
|
||||||
|
|
||||||
QUnit.test(
|
QUnit.test(
|
||||||
|
|
Loading…
Reference in New Issue