Zum Inhalt springen

Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33
Von Version Icon 38.1 Icon
bearbeitet von Daniel Herrmann
am 2022/01/28 17:05
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version 1.1 Icon
bearbeitet von superadmin
am 2019/11/20 20:53
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Icon Seiteneigenschaften
Titel
... ... @@ -1,1 +1,1 @@
1 -Welcome
1 +Makerspace Darmstadt
Dokument-Autor
... ... @@ -1,1 +1,1 @@
1 -XWiki.dherrman
1 +XWiki.superadmin
Inhalt
... ... @@ -1,167 +1,148 @@
1 1  {{confluence_layout}}
2 -{{confluence_layout-section ac:type="two_right_sidebar"}}
2 +{{confluence_layout-section ac:type="single"}}
3 3  {{confluence_layout-cell}}
4 -----
4 +{{confluence_tip}}
5 +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.
6 +{{/confluence_tip}}
7 +{{/confluence_layout-cell}}
8 +{{/confluence_layout-section}}
5 5  
6 -= {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
10 +{{confluence_layout-section ac:type="single"}}
11 +{{confluence_layout-cell}}
12 +[[image:attach:peak.jpeg]]
7 7  
8 -== {{id name="Welcome-UnserZielistes,jedemeineWerkstattmitWerkzeugen,MaschinenundeinerCommunityrundumsSelbermachenzubieten.HierfindestDuInformationenzuunseremVerein,derCommunityunddenimSpacevorhandenenMaschinenundWerkzeugen."/}}//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 vorhandenen Maschinen und Werkzeugen.// ==
14 +
15 +{{/confluence_layout-cell}}
16 +{{/confluence_layout-section}}
9 9  
18 +{{confluence_layout-section ac:type="two_right_sidebar"}}
19 +{{confluence_layout-cell}}
10 10  ----
11 11  
12 -= {{id name="Welcome-"/}} =
22 += {{id name="Welcome-Goal"/}}**Goal** =
13 13  
14 -{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
24 +== {{id name="Welcome-Yourspacehomepageshouldsummarizewhatthespaceisfor,andprovidelinkstokeyresourcesforyourteam."/}}//Your space homepage should summarize what the space is for, and provide links to key resources for your team. // ==
15 15  
16 -\\
17 -
18 18  ----
19 19  
20 -= {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
28 +
21 21  
22 -(% class="wrapped" %)
30 += {{id name="Welcome-Coreteam"/}}**Core team** =
31 +
23 23  |(((
24 24  (% style="text-align: center;" %)
25 -\\
34 +[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
26 26  
27 27  (% style="text-align: center;" %)
28 -\\
29 -
37 +**Harvey Honner-white
38 +**Team Lead** **
39 +)))|(((
30 30  (% style="text-align: center;" %)
31 -\\
41 +[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
32 32  
33 33  (% style="text-align: center;" %)
34 -\\
35 -
44 +**Alana Baczewski
45 + **Tech Lead
46 +)))|(((
36 36  (% style="text-align: center;" %)
37 -\\
48 +[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
38 38  
39 -(% class="content-wrapper" %)
40 -(((
41 41  (% style="text-align: center;" %)
42 -**Daniel Herrmann
43 -**Vorsitzender
44 -Öffentl./Kommunikation
45 -)))
51 +**Sameer Farrell
52 + **Marketing
46 46  )))|(((
47 47  (% style="text-align: center;" %)
48 -\\
55 +[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
49 49  
50 50  (% style="text-align: center;" %)
51 -\\
52 -
53 -(% style="text-align: center;" %)
54 -\\
55 -
56 -(% style="text-align: center;" %)
57 -\\
58 -
59 -(% style="text-align: center;" %)
60 -\\
61 -
62 -(% class="content-wrapper" %)
63 -(((
64 -(% style="text-align: center;" %)
65 -**Daniel Gasch
66 -**Mitgliederverwaltung
67 -Organisation/Struktur
58 +**Mia Bednarczyk
59 + **Recruitment
68 68  )))
69 -)))|(((
70 -(% class="content-wrapper" %)
71 -(((
72 -[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
73 73  
74 -(% style="text-align: center;" %)
75 -(% style="text-align: center;letter-spacing: 0.0px;" %)**Jan Schuhmacher**(% style="letter-spacing: 0.0px;" %)
76 -Offene Werkstatt
77 -Inventar
78 -)))
79 -)))|(((
80 -(% style="text-align: center;" %)
81 -\\
62 +
82 82  
83 -(% style="text-align: center;" %)
84 -\\
64 += {{id name="Welcome-Roadmap"/}}**Roadmap** =
85 85  
86 -(% style="text-align: center;" %)
87 -\\
66 +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"]].
88 88  
89 -(% style="text-align: center;" %)
90 -\\
68 +{{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"/}}
91 91  
92 -(% style="text-align: center;" %)
93 -\\
70 +
94 94  
95 -(% class="content-wrapper" %)
96 -(((
97 -(% style="text-align: center;" %)
98 -**Ansgar Schaefer**
99 -Raumbeauftragter
100 -Sicherheit / Einweisungen
101 -)))
102 -)))
103 -{{/confluence_layout-cell}}
72 += {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
104 104  
105 -{{confluence_layout-cell}}
106 -----
74 +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.
107 107  
108 -= {{id name="Welcome-GettingStarted"/}}Getting Started =
76 +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.
109 109  
110 -Hier sind einige wichtige Links zusammengefasst, die Dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
78 += {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
111 111  
112 -{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
80 +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.
113 113  
114 -\\
82 +Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
115 115  
116 -----
84 +
117 117  
118 -= {{id name="Welcome-"/}}[[image:attach:Slack_MKSP.png]] =
119 -
120 -Wir benutzen Slack, um miteinander zu kommunizieren. Komm einfach vorbei und werde Teil unserer Maker-Community: [[hier beitreten>>url:https://join.slack.com/t/makerspace-darmstadt/shared_invite/zt-pib8n8ib-RFlKRhlHzgIjoXZVmyUQMQ||shape="rect"]]!
121 -
122 -\\
123 -
124 124  ----
87 +{{/confluence_layout-cell}}
125 125  
126 -= {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
89 +{{confluence_layout-cell}}
90 += {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
127 127  
128 -(% style="" %)
129 -Ohne Anmeldung einfach vorbei kommen. Jeder mit **einem gültigen 2G+ Nachweis **ist willkommen! Am besten Du bringst direkt den ausgefüllten [[Haftungsausschluss>>url:https://cloud.makerspace-darmstadt.de/s/722GF4AGrPd95aP||style="text-decoration: none;" shape="rect"]] mit.
92 +When you create new pages in this space, they'll appear here automatically.
130 130  
131 -(% style="" %)
132 -**Jeden Donnerstag, 19:00 bis ca. 21:00 Uhr**
94 +{{children/}}
133 133  
134 -(% style="" %)
135 -Während der offenen Werkstatt kannst Du einfach vorbei kommen und an deinem Projekt arbeiten. Bitte beachte aber, dass zur Verwendung der Maschinen eine Einweisung erforderlich ist, die du gegebenfalls vorher absolvieren musst. Wenn ein Mitglied mit entsprechender Einweisung vor Ort ist und Zeit hat helfen wir natürlich gerne aus, dies können wir aber nicht garantieren, da Rundgänge Priorität haben.
96 += {{id name="Welcome-Usefullinks"/}}**Useful links** =
136 136  
137 -(% style="" %)
138 -**Sprecht euch idealerweise schon vor der offenen Werkstatt mit einem Mitglied in unserem [[Slack>>url:https://join.slack.com/t/makerspace-darmstadt/shared_invite/zt-pib8n8ib-RFlKRhlHzgIjoXZVmyUQMQ||style="text-decoration: none;" shape="rect"]] ab, so könnt ihr sicherstellen, dass ihr auf jeden Fall arbeiten könnt.**
98 +|=(((
99 +Link
100 +)))|=(((
101 +Description
102 +)))
103 +|(((
104 +[[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
105 +)))|(((
106 +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.
139 139  
140 -(% style="" %)
141 -Übrigens: Ihr könnt euch mit einem Mitglied gerne auch außerhalb der offenen Werkstattzeiten zum Arbeiten verabreden!
108 +But with Confluence, you can bring all that information into one place.
109 +)))
110 +|(((
111 +[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
112 +)))|(((
113 +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.
114 +)))
115 +|(((
116 +[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
117 +)))|(((
118 +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
119 +)))
142 142  
143 -(% style="text-decoration: none;" %)
144 -= {{id name="Welcome-FührungenundRundgänge"/}}Führungen und Rundgänge =
121 +(% style="font-size: 24.0px;line-height: 1.25;" %)**
122 +**
145 145  
146 -(% style="" %)
147 -Im Rahmen der offenen Werkstatt bieten wir euch auch gerne einen Rundgang durch unsere Werkstatt. Hier könnt ihr den Verein und unser Konzept kennenlernen sowie die Maschinen und Möglichkeiten der Werkstatt gezeigt bekommen.
124 +(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
148 148  
149 -(% style="" %)
150 -Jeden Donnerstag werden zwei Führungen angeboten:
126 +|(((
127 +(% class="task-list" %)
128 +(((
129 +{{task reference="/Tasks/Task_59" status="InProgress"}}
130 +[[Customize the name, colour, and icon of Confluence>>url:https://confluence.atlassian.com/x/NgszKw||shape="rect"]].
131 +{{/task}}
151 151  
152 -(% style="text-decoration: none;" %)
153 -* Um 19:15 Uhr (bitte um 19:00 da sein)
154 -* Um 20:15 Uhr (bitte um 20:00 da sein)
133 +{{task reference="/Tasks/Task_56" status="InProgress"}}
134 +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"]].
135 +{{/task}}
155 155  
156 -(% style="" %)
157 -Der Rundgang dauert jeweils ca. 45 Minuten und ihr habt natürlich auch die Möglichkeit, eure Fragen loszuwerden.
137 +{{task reference="/Tasks/Task_57" status="InProgress"}}
138 +Try adding an [[inline comment>>url:https://confluence.atlassian.com/x/2yAC||shape="rect"]] by highlighting some text and click the comment icon.
139 +{{/task}}
158 158  
159 -(% style="" %)
160 -Bitte beachtet die folgenden Punkte:
161 -
162 -(% style="text-decoration: none;" %)
163 -* Zur Zeit gilt für den Freizeitbereich die 2G Plus Regelung. Bitte bringt entsprechende Nachweise mit, diese werden am Eingang zusammen mit eurem Ausweisdokument geprüft.
164 -* Die Werkstatt beinhaltet gefährliche Maschinen, bringt daher bitte nach Möglichkeit den unterschrieben [[Haftungsauschluss>>url:https://cloud.makerspace-darmstadt.de/s/722GF4AGrPd95aP||style="text-decoration: none;" shape="rect"]] schon ausgedruckt mit. Dieser kann aber auch vor Ort ausgefüllt werden, das verzögert allerdings die Abläufe.
141 +{{task reference="/Tasks/Task_58" status="InProgress"}}
142 +Learn more about [[inviting your team to Confluence>>url:https://confluence.atlassian.com/x/SRwC||shape="rect"]].
143 +{{/task}}
144 +)))
145 +)))
165 165  {{/confluence_layout-cell}}
166 166  {{/confluence_layout-section}}
167 167  {{/confluence_layout}}
Icon Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -53182494
1 +327712
Title
... ... @@ -1,1 +1,1 @@
1 -Welcome
1 +Makerspace Darmstadt
URL
... ... @@ -1,1 +1,1 @@
1 -https://wiki.makerspace-darmstadt.de/spaces/MD/pages/53182494/Welcome
1 +https://wiki.makerspace-darmstadt.de/spaces/MD/pages/327712/Makerspace Darmstadt