Skip to content
Snippets Groups Projects
Commit a2abaef0 authored by gnaegi's avatar gnaegi
Browse files

OO-1741 remove ? from dummy avatar images, adding anonymous avatar and...

OO-1741 remove ? from dummy avatar images, adding anonymous avatar and removing old avatar images outside the theme
parent bdff440a
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 4 deletions
...@@ -67,6 +67,7 @@ public class DisplayPortraitController extends BasicController implements Generi ...@@ -67,6 +67,7 @@ public class DisplayPortraitController extends BasicController implements Generi
private final boolean useLarge; private final boolean useLarge;
private final boolean displayPortraitImage; private final boolean displayPortraitImage;
private final boolean isAnonymous;
/** /**
* most common used constructor<br /> * most common used constructor<br />
...@@ -114,6 +115,7 @@ public class DisplayPortraitController extends BasicController implements Generi ...@@ -114,6 +115,7 @@ public class DisplayPortraitController extends BasicController implements Generi
this.useLarge = useLarge; this.useLarge = useLarge;
this.portraitIdent = portraitIdent; this.portraitIdent = portraitIdent;
this.displayPortraitImage = displayPortraitImage; this.displayPortraitImage = displayPortraitImage;
this.isAnonymous = ureq.getUserSession().getRoles().isGuestOnly();
mapper = new UserAvatarMapper(useLarge); mapper = new UserAvatarMapper(useLarge);
mapperPath = registerMapper(ureq, mapper); mapperPath = registerMapper(ureq, mapper);
...@@ -150,6 +152,8 @@ public class DisplayPortraitController extends BasicController implements Generi ...@@ -150,6 +152,8 @@ public class DisplayPortraitController extends BasicController implements Generi
portrait = DisplayPortraitManager.getInstance().getBigPortrait(portraitIdent.getName()); portrait = DisplayPortraitManager.getInstance().getBigPortrait(portraitIdent.getName());
if (portrait != null) { if (portrait != null) {
myContent.contextPut("portraitCssClass", DisplayPortraitManager.AVATAR_BIG_CSS_CLASS); myContent.contextPut("portraitCssClass", DisplayPortraitManager.AVATAR_BIG_CSS_CLASS);
} else if (isAnonymous) {
myContent.contextPut("portraitCssClass", DisplayPortraitManager.ANONYMOUS_BIG_CSS_CLASS);
} else if (gender.equals("-")) { } else if (gender.equals("-")) {
myContent.contextPut("portraitCssClass", DisplayPortraitManager.DUMMY_BIG_CSS_CLASS); myContent.contextPut("portraitCssClass", DisplayPortraitManager.DUMMY_BIG_CSS_CLASS);
} else if (gender.equals("male")) { } else if (gender.equals("male")) {
...@@ -161,6 +165,8 @@ public class DisplayPortraitController extends BasicController implements Generi ...@@ -161,6 +165,8 @@ public class DisplayPortraitController extends BasicController implements Generi
portrait = DisplayPortraitManager.getInstance().getSmallPortrait(portraitIdent.getName()); portrait = DisplayPortraitManager.getInstance().getSmallPortrait(portraitIdent.getName());
if (portrait != null) { if (portrait != null) {
myContent.contextPut("portraitCssClass", DisplayPortraitManager.AVATAR_SMALL_CSS_CLASS); myContent.contextPut("portraitCssClass", DisplayPortraitManager.AVATAR_SMALL_CSS_CLASS);
} else if (isAnonymous) {
myContent.contextPut("portraitCssClass", DisplayPortraitManager.ANONYMOUS_SMALL_CSS_CLASS);
} else if (gender.equals("-")) { } else if (gender.equals("-")) {
myContent.contextPut("portraitCssClass", DisplayPortraitManager.DUMMY_SMALL_CSS_CLASS); myContent.contextPut("portraitCssClass", DisplayPortraitManager.DUMMY_SMALL_CSS_CLASS);
} else if (gender.equals("male")) { } else if (gender.equals("male")) {
......
...@@ -56,6 +56,8 @@ public class DisplayPortraitManager extends BasicManager implements UserDataDele ...@@ -56,6 +56,8 @@ public class DisplayPortraitManager extends BasicManager implements UserDataDele
// The following class names refer to CSS class names in olat.css // The following class names refer to CSS class names in olat.css
public static final String AVATAR_BIG_CSS_CLASS = "o_portrait_avatar"; public static final String AVATAR_BIG_CSS_CLASS = "o_portrait_avatar";
public static final String AVATAR_SMALL_CSS_CLASS = "o_portrait_avatar_small"; public static final String AVATAR_SMALL_CSS_CLASS = "o_portrait_avatar_small";
public static final String ANONYMOUS_BIG_CSS_CLASS = "o_portrait_anonymous";
public static final String ANONYMOUS_SMALL_CSS_CLASS = "o_portrait_anonymous_small";
public static final String DUMMY_BIG_CSS_CLASS = "o_portrait_dummy"; public static final String DUMMY_BIG_CSS_CLASS = "o_portrait_dummy";
public static final String DUMMY_SMALL_CSS_CLASS = "o_portrait_dummy_small"; public static final String DUMMY_SMALL_CSS_CLASS = "o_portrait_dummy_small";
public static final String DUMMY_FEMALE_BIG_CSS_CLASS = "o_portrait_dummy_female_big"; public static final String DUMMY_FEMALE_BIG_CSS_CLASS = "o_portrait_dummy_female_big";
......
src/main/webapp/static/images/user/dummy.png

5.04 KiB

src/main/webapp/static/images/user/dummy_female_big.png

4.91 KiB

src/main/webapp/static/images/user/dummy_female_small.png

3.51 KiB

src/main/webapp/static/images/user/dummy_male_big.png

4.69 KiB

src/main/webapp/static/images/user/dummy_male_small.png

3.42 KiB

src/main/webapp/static/images/user/dummy_small.png

3.55 KiB

src/main/webapp/static/themes/light/images/portrait/anonymous.png

3.51 KiB

src/main/webapp/static/themes/light/images/portrait/anonymous_small.png

959 B

src/main/webapp/static/themes/light/images/portrait/dummy.png

5.04 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy.png

2.86 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy.png
src/main/webapp/static/themes/light/images/portrait/dummy.png
src/main/webapp/static/themes/light/images/portrait/dummy.png
src/main/webapp/static/themes/light/images/portrait/dummy.png
  • 2-up
  • Swipe
  • Onion skin
File added
src/main/webapp/static/themes/light/images/portrait/dummy_female_big.png

4.91 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_female_big.png

2.71 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_female_big.png
src/main/webapp/static/themes/light/images/portrait/dummy_female_big.png
src/main/webapp/static/themes/light/images/portrait/dummy_female_big.png
src/main/webapp/static/themes/light/images/portrait/dummy_female_big.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/images/portrait/dummy_female_small.png

3.51 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_female_small.png

722 B | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_female_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_female_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_female_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_female_small.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/images/portrait/dummy_male_big.png

4.69 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_male_big.png

2.27 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_male_big.png
src/main/webapp/static/themes/light/images/portrait/dummy_male_big.png
src/main/webapp/static/themes/light/images/portrait/dummy_male_big.png
src/main/webapp/static/themes/light/images/portrait/dummy_male_big.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/images/portrait/dummy_male_small.png

3.42 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_male_small.png

684 B | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_male_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_male_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_male_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_male_small.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/images/portrait/dummy_small.png

3.55 KiB | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_small.png

741 B | W: | H:

src/main/webapp/static/themes/light/images/portrait/dummy_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_small.png
src/main/webapp/static/themes/light/images/portrait/dummy_small.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -234,7 +234,15 @@ ul.o_dropdown { ...@@ -234,7 +234,15 @@ ul.o_dropdown {
} }
} }
/* Dummy user portrait (avatar) display - portrait sizes must match with DisplayPortraitManager.WIDTH_PORTRAIT_SMALL DisplayPortraitManager.WIDTH_PORTRAIT_BIG */ /* Dummy user portrait (avatar) display - portrait sizes must match with DisplayPortraitManager.WIDTH_PORTRAIT_SMALL DisplayPortraitManager.WIDTH_PORTRAIT_BIG
Dummy is used for registered users which have no personal avatar image.
- dummy is used if gender is not known
- dummy_female is used for femal users
- dummy_male is used for male users
Anonymous is used for guest users and in anonymous chat / forum postings
*/
.o_portrait_avatar, .o_portrait_avatar,
.o_portrait_dummy, .o_portrait_dummy,
.o_portrait_dummy_female_big, .o_portrait_dummy_female_big,
...@@ -243,7 +251,7 @@ ul.o_dropdown { ...@@ -243,7 +251,7 @@ ul.o_dropdown {
.o_portrait_dummy {background-image: url('#{$o-images-path}portrait/dummy.png');} .o_portrait_dummy {background-image: url('#{$o-images-path}portrait/dummy.png');}
.o_portrait_dummy_female_big {background-image: url('#{$o-images-path}portrait/dummy_female_big.png');} .o_portrait_dummy_female_big {background-image: url('#{$o-images-path}portrait/dummy_female_big.png');}
.o_portrait_dummy_male_big {background-image: url('#{$o-images-path}portrait/dummy_male_big.png');} .o_portrait_dummy_male_big {background-image: url('#{$o-images-path}portrait/dummy_male_big.png');}
.o_portrait_anonymous {background-image: url('#{$o-images-path}portrait/dummy.png'); } .o_portrait_anonymous {background-image: url('#{$o-images-path}portrait/anonymous.png'); }
.o_portrait_avatar_small, .o_portrait_avatar_small,
.o_portrait_dummy_small, .o_portrait_dummy_small,
...@@ -253,7 +261,7 @@ ul.o_dropdown { ...@@ -253,7 +261,7 @@ ul.o_dropdown {
.o_portrait_dummy_small {background-image: url('#{$o-images-path}portrait/dummy_small.png');} .o_portrait_dummy_small {background-image: url('#{$o-images-path}portrait/dummy_small.png');}
.o_portrait_dummy_female_small {background-image: url('#{$o-images-path}portrait/dummy_female_small.png');} .o_portrait_dummy_female_small {background-image: url('#{$o-images-path}portrait/dummy_female_small.png');}
.o_portrait_dummy_male_small {background-image: url('#{$o-images-path}portrait/dummy_male_small.png');} .o_portrait_dummy_male_small {background-image: url('#{$o-images-path}portrait/dummy_male_small.png');}
.o_portrait_anonymous_small {background-image: url('#{$o-images-path}portrait/dummy_small.png'); } .o_portrait_anonymous_small {background-image: url('#{$o-images-path}portrait/anonymous_small.png'); }
/* Date component, used in info course element, blog etc */ /* Date component, used in info course element, blog etc */
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment