Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33

Verwalten
- Kopieren
Aktionen
Ansichten

Von 33.1 nach 34.1

Von Version 1.1

bearbeitet von superadmin
am 2019/11/20 20:53

Änderungskommentar: Es gibt keinen Kommentar für diese Version

Auf Version

33.1

bearbeitet von Daniel Herrmann
am 2020/10/19 19:36

Änderungskommentar: Es gibt keinen Kommentar für diese Version

Rohform
Im Layout

Zusammenfassung

Seiteneigenschaften (3 geändert, 0 hinzugefügt, 0 gelöscht)
Objekte (1 geändert, 0 hinzugefügt, 0 gelöscht)
- Confluence.Code.ConfluencePageClass[0]

Details

Seiteneigenschaften

Titel

@@ -1,1 +1,1 @@
--Makerspace Darmstadt
++Welcome

Dokument-Autor

@@ -1,1 +1,1 @@
--XWiki.superadmin
++XWiki.dherrman

Inhalt

@@ -1,148 +1,124 @@
  {{confluence_layout}}
--{{confluence_layout-section ac:type="single"}}
++{{confluence_layout-section ac:type="two_right_sidebar"}}
  {{confluence_layout-cell}}
--{{confluence_tip}}
--Welcome to your first space. Go ahead, edit and customize this home page any way you like. We've added some sample content to get you started.
--{{/confluence_tip}}
--{{/confluence_layout-cell}}
--{{/confluence_layout-section}}
++----
--{{confluence_layout-section ac:type="single"}}
--{{confluence_layout-cell}}
--[[image:attach:peak.jpeg]]
++= {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
--
--{{/confluence_layout-cell}}
--{{/confluence_layout-section}}
++== {{id name="Welcome-UnserZielistes,jedemeineWerkstattmitWerkzeugen,MaschinenundeinerCommunityrundumsSelbermachenzubieten.HierfindestduInformationenzuunseremVerein,derCommunityunddenimSpacevorhandenMaschinenundWerkzeugen."/}}//Unser Ziel ist es, jedem eine Werkstatt mit Werkzeugen, Maschinen und einer Community rund ums Selbermachen zu bieten. Hier findest du Informationen zu unserem Verein, der Community und den im Space vorhanden Maschinen und Werkzeugen.// ==
--{{confluence_layout-section ac:type="two_right_sidebar"}}
--{{confluence_layout-cell}}
  ----
--= {{id name="Welcome-Goal"/}}**Goal** =
++= {{id name="Welcome-"/}} =
--== {{id name="Welcome-Yourspacehomepageshouldsummarizewhatthespaceisfor,andprovidelinkstokeyresourcesforyourteam."/}}//Your space homepage should summarize what the space is for, and provide links to key resources for your team. // ==
++{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
++\\
++
  ----
--
++= {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
--= {{id name="Welcome-Coreteam"/}}**Core team** =
--
++(% class="wrapped" %)
  |(((
++(% class="content-wrapper" %)
++(((
  (% style="text-align: center;" %)
--[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
++[[image:attach:_ms_nico-neumann.png||thumbnail="true" height="150"]]
  (% style="text-align: center;" %)
--**Harvey Honner-white
--**Team Lead** **
++**Nico Neumann
++**Vorsitzender
++Öffentl./Kommunikation
++)))
  )))|(((
  (% style="text-align: center;" %)
--[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
++\\
  (% style="text-align: center;" %)
--**Alana Baczewski
-- **Tech Lead
--)))|(((
++\\
++
  (% style="text-align: center;" %)
--[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
++\\
  (% style="text-align: center;" %)
--**Sameer Farrell
-- **Marketing
--)))|(((
++\\
++
  (% style="text-align: center;" %)
--[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
++\\
++(% class="content-wrapper" %)
++(((
  (% style="text-align: center;" %)
--**Mia Bednarczyk
-- **Recruitment
++**Daniel Herrmann
++**Mitgliederverwaltung
++Organisation/Struktur
  )))
++)))|(((
++(% class="content-wrapper" %)
++(((
++[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
--
++(% style="text-align: center;" %)
++(% style="text-align: center;letter-spacing: 0.0px;" %)**Jan Schuhmacher**(% style="letter-spacing: 0.0px;" %)
++Offene Werkstatt
++Inventar
++)))
++)))|(((
++(% style="text-align: center;" %)
++\\
--= {{id name="Welcome-Roadmap"/}}**Roadmap** =
++(% style="text-align: center;" %)
++\\
--You can edit this roadmap or create a new one by adding the Roadmap Planner macro from the Insert menu. Link your Confluence pages to each bar to add visibility, and find more tips by reading the Atlassian blog: [[Plan better in 2015 with the Roadmap Planner macro>>url:http://blogs.atlassian.com/2015/01/roadmap-planner-macro/||shape="rect"]].
++(% style="text-align: center;" %)
++\\
--{{confluence_roadmap timeline="true" source="%7B%22title%22%3A%22Roadmap%20Planner%22%2C%22timeline%22%3A%7B%22startDate%22%3A%222015-06-01%2000%3A00%3A00%22%2C%22endDate%22%3A%222015-12-31%2000%3A00%3A00%22%2C%22displayOption%22%3A%22MONTH%22%7D%2C%22lanes%22%3A%5B%7B%22title%22%3A%22Marketing%22%2C%22color%22%3A%7B%22lane%22%3A%22%23f15c75%22%2C%22bar%22%3A%22%23f58598%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22Social%20campaign%22%2C%22description%22%3A%22Add%20a%20description%20to%20your%20bars%20here.%22%2C%22startDate%22%3A%222015-07-30%2011%3A10%3A05%22%2C%22duration%22%3A3.6435643564356437%2C%22rowIndex%22%3A0%2C%22id%22%3A%22e703c6a8-1649-4d20-9ccf-2c7a8698e385%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22title%22%3A%22Website%20development%22%2C%22description%22%3A%22Add%20a%20description%20to%20your%20bars%20here.%22%2C%22startDate%22%3A%222015-07-17%2006%3A24%3A57%22%2C%22duration%22%3A3.3069306930693068%2C%22rowIndex%22%3A1%2C%22id%22%3A%22655d454d-b701-4584-a301-9ea0bb86ed32%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A2%2C%22startDate%22%3A%222015-06-01%2000%3A00%3A00%22%2C%22id%22%3A%22c420ef33-ae28-4828-958f-8a9d793153b3%22%2C%22title%22%3A%22Crowdfunding%20campaign%22%2C%22description%22%3A%22Add%20a%20description%20to%20your%20bars%20here.%22%2C%22duration%22%3A2.5544554455445545%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22People%22%2C%22color%22%3A%7B%22lane%22%3A%22%23654982%22%2C%22bar%22%3A%22%238c77a1%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22Recruitment%22%2C%22description%22%3A%22%22%2C%22startDate%22%3A%222015-06-01%2000%3A00%3A00%22%2C%22duration%22%3A2.5%2C%22rowIndex%22%3A0%2C%22id%22%3A%221230bab8-718c-47da-903a-2cbdcb220d97%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-08-17%2013%3A46%3A55%22%2C%22id%22%3A%228639d09c-59d1-4d1f-ad91-c78f04b20135%22%2C%22title%22%3A%22Assessment%20Period%22%2C%22description%22%3A%22%22%2C%22duration%22%3A2.910891089108911%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A1%2C%22startDate%22%3A%222015-09-01%2021%3A23%3A10%22%2C%22id%22%3A%22802b53f7-ba66-4415-984d-efef93b4caec%22%2C%22title%22%3A%22Training%22%2C%22description%22%3A%22%22%2C%22duration%22%3A2.5841584158415842%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-11-15%2006%3A10%3A41%22%2C%22id%22%3A%22502fac56-3849-415f-b412-af27c39229b7%22%2C%22title%22%3A%22Finalisation%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1.4356435643564356%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22Product%22%2C%22color%22%3A%7B%22lane%22%3A%22%233b7fc4%22%2C%22bar%22%3A%22%236c9fd3%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-06-24%2004%3A02%3A22%22%2C%22id%22%3A%2200ada54b-0998-41a5-aa98-712ecdec8c7f%22%2C%22title%22%3A%22Planning%22%2C%22description%22%3A%22%22%2C%22duration%22%3A2.1782178217821784%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-08-31%2001%3A54%3A03%22%2C%22id%22%3A%2271967f2c-f3ab-4871-aaf5-7cf31389e62f%22%2C%22title%22%3A%22Development%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1.9207920792079207%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-10-29%2013%3A04%3A09%22%2C%22id%22%3A%22d76ac773-3ee7-495b-9d7f-1daf267dc58c%22%2C%22title%22%3A%22Testing%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-11-30%2002%3A36%3A49%22%2C%22id%22%3A%224f584dc6-63b8-4efa-a98e-a5d7bbe9910e%22%2C%22title%22%3A%22Deploy%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1.0297029702970297%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%5D%2C%22markers%22%3A%5B%7B%22title%22%3A%22Yearly%20Finalisation%22%2C%22markerDate%22%3A%222015-11-29%2012%3A21%3A23%22%7D%5D%7D" title="Roadmap%20Planner" hash="f0477dfac6f6ca380d8c5f2f44041947"/}}
++(% style="text-align: center;" %)
++\\
--
++(% style="text-align: center;" %)
++\\
--= {{id name="Welcome-Knowyourspaces"/}}**Know your spaces**  =
++(% class="content-wrapper" %)
++(((
++(% style="text-align: center;" %)
++**Ansgar Schäfer**
++Raumbeauftragter
++Sicherheit / Einweisungen
++)))
++)))
++{{/confluence_layout-cell}}
--Everything your team is working on - meeting notes and agendas, project plans and timelines, technical documentation and more - is located in a space; it's home base for your team.
++{{confluence_layout-cell}}
++----
--A small team should plan to have a space for the team, and a space for each big project. If you'll be working in Confluence with several other teams and departments, we recommend a space for each team as well as a space for each major cross-team project. The key is to think of a space as the container that holds all the important stuff - like pages, files, and blog posts - a team, group, or project needs to work.
++= {{id name="Welcome-GettingStarted"/}}Getting Started =
--= {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
++Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
--If you're working on something related to your team - project plans, product requirements, blog posts, internal communications, you name it - create and store it in a Confluence page. Confluence pages offer a lot of flexibility in creating and storing information, and there are a number of useful page templates included to get you started, like the meeting notes template. Your spaces should be filled with pages that document your business processes, outline your plans, contain your files, and report on your progress. The more you learn to do in Confluence (adding tables and graphs, or embedding video and links are great places to start), the more engaging and helpful your pages will become.
++{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
--Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
--
--
--
  ----
--{{/confluence_layout-cell}}
--{{confluence_layout-cell}}
--= {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
++= {{id name="Welcome-Slack"/}}Slack =
--When you create new pages in this space, they'll appear here automatically.
++Wir benutzen Slack, um miteinander zu kommunizieren! Komm einfach vorbei: [[hier beitreten>>url:https://join.slack.com/t/makerspace-darmstadt/shared_invite/MjI3MDc1NTQ4NTgyLTE1MDI3MDY1MzAtOTdmMWVmNGMzOA||shape="rect"]]
--{{children/}}
++----
--= {{id name="Welcome-Usefullinks"/}}**Useful links** =
++= {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
--|=(((
--Link
--)))|=(((
--Description
--)))
--|(((
--[[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
--)))|(((
--Chances are, the information you need to do your job lives in multiple places. Word docs, Evernote files, email, PDFs, even Post-it notes. It's scattered among different systems. And to make matters worse, //the stuff your teammates need is equally siloed//. If information had feelings, it would be lonely.
++Du willst uns kennenlernen und einfach mal reinschnuppern? Leider können wir im Moment wegen der Pandemie keine offene Werkstatt in der Form wie früher anbieten.
++Du hast allerdings als Nicht-Mitglied die Möglichkeit, dich maximal zu zweit mit einem Mitglied aus dem Space zu verabreden, wenn gerade keine anderen fremden Personen im Space sind. Verwenden kannst du dafür diesen Kalender: [[http:~~/~~/www.makerspace-darmstadt.de/zugang>>url:http://www.makerspace-darmstadt.de/zugang||shape="rect"]], in dem ihr euch dann eintragt. So stellt ihr sicher, dass immernur ein Pärchen gleichzeitig in den Space gelassen wird.
++\\\\
--But with Confluence, you can bring all that information into one place.
--)))
++(% class="wrapped" %)
  |(((
--[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
--)))|(((
--Getting a project outlined and adding the right content are just the first steps. Now it's time for your team to weigh in. Confluence makes it easy to discuss your work - with your team, your boss, or your entire company - in the same place where you organized and created it.
++\\
  )))
--|(((
--[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
--)))|(((
--Think of pages as a New Age "document." If Word docs were rotary phones, Confluence pages would be smart phones. A smart phone still makes calls (like their rotary counterparts), but it can do so much more than that
--)))
--(% style="font-size: 24.0px;line-height: 1.25;" %)**
--**
--
--(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
--
--|(((
--(% class="task-list" %)
--(((
--{{task reference="/Tasks/Task_59" status="InProgress"}}
--[[Customize the name, colour, and icon of Confluence>>url:https://confluence.atlassian.com/x/NgszKw||shape="rect"]].
--{{/task}}
--
--{{task reference="/Tasks/Task_56" status="InProgress"}}
--Decide who can see and edit this space or a specific page by clicking the [[image:attach:lock-icon.png]]icon. Learn more about [[Page Restrictions>>url:https://confluence.atlassian.com/x/liAC||shape="rect"]] and [[Space Permissions>>url:https://confluence.atlassian.com/x/ASEC||shape="rect"]].
--{{/task}}
--
--{{task reference="/Tasks/Task_57" status="InProgress"}}
--Try adding an [[inline comment>>url:https://confluence.atlassian.com/x/2yAC||shape="rect"]] by highlighting some text and click the comment icon.
--{{/task}}
--
--{{task reference="/Tasks/Task_58" status="InProgress"}}
--Learn more about [[inviting your team to Confluence>>url:https://confluence.atlassian.com/x/SRwC||shape="rect"]].
--{{/task}}
--)))
--)))
++Weitere Termine findest du auch immer im [[Veranstaltungskalender unserer Homepage>>url:https://www.makerspace-darmstadt.de/termine||shape="rect"]]!
  {{/confluence_layout-cell}}
  {{/confluence_layout-section}}
  {{/confluence_layout}}

Confluence.Code.ConfluencePageClass[0]

Id

@@ -1,1 +1,1 @@
--327712
++21233742

Title

@@ -1,1 +1,1 @@
--Makerspace Darmstadt
++Welcome

URL

@@ -1,1 +1,1 @@
--https://wiki.makerspace-darmstadt.de/spaces/MD/pages/327712/Makerspace Darmstadt
++https://wiki.makerspace-darmstadt.de/spaces/MD/pages/21233742/Welcome