From d30a1498f309370a0456868beb5ae0e409ccbf88 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 30 Aug 2014 14:44:54 -0400 Subject: [PATCH 1/8] remove comma after state --- creators/hcard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/creators/hcard.html b/creators/hcard.html index b95947e..71fa66e 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -154,7 +154,7 @@ csz += templates.region.process({region : region}) + "\n"; } if(postal) { - if(csz) csz += ', \n'; + if(csz) csz += '\n'; csz += templates.postal_code.process({postal_code : postal}) + "\n"; } if(country) { From cc9b903b702ffdc29b8e58b98a5a2e6c16b2a775 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 30 Aug 2014 14:49:35 -0400 Subject: [PATCH 2/8] remove trailing line break from city to fix code spacing issues --- creators/hcard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/creators/hcard.html b/creators/hcard.html index 71fa66e..1d707ca 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -148,7 +148,7 @@ resultstr += '
\n'; if(street) resultstr += templates.street_address.process({street_address : street}) + "\n"; var csz = ""; - if(city) csz += templates.city.process({city: city}) + "\n"; + if(city) csz += templates.city.process({city: city}); if(region) { if(csz) csz += ', \n'; csz += templates.region.process({region : region}) + "\n"; From ac66b8efd15535ed63b99dbb92b911b38d72cd5c Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 30 Aug 2014 15:14:05 -0400 Subject: [PATCH 3/8] add tel link --- creators/hcard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/creators/hcard.html b/creators/hcard.html index 1d707ca..fea0d19 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -107,7 +107,7 @@ region : ' ${region}<\/span>', postal_code : ' ${postal_code}', country_name : ' ${country}<\/span>', - tel : '
${tel}
', + tel : '
${tel}
', /* TODO: add encodeURIComponent to templates */ aim : ' AIM<\/a>\n', yim : ' YIM<\/a>\n', From 4b22dd82a9fab386aedd251112514e7e9164edc7 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 30 Aug 2014 15:14:10 -0400 Subject: [PATCH 4/8] remove ad --- creators/hcard.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/creators/hcard.html b/creators/hcard.html index fea0d19..da98f4c 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -114,7 +114,6 @@ jabber : ' Jabber\n', tags : '
${tags}
', tag : '${term}', - ad : '

This hCard created with the hCard creator.

' }; var implied_n_opt = ((additionalname == undefined || additionalname == "") && (givenname && givenname.indexOf(' ') == -1) && (familyname && familyname.indexOf(' ') == -1)); @@ -177,7 +176,6 @@ } resultstr += templates.tags.process({tags : temp}) } - resultstr += templates.ad.process({}) + "\n"; resultstr += '<\/div>'; $(outputfield).val(resultstr); $("#preview").html(resultstr); From be8984ded82e144df491046a3ad9020fc0ae7722 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 30 Aug 2014 19:24:00 -0400 Subject: [PATCH 5/8] add job title field --- creators/hcard.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/creators/hcard.html b/creators/hcard.html index da98f4c..f73bb1a 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -75,6 +75,7 @@ function codeit() { /* get values of text fields */ + var title = NormalizeSpace($('#title').val()); var givenname = NormalizeSpace($('#givenname').val()); var additionalname = NormalizeSpace($('#additionalname').val()); var familyname = NormalizeSpace($('#familyname').val()); @@ -95,6 +96,7 @@ var templates = { vcard: '
${content}
', + title: ' ${title}', given_name : ' ${given_name}', additional_name : ' ${additional_name}', family_name : ' ${family_name}', @@ -120,6 +122,9 @@ if(implied_n_opt) { var fn = filter(null, [givenname, familyname]).join(' '); } else { + if (title != "") { + var fn += templates.title.process({title : title}) + "\n"; + } var fn = templates.given_name.process({given_name : givenname}) + "\n"; var fn_text = givenname; if (additionalname != "") { @@ -128,7 +133,7 @@ fn += templates.family_name.process({family_name : familyname}) + "\n"; } /* set results field */ - var fn_id = (filter(null, [givenname, additionalname, familyname]).length > 0 ? filter(null, ['hcard', givenname, additionalname, familyname]).join(' ').replace(/ /g, '-'): ''); + var fn_id = (filter(null, [title, givenname, additionalname, familyname]).length > 0 ? filter(null, ['hcard', title, givenname, additionalname, familyname]).join(' ').replace(/ /g, '-'): ''); var resultstr = '
\n'; if(photo && photo.match(/https?:\/\/.*\..{2,4}.*\/.+/)) resultstr += templates.photo.process({photo_url:photo, fn:fn_text}) + "\n"; if(url && url.match(/https?\:\/\/.*\..{2,4}.*/)) { // make sure the url at least looks like a url before we load it @@ -208,6 +213,10 @@

hCard Creator

hCard-o-matic +
+ + +
From 4c4c820a94f5a3c552764e645e295a635c2e14b7 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Mon, 15 Sep 2014 19:47:12 -0400 Subject: [PATCH 6/8] declare `fn` before it's needed --- creators/hcard.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/creators/hcard.html b/creators/hcard.html index f73bb1a..21752f0 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -119,11 +119,12 @@ }; var implied_n_opt = ((additionalname == undefined || additionalname == "") && (givenname && givenname.indexOf(' ') == -1) && (familyname && familyname.indexOf(' ') == -1)); + var fn; if(implied_n_opt) { - var fn = filter(null, [givenname, familyname]).join(' '); + fn = filter(null, [givenname, familyname]).join(' '); } else { if (title != "") { - var fn += templates.title.process({title : title}) + "\n"; + fn += templates.title.process({title : title}) + "\n"; } var fn = templates.given_name.process({given_name : givenname}) + "\n"; var fn_text = givenname; From 60a6bf16a3f6e34c59a8df2194bfc30c83c610ee Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Mon, 15 Sep 2014 19:52:43 -0400 Subject: [PATCH 7/8] add note about a bug related to the title field --- creators/hcard.html | 1 + 1 file changed, 1 insertion(+) diff --git a/creators/hcard.html b/creators/hcard.html index 21752f0..f97e948 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -134,6 +134,7 @@ fn += templates.family_name.process({family_name : familyname}) + "\n"; } /* set results field */ + // FIXME: fix title not being displayed in output var fn_id = (filter(null, [title, givenname, additionalname, familyname]).length > 0 ? filter(null, ['hcard', title, givenname, additionalname, familyname]).join(' ').replace(/ /g, '-'): ''); var resultstr = '
\n'; if(photo && photo.match(/https?:\/\/.*\..{2,4}.*\/.+/)) resultstr += templates.photo.process({photo_url:photo, fn:fn_text}) + "\n"; From b63919278e53543619f92af6cf0075a931c38265 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Mon, 15 Sep 2014 20:05:13 -0400 Subject: [PATCH 8/8] add note about a.tel links --- creators/hcard.html | 1 + 1 file changed, 1 insertion(+) diff --git a/creators/hcard.html b/creators/hcard.html index f97e948..74d62f4 100644 --- a/creators/hcard.html +++ b/creators/hcard.html @@ -171,6 +171,7 @@ resultstr += csz + ' <\/div>\n'; } if(phone) resultstr += templates.tel.process({tel: phone}) + "\n"; + // TODO: remove hyphens from a.tel link if(aim) resultstr += templates.aim.process({ aim : aim}) + "\n"; if(yim) resultstr += templates.yim.process({yim : yim}) + "\n"; if(jabber) resultstr += templates.jabber.process({jabber : jabber}) + "\n";