diff --git a/addons/website_slides/data/slide_channel_tag_demo.xml b/addons/website_slides/data/slide_channel_tag_demo.xml index aa4d31c33e7..cf522d9877d 100644 --- a/addons/website_slides/data/slide_channel_tag_demo.xml +++ b/addons/website_slides/data/slide_channel_tag_demo.xml @@ -6,14 +6,17 @@ Basic + 10 Intermediate + 3 Advanced + 1 @@ -23,14 +26,17 @@ Gardener + 10 Carpenter + 11 Furniture Designer + 3 @@ -40,10 +46,11 @@ Certification + 7 Dog Friendly - \ No newline at end of file + diff --git a/addons/website_slides/models/slide_channel_tag.py b/addons/website_slides/models/slide_channel_tag.py index a6abfd4c38f..67c62cf742d 100644 --- a/addons/website_slides/models/slide_channel_tag.py +++ b/addons/website_slides/models/slide_channel_tag.py @@ -30,3 +30,4 @@ class SlideChannelTag(models.Model): 'Group sequence', related='group_id.sequence', index=True, readonly=True, store=True) channel_ids = fields.Many2many('slide.channel', 'slide_channel_tag_rel', 'tag_id', 'channel_id', string='Channels') + color = fields.Integer(string='Color Index', help="Color to apply to this tag (including in website).") diff --git a/addons/website_slides/static/src/scss/website_slides.scss b/addons/website_slides/static/src/scss/website_slides.scss index fdff5ace23d..815ae9aa050 100644 --- a/addons/website_slides/static/src/scss/website_slides.scss +++ b/addons/website_slides/static/src/scss/website_slides.scss @@ -58,6 +58,36 @@ $o-wslides-fs-side-width: 300px; } } +// Color tags according to assigned background color. +.o_wslides_channel_tag { + vertical-align: middle; + @for $size from 1 through length($o-colors) { + &.o_tag_color_#{$size - 1} { + $background-color: white; + // no color selected + @if $size == 1 { + & { + color: black; + background-color: $background-color; + box-shadow: inset 0 0 0 1px nth($o-colors, $size); + } + } @else { + $background-color: nth($o-colors, $size); + & { + color: white; + background-color: $background-color; + } + } + @at-root a#{&} { + &:hover { + color: color-yiq($background-color); + background-color: darken($background-color, 10%); + } + } + } + } +} + .o_wslides_body { background-color: $o-wslides-color-bg; diff --git a/addons/website_slides/views/slide_channel_tag_views.xml b/addons/website_slides/views/slide_channel_tag_views.xml index b30738f5d06..b4c4e9ab12e 100644 --- a/addons/website_slides/views/slide_channel_tag_views.xml +++ b/addons/website_slides/views/slide_channel_tag_views.xml @@ -74,6 +74,7 @@ + diff --git a/addons/website_slides/views/slide_channel_views.xml b/addons/website_slides/views/slide_channel_views.xml index a0922b398fe..c2df312e124 100644 --- a/addons/website_slides/views/slide_channel_views.xml +++ b/addons/website_slides/views/slide_channel_views.xml @@ -57,7 +57,7 @@
- +
diff --git a/addons/website_slides/views/website_slides_templates_course.xml b/addons/website_slides/views/website_slides_templates_course.xml index 5fe76ff83fc..75396abceb0 100644 --- a/addons/website_slides/views/website_slides_templates_course.xml +++ b/addons/website_slides/views/website_slides_templates_course.xml @@ -196,7 +196,7 @@ diff --git a/addons/website_slides/views/website_slides_templates_profile.xml b/addons/website_slides/views/website_slides_templates_profile.xml index e310abf9b30..d1a5a3f60e4 100644 --- a/addons/website_slides/views/website_slides_templates_profile.xml +++ b/addons/website_slides/views/website_slides_templates_profile.xml @@ -50,7 +50,7 @@