Zum Inhalt springen

Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33
Von Version Icon 37.1 Icon
bearbeitet von Markus Chrzonszcz
am 2021/04/26 10:30
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version Icon 8.1 Icon
bearbeitet von ff8080816e8eea3f016e8ef83e5a0000
am 2019/11/26 08:10
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Icon Seiteneigenschaften
Dokument-Autor
... ... @@ -1,1 +1,1 @@
1 -XWiki.mchrzonsz
1 +XWiki.ff8080816e8eea3f016e8ef83e5a0000
Inhalt
... ... @@ -1,4 +1,12 @@
1 1  {{confluence_layout}}
2 +{{confluence_layout-section ac:type="single"}}
3 +{{confluence_layout-cell}}
4 +[[image:attach:msd.png]]
5 +
6 +\\
7 +{{/confluence_layout-cell}}
8 +{{/confluence_layout-section}}
9 +
2 2  {{confluence_layout-section ac:type="two_right_sidebar"}}
3 3  {{confluence_layout-cell}}
4 4  ----
... ... @@ -5,134 +5,150 @@
5 5  
6 6  = {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
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.// ==
16 +== {{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.// ==
9 9  
10 -----
18 +\\
11 11  
12 -= {{id name="Welcome-"/}} =
20 +//Der Rest ist Test//
13 13  
14 -{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
22 +----
15 15  
16 16  \\
17 17  
18 -----
26 +(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Wichtigste Ansprechpartner**
19 19  
20 -= {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
21 -
22 22  (% class="wrapped" %)
23 23  |(((
24 -(% style="text-align: center;" %)
25 -\\
26 -
27 -(% style="text-align: center;" %)
28 -\\
29 -
30 -(% style="text-align: center;" %)
31 -\\
32 -
33 -(% style="text-align: center;" %)
34 -\\
35 -
36 -(% style="text-align: center;" %)
37 -\\
38 -
39 39  (% class="content-wrapper" %)
40 40  (((
41 41  (% style="text-align: center;" %)
42 -**Daniel Herrmann
43 -**Vorsitzender
44 -Öffentl./Kommunikation
45 -)))
46 -)))|(((
47 -(% style="text-align: center;" %)
48 -\\
33 +[[image:attach:Harvey.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 -
36 +**Harvey Honner-white
37 +**Team Lead** **
38 +)))
39 +)))|(((
62 62  (% class="content-wrapper" %)
63 63  (((
64 64  (% style="text-align: center;" %)
65 -**Daniel Gasch
66 -**Mitgliederverwaltung
67 -Organisation/Struktur
43 +[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
44 +
45 +(% style="text-align: center;" %)
46 +**Alana Baczewski
47 + **Tech Lead
68 68  )))
69 69  )))|(((
70 70  (% class="content-wrapper" %)
71 71  (((
72 -[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
52 +(% style="text-align: center;" %)
53 +[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
73 73  
74 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
56 +**Sameer Farrell
57 + **Marketing
78 78  )))
79 79  )))|(((
60 +(% class="content-wrapper" %)
61 +(((
80 80  (% style="text-align: center;" %)
81 -\\
63 +[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
82 82  
83 83  (% style="text-align: center;" %)
84 -\\
66 +**Mia Bednarczyk
67 + **Recruitment
68 +)))
69 +)))
85 85  
86 -(% style="text-align: center;" %)
87 87  \\
88 88  
89 -(% style="text-align: center;" %)
90 -\\
73 += {{id name="Welcome-Roadmap"/}}**Roadmap** =
91 91  
92 -(% style="text-align: center;" %)
93 -\\
75 +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"]].
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}}
77 +{{confluence_roadmap timeline="true" source="%7B%22title%22%3A%22Roadmap%20Planner%22%2C%22timeline%22%3A%7B%22startDate%22%3A%222019-11-21%2000%3A00%3A00%22%2C%22endDate%22%3A%222020-10-21%2000%3A00%3A00%22%2C%22displayOption%22%3A%22MONTH%22%7D%2C%22lanes%22%3A%5B%7B%22title%22%3A%22Verein%22%2C%22color%22%3A%7B%22lane%22%3A%22%23f6c342%22%2C%22bar%22%3A%22%23fadb8e%22%2C%22text%22%3A%22%23594300%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22Test1%22%2C%22description%22%3A%22This%20is%20the%20first%20bar.%22%2C%22startDate%22%3A%222019-11-26%2020%3A11%3A52%22%2C%22duration%22%3A2%2C%22rowIndex%22%3A0%2C%22id%22%3A%22a3872b7b-d89b-41b7-a87f-2827b26477fd%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22title%22%3A%22Something%20Different%22%2C%22description%22%3A%22This%20is%20the%20second%20bar.%22%2C%22startDate%22%3A%222020-01-21%2013%3A32%3A40%22%2C%22duration%22%3A1%2C%22rowIndex%22%3A1%2C%22id%22%3A%2288d0e1ef-5036-49a1-8137-ce87257f4c09%22%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22Metallwerkstatt%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%22title%22%3A%22CNC%20Fr%C3%A4se%22%2C%22description%22%3A%22This%20is%20the%20third%20bar.%22%2C%22startDate%22%3A%222019-11-01%2007%3A07%3A43%22%2C%22duration%22%3A2.5%2C%22rowIndex%22%3A0%2C%22id%22%3A%2268d22371-ae27-4f9b-9ee1-38b520511d85%22%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22Gr%C3%BCn%22%2C%22color%22%3A%7B%22lane%22%3A%22%238eb021%22%2C%22bar%22%3A%22%23aac459%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%222019-11-01%2021%3A23%3A10%22%2C%22id%22%3A%22add00c9f-d55c-479f-8081-920e623759fb%22%2C%22title%22%3A%22Neue%20Leiste%22%2C%22description%22%3A%22Dies%20ist%20ein%20Test%22%2C%22duration%22%3A1%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%5D%2C%22markers%22%3A%5B%7B%22title%22%3A%22Heute%22%2C%22markerDate%22%3A%222019-11-15%2000%3A00%3A00%22%7D%5D%7D" title="Roadmap%20Planner" hash="62914bfede9c84a4ed318c2893899af7"/}}
104 104  
105 -{{confluence_layout-cell}}
106 -----
79 += {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
107 107  
108 -= {{id name="Welcome-GettingStarted"/}}Getting Started =
81 +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.
109 109  
110 -Hier sind einige wichtige Links zusammengefasst, die Dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
83 +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.
111 111  
112 -{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
85 += {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
113 113  
87 +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.
88 +
89 +This is a test: [[Pagelink>>confluencePage:page:MD.testpage]]
90 +
91 +Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
92 +
114 114  \\
115 115  
116 116  ----
96 +{{/confluence_layout-cell}}
117 117  
118 -= {{id name="Welcome-"/}}[[image:attach:Slack_MKSP.png]] =
98 +{{confluence_layout-cell}}
99 += {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
119 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"]]!
101 +Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
121 121  
122 -\\
103 +{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
123 123  
124 -----
105 += {{id name="Welcome-Usefullinks"/}}**Useful links** =
125 125  
126 -= {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
107 +(% class="wrapped" %)
108 +|=(((
109 +Link
110 +)))|=(((
111 +Description
112 +)))
113 +|(((
114 +[[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
115 +)))|(((
116 +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.
127 127  
128 -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.
118 +But with Confluence, you can bring all that information into one place.
119 +)))
120 +|(((
121 +[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
122 +)))|(((
123 +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.
124 +)))
125 +|(((
126 +[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
127 +)))|(((
128 +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
129 +)))
129 129  
131 +(% style="font-size: 24.0px;line-height: 1.25;" %)**
132 +**
130 130  
131 -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 immer nur ein Pärchen gleichzeitig in den Space gelassen wird.
134 +(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
132 132  
133 -\\
136 +(% class="wrapped" %)
137 +|(((
138 +(% class="content-wrapper" %)
139 +(((
140 +(% class="task-list" %)
141 +(((
142 +{{task reference="/Tasks/Task_59" status="InProgress"}}
143 +[[Customize the name, colour, and icon of Confluence>>url:https://confluence.atlassian.com/x/NgszKw||shape="rect"]].
144 +{{/task}}
134 134  
135 -Weitere Termine findest Du auch immer im [[Veranstaltungskalender unserer Homepage>>url:https://www.makerspace-darmstadt.de/termine||shape="rect"]]!
146 +{{task reference="/Tasks/Task_56" status="InProgress"}}
147 +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"]].
148 +{{/task}}
149 +
150 +{{task reference="/Tasks/Task_57" status="InProgress"}}
151 +Try adding an [[inline comment>>url:https://confluence.atlassian.com/x/2yAC||shape="rect"]] by highlighting some text and click the comment icon.
152 +{{/task}}
153 +
154 +{{task reference="/Tasks/Task_58" status="InProgress"}}
155 +Learn more about [[inviting your team to Confluence>>url:https://confluence.atlassian.com/x/SRwC||shape="rect"]].
156 +{{/task}}
157 +)))
158 +)))
159 +)))
136 136  {{/confluence_layout-cell}}
137 137  {{/confluence_layout-section}}
138 138  {{/confluence_layout}}
Icon Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -42369868
1 +1146905
URL
... ... @@ -1,1 +1,1 @@
1 -https://wiki.makerspace-darmstadt.de/spaces/MD/pages/42369868/Welcome
1 +https://wiki.makerspace-darmstadt.de/spaces/MD/pages/1146905/Welcome