From 19f4ad74dd6fc86bdd341f197e7949674bf13ebf Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 25 Aug 2022 02:28:17 -0500 Subject: [PATCH] various small fixes to layout --- .../src/main/web/css/gemp-001/hall.css | 17 +- .../src/main/web/includes/help.html | 727 +++++++++--------- .../src/main/web/includes/help/coc.html | 133 ++-- .../src/main/web/js/gemp-022/chat.js | 4 +- gemp-lotr/todo.txt | 14 +- 5 files changed, 457 insertions(+), 438 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css index d10f7f30f..3427186f9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css +++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css @@ -141,12 +141,11 @@ textarea, input { /*filter: brightness(50%) contrast(150%);*/ /*background: radial-gradient(circle at center, red 0, blue, green 100%);*/ /*overflow-x: hidden;*/ - +overflow-y: auto; } #hall-content { - position: relative; - z-index: 2; + } #serverInfo { @@ -550,8 +549,8 @@ table.tables tr.privateForPlayer { #disclaimer { color: #ffffff; font-size: 70%; - position: absolute; - bottom: -15px; + position: relative; + text-align: center; } .ui-button-text-only .ui-button-text { @@ -574,4 +573,10 @@ table.tables tr.privateForPlayer { - +#helpMain { + height: 100%; + min-height: 100%; + max-height: 100%; + width: 100%; + overflow-y: auto; +} diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html index 6f5b4a846..5fba3edff 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html @@ -1,10 +1,42 @@ -
- + + +
+
+ +
+ test1 +
+
+ test2 +
+
+ test3 +
+
+
+ + + + + + + +--> \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/help/coc.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/help/coc.html index 7ecf5f19b..7499bdc5a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/help/coc.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/help/coc.html @@ -1,82 +1,51 @@ -

The Gemp-LotR sever is devoted to fans of Decipher’s Lord of the Rings Card Game. We want GEMP to be a place where - everyone, regardless of who they are, can gather to socialize, talk, and play Lord of the Rings with like-minded - people in a safe and welcoming environment. This is a family game and this is a family friendly server. In order - to make that happen we have certain rules we ask all members of our community to adhere to. These rules will be - vigorously enforced so that a handful of bad apples don't spoil it for everyone else.

-

Don't Cheat

-

Cheating includes but is not limited to the following:

- -

Don't Be a Jerk

-

This rule trumps any other. Any loophole you think you've found in any other rule is covered by this one. If you make - our server a less pleasant place to be, we don't want you here and we have no problem revoking your account. - Here are a couple of the things you should stay away from:

- -

If you find someone is violating one of these rules, report them to TLHH and let the moderators do their job. - Responding to a troll or someone who may have flamed you will only get you in trouble. Report, ignore and move - on the community at large will be better for it.

-

Have Respect for Others

-

Everyone is entitled to their opinion, but no one is entitled to attack others for sharing, or not sharing, - that opinion. If you can't communicate without using combative, aggressive, or demeaning language, then please - keep those comments to yourself, or be shown the door. Deliberately inflammatory remarks in game chat or the game - hall; statements written with the sole intention of irritating people; attacks toward or inappropriate commentary - regarding GEMP-LotR staff, creators, or other players will limit or remove your GEMP-LotR privileges.

-

Have Respect for the Site and its Content

-

MarcinS and others have put a lot of work into the content on the site, and if you've just shown up to trample on - that hard work, we will ask you to leave. Constructive criticism is welcomed; negativity for its own sake is not. - Further, discussions instructing or otherwise advocating the circumvention of Code of Conduct will not be tolerated.

-

Put Some Effort Into Your Communication

-

A well-written comment engages your opponent and the rest of the game hall and facilitates discussion. We ask that - while in game hall or game chat you avoid posting about or linking to the following:

- -

Penalties

-

(Keep in mind, that banning a user takes us less time, than it takes you to create a new one.)

-

