diff --git a/app/views/account/bits.scala b/app/views/account/bits.scala index 5c99b164b2..ce40637e2e 100644 --- a/app/views/account/bits.scala +++ b/app/views/account/bits.scala @@ -28,6 +28,6 @@ object bits { case PrefCateg.GameDisplay => trans.preferences.gameDisplay.txt() case PrefCateg.ChessClock => trans.preferences.chessClock.txt() case PrefCateg.GameBehavior => trans.preferences.gameBehavior.txt() - case PrefCateg.Privacy => trans.privacy.txt() + case PrefCateg.Site => "Site settings" } } diff --git a/app/views/account/pref.scala b/app/views/account/pref.scala index d55a6b76d1..3de7f3cddb 100644 --- a/app/views/account/pref.scala +++ b/app/views/account/pref.scala @@ -79,10 +79,6 @@ object pref { zenMode(), radios(form("display.zen"), booleanChoices) ), - setting( - showPlayerRatings(), - radios(form("display.ratings"), booleanChoices) - ), setting( displayBoardResizeHandle(), radios(form("display.resizeHandle"), translatedBoardResizeHandleChoices) @@ -165,7 +161,7 @@ object pref { radios(form("behavior.scrollMoves"), booleanChoices) ) ), - categFieldset(PrefCateg.Privacy, categ)( + categFieldset(PrefCateg.Site, categ)( setting( trans.letOtherPlayersFollowYou(), radios(form("follow"), booleanChoices) @@ -189,6 +185,15 @@ object pref { setting( trans.shareYourInsightsData(), radios(form("insightShare"), translatedInsightShareChoices) + ), + setting( + showPlayerRatings(), + frag( + radios(form("ratings"), booleanChoices), + div(cls := "help text shy", dataIcon := "")( + "This allows hiding all ratings from the website, to help focus on the chess. Games can still be rated, this is only about what you get to see." + ) + ) ) ), p(cls := "saved text none", dataIcon := "")(yourPreferencesHaveBeenSaved()) diff --git a/modules/pref/src/main/PrefCateg.scala b/modules/pref/src/main/PrefCateg.scala index 8927c43e09..f05ac5e24b 100644 --- a/modules/pref/src/main/PrefCateg.scala +++ b/modules/pref/src/main/PrefCateg.scala @@ -7,9 +7,9 @@ object PrefCateg { case object GameDisplay extends PrefCateg("game-display") case object ChessClock extends PrefCateg("chess-clock") case object GameBehavior extends PrefCateg("game-behavior") - case object Privacy extends PrefCateg("privacy") + case object Site extends PrefCateg("site") - val all: List[PrefCateg] = List(GameDisplay, ChessClock, GameBehavior, Privacy) + val all: List[PrefCateg] = List(GameDisplay, ChessClock, GameBehavior, Site) - def apply(slug: String) = all find (_.slug == slug) + def apply(slug: String) = all.find(_.slug == slug) } diff --git a/modules/pref/src/main/PrefForm.scala b/modules/pref/src/main/PrefForm.scala index 577520c7a2..c296b075af 100644 --- a/modules/pref/src/main/PrefForm.scala +++ b/modules/pref/src/main/PrefForm.scala @@ -27,7 +27,6 @@ object PrefForm { "replay" -> checkedNumber(Pref.Replay.choices), "pieceNotation" -> optional(booleanNumber), "zen" -> optional(booleanNumber), - "ratings" -> optional(booleanNumber), "resizeHandle" -> optional(checkedNumber(Pref.ResizeHandle.choices)), "blindfold" -> checkedNumber(Pref.Blindfold.choices) )(DisplayData.apply)(DisplayData.unapply), @@ -53,7 +52,8 @@ object PrefForm { "message" -> checkedNumber(Pref.Message.choices), "studyInvite" -> optional(checkedNumber(Pref.StudyInvite.choices)), "mention" -> optional(booleanNumber), - "insightShare" -> numberIn(Set(0, 1, 2)) + "insightShare" -> numberIn(Set(0, 1, 2)), + "ratings" -> optional(booleanNumber) )(PrefData.apply)(PrefData.unapply) ) @@ -66,7 +66,6 @@ object PrefForm { replay: Int, pieceNotation: Option[Int], zen: Option[Int], - ratings: Option[Int], resizeHandle: Option[Int], blindfold: Int ) @@ -99,7 +98,8 @@ object PrefForm { message: Int, studyInvite: Option[Int], mention: Option[Int], - insightShare: Int + insightShare: Int, + ratings: Option[Int] ) { def apply(pref: Pref) = @@ -129,7 +129,7 @@ object PrefForm { captured = display.captured == 1, keyboardMove = behavior.keyboardMove | pref.keyboardMove, zen = display.zen | pref.zen, - ratings = display.ratings | pref.ratings, + ratings = ratings | pref.ratings, resizeHandle = display.resizeHandle | pref.resizeHandle, rookCastle = behavior.rookCastle | pref.rookCastle, pieceNotation = display.pieceNotation | pref.pieceNotation, @@ -149,7 +149,6 @@ object PrefForm { captured = if (pref.captured) 1 else 0, blindfold = pref.blindfold, zen = pref.zen.some, - ratings = pref.ratings.some, resizeHandle = pref.resizeHandle.some, pieceNotation = pref.pieceNotation.some ), @@ -175,7 +174,8 @@ object PrefForm { message = pref.message, studyInvite = pref.studyInvite.some, mention = (if (pref.mention) 1 else 0).some, - insightShare = pref.insightShare + insightShare = pref.insightShare, + ratings = pref.ratings.some ) }