diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs index dd991aa114..54743b948f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs @@ -20,6 +20,12 @@ namespace Volo.CmsKit.Web { options.ReactionIcons[StandardReactions.Smile] = new LocalizableIconDictionary("/cms-kit/icons/smile.png"); options.ReactionIcons[StandardReactions.ThumbsUp] = new LocalizableIconDictionary("/cms-kit/icons/thumbsup.png"); + options.ReactionIcons[StandardReactions.Confused] = new LocalizableIconDictionary("/cms-kit/icons/confused.png"); + options.ReactionIcons[StandardReactions.Eyes] = new LocalizableIconDictionary("/cms-kit/icons/eyes.png"); + options.ReactionIcons[StandardReactions.Heart] = new LocalizableIconDictionary("/cms-kit/icons/heart.png"); + options.ReactionIcons[StandardReactions.Hooray] = new LocalizableIconDictionary("/cms-kit/icons/hooray.png"); + options.ReactionIcons[StandardReactions.Rocket] = new LocalizableIconDictionary("/cms-kit/icons/rocket.png"); + options.ReactionIcons[StandardReactions.ThumbsDown] = new LocalizableIconDictionary("/cms-kit/icons/thumbsdown.png"); }); Configure(options => diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/confused.png b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/confused.png new file mode 100644 index 0000000000..4ecf0c98c1 Binary files /dev/null and b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/confused.png differ diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/eyes.png b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/eyes.png new file mode 100644 index 0000000000..0b11401c9e Binary files /dev/null and b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/eyes.png differ diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/heart.png b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/heart.png new file mode 100644 index 0000000000..578091d6d2 Binary files /dev/null and b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/heart.png differ diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/hooray.png b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/hooray.png new file mode 100644 index 0000000000..5a6d5af253 Binary files /dev/null and b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/hooray.png differ diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/rocket.png b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/rocket.png new file mode 100644 index 0000000000..e72bb81025 Binary files /dev/null and b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/rocket.png differ diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/thumbsdown.png b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/thumbsdown.png new file mode 100644 index 0000000000..aef5b5c317 Binary files /dev/null and b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/cms-kit/icons/thumbsdown.png differ diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Reactions/StandardReactions.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Reactions/StandardReactions.cs index db1a4ebaea..69a2d4c73a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Reactions/StandardReactions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Reactions/StandardReactions.cs @@ -2,7 +2,13 @@ { public static class StandardReactions { - public const string Smile = "SM"; - public const string ThumbsUp = "TU"; + public const string Smile = "_SM"; + public const string ThumbsUp = "_TU"; + public const string ThumbsDown = "_TD"; + public const string Confused = "_CF"; + public const string Eyes = "_EY"; + public const string Heart = "_HE"; + public const string Hooray = "_HO"; + public const string Rocket = "_RO"; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs index 4fbdf07204..e67bca57df 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs @@ -16,6 +16,12 @@ namespace Volo.CmsKit { options.Reactions.AddOrReplace(StandardReactions.Smile); options.Reactions.AddOrReplace(StandardReactions.ThumbsUp); + options.Reactions.AddOrReplace(StandardReactions.ThumbsDown); + options.Reactions.AddOrReplace(StandardReactions.Confused); + options.Reactions.AddOrReplace(StandardReactions.Eyes); + options.Reactions.AddOrReplace(StandardReactions.Heart); + options.Reactions.AddOrReplace(StandardReactions.Hooray); + options.Reactions.AddOrReplace(StandardReactions.Rocket); }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml index 4a4ee6cfb5..adaa925a55 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml @@ -1,18 +1,19 @@ @model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewModel - + @foreach (var reaction in Model.Reactions.Where(r => r.Count > 0)) { - - @(reaction.Count) + + + @(reaction.Count) } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.css index e984fa3d77..8e27846c5c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.css +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.css @@ -5,9 +5,9 @@ .cms-reaction-icon { cursor: pointer; - padding: 2px; + padding: 3px 5px 5px; } .cms-reaction-icon-selected { - background-color: #eee; + background-color: #eef; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js index 62a060a543..7901557e72 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js @@ -4,8 +4,8 @@ var myDefaultWhiteList = $.fn.tooltip.Constructor.Default.whiteList; - if (myDefaultWhiteList.img.indexOf('data-name') < 0) { - myDefaultWhiteList['img'].push('data-name'); + if (myDefaultWhiteList.span.indexOf('data-reaction-name') < 0) { + myDefaultWhiteList.span.push('data-reaction-name'); } $(document).ready(function () { @@ -30,7 +30,7 @@ var methodName = $icon.hasClass('cms-reaction-icon-selected') ? 'delete' : 'create'; volo.cmsKit.reactions.reactionPublic[methodName]( $.extend(getFilters(), { - reactionName: $icon.attr('data-name') + reactionName: $icon.attr('data-reaction-name') }) ).then(function () { $selectIcon.popover('hide'); @@ -45,6 +45,7 @@ $selectIcon.popover({ placement: 'right', html: true, + trigger: 'focus', title: l('PickYourReaction'), content: $popoverContent.html() }).on('shown.bs.popover', function () {