The penalty system is meant to provide guidance to users - it allows users to better understand the rules and adjust - their conduct to conform to the expectations of the GEMP-LotR community which may differ from other Internet game - sites. GEMP-LotR uses a strike system that grants you a maximum amount of 8 penalties to learn how to adhere to our - server policies. Once a threshold has been broken, there is no way to gain strikes back. Here is the breakdown - of all 8 stages:

- -

We do not enjoy banning people, but we will not hesitate to do so if we think that a person's removal will have - an overall positive effect on the community. We also reserve the right to increase the punishment as we see fit, - and any punishment above a warning will put the user at a minimum on the probationary level.

-

Appeal System

-

Moderators and staff are human and sometimes make mistakes. For this reason, we have an appeal system that members - can utilize to plead their case in hopes of a reversal of a penalty. Once you have received a penalty, you may - appeal your penalty via private e-mail. Discussion of penalties/conduct or ranting against a suspension on TLHH - forums will not advance your appellant case. If you choose to use the appeal system, please make sure to check your - spam folder for an email.

-

All appeals are normally seen within 48 hours of your appeal, except on weekends.

+
+

The Gemp-LotR sever is devoted to fans of Decipher’s Lord of the Rings Card Game. We want GEMP to be a place where everyone, regardless of who they are, can gather to socialize, talk, and play Lord of the Rings with like-minded people in a safe and welcoming environment. This is a family game and this is a family friendly server. In order to make that happen we have certain rules we ask all members of our community to adhere to. These rules will be vigorously enforced so that a handful of bad apples don't spoil it for everyone else.

+ +

Don't Cheat

+

Cheating includes but is not limited to the following:

+
    +
  • Gold Farming - Creating multiple accounts to abuse the merchant system to the benefit of primary account decreases the value of everyone’s my-card collections. Don’t do it.
    • +
  • Collusion (Game Fixing) - Soliciting or agreeing with an opponent to end any ranked match in any way other than playing it to conclusion detracts from the integrity of the league or tournament.
    • +
  • Exploiting the Sever - Knowingly utilizing a system error or card bug to your advantage.
    • +
  • Multiple Accounts - Entering a league or tournament with multiple accounts is not acceptable. If you have more than one family member using your network contact MarcinS. Otherwise a member with multiple accounts found entering a league or tournament will have those accounts deleted.
    • +
+ +

Don't Be a Jerk

+

This rule trumps any other. Any loophole you think you've found in any other rule is covered by this one. If you make our server a less pleasant place to be, we don't want you here and we have no problem revoking your account.
Here are a couple of the things you should stay away from:

+
    +
  • Flaming - Calling people names, this includes calling others a troll. Personal attacks are unacceptable.
    • +
  • Rage Quitting - Leaving a GEMP-LotR game without first hitting the concede button. It is found in the options tab of the chat window.
    • +
  • Trolling - Posting inflammatory, extraneous or off-topic messages with the primary intent of provoking readers into an emotional response or otherwise intentionally disrupting a game (even if that game is your own)
    • +
  • Offensive language - Please read what you wrote before you post it and think if anyone else could find it offensive, including but not limited to your standard 4-letter words. This also includes attacks against race, religion, culture, class, or sexuality.
    • +
  • Rants - You can disagree with whatever you like but using obscene language and/or a full CAPS chat is against our policies. We are sure you can find another way to voice your opinion without being aggressive, regardless of whom it is directed at.
    • +
  • Ban Jumping - If you create another account after being permanently banned, suspended or on probation, both of your accounts will be automatically banned.
    • +
+

If you find someone is violating one of these rules, report them to TLHH and let the moderators do their job. Responding to a troll or someone who may have flamed you will only get you in trouble. Report, ignore and move on the community at large will be better for it.

+

Have Respect for Others

+

Everyone is entitled to their opinion, but no one is entitled to attack others for sharing, or not sharing, that opinion. If you can't communicate without using combative, aggressive, or demeaning language, then please keep those comments to yourself, or be shown the door. Deliberately inflammatory remarks in game chat or the game hall; statements written with the sole intention of irritating people; attacks toward or inappropriate commentary regarding GEMP-LotR staff, creators, or other players will limit or remove your GEMP-LotR privileges.

