Template:Event: Difference between revisions

@@ Line 22: / Line 22: @@
    }}
 | {{#if: {{{title|}}} | '''{{{title}}}'''<br /> }}{{#var: date}}
-}}<br />{{Address
+}}<br />{{#if: {{{venue|}}}
-|venue={{{venue|}}}
+| {{#if: {{{linkvenue|}}}
-|linkvenue={{{linkvenue|}}}
+  | [{{{linkvenue}}} {{{venue}}}]
-|address={{{address|}}}
+  | {{{venue}}}
-|city={{{city|}}}
+  }} {{#if: {{{address|}}} | – {{{address}}} }}
-|postalcode={{{postalcode|}}}
+| {{#if: {{{address|}}} | {{{address}}} | ? }}
-|sep=<br />
+}}<br />{{#if: {{{postalcode|}}}
-|noproperties={{{noproperties|}}}
+| {{{postalcode}}} {{#if: {{{city|}}} | {{{city}}} | ? }}
+| {{#if: {{{city|}}} | {{{city}}} | ? }}
 }} {{#if: {{{nocat|}}}
 |
@@ Line 35: / Line 36: @@
 }} {{#if: {{{noproperties|}}}
 |
-| {{#set: In language={{{lang|en}}}
+| {{#set:
+  In language={{{lang|en}}}
    |Has title={{{title|}}}
    |Has date={{#if: {{{date|}}} | {{#time:Y/m/d H:i| {{{date}}} {{{time|}}} }} }}
    |Has time={{{time|}}}
+  |Has address={{{address|}}}
+  |In venue={{{venue|}}}
+  |Has link venue={{{linkvenue|}}}
+  |In city={{{city|}}}
+  |In postal code={{{postalcode|}}}
    |Organized by={{{workgroup|}}}
+  |Has coordinates={{Coordinates
+    |address={{{address|}}}
+    |venue={{{venue|}}}
+    |city={{{city|}}}
+    }}
+  |Has location={{#if: {{{venue|}}}
+    | {{{venue}}} {{#if: {{{address|}}}{{{city|}}} | – }}
+    }} {{#if: {{{address|}}}
+    | {{{address}}}{{#if: {{{city|}}} | , }}
+    }} {{{city|}}}
    }}
 }}</includeonly>

Revision as of 18:08, 14 February 2017