Template:Location - Revision history

Kwisatz at 12:09, 23 June 2012

2012-06-23T12:09:43Z

2012-02-18T12:25:52Z

don't obfuscate email address in semantic data

2012-02-18T12:20:51Z

hmm odd.. new behaviour seems to ignore nowiki

2012-02-18T12:19:40Z

email obfuscation

2012-02-18T11:55:00Z

we don't have that many cols

2012-02-18T11:02:15Z

starting change

2012-02-16T18:46:08Z

reduced colspan, added heading

2012-02-16T18:45:05Z

changed colspan

2012-02-16T18:44:14Z

restrict image width

2012-02-16T18:41:35Z

added picture attribute

@@ Line 1: / Line 1: @@
 <noinclude>
-This is the 'Location' template.
+This is the 'Location' template.<br/>
-It should be called in the following format:
+Please dont't use it directly. Use the [[Form:Location|form]] instead.
-<pre>
-{{Location
-|address=
-|city=
-|state=
-|country=
-|picture=<Filename, omitting File:, optional>
-|coordinates=<optional>
-|type=<optional, i.e. hackerspace, agglomeration; highschool>
-|website=
-|email=
-|phonenumber=
-}}
-</pre>
-Edit the page to see the template text.
 </noinclude><includeonly>
 {| class="wikitable"

@@ Line 40: / Line 40: @@
 | [[Has phonenumber::{{{phonenumber|}}}]]
 ! Email
-| [[Has email address::{{#replace:{{{email|}}}|@|<nowiki> </nowiki>_theAtSign_<nowiki> </nowiki>}}]]
+| {{#replace:{{{email|}}}|@|<nowiki> </nowiki>_theAtSign_<nowiki> </nowiki>}}
 |-
 ! Events upcoming at this location
@@ Line 78: / Line 78: @@
 Has coordinates={{#if: {{{coordinates|}}} | {{{coordinates}}} | {{#geocode:{{{address}}} {{{city}}} {{{country}}} }} }}
 | Has picture={{#if: {{{picture|}}} | [[File:{{{picture}}}]] }}
 }}
 </includeonly>

@@ Line 40: / Line 40: @@
 | [[Has phonenumber::{{{phonenumber|}}}]]
 ! Email
-| [[Has email address::{{#replace:{{{email|}}}|@|<nowiki>_</nowiki>theAtSign<nowiki>_</nowiki>}}]]
+| [[Has email address::{{#replace:{{{email|}}}|@|<nowiki> </nowiki>_theAtSign_<nowiki> </nowiki>}}]]
 |-
 ! Events upcoming at this location

@@ Line 40: / Line 40: @@
 | [[Has phonenumber::{{{phonenumber|}}}]]
 ! Email
-| [[Has email address::{{#replace:{{{email|}}}|@|<nowiki> </nowiki>theAtSign<nowiki> </nowiki>}}]]
+| [[Has email address::{{#replace:{{{email|}}}|@|<nowiki>_</nowiki>theAtSign<nowiki>_</nowiki>}}]]
 |-
 ! Events upcoming at this location

@@ Line 11: / Line 11: @@
 |coordinates=<optional>
 |type=<optional, i.e. hackerspace, agglomeration; highschool>
-|picture=<File.png>
+|website=
 }}
 </pre>
@@ Line 33: / Line 35: @@
 |-
 ! Website
-| {{{website|}}}
+| colspan="2" | [[Url::{{{website|}}}]]
 ! PhoneNumber
+| [[Has phonenumber::{{{phonenumber|}}}]]
 ! Email
+| [[Has email address::{{#replace:{{{email|}}}|@|<nowiki> </nowiki>theAtSign<nowiki> </nowiki>}}]]
 |-
 ! Events upcoming at this location

@@ Line 8: / Line 8: @@
 |state=
 |country=
 |coordinates=<optional>
 |type=<optional, i.e. hackerspace, agglomeration; highschool>
@@ Line 31: / Line 32: @@
 | {{#if: {{{picture|}}} | [[File:{{{picture}}}|400px]] }}
 |-
-! Manual coordinates
+! Website
-| {{{coordinates|}}}
+| {{{website|}}}
 |-
 ! Events upcoming at this location
@@ Line 62: / Line 67: @@
 |-
 ! Type of location
-| colspan="3" | [[Has typeOfLocation::{{{type|}}}]]
+| [[Has typeOfLocation::{{{type|}}}]]
 |}
 [[Category:Location]]

@@ Line 17: / Line 17: @@
 {| class="wikitable"
 ! Address
-| colspan="3" |{{Address|[[Has address::{{{address|}}}]]|[[Has city::{{{city|}}}]]|[[Has country::{{{country|}}}]]}}({{#geocode:{{{address|}}} {{{city|}}} {{{country|}}} }})
+| colspan="2" |{{Address|[[Has address::{{{address|}}}]]|[[Has city::{{{city|}}}]]|[[Has country::{{{country|}}}]]}}({{#geocode:{{{address|}}} {{{city|}}} {{{country|}}} }})
 |-
 ! Map display

@@ Line 20: / Line 20: @@
 |-
 ! Map display
-| colspan="3" |
+| colspan="2" |
 {{#display_point:
 {{#if: {{{coordinates|}}} | {{{coordinates}}} | {{{address|}}} {{{city|}}} {{{country|}}} }}
@@ Line 28: / Line 28: @@
 |type=hybrid
 }}
-| {{#if: {{{picture|}}} | [[File:{{{picture}}}|500px]] }}
+| {{#if: {{{picture|}}} | [[File:{{{picture}}}|400px]] }}
 |-
 ! Manual coordinates