Änderungen von Dokument Der Verein

Zusammenfassung

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

Details

Seiteneigenschaften

Dokument-Autor

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

Inhalt

...	...	@@ -1,12 +1,4 @@
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		-
10	10	{{confluence_layout-section ac:type="two_right_sidebar"}}
11	11	{{confluence_layout-cell}}
12	12	----
...	...	@@ -17,146 +17,104 @@
17	17
18	18	\\
19	19
20		-//Der Rest ist Test//
21		-
22	22	----
23	23
24		-\\
	14	+= {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
25	25
26		-(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Wichtigste Ansprechpartner**
27		-
28	28	(% class="wrapped" %)
29	29	|(((
30	30	(% class="content-wrapper" %)
31	31	(((
32	32	(% style="text-align: center;" %)
33		-[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
	21	+[[image:attach:_ms_nico-neumann.png||thumbnail="true" height="150"]]
34	34
35	35	(% style="text-align: center;" %)
36		-**Harvey Honner-white
37		-**Team Lead** **
	24	+**Nico Neumann
	25	+**Vorsitzender
	26	+Öffentl./Kommunikation
38	38	)))
39	39	)))|(((
40	40	(% class="content-wrapper" %)
41	41	(((
42	42	(% style="text-align: center;" %)
43		-[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
	32	+[[image:attach:_ms_antje-schreiber.png||thumbnail="true" height="150"]]
44	44
45	45	(% style="text-align: center;" %)
46		-**Alana Baczewski
47		- **Tech Lead
	35	+**Antje Schreiber**
	36	+Mitgliederverwaltung
	37	+Organisation/Struktur
48	48	)))
49	49	)))|(((
50	50	(% class="content-wrapper" %)
51	51	(((
52		-(% style="text-align: center;" %)
53		-[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
	42	+[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
54	54
55	55	(% style="text-align: center;" %)
56		-**Sameer Farrell
57		- **Marketing
	45	+(% style="text-align: center;letter-spacing: 0.0px;" %)**Jan Schuhmacher**(% style="letter-spacing: 0.0px;" %)
	46	+Offene Werkstatt
	47	+Inventar
58	58	)))
59	59	)))|(((
60	60	(% class="content-wrapper" %)
61	61	(((
62	62	(% style="text-align: center;" %)
63		-[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
	53	+[[image:attach:_ms_roman-shuf.png||thumbnail="true" height="150"]]
64	64
65	65	(% style="text-align: center;" %)
66		-**Mia Bednarczyk
67		- **Recruitment
	56	+**Roman Shuf**
	57	+Raumbeauftragter
	58	+Sicherheit / Einweisungen
68	68	)))
69	69	)))
70	70
71		-\\
	62	+= {{id name="Welcome-Suche"/}}Suche =
72	72
73		-= {{id name="Welcome-Roadmap"/}}**Roadmap** =
	64	+= {{id name="Welcome-"/}} =
74	74
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"]].
	66	+{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
76	76
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"/}}
	68	+\\
	69	+{{/confluence_layout-cell}}
78	78
79		-= {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
	71	+{{confluence_layout-cell}}
	72	+----
80	80
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.
	74	+= {{id name="Welcome-GettingStarted"/}}Getting Started =
82	82
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.
	76	+Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
84	84
85		-= {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
	78	+{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
86	86
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.
	80	+----
88	88
89		-This is a test: [[Pagelink>>confluencePage:page:MD.Testpage 2]]
	82	+= {{id name="Welcome-Slack"/}}Slack =
90	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"]]
	84	+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"]]
92	92
93		-\\
94		-
95	95	----
96		-{{/confluence_layout-cell}}
97	97
98		-{{confluence_layout-cell}}
99		-= {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
	88	+= {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
100	100
101		-Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
	90	+Du willst uns kennenlernen und einfach mal reinschnuppern? Komm zu unseren offenen Werkstattzeiten vorbei! Diese sind momentan:
102	102
103		-{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
104		-
105		-= {{id name="Welcome-Usefullinks"/}}**Useful links** =
106		-
107	107	(% class="wrapped" %)
108	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"]]
	94	+Dienstags
115	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.
117		-
118		-But with Confluence, you can bring all that information into one place.
	96	+19:00 - 21:00 Uhr (3D Druck Abend)
119	119	)))
120		-|(((
121		-[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
	98	+|=(((
	99	+Donnerstags
122	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.
	101	+19:00 - 21:00 Uhr
124	124	)))
125		-|(((
126		-[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
	103	+|=(((
	104	+Samstags
127	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
	106	+16:00 - 18:00 Uhr
129	129	)))
130	130
131		-(% style="font-size: 24.0px;line-height: 1.25;" %)**
132		-**
133		-
134		-(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
135		-
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}}
145		-
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		-)))
	109	+Weitere Termine findest du auch immer im [[Veranstaltungskalender unserer Homepage>>url:https://www.makerspace-darmstadt.de/termine||shape="rect"]]!
160	160	{{/confluence_layout-cell}}
161	161	{{/confluence_layout-section}}
162	162	{{/confluence_layout}}

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-1146911
	1	+3801169

URL

...	...	@@ -1,1 +1,1 @@
1		-https://wiki.makerspace-darmstadt.de/spaces/MD/pages/1146911/Welcome
	1	+https://wiki.makerspace-darmstadt.de/spaces/MD/pages/3801169/Welcome