From 38fe7d1942acfaaa3c0b21872ccb5793046bf527 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 00:11:34 -0700 Subject: [PATCH 01/12] Changed "I'm Done" to "Close" --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 69136a5..0c93fa3 100644 --- a/index.html +++ b/index.html @@ -77,7 +77,7 @@
- I'm Done + Close
From 583e33ec754100881d7d9d2fc62d60dc08022379 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 01:16:19 -0700 Subject: [PATCH 02/12] Updated Server Conduct Policy --- css/main.css | 3 ++- index.html | 49 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/css/main.css b/css/main.css index 1402398..4f85565 100644 --- a/css/main.css +++ b/css/main.css @@ -82,7 +82,8 @@ body { .rule { z-index: 100; display: none; - padding: 30px + padding: 30px; + text-align: left; } #rules-title, diff --git a/index.html b/index.html index 0c93fa3..c04f72d 100644 --- a/index.html +++ b/index.html @@ -82,26 +82,44 @@
-

Server Rules

+
+

Server Conduct Policy

-

No Malicious Actions

-

Do not attempt to cause harm to the server. This can include, intentionally crashing the server, lagging the server, destroying or damaging the spawn, destroying or damaging other player's builds, erasing warp points, PVP without agreement of other players (or in a forbidden gamemode), chat spamming, and so forth.
Use your best judgment, and remember that other people are on here to have fun also.

+

Category 1 (Permanent Bannable Offenses)

+
+

a. Attempts at harming the server.

+

b. Repeated rule-breaking (recurring category 2 & 3 offenses or punishment bypassing).

+

c. Attempting to or successfully DDoSing or doxing any (ex)member of TotalFreedom.

+

d. Impersonating any (ex)member of TotalFreedom.

+

e. Framing any (ex)member of TotalFreedom.

+

f. Unauthorized access to admin-exclusive resources.

+

g. Using an exploit that restricts a players experience.

+

h. Attempts to harm any (ex)member of TotalFreedom.

+

i. Threatening to commit/committing illegal activities that violate US Law on any official TotalFreedom platform.

+
-

No Imposing

-

Do not pose as the server owner (scripthead) and do not pose as an admin or one of the other regular players that use Total Freedom. By imposing, that means you are using a program such as MinecraftSP, changing your nick or using a tag to make yourself appear as a member of staff. You may not use nicks or tags that imply you have an official position on the server. This includes any nick or tag including the words admin, senior, owner, telnet, builder, architect, coder, dev, programmer, mod, security, or any nick or tag that the owner or a senior admin believes is an attempt to impose or show that you have an invalid staff position. In such cases, the offender will be de-nicked, have their tag removed or could be banned depending if the offense repeats itself. Changing your in-game name to a "famous" (like Notch) via a hacked client is okay provided you do not use it to violate the rules of the server. In such cases, the offender's IP may be banned or permbanned based on the severity of the action.

+

Category 2 (Temporary Bannable Offenses)

+
+

a. Modifying other players’ builds (with intent) without permission from the builder.

+

b. Tricking players into breaking a rule.

+

c. Repeated offenses from Category 3 (Minor Offense).

+

d. Posting links to NSFW, scams, gore, or money soliciting sites.

+

e. Self-harm or suicide threats.

+ +
-

Respect Privacy

-

Respect the "Total Freedom" of other players and admins. Do not be a pest or a nuisance to others, and respect their privacy. Do not "help" with builds if people do not want you to, and do not teleport someone without their permission. It is best to use /tpahere to request for someone to teleport to you, rather than forcefully teleporting them.

-
-
-

Respect others

-

Do not engage in personal attacks on other players/admins and take all personal disputes off the server. If you don't like a particular player, feel more than free to use the ignore command on them but personal wars on the server won't be tolerated regardless of who started it and temporary bans will result. If you're coming on the server to troll other players, you'll end up getting trolled yourself (we love to play with trolls). Similarly, threats to DOX, threats to commit illegal acts (e.g. DDOS), graphic sexual discussion or RP, linking to porn or scam sites, racist attacks, and other forms of behavior designed to offend, intimidate or harass will not be tolerated.

-
-
-

Adhere to Authority

-

Do not override the actions of the server owners or other admins. For example, if an admin de-ops or bans a player for griefing, you may not re-op or pardon them without permission. Super admins will follow the directions of senior admins with respect to any admin matter unless it violates server rules. If it violates the rules, the admin will notify the proper authority.

+

Category 3 (Minor Offenses)

+
+

a. Bigotry.

+

b. Spamming commands or chat.

+

c. Being a nuisance to other players.

+

d. Interfering with an admin doing their job.

+

e. Having a nickname that is unreadable, i.e. admins cannot use /realname on it.

+

f. A tag/nick that implies an official rank that they do not have or one that impersonates another player.

+

g. Pornographic builds if in a 250 block radius of spawn.

+

h. Advertising a server more than once in a 1 hour period.

    @@ -122,6 +140,7 @@

    Gamemodes

    You are free to use creative or survival mode on the server. For creative, type /creative. For survival, type /survival.

+
From 49062de5ad4b25ea52edd03eac61482f3ca34d25 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 01:26:09 -0700 Subject: [PATCH 03/12] Aligned #rule-title (not sure why it is an ID) left --- css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/main.css b/css/main.css index 4f85565..d441100 100644 --- a/css/main.css +++ b/css/main.css @@ -23,6 +23,7 @@ body { padding: 10px 55px; background: rgba(255, 255, 255, 0.1); color: #c8c8c8; + text-align: left; } #rules-title:hover, From 0db981a6cc65abe7dfb5df91788ad906d5065bbe Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 11:55:47 -0700 Subject: [PATCH 04/12] Fixed Favicon --- masterbuilders/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/masterbuilders/index.html b/masterbuilders/index.html index d054716..a168b49 100644 --- a/masterbuilders/index.html +++ b/masterbuilders/index.html @@ -32,8 +32,8 @@ - - + + From 95a8995be7cc4c399fd877456ecccb64454de421 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 12:01:29 -0700 Subject: [PATCH 05/12] I am dumb --- masterbuilders/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/masterbuilders/index.html b/masterbuilders/index.html index a168b49..14e4262 100644 --- a/masterbuilders/index.html +++ b/masterbuilders/index.html @@ -32,7 +32,7 @@ - + From 33446ab77c964850ed12e58446196fc9b8b231f0 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 16:06:29 -0700 Subject: [PATCH 06/12] Code cleanup/beautified --- calc/index.html | 131 ++++---- calc/script.js | 32 +- calc/style.css | 13 +- css/conduct.css | 73 ++-- css/main.css | 35 +- index.html | 439 ++++++++++++++----------- js/index.js | 118 +++---- js/main.js | 4 +- masterbuilders/assets/css/builders.css | 11 +- masterbuilders/assets/js/builders.js | 18 +- masterbuilders/index.html | 211 +++++++----- staff/index.html | 152 +++++---- 12 files changed, 694 insertions(+), 543 deletions(-) diff --git a/calc/index.html b/calc/index.html index 072deb1..c1a123c 100644 --- a/calc/index.html +++ b/calc/index.html @@ -1,80 +1,83 @@ - + + Admin Application Calculator - - -

Admin Application Calculator

-
-
+ + + +

Admin Application Calculator

+
+

Application Type:

+ +
+
+
+

Operator:

-
-

Operator:

-
-
- - -
-
- - -
+ +
-
-

Super Admin:

-
-
- - - -
-
- - - -
-
-
-
-

Telnet Admin:

-
-
- - -
-
- - -
-
-
-
-

Senior Admin:

-
-
- -
-
- -
-
-
-
-

Score:

-

0 points / 0 votes

-

0% (0%)

-

Status: N/A

-
+ +
- +
+
+

Super Admin:

+
+
+ + + +
+
+ + + +
+
+
+
+

Telnet Admin:

+
+
+ + +
+
+ + +
+
+
+
+

Senior Admin:

+
+
+ +
+
+ +
+
+
+
+

Score:

+

0 points / 0 votes

+

0% (0%)

+

Status: N/A

+
+
+
+ + \ No newline at end of file diff --git a/calc/script.js b/calc/script.js index 0151062..3ad5d96 100644 --- a/calc/script.js +++ b/calc/script.js @@ -5,8 +5,7 @@ var rounded_percentage = 0; var application_type = "super"; var approved = false; -function submit_vote(points) -{ +function submit_vote(points) { total_points += points; total_votes++; percentage = (total_points / total_votes) * 100; @@ -14,38 +13,27 @@ function submit_vote(points) update_score(); } -function update_score() -{ +function update_score() { document.getElementById("points").innerHTML = total_points; document.getElementById("total_votes").innerHTML = total_votes; document.getElementById("rounded_percentage").innerHTML = rounded_percentage; document.getElementById("percentage").innerHTML = percentage; application_type = document.getElementById("type").value; - - if (application_type == "super" && rounded_percentage >= 60) - { + + if (application_type == "super" && rounded_percentage >= 60) { approved = true; - } - else if (application_type == "telnet" && rounded_percentage >= 65) - { + } else if (application_type == "telnet" && rounded_percentage >= 65) { approved = true; - } - else if (application_type == "senior" && rounded_percentage >= 70) - { + } else if (application_type == "senior" && rounded_percentage >= 70) { approved = true; - } - else - { + } else { approved = false; } - - if (approved) - { + + if (approved) { document.getElementById("status").style = "color: #0f0;"; document.getElementById("status").innerHTML = "Accepted"; - } - else - { + } else { document.getElementById("status").style = "color: #f00;"; document.getElementById("status").innerHTML = "Denied"; } diff --git a/calc/style.css b/calc/style.css index 7da023c..1ab3215 100644 --- a/calc/style.css +++ b/calc/style.css @@ -30,14 +30,15 @@ select { color: white; cursor: pointer; -webkit-appearance: none; - +} + select::before { - border-bottom-style: solid; - border-top: none; + border-bottom-style: solid; + border-top: none; } select:after { - margin-top: 7px; - border-top-style: solid; - border-bottom: none; + margin-top: 7px; + border-top-style: solid; + border-bottom: none; } \ No newline at end of file diff --git a/css/conduct.css b/css/conduct.css index d33279c..1300ea1 100644 --- a/css/conduct.css +++ b/css/conduct.css @@ -2,10 +2,12 @@ body { background: #222 url("../images/conduct-bg.png") fixed no-repeat center center; background-size: cover; font-family: 'Roboto', sans-serif; - margin-bottom: 50px; } + margin-bottom: 50px; +} .brand-logo { - font-family: 'Raleway', sans-serif !important; } + font-family: 'Raleway', sans-serif !important; +} .content { margin: 50px auto; @@ -13,30 +15,43 @@ body { width: 90%; color: #eee; height: 100%; - background: rgba(34, 34, 34, 0.6); } - .content h1 { - margin-top: 5.17241px; - font-size: 1.3em; - font-weight: 900; - text-transform: uppercase; - border-bottom: 1px solid #ccc; - padding: 0 0 10px; } - .content h3 { - font-size: 1.05em; - font-weight: 600; } - .content li { - padding: 5px; } - .content .warning { - color: #F44336; - padding: 1px 10px; - border-left: 3px solid #F44336; - display: block; } - .content a { - color: #bbb; - padding: 2px; - -webkit-transition: all .3s ease-in-out; - -o-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; - border-bottom: 1px hidden #ccc; } - .content a:hover { - border-bottom: 1px solid #ccc; } + background: rgba(34, 34, 34, 0.6); +} + +.content h1 { + margin-top: 5.17241px; + font-size: 1.3em; + font-weight: 900; + text-transform: uppercase; + border-bottom: 1px solid #ccc; + padding: 0 0 10px; +} + +.content h3 { + font-size: 1.05em; + font-weight: 600; +} + +.content li { + padding: 5px; +} + +.content .warning { + color: #F44336; + padding: 1px 10px; + border-left: 3px solid #F44336; + display: block; +} + +.content a { + color: #bbb; + padding: 2px; + -webkit-transition: all .3s ease-in-out; + -o-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; + border-bottom: 1px hidden #ccc; +} + +.content a:hover { + border-bottom: 1px solid #ccc; +} \ No newline at end of file diff --git a/css/main.css b/css/main.css index d441100..dba230a 100644 --- a/css/main.css +++ b/css/main.css @@ -431,57 +431,65 @@ small { } footer.page-footer .footer-copyright { - height: auto!important; + height: auto !important; margin-bottom: -15px } h3 { - color: rgba(255, 255, 255, 0.6); - font-size: 1.35em;text-align: center; - margin-top: 2px; + color: rgba(255, 255, 255, 0.6); + font-size: 1.35em; + text-align: center; + margin-top: 2px; } .github { - position: absolute; - right: 10px; - font-size: 16px; - z-index: 1; - color: #ddd; + position: absolute; + right: 10px; + font-size: 16px; + z-index: 1; + color: #ddd; } .github-icon { - font-family: FontAwesome; + font-family: FontAwesome; } .github-icon::before { - content: '\f09b' + content: '\f09b' } @media only screen and (max-width:991px) { + .cover-2 h2, .cover-2 p { width: 100% } + .online-part { padding: 25% .7% } + .rule { padding: 15px } + .useful { margin-top: 0; margin: 0 } + .discord-widget { padding-left: 0; -webkit-transform: translateX(25%); -ms-transform: translateX(25%); transform: translateX(25%) } + .admins>ul>a { display: block; border-radius: 0 } + .head-icon { width: 20px; height: 20px; @@ -489,21 +497,26 @@ h3 { float: left; border-radius: 50% } + .modal li { display: block; width: 100%; padding: 5px 70px } + .modal-msg { margin: 25px 0; padding: 5px } + .nav-wrapper { background: #111 } + .modal.modal-fixed-footer .modal-content { padding: 10px } + nav .nav-wrapper li>a { font-weight: 500; font-size: 1em diff --git a/index.html b/index.html index c04f72d..f55db44 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,8 @@ - - - - - - Home | TotalFreedom Minecraft Server - - - - - - - - - - - - - -
- -
- -
- +
-

Made by miwojedk - this project won the #1 place on PlanetMinecraft Contest (Press "Show More" to see more information) +

Made by miwojedk - this project won the #1 place on PlanetMinecraft Contest (Press "Show More" to see + more information)

- +
- +

Made by Dusty01

- +
- +

Made by Dusty01

- +
- +

Made by Dusty01

- +
- +

Made by UYScutix

- +
@@ -219,53 +244,61 @@
- +

Made by UYScutix

- +
- +

Made by UYScutix

- +
- +

Made by UYScutix

- +
- +

Made by xfilez (Redstoner)

- +
@@ -273,174 +306,200 @@
- +

Made by xfilez (Redstoner)

- +
- +

Made by DDiS

- +
- +

Made by DisignusBlocks

- +
- +

Made by DisignusBlocks

- +
- +

Made by DisignusBlocks

- +
- +

Made by DisignusBlocks

- +
- +

Made by Nathaniel

- +
- +

Made by Nathaniel

- +
- +

Made by CaliburnS3 (Redstoner)

- +
- +

Made by xfilez (Redstoner)

- +
- +

Made by xfilez (Redstoner)

- +
-
+
- +

Made by DragonSlayer2189 (Redstoner)

- +
-
+
-
- -
If you are masterbuilder, send me your builds!
- +
+ +
If you are masterbuilder, send me + your builds!
+
TotalFreedom © 2010 - - Designed by aggelosQQ + Designed by + aggelosQQ
@@ -455,16 +514,16 @@ + $(document).ready(function () { + loadJson(jsonUrl, jsonContent); + }); + - + \ No newline at end of file diff --git a/staff/index.html b/staff/index.html index 1207a4a..407c660 100644 --- a/staff/index.html +++ b/staff/index.html @@ -1,7 +1,8 @@ - - - - - - Staff | TotalFreedom Minecraft Server - - - - - - - - - - - - - - -
-
-

TotalFreedom Developers

-
    -

    TotalFreedom Senior Admins

    -
      -

      TotalFreedom Telnet Admins

      -
        -

        TotalFreedom Super Admins

        -
          + + + + Staff | TotalFreedom Minecraft Server + + + + + + + + + + + + + + + +
          +
          +

          TotalFreedom Developers

          +
            +

            TotalFreedom Senior Admins

            +
              +

              TotalFreedom Telnet Admins

              +
                +

                TotalFreedom Super Admins

                +
                  +
                  + - - - - - - - - - - +
                  +
                  + + + + + + + + + + + \ No newline at end of file From 2a8453f6916d4547520227d6adc9b8addfa3da9f Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 16:17:33 -0700 Subject: [PATCH 07/12] Missing curly brace --- calc/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calc/style.css b/calc/style.css index 7da023c..825f7aa 100644 --- a/calc/style.css +++ b/calc/style.css @@ -30,7 +30,8 @@ select { color: white; cursor: pointer; -webkit-appearance: none; - +} + select::before { border-bottom-style: solid; border-top: none; From 77bd1d90be62fa002f310cf70a05f0b5e41ba2ff Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 18:12:58 -0700 Subject: [PATCH 08/12] Put Upper-Level Staff in Container Removed container class from see rest of staff and below --- index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f55db44..7203d2b 100644 --- a/index.html +++ b/index.html @@ -180,6 +180,7 @@

                  Upper-Level Staff Members

                  Last updated August 1st, 2020

                  +

                  Executives

                    @@ -283,7 +284,8 @@
                  • fionnn
                  -
                  +
                  +
                  • See the rest of the staff

                    • From 3d7ae5c6ae1394afa6cc0bb3571f2a4bb379f8be Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Tue, 4 Aug 2020 16:43:12 -0700 Subject: [PATCH 09/12] Added descriptions to rule categories --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 7203d2b..5b5d6a8 100644 --- a/index.html +++ b/index.html @@ -104,6 +104,7 @@

                    Category 1 (Permanent Bannable Offenses)

                    +

                    Bans that restrict the user from joining the server permanently depending on the severity of the offense. Users who were permanently banned are able to appeal via the forums or email.

                    a. Attempts at harming the server.

                    b. Repeated rule-breaking (recurring category 2 & 3 offenses or punishment bypassing).

                    c. Attempting to or successfully DDoSing or doxing any (ex)member of TotalFreedom.

                    @@ -120,6 +121,7 @@

                    Category 2 (Temporary Bannable Offenses)

                    +

                    Bans that restrict the user from joining the server for 24 hours. Users who were given a day ban are able to appeal via the forums.

                    a. Modifying other players’ builds (with intent) without permission from the builder.

                    b. Tricking players into breaking a rule.

                    c. Repeated offenses from Category 3 (Minor Offense).

                    @@ -132,6 +134,7 @@

                    Category 3 (Minor Offenses)

                    +

                    These offenses will not result in a 24-hour ban or a permanent ban unless they are done repeatedly. (Punishment may include: mutes, smites, temporary bans, warnings etc).

                    a. Bigotry.

                    b. Spamming commands or chat.

                    c. Being a nuisance to other players.

                    From b8791bd593256e05ad41b052564089e4254a28fe Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Thu, 13 Aug 2020 12:42:59 -0700 Subject: [PATCH 10/12] Added serrif to Internal Affairs --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 5b5d6a8..52b3b6d 100644 --- a/index.html +++ b/index.html @@ -286,6 +286,9 @@
                  • fionnn
                    •  + +
                  • serrif
                    • +
                  From 4687c27628728849d9d620c2600402d8589966df Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Thu, 13 Aug 2020 13:05:37 -0700 Subject: [PATCH 11/12] Changed last updated date --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 52b3b6d..c23adbe 100644 --- a/index.html +++ b/index.html @@ -182,7 +182,7 @@

                  Upper-Level Staff Members

                  -

                  Last updated August 1st, 2020

                  +

                  Last Updated: August 13th, 2020

                  Executives

                  From 6c4a0b0d83718b39076faee34e1b8e4837c70610 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 16 Aug 2020 16:36:16 -0700 Subject: [PATCH 12/12] Changed forum link and removed tooltip. Also made it open in new tab. --- index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index c23adbe..a798c2f 100644 --- a/index.html +++ b/index.html @@ -59,8 +59,9 @@
                • Email Appeal
                • Staff
                • Masterbuilders
                  • -
                • Forum
                  • + +
                • Forum