diff --git a/css/osticket.css b/css/osticket.css index 5ec2e8e295a2dd2c6d555e62f0c162c63a838b29..1638f464cf1e8fb79e2f84866dacecbc9073213f 100644 --- a/css/osticket.css +++ b/css/osticket.css @@ -67,3 +67,17 @@ input.dp { height:16px; background:inherit; } + +.draft-saved { + background-color: black; + background-color: rgba(0, 0, 0, 0.7); + color: white; + padding: 4px 8px 6px; + border-radius: 3px; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + line-height: 14px; +} + +.delete-draft:hover { + background-color: #fc9f41 !important; +} diff --git a/css/redactor.css b/css/redactor.css index 7217297491a91fb8b46d1be452540dfc34d25d54..ea84c64ef5f2562de15b623d79c20be44d8cfbb8 100644 --- a/css/redactor.css +++ b/css/redactor.css @@ -363,6 +363,7 @@ body .redactor_air .redactor_toolbar { outline: none; background-color: #1f78d8; color: #fff; + text-decoration: none; } .redactor_toolbar li a:hover i:before { color: #fff; diff --git a/include/i18n/en_US/help/tips/settings.alerts.yaml b/include/i18n/en_US/help/tips/settings.alerts.yaml index 5a37ac2275de5013e432926db53b73ce6762f984..b114af2e765fdb7bdefe6d71960b788b66f232c6 100644 --- a/include/i18n/en_US/help/tips/settings.alerts.yaml +++ b/include/i18n/en_US/help/tips/settings.alerts.yaml @@ -72,7 +72,7 @@ transfer_alert: overdue_alert: title: Overdue Ticket Alert content: > - Alerts sent out when a ticket becomes overdue based on SLA or Overdue Date. + Alert sent out when a ticket becomes overdue based on SLA or Overdue Date. links: - title: Default Stale Ticket Alert Template href: /scp/templates.php?default_for=ticket.overdue diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js index e648f0aa4385175f58116f3a65b822bd6d81633e..53e99b393192f3309c472417fc3b19ac2ead3d80 100644 --- a/js/redactor-osticket.js +++ b/js/redactor-osticket.js @@ -27,24 +27,19 @@ RedactorPlugins.draft = { this.opts.initCallback = this.recoverDraft; this.$draft_saved = $('<span>') - .addClass("pull-right draft-saved faded") + .addClass("pull-right draft-saved") .css({'position':'absolute','top':'3em','right':'0.5em'}) .hide() .append($('<span>') .text('Draft Saved')); + // Float the [Draft Saved] box with the toolbar + this.$toolbar.append(this.$draft_saved); if (this.opts.draftDelete) { - this.$draft_saved.append($('<span>') - .css({'padding-left':'1em', 'cursor':'pointer'}) - .click($.proxy(function() { - this.deleteDraft(); - return false; - }, this)) - .append($('<i>') - .addClass('icon-trash') - ) - ); + var trash = this.buttonAdd('deleteDraft', 'Delete Draft', this.deleteDraft); + this.buttonAwesome('deleteDraft', 'icon-trash'); + trash.parent().addClass('pull-right'); + trash.addClass('delete-draft'); } - this.$toolbar.append(this.$draft_saved); }, recoverDraft: function() { var self = this; diff --git a/scp/css/scp.css b/scp/css/scp.css index 493f6dc34db877f6c73fe91feb7c5e53f56b41ca..676449d0733c52a02ba6edf1ad9d7fe978e43be3 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -1826,3 +1826,7 @@ table.custom-info td { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); line-height: 14px; } + +.delete-draft:hover { + background-color: #fc9f41 !important; +}