Zum Inhalt springen

Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33
Von Version 1.1 Icon
bearbeitet von superadmin
am 2019/11/20 20:53
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version Icon 11.1 Icon
bearbeitet von ff8080816e8eea3f016e8ef83e5a0000
am 2019/11/26 08:28
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Icon Seiteneigenschaften
Titel
... ... @@ -1,1 +1,1 @@
1 -Makerspace Darmstadt
1 +Welcome
Dokument-Autor
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +XWiki.ff8080816e8eea3f016e8ef83e5a0000
Inhalt
... ... @@ -1,17 +1,9 @@
1 1  {{confluence_layout}}
2 2  {{confluence_layout-section ac:type="single"}}
3 3  {{confluence_layout-cell}}
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}}
4 +[[image:attach:msd.png]]
9 9  
10 -{{confluence_layout-section ac:type="single"}}
11 -{{confluence_layout-cell}}
12 -[[image:attach:peak.jpeg]]
13 -
14 -
6 +\\
15 15  {{/confluence_layout-cell}}
16 16  {{/confluence_layout-section}}
17 17  
... ... @@ -19,17 +19,24 @@
19 19  {{confluence_layout-cell}}
20 20  ----
21 21  
22 -= {{id name="Welcome-Goal"/}}**Goal** =
14 += {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
23 23  
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. // ==
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.// ==
25 25  
18 +\\
19 +
20 +//Der Rest ist Test//
21 +
26 26  ----
27 27  
28 -
24 +\\
29 29  
30 -= {{id name="Welcome-Coreteam"/}}**Core team** =
26 +(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Wichtigste Ansprechpartner**
31 31  
28 +(% class="wrapped" %)
32 32  |(((
30 +(% class="content-wrapper" %)
31 +(((
33 33  (% style="text-align: center;" %)
34 34  [[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
35 35  
... ... @@ -36,7 +36,10 @@
36 36  (% style="text-align: center;" %)
37 37  **Harvey Honner-white
38 38  **Team Lead** **
38 +)))
39 39  )))|(((
40 +(% class="content-wrapper" %)
41 +(((
40 40  (% style="text-align: center;" %)
41 41  [[image:attach:Alana.jpg||thumbnail="true" width="100"]]
42 42  
... ... @@ -43,7 +43,10 @@
43 43  (% style="text-align: center;" %)
44 44  **Alana Baczewski
45 45   **Tech Lead
48 +)))
46 46  )))|(((
50 +(% class="content-wrapper" %)
51 +(((
47 47  (% style="text-align: center;" %)
48 48  [[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
49 49  
... ... @@ -50,7 +50,10 @@
50 50  (% style="text-align: center;" %)
51 51  **Sameer Farrell
52 52   **Marketing
58 +)))
53 53  )))|(((
60 +(% class="content-wrapper" %)
61 +(((
54 54  (% style="text-align: center;" %)
55 55  [[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
56 56  
... ... @@ -58,17 +58,16 @@
58 58  **Mia Bednarczyk
59 59   **Recruitment
60 60  )))
69 +)))
61 61  
62 -
71 +\\
63 63  
64 64  = {{id name="Welcome-Roadmap"/}}**Roadmap** =
65 65  
66 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"]].
67 67  
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"/}}
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"/}}
69 69  
70 -
71 -
72 72  = {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
73 73  
74 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.
... ... @@ -75,13 +75,17 @@
75 75  
76 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.
77 77  
85 +\\
86 +
78 78  = {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
79 79  
80 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.
81 81  
91 +This is a test: [[Pagelink>>confluencePage:page:MD.Testpage 2]]
92 +
82 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"]]
83 83  
84 -
95 +\\
85 85  
86 86  ----
87 87  {{/confluence_layout-cell}}
... ... @@ -89,12 +89,13 @@
89 89  {{confluence_layout-cell}}
90 90  = {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
91 91  
92 -When you create new pages in this space, they'll appear here automatically.
103 +Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
93 93  
94 -{{children/}}
105 +{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
95 95  
96 96  = {{id name="Welcome-Usefullinks"/}}**Useful links** =
97 97  
109 +(% class="wrapped" %)
98 98  |=(((
99 99  Link
100 100  )))|=(((
... ... @@ -123,7 +123,10 @@
123 123  
124 124  (% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
125 125  
138 +(% class="wrapped" %)
126 126  |(((
140 +(% class="content-wrapper" %)
141 +(((
127 127  (% class="task-list" %)
128 128  (((
129 129  {{task reference="/Tasks/Task_59" status="InProgress"}}
... ... @@ -143,6 +143,76 @@
143 143  {{/task}}
144 144  )))
145 145  )))
161 +)))
146 146  {{/confluence_layout-cell}}
147 147  {{/confluence_layout-section}}
164 +
165 +{{confluence_layout-section ac:type="single"}}
166 +{{confluence_layout-cell}}
167 += {{id name="Welcome-Fullwidthtestsection"/}}**Full width testsection** =
168 +
169 + Ich sau hier mal ein bisschen drin rum, ich hoffe das ist nicht schlimm.
170 +
171 +\\
172 +
173 +----
174 +
175 +----
176 +
177 += {{id name="Welcome-"/}}{{confluence_loremipsum/}} =
178 +
179 += {{id name="Welcome-InstallationGravityAnleitung"/}}Installation Gravity Anleitung =
180 +
181 +(Reihenfolge von Schritten ist zubeachten!)
182 +
183 +== {{id name="Welcome-GenerelleInformationen"/}}Generelle Informationen ==
184 +
185 +* Die weiße Steckerleiste bitte immer eingesteckt lassen
186 +* Sofern diese ausgesteckt wurde und nach einstecken nicht wieder funktionieren sollte bitte Problembehandlung a) anwenden
187 +
188 +== {{id name="Welcome-Einschalten"/}}Einschalten ==
189 +
190 +* Schwarzen Stromstecker einstecken
191 +* Klebeband von Macbook abmachen und Macbook aufklappen
192 +* Hier nach sollte die Installation anfangen abzuspielen
193 +
194 +== {{id name="Welcome-Ausschalten"/}}Ausschalten ==
195 +
196 +* Macbook zuklappen und mit dem angebrachten Stück Klebeband absichern. (Leider ist das Macbook etwas älter, sodass das Scharnier nicht mehr richtig schließt, daher ist dieser Schritt notwendig)
197 +* Warten bis der Macbook Lüfter nicht mehr zu hören ist
198 +* Schwarzen Stromstecker ziehen
199 +
200 +== {{id name="Welcome-Problembehandlung"/}}Problembehandlung ==
201 +
202 +a) Sollte es zu Problemen mit dem Ablauf des 15 minütigen Loops kommen, einmal das Hauptprogramm Neustarten:
203 +
204 +1. Macbook nutzen
205 +1. Eine Visualisierung der Installation sollte zu sehen sein
206 +1. Das Fenster welches diese Visualisierung zeigt schließen. (Oben links roter Knopf)
207 +1. Ein weiteres Fenster mit Programmiercode sollte nun sichtbar sein.
208 +1. Hiebei den "Stop" Button (oben links unterhalb der Fensterleiste) anklicken
209 +1. Bei allen Stehlen die drehbaren Elemente in die geraden Ausgangsposition bewegen. Dazu die mittigste Stange anfassen und drehen.
210 +1. Danach den "Play" Knopf drücken. Dieser befindet sich der neben dem Stop Knopf.
211 +1. Nun sollte sich die Visualisierung wieder öffnen und die Installation weiterlaufen
212 +1. Ist dies nicht der Fall bitte zuvor schwarzen Stromstecker ziehen und die Lichtelemente an den Stehlen in vorherige Position drehen
213 +1. Schwarzer Stecker wieder einstecken und den vorherigen Schritt 6. Ausführen
214 +
215 +b) Gesamtneustart (sofern a) nicht geholfen hat):
216 +
217 +1. Schwarzen Stromstecker ziehen
218 +1. a) ausführen bis einschließlich 5.
219 +1. Weißen Stromstecker ziehen
220 +1. ca. 30 Sekunden warten
221 +1. Weißen Stromstecker einstecken
222 +1. Schwarzen Stromstecker einstecken
223 +1. ca. 30 Sekunden warten
224 +1. a) Schritt 6. Ausführen
225 +
226 +== {{id name="Welcome-Kontaktdaten"/}}Kontaktdaten ==
227 +
228 +* bei unkritische Problemen oder Fragen Kontakt über Mail : [[gravity@robertschnuell.de>>mailto:gravity@robertschnuell.de||shape="rect"]]
229 +* Bei Problemen die absolut schnell gelöst werden müssen -> Telefon: 017663780878
230 +* Ansonsten bitte erst Hermann Nöring oder andere Beteiligte der Emaf kontaktieren
231 +{{/confluence_layout-cell}}
232 +{{/confluence_layout-section}}
148 148  {{/confluence_layout}}
Icon Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -327712
1 +2293764
Title
... ... @@ -1,1 +1,1 @@
1 -Makerspace Darmstadt
1 +Welcome
URL
... ... @@ -1,1 +1,1 @@
1 -https://wiki.makerspace-darmstadt.de/spaces/MD/pages/327712/Makerspace Darmstadt
1 +https://wiki.makerspace-darmstadt.de/spaces/MD/pages/2293764/Welcome