Skip to content

Commit

Permalink
Merge pull request #56 from ITPNYU/renaming-edits
Browse files Browse the repository at this point in the history
Renaming and Other Edits
  • Loading branch information
shiffman authored Feb 14, 2024
2 parents fcc86a7 + 03048c1 commit 31ad8f2
Show file tree
Hide file tree
Showing 16 changed files with 82 additions and 77 deletions.
17 changes: 9 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# How to Contribute

The ITP/IMA Code of Conduct is a community driven project. This repo is part of our effort to maintain a reachable and participative process in order to easily evolve the document and encourage contributions.
The ITP/IMA Community Commitments is a community driven project. This repo is part of our effort to maintain a reachable and participative process in order to easily evolve the document and encourage contributions.

The Code of Conduct follows the All-contributors specifications, which means that the community can get involved in any kind of support: like participation in discussions, co-authoring the document, as well as the website. We encourage any type of contribution, any change that helps the community grow a Best content and environment for all community members.
The Community Commitments follows the All-contributors specifications, which means that the community can get involved in any kind of support: like participation in discussions, co-authoring the document, as well as the website. We encourage any type of contribution, any change that helps the community grow a Best content and environment for all community members.

## Contributing Workflow

The basic flow for this participation is through the ITP/IMA Code of Conduct Github. You can contribute by giving suggestions, or changing content with markdown. This allows us to change text, edit content without going deeper in the code.
The basic flow for this participation is through the ITP/IMA Community Commitments Github. You can contribute by giving suggestions, or changing content with markdown. This allows us to change text, edit content without going deeper in the code.

To contribute through this repository, you must have a Github account.

Contributions are accessible through buttons like “Propose a Change”. The “Give Feedback” button can be found on the Get Involved page and other parts of the document. These two buttons will direct you to the github source, where you open a “pull request” to propose the changes, or give feedback by “reporting an issue”.

### Contributing with new/additional content, or updates

Using plain text editor Markdown, you can contribute to the Code of Conduct.
Using plain text editor Markdown, you can contribute to the Community Commitments.

**No code required!**

**Instructions to contribute changes to the Code of Conduct document**
**Instructions to contribute changes to the Community Commitments document**

1. Go to the .md file where you want to make a change.
2. Press the edit button to edit the file.
Expand All @@ -26,9 +27,9 @@ Using plain text editor Markdown, you can contribute to the Code of Conduct.
5. Title new branch
6. Commit changes

### Contributing from [Issues](https://github.com/ITPNYU/ITP-IMA-Code-of-Conduct/issues)
### Contributing from [Issues](https://github.com/ITPNYU/ITP-IMA-Community-Guidelines/issues)