+

Have Respect for the Site and its Content

+

MarcinS and others have put a lot of work into the content on the site, and if you've just shown up to trample on that hard work, we will ask you to leave. Constructive criticism is welcomed; negativity for its own sake is not. Further, discussions instructing or otherwise advocating the circumvention of Code of Conduct will not be tolerated.

+ +

Put Some Effort Into Your Communication

+

A well-written comment engages your opponent and the rest of the game hall and facilitates discussion. We ask that while in game hall or game chat you avoid posting about or linking to the following:

+
    +
  • Pedophilia
    • +
  • Pornography
    • +
  • Sexist, Racist or Perverted Remarks
    • +
+

Penalties

+

(Keep in mind, that banning a user takes us less time, than it takes you to create a new one.)

+

The penalty system is meant to provide guidance to users - it allows users to better understand the rules and adjust their conduct to conform to the expectations of the GEMP-LotR community which may differ from other Internet game sites. GEMP-LotR uses a strike system that grants you a maximum amount of 8 penalties to learn how to adhere to our server policies. Once a threshold has been broken, there is no way to gain strikes back. Here is the breakdown of all 8 stages:

+
    +
  • Up to 4 Warnings - Warnings do not negatively impact your account but will stack against you for penalties.
    • +
  • Probation - This is your final warning. Once you receive probation, you are always on probation. All penalties after this will be suspensions.
    • +
  • 3-day Suspension - You will be unable to log into the site for three days.
    • +
  • 2-week Suspension - You will be unable to log into for two weeks.
    • +
  • Permanent Ban - Your privilege to play Lord of the Rings on the site will be revoked permanently.
    • +
+

We do not enjoy banning people, but we will not hesitate to do so if we think that a person's removal will have an overall positive effect on the community. We also reserve the right to increase the punishment as we see fit, and any punishment above a warning will put the user at a minimum on the probationary level.

+

Appeal System

+

Moderators and staff are human and sometimes make mistakes. For this reason, we have an appeal system that members can utilize to plead their case in hopes of a reversal of a penalty. Once you have received a penalty, you may appeal your penalty via private e-mail. Discussion of penalties/conduct or ranting against a suspension on TLHH forums will not advance your appellant case. If you choose to use the appeal system, please make sure to check your spam folder for an email.

+ +

All appeals are normally seen within 48 hours of your appeal, except on weekends.

+
\ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js index 7919f9704..5860a1bec 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js @@ -65,8 +65,8 @@ var ChatBoxUI = Class.extend({ this.comm.getPlayerInfo(function(json) { that.userName = json; - that.pingRegex = new RegExp("@" + json); - that.mentionRegex = new RegExp("(?)" + json ); + that.pingRegex = new RegExp("@" + json + "\\b"); + that.mentionRegex = new RegExp("(?)\\b" + json + "\\b"); }, this.chatErrorMap()); diff --git a/gemp-lotr/todo.txt b/gemp-lotr/todo.txt index 69f0326bc..d74a13295 100644 --- a/gemp-lotr/todo.txt +++ b/gemp-lotr/todo.txt @@ -1,4 +1,5 @@ +- add links to the users list to their profiles - add email column to user - add email field to register form - create auth attempt database @@ -19,6 +20,8 @@ - auto-accept - always display drop-down - Phase auto-skip array + - manage user ignore list + - - create password reset process - if email is authenticated, email is sent to address with a link to password reset API @@ -41,4 +44,13 @@ Strategy: - add password reset - require all new accounts to register email before playing - bug existing users to register email with a month's warning - - after a month or so, require all existing users to register email before playing \ No newline at end of file + - after a month or so, require all existing users to register email before playing + + +adobe suggested color pallete based on back of card: + +#D98E04 - bright orange +#BF6B04 - orange +#A63F03 - dark orange +#590902 - dark red +#0D0D0D - black \ No newline at end of file