From 7a6f2a7d4b88c9170700a2106e502d557b13bef7 Mon Sep 17 00:00:00 2001 From: Ben Visness Date: Sun, 13 Feb 2022 16:24:01 -0600 Subject: [PATCH] Remove the code of conduct, tweak the communication guidelines The code of conduct has historically not been of much use, while the communication guidelines are more tangible. The two are also just kind of redundant. --- public/style.css | 3 ++ src/hmnurl/urls.go | 7 --- src/rawdata/scss/_content.scss | 4 ++ src/templates/src/code_of_conduct.html | 49 ------------------- .../src/communication_guidelines.html | 12 ++--- src/templates/src/include/footer.html | 3 -- src/website/base_data.go | 1 - src/website/routes.go | 1 - src/website/staticpages.go | 12 ----- 9 files changed, 13 insertions(+), 79 deletions(-) delete mode 100644 src/templates/src/code_of_conduct.html diff --git a/public/style.css b/public/style.css index 374ef74..64db5c0 100644 --- a/public/style.css +++ b/public/style.css @@ -7937,6 +7937,9 @@ pre { margin-top: 0.5em; margin-bottom: 0.5em; } +.post-content li:not(:last-child) { + margin-bottom: 0.2em; } + .post-content img { max-width: 100%; } diff --git a/src/hmnurl/urls.go b/src/hmnurl/urls.go index ab089e9..b0f0dba 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -143,13 +143,6 @@ func BuildAbout() string { return Url("/about", nil) } -var RegexCodeOfConduct = regexp.MustCompile("^/code-of-conduct$") - -func BuildCodeOfConduct() string { - defer CatchPanic() - return Url("/code-of-conduct", nil) -} - var RegexCommunicationGuidelines = regexp.MustCompile("^/communication-guidelines$") func BuildCommunicationGuidelines() string { diff --git a/src/rawdata/scss/_content.scss b/src/rawdata/scss/_content.scss index 736c687..8901deb 100644 --- a/src/rawdata/scss/_content.scss +++ b/src/rawdata/scss/_content.scss @@ -109,6 +109,10 @@ pre { margin-bottom: 0.5em; } + li:not(:last-child) { + margin-bottom: 0.2em; + } + img { max-width: 100%; } diff --git a/src/templates/src/code_of_conduct.html b/src/templates/src/code_of_conduct.html deleted file mode 100644 index aab0980..0000000 --- a/src/templates/src/code_of_conduct.html +++ /dev/null @@ -1,49 +0,0 @@ -{{ template "base.html" . }} - -{{ define "content" }} -
-

Handmade Code of Conduct v1.0

-

The Handmade community is an international community of programmers, designers, artists, musicians, mathematicians, and other creatives dedicated to building and improving high quality software.

-

Outlined herein are the guidelines we pledge to uphold to maintain a healthy community, stay true to the ideas first explored in our Manifesto and refined by valuable feedback, and ensure we mature into a functional, inclusive, and innovative network.

-

COMMUNITY

-

OPEN-MINDED

-

The Handmade community strives to be unprejudiced—we welcome unusual ideas, encourage different points of view, and consider their effectiveness in reality.

-

The Handmade community does not waste time and alienate others by engaging in flame-wars, drawing out pointless arguments, singling out developers, or making attacks on the hard work of others; instead, we learn from exercising the methods that we believe to be reasonable, and offer suggestions on how to improve ourselves and others.

-

DOWN-TO-EARTH

-

Handmade favors the languages and tools that first serve the users of our software by not wasting their time and resources, and second those who develop it by making meaningful abstractions oriented to the task at hand.

-

We try to minimize the emergent complexity of tightly coupled systems, avoid the over-complication by refusing to blindly apply accepted strategies without clear understanding of their costs, and we prefer that which is simple to that which is easy. When uncertain, we make measurements and follow the data.

-

DIVERSE

-

Handmade encourages participation by everyone. We will do everything in our power to ensure everyone feels accepted and respected in their interactions with our community.

-

If someone has been harmed or offended, it is our responsibility to listen carefully and respectfully, and do our best to right the wrong. We accept that jokes and trolling can be taken too far and are not valid excuses for the alienation of any person.

-

Although this list cannot be exhaustive, we explicitly honour diversity in age, culture, ethnicity, family background, gender identity or expression, language, national origin, neurotype, phenotype, political beliefs, profession, race, religion, sexual orientation, socio-economic status, membership in other communities, and technical ability.

-

Some of the ideas and wording for this statement were based on diversity statements from Ubuntu Diversity Page, which is in turn based on the Python community and Dreamwidth Studios (CC-BY-SA 3.0).

-

To see how we encourage participation by everyone, see our Handmade Guide to Community Interaction.

-

INDIVIDUAL

-

INQUISITIVE

-

The Handmade developer strives to understand their creations on a technical level. They will take the time on their personal software projects to meet their goals to the best of their abilities, without taking shortcuts that diminish the value of their work.

-

They include technical understanding and user experience as important metrics for the quality of their creations, and minimize trade-offs which impact these negatively.

-

They will ask questions exhaustively, and always re-evaluate what they consider to be a “good solution” in light of new evidence. Their curiosity is one of the primary driving forces in their work.

-

CONSIDERATE

-

The developer practices empathy; they try to understand how those they interact with and those they create for see the world in order to better understand each other.

-

They realize that their actions in both professional and community contexts can have consequences for other people that they may not immediately understand, and will do their best to correct themselves when they make a mistake.

-

They will, to the best of their abilities, keep those who enjoy their ongoing personal software projects up to date on the state of development and be honest about their progress and achievement of their stated goals.

-

WILLING TO SHARE

-

Handmade community members share their knowledge and expertise unflinchingly. They will not hesitate to lend a hand if the opportunity to improve the software development space arises.

-

They realize that their fellow community member not knowing something is an opportunity rather than a character flaw. They also realize that their knowledge and experience, however deep and long-collected, is not absolute, and accept that the experiences of others may differ.

-

LEADERS

-

TIGHT-KNIT

-

The Handmade Dev Team acts as one unit.

-

The staff are open with each other, make decisions unanimously, and perform their roles admirably for the benefit of the community.

-

RECEPTIVE

-

The leaders are receptive to the state of the community.

-

They will listen to everyone's concerns and make careful, considered judgment calls to move forward or solve a problem.

-

They will never place personal benefit over the well-being of the community, and only act against the community's immediate short-term interests if it’s for the long-term benefit of everyone involved.

-

SERIOUS

-

The leaders are serious about their roles.

-

They will uphold the ideas explored in the Manifesto, setting the prime example of Handmade values in their development, behavior, and character.

-

They agree to enforce the code of conduct as written and accepted by the community, understanding that there are times when enforcement involves consequences for those shown to be in repeated and flagrant violation thereof.

-

They also agree to ensure all future revisions to such are accepted by and in the best interest of the community.

-

This code of conduct is released under a Creative Commons Attribution-ShareAlike 4.0 International License.

-

Written by Jeroen van Rijn

-
-{{ end }} diff --git a/src/templates/src/communication_guidelines.html b/src/templates/src/communication_guidelines.html index f8fdf38..94dae3f 100644 --- a/src/templates/src/communication_guidelines.html +++ b/src/templates/src/communication_guidelines.html @@ -2,25 +2,25 @@ {{ define "content" }}
-

Handmade Guide to Community Interaction v1.0

+

Handmade Guide to Community Interaction

Our Philosophy

-

The Handmade community strives to create an environment conducive to innovation, education, and constructive discussion. To that end, we expect members of the site to respect the following set of principles to maintain civil discourse and create an inclusive environment.

+

The Handmade community strives to create an environment conducive to innovation, education, and constructive discussion. To that end, we expect members of the community to respect the following set of principles to maintain civil discourse and create an inclusive environment.

Discourse

Inclusiveness

The Handmade community will encourage participation of underrepresented groups. In order to promote diversity among the community, a Handmade community member shall not:

{{ end }} diff --git a/src/templates/src/include/footer.html b/src/templates/src/include/footer.html index 2d1ed7a..5f6d0f3 100644 --- a/src/templates/src/include/footer.html +++ b/src/templates/src/include/footer.html @@ -19,9 +19,6 @@
  • Projects
    • -
  • - Code of Conduct -
  • Communication Guidelines
    • diff --git a/src/website/base_data.go b/src/website/base_data.go index 7436a05..7e70e8f 100644 --- a/src/website/base_data.go +++ b/src/website/base_data.go @@ -79,7 +79,6 @@ func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadc HomepageUrl: hmnurl.BuildHomepage(), AboutUrl: hmnurl.BuildAbout(), ManifestoUrl: hmnurl.BuildManifesto(), - CodeOfConductUrl: hmnurl.BuildCodeOfConduct(), CommunicationGuidelinesUrl: hmnurl.BuildCommunicationGuidelines(), ProjectIndexUrl: hmnurl.BuildProjectIndex(1), ForumsUrl: hmnurl.HMNProjectContext.BuildForum(nil, 1), diff --git a/src/website/routes.go b/src/website/routes.go index de55ed6..20062fd 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -160,7 +160,6 @@ func NewWebsiteRoutes(longRequestContext context.Context, conn *pgxpool.Pool) ht // NOTE(asaf): HMN-only routes: hmnOnly.GET(hmnurl.RegexManifesto, Manifesto) hmnOnly.GET(hmnurl.RegexAbout, About) - hmnOnly.GET(hmnurl.RegexCodeOfConduct, CodeOfConduct) hmnOnly.GET(hmnurl.RegexCommunicationGuidelines, CommunicationGuidelines) hmnOnly.GET(hmnurl.RegexContactPage, ContactPage) hmnOnly.GET(hmnurl.RegexMonthlyUpdatePolicy, MonthlyUpdatePolicy) diff --git a/src/website/staticpages.go b/src/website/staticpages.go index 63446a9..638dc85 100644 --- a/src/website/staticpages.go +++ b/src/website/staticpages.go @@ -20,18 +20,6 @@ func About(c *RequestContext) ResponseData { return res } -func CodeOfConduct(c *RequestContext) ResponseData { - baseData := getBaseDataAutocrumb(c, "Code of Conduct") - baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{ - Property: "og:description", - Value: "The Handmade community is an international community of creatives dedicated to building and improving high quality software. These are the guidelines we pledge to uphold to maintain a healthy community.", - }) - - var res ResponseData - res.MustWriteTemplate("code_of_conduct.html", baseData, c.Perf) - return res -} - func CommunicationGuidelines(c *RequestContext) ResponseData { baseData := getBaseDataAutocrumb(c, "Communication Guidelines") baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{