To give feedback, or see what issues are pending, you can go to [Issues](https://github.com/ITPNYU/ITP-IMA-Code-of-Conduct/issues) in this repository.
To give feedback, or see what issues are pending, you can go to [Issues](https://github.com/ITPNYU/ITP-IMA-Community-Guidelines/issues) in this repository.

**Give a Feedback**
Before filing an issue, we encourage you to take a look at the list of issues. It might be addressed already.
Expand All @@ -41,7 +42,7 @@ The website is built in Jekyll. You can contribute to the website using html, cs

## Getting Started

If you want to help develop the ITP/IMA Code of Conduct, here are the steps to get started:
If you want to help develop the ITP/IMA Community Commitments, here are the steps to get started:

### Setup

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Code of Conduct
# Community Commitments

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-)

<!-- ALL-CONTRIBUTORS-BADGE:END -->

Welcome to the ITP/IMA Code of Conduct! All ITP/IMA community members are expected to thoroughly read and understand the Code of Conduct, so please make sure to visit the [Code of Conduct's website](https://itpnyu.github.io/ITP-IMA-Code-of-Conduct/).
Welcome to the ITP/IMA Community Commitments! We invite all ITP/IMA community members to thoroughly read the Community Commitments, at [community.itp.io](https://community.itp.io).

The ITP/IMA CoC is an evolving **work-in-progress** document that establishes and communicates the commitment of the ITP/IMA community to uphold a key set of standards and obligations that aim to make ITP/IMA an inclusive and welcoming environment.
The ITP/IMA Community Commitments is an evolving **work-in-progress** document that establishes and communicates the commitment of the ITP/IMA community to uphold a key set of standards and obligations that aim to make ITP/IMA an inclusive and welcoming environment.

The CoC is open to revisions, clarifications, and reconsideration. For more information on how the Code of Conduct came to be, who was involved, and how you can get involved check out the [Code of Conduct Development](CONTRIBUTING.md). For questions or suggestions, contact equitable@itp.nyu.edu.
The Community Commitments is open to revisions, clarifications, and reconsideration. For more information on how the Community Commitments came to be, who was involved, and how you can get involved check out the [Community Commitments Development](CONTRIBUTING.md). For questions or suggestions, contact equitable@itp.nyu.edu.

Many terms, concepts, and words in this Code of Conduct may be new or unfamiliar. Please refer to the [Glossary](glossary.md) for clarification of meaning. Certain words may be highlighted in the Code of Conduct with definitions in order to assist with comprehensibility.
Many terms, concepts, and words in this Community Commitments may be new or unfamiliar. Please refer to the [Glossary](glossary.md) for clarification of meaning. Certain words may be highlighted in the Community Commitments with definitions in order to assist with comprehensibility.

## Contributors ✨

Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
# You can create any custom variable you would like, and they will be accessible
# in the templates via {{ site.myvariable }}.

title: ITP/IMA Code of Conduct
title: ITP/IMA Community Commitments
email: equitable@itp.nyu.edu
description: >- # this means to ignore newlines until "baseurl:"
The ITP/IMA Code of Conduct is an evolving work-in-progress document that establishes and communicates the commitment of the ITP/IMA community to uphold a key set of standards and obligations that aim to make ITP/IMA an inclusive and welcoming environment.
The ITP/IMA Community Commitments is an evolving work-in-progress document that establishes and communicates the commitment of the ITP/IMA community to uphold a key set of standards and obligations that aim to make ITP/IMA an inclusive and welcoming environment.
baseurl: '/ITP-IMA-Code-of-Conduct' # the subpath of your site, e.g. /blog
url: '' # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: jekyllrb
Expand Down
2 changes: 1 addition & 1 deletion _layouts/document-code-of-conduct.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h1 class="content-nav">Contents</h1>
</button>

<button class="button_coc_side_nav">
<a href="./development"><b> 🚧Development of Code of Conduct</b></a>
<a href="./development"><b> 🚧Development of Community Commitments</b></a>
</button>
<a class="side-page-link" href="./development#developing_and_growing"
>Developing and Growing</a
Expand Down
20 changes: 10 additions & 10 deletions _layouts/header-footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"><!-- Begin Jekyll SEO tag v2.7.1 -->
<title>ITP/IMA Code of Conduct | The ITP/IMA Code of Conduct is an evolving work-in-progress document that establishes
<title>ITP/IMA Community Commitments | The ITP/IMA Community Commitments is an evolving work-in-progress document that establishes
and communicates the commitment of the ITP/IMA community to uphold a key set of standards and obligations that aim
to make ITP/IMA an inclusive and welcoming environment.
</title>

<link rel="shortcut icon" type="image/png" href="assets/sun-04.png" />

<meta name="generator" content="Jekyll v4.1.1" />
<meta property="og:title" content="ITP/IMA Code of Conduct" />
<meta property="og:title" content="ITP/IMA Community Commitments" />
<meta property="og:locale" content="en_US" />
<meta name="ITP/IMA Code of Conduct"
<meta name="ITP/IMA Community Commitments"
content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description." />
<meta property="og:description"
content="Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description." />
<link rel="canonical" href="http://localhost:4000/" />
<meta property="og:url" content="http://localhost:4000/" />
<meta property="og:site_name" content="ITP/IMA Code of Conduct" />
<meta property="og:site_name" content="ITP/IMA Community Commitments" />
<meta name="twitter:card" content="summary" />
<meta property="twitter:title" content="ITP/IMA Code of Conduct" />
<meta property="twitter:title" content="ITP/IMA Community Commitments" />
<script type="application/ld+json">
{"url":"http://localhost:4000/","headline":"ITP/IMA Code of Conduct","description":"Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.","name":"ITP/IMA Code of Conduct","@type":"WebSite","@context":"https://schema.org"}</script>
{"url":"http://localhost:4000/","headline":"ITP/IMA Community Commitments","description":"Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.","name":"ITP/IMA Community Commitments","@type":"WebSite","@context":"https://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<link rel="stylesheet" href="assets/main.css">
<!-- <link rel="stylesheet" href="/code-of-conduct/assets/main.css"> -->
<link type="application/atom+xml" rel="alternate" href="http://localhost:4000/feed.xml"
title="ITP/IMA Code of Conduct" />
title="ITP/IMA Community Commitments" />
</head>

</head>
Expand All @@ -47,9 +47,9 @@
<img src="assets/itp-logo.png" class="icon_logo_itp" alt="ITP logo" /></a>

<a href="index" class="logo_style">
<img src="assets/sun-04.png" class="icon_logo_code" alt="Code of Conduct logo. Drawing of a yellow Sun." /></a>
<img src="assets/sun-04.png" class="icon_logo_code" alt="Community Commitments logo. Drawing of a yellow Sun." /></a>

<!-- <a class="site-title" rel="author" href="index">Code of Conduct</a> -->
<!-- <a class="site-title" rel="author" href="index">Community Commitments</a> -->

</div>

Expand All @@ -66,7 +66,7 @@

<div class="trigger">
<!-- <a class="page-link" href="/about/">About</a> -->
<a class="page-link" href="community_statement">Code of Conduct</a>
<a class="page-link" href="community_statement">Community Commitments</a>
<a class="page-link" href="community">Community</a>
<a class="page-link" href="glossary">Glossary</a>
<a class="page-link" href="getting_help">Getting Help</a>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/homepage.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<header class="cover-section">
<div class="sub-cover-section">
<div class="img-cover">
<img src="assets/sun-04.png" alt="Code of Conduct Logo. Drawing of a yellow Sun." />
<img src="assets/sun-04.png" alt="Community Commitments Logo. Drawing of a yellow Sun." />
</div>
<div class="header-text">
<h3>{{ page.header-text-h3 }}</h3>
Expand Down
4 changes: 2 additions & 2 deletions attribution.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: document-code-of-conduct
title: Code of Conduct
title: Community Commitments
permalink: /attribution

edit-markdown-link: https://github.com/ITPNYU/ITP-IMA-Code-of-Conduct/edit/main/attribution.md
Expand All @@ -14,7 +14,7 @@ left-button-link: ./development

## <a name="attribution">🔗 Attribution</a>

In addition to the work done by community members in developing the Code of Conduct we want to acknowledge the community guidelines used by other communities that have acted as a guide, reference, and inspiration for our own process.
In addition to the work done by community members in developing the Community Commitments we want to acknowledge the community guidelines used by other communities that have acted as a guide, reference, and inspiration for our own process.

- [http://p5js.org/community/](http://p5js.org/community/)
- [https://www.contributor-covenant.org/version/2/0/code_of_conduct/](https://www.contributor-covenant.org/version/2/0/code_of_conduct/)
Expand Down
6 changes: 3 additions & 3 deletions community.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
layout: community
title: Code of Conduct
title: Community Commitments
permalink: /community
---

## Community Stewards ✨

The Code of Conduct stewards are responsible for maintaining the Code of Conduct, managing discussions about additions and subtractions, and interpreting the Code of Conduct in related discussions.
The Community Commitments stewards are responsible for maintaining the Community Commitments, managing discussions about additions and subtractions, and interpreting the Community Commitments in related discussions.

The initial stewards consist of members of the ITP/IMA community responsible for drafting this Code of Conduct drawn from organizing members of Tech & Society and the ITP/IMA Equitability Working Group. The stewards have made a commitment for the academic year 2020-2021. In addition to maintaining the Code of Conduct during this period, they will be responsible for developing a plan for regularly rotating stewards. The stewards primary responsibility is to maintain this Code of Conduct in order to make sure it continues to reflect the ITP/IMA community’s values.
The initial stewards consist of members of the ITP/IMA community responsible for drafting this Community Commitments drawn from organizing members of Tech & Society and the ITP/IMA Equitability Working Group. The stewards have made a commitment for the academic year 2020-2021. In addition to maintaining the Community Commitments during this period, they will be responsible for developing a plan for regularly rotating stewards. The stewards primary responsibility is to maintain this Community Commitments in order to make sure it continues to reflect the ITP/IMA community’s values.

## This year’s stewards are:

Expand Down
8 changes: 4 additions & 4 deletions community_statement.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: document-code-of-conduct
title: Code of Conduct
title: Community Commitments
permalink: /community_statement

edit-markdown-link: https://github.com/ITPNYU/ITP-IMA-Code-of-Conduct/edit/main/community_statement.md
Expand All @@ -19,7 +19,7 @@ left-button-link: #community_statement
ITP/IMA is a community whose mission is to explore the imaginative uses of emerging technologies — to make people's lives safer, more just, more beautiful, more meaningful, and more fun. We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.

The scope of this Code of Conduct applies to all ITP/IMA community members (faculty, staff, students, residents, fellows, and guests), ITP/IMA physical and digital spaces (e.g. Email listservs, Yorb, and ITP/IMA Discord server), and all courses, events, and projects created at or in service to ITP/IMA.
These Community Commitments apply to all ITP/IMA community members (faculty, staff, students, residents, fellows, and guests), ITP/IMA physical and digital spaces (e.g. Email listservs, Yorb, and ITP/IMA Discord server), and all courses, events, and projects created at or in service to ITP/IMA.

## <a name="solidarity">Solidarity</a>

Expand Down Expand Up @@ -47,6 +47,6 @@ We pledge to center creative and ethical uses of technology in our research, tea

With this understanding, it is our responsibility to center these groups when hosting, participating in, or developing events (e.g. workshops or meetings), materials (e.g. courses, syllabi, resources), technologies (software, hardware, tools, etc) and creative applications made at ITP /IMA (e.g. works of art, products, installations, experiments, etc).

## <a name="footnotes">Footnotes</a>
<!--## <a name="footnotes">Footnotes</a>
1: This is an example of a footnote. Interactive Telecommuncations Program / Interactive Media Arts
1: This is an example of a footnote. Interactive Telecommuncations Program / Interactive Media Arts-->
Loading

0 comments on commit 31ad8f2

Please sign in to comment.