From svnadmin@urchin.earth.li Sat Apr 20 22:14:12 2013 From: svnadmin@urchin.earth.li To: openguides-commits@lists.openguides.org Subject: [openguides-commits] r1465 - sites/oxford.openguides.org/templates Date: Sat, 20 Apr 2013 22:14:12 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4531418856643348834==" --===============4531418856643348834== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: dom Date: 2013-04-20 22:14:12 +0100 (Sat, 20 Apr 2013) New Revision: 1465 Added: sites/oxford.openguides.org/templates/custom_auto_map_link.tt sites/oxford.openguides.org/templates/display_metadata.tt Log: restore streetmap links. Note: display_metadata.tt should be removed once we're running a version including https://github.com/OpenGuides/OpenGuides/commit/111c9339858fad183cabde469518c= b70424f37b4 Added: sites/oxford.openguides.org/templates/custom_auto_map_link.tt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sites/oxford.openguides.org/templates/custom_auto_map_link.tt = (rev 0) +++ sites/oxford.openguides.org/templates/custom_auto_map_link.tt 2013-04-20 = 21:14:12 UTC (rev 1465) @@ -0,0 +1,7 @@ +[% IF os_x AND os_y %] +[% IF auto_map_link_in_address %] +(map of this place) +[% ELSE %] +Map of this place +[% END %] +[% END %] Added: sites/oxford.openguides.org/templates/display_metadata.tt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sites/oxford.openguides.org/templates/display_metadata.tt = (rev 0) +++ sites/oxford.openguides.org/templates/display_metadata.tt 2013-04-20 21:1= 4:12 UTC (rev 1465) @@ -0,0 +1,100 @@ +[% USE CGI %] + +[% IF phone OR fax OR address OR postcode OR formatted_website_text + OR hours_text OR map_link OR categories.size OR locales.size OR + node_image %] +
+ + + [% node_name %] +[% IF phone OR fax OR address OR postcode OR formatted_website_text + OR hours_text OR map_link %]=20 + +[% END %] + +[% IF (categories.size AND categories.size > 0) + OR (locales.size AND locales.size > 0) %] + +[% END %] +
+[% END %] + --===============4531418856643348834==-- From dom@earth.li Sat Apr 20 22:18:51 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] d2c884: Merge pull request #45 from OpenGuides/26_remove_o... Date: Sat, 20 Apr 2013 14:08:15 -0700 Message-ID: <517303bf4ecbf_4d76b35e2032613@hookshot-fe4-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6021772559754550728==" --===============6021772559754550728== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/master Home: https://github.com/OpenGuides/OpenGuides Commit: d2c884b0d1c49726f534a449921c2bda2883d34b https://github.com/OpenGuides/OpenGuides/commit/d2c884b0d1c49726f534a44= 9921c2bda2883d34b Author: bob Date: 2013-03-23 (Sat, 23 Mar 2013) Changed paths: M INSTALL M README M lib/OpenGuides.pm M t/506_diffs_with_macros.t Log Message: ----------- Merge pull request #45 from OpenGuides/26_remove_ogl remove outdated references to OGL. Commit: 31fa70b3a6f2ede8b16968d1e619348e3afdb18f https://github.com/OpenGuides/OpenGuides/commit/31fa70b3a6f2ede8b16968d= 1e619348e3afdb18f Author: bob walker Date: 2013-03-23 (Sat, 23 Mar 2013) Changed paths: A .gitignore Log Message: ----------- add a .gitignore Commit: 111c9339858fad183cabde469518cb70424f37b4 https://github.com/OpenGuides/OpenGuides/commit/111c9339858fad183cabde4= 69518cb70424f37b4 Author: Dominic Hargreaves Date: 2013-04-20 (Sat, 20 Apr 2013) Changed paths: M CUSTOMISATION M templates/display_metadata.tt Log Message: ----------- Add (hook for) automatic map links If there is no explicit map_link for a node, try and call a custom template, custom_auto_map_link.tt, to create one Compare: https://github.com/OpenGuides/OpenGuides/compare/9a640fbaf0ce...111c= 9339858f --===============6021772559754550728==-- From kake@earth.li Mon Apr 22 19:43:40 2013 From: Kake To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 6bc2c5: Here is a commit message. Date: Mon, 22 Apr 2013 11:43:32 -0700 Message-ID: <517584d451da6_4b2777be10349c@hookshot-fe1-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7283740269710176582==" --===============7283740269710176582== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/testing Home: https://github.com/OpenGuides/OpenGuides Commit: 6bc2c587966718e10f7f6b6ed3fd33f1607f74f9 https://github.com/OpenGuides/OpenGuides/commit/6bc2c587966718e10f7f6b6= ed3fd33f1607f74f9 Author: Kake Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M Changes Log Message: ----------- Here is a commit message. Commit: 32020a6060a4765fab4466c13661b13fecc97590 https://github.com/OpenGuides/OpenGuides/commit/32020a6060a4765fab4466c= 13661b13fecc97590 Author: Kake Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M Changes Log Message: ----------- Testing testing... Compare: https://github.com/OpenGuides/OpenGuides/compare/6bc2c5879667^...320= 20a6060a4 --===============7283740269710176582==-- From kake@earth.li Mon Apr 22 19:44:39 2013 From: Kake To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] d70191: Tests again. Date: Mon, 22 Apr 2013 11:44:37 -0700 Message-ID: <517585158558e_19f98cbe14886c8@hookshot-fe2-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4869078872062593531==" --===============4869078872062593531== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/testing Home: https://github.com/OpenGuides/OpenGuides Commit: d7019164ba67fa711e2661575ee96d3adb359962 https://github.com/OpenGuides/OpenGuides/commit/d7019164ba67fa711e26615= 75ee96d3adb359962 Author: Kake Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M Changes Log Message: ----------- Tests again. --===============4869078872062593531==-- From kake@earth.li Mon Apr 22 19:47:24 2013 From: KakeLP To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] Date: Mon, 22 Apr 2013 11:47:16 -0700 Message-ID: <517585b410e54_34129d9e145581d@hookshot-fe5-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5375624625680698641==" --===============5375624625680698641== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Branch: refs/heads/testing Home: https://github.com/OpenGuides/OpenGuides --===============5375624625680698641==-- From dom@earth.li Sun Apr 28 23:59:26 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 2aa6b1: Revert "Add (hook for) automatic map links" Date: Sun, 28 Apr 2013 15:59:17 -0700 Message-ID: <517da9c5152b8_62e0f59e20296ab@hookshot-fe1-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5836942224145648816==" --===============5836942224145648816== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/master Home: https://github.com/OpenGuides/OpenGuides Commit: 2aa6b1ef18faa1b408b3bf04d7961abe1f4d9370 https://github.com/OpenGuides/OpenGuides/commit/2aa6b1ef18faa1b408b3bf0= 4d7961abe1f4d9370 Author: Dominic Hargreaves Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M CUSTOMISATION M templates/display_metadata.tt Log Message: ----------- Revert "Add (hook for) automatic map links" This reverts commit 111c9339858fad183cabde469518cb70424f37b4, pending a change to the interface, and the addition of tests. --===============5836942224145648816==-- From dom@earth.li Sun Apr 28 23:59:52 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 511ae3: Add (hook for) automatic map links Date: Sun, 28 Apr 2013 15:59:47 -0700 Message-ID: <517da9e35db3d_2be9a7fe18470b9@hookshot-fe4-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1639432402009764422==" --===============1639432402009764422== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/auto_map_links Home: https://github.com/OpenGuides/OpenGuides Commit: 511ae38f2d14a8fe07f76cae02c3d061223c3cd6 https://github.com/OpenGuides/OpenGuides/commit/511ae38f2d14a8fe07f76ca= e02c3d061223c3cd6 Author: Dominic Hargreaves Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M CUSTOMISATION M templates/display_metadata.tt Log Message: ----------- Add (hook for) automatic map links If there is no explicit map_link for a node, try and call a custom template, custom_auto_map_link.tt, to create one --===============1639432402009764422==-- From dom@earth.li Tue Apr 30 19:22:19 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 70b463: Add (hook for) automatic map links Date: Tue, 30 Apr 2013 11:22:05 -0700 Message-ID: <51800bcd6704e_2685139de141054d@hookshot-fe4-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8041593904962207330==" --===============8041593904962207330== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/auto_map_links Home: https://github.com/OpenGuides/OpenGuides Commit: 70b4636c75619117d56a0dd035c8b21cd2df019a https://github.com/OpenGuides/OpenGuides/commit/70b4636c75619117d56a0dd= 035c8b21cd2df019a Author: Dominic Hargreaves Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M CUSTOMISATION M templates/display_metadata.tt Log Message: ----------- Add (hook for) automatic map links If there is no explicit map_link for a node, try and call a custom template, custom_auto_map_link.tt, to create one --===============8041593904962207330==-- From dom@earth.li Tue Apr 30 19:23:41 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 1c517f: Add (hook for) automatic map links Date: Tue, 30 Apr 2013 11:23:33 -0700 Message-ID: <51800c25535c4_6af65e9e1c9334@hookshot-fe5-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6497268132379526937==" --===============6497268132379526937== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/auto_map_links Home: https://github.com/OpenGuides/OpenGuides Commit: 1c517f3ea72bef29713d84b446965b6a42d6a8ee https://github.com/OpenGuides/OpenGuides/commit/1c517f3ea72bef29713d84b= 446965b6a42d6a8ee Author: Dominic Hargreaves Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M CUSTOMISATION M templates/display_metadata.tt Log Message: ----------- Add (hook for) automatic map links Allow a custom template, custom_auto_map_link.tt to populate map links in node metadata TODO: tests --===============6497268132379526937==-- From svnadmin@urchin.earth.li Tue Apr 30 20:13:39 2013 From: svnadmin@urchin.earth.li To: openguides-commits@lists.openguides.org Subject: [openguides-commits] r1466 - sites/oxford.openguides.org/templates Date: Tue, 30 Apr 2013 20:13:39 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0329849708175097423==" --===============0329849708175097423== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: dom Date: 2013-04-30 20:13:39 +0100 (Tue, 30 Apr 2013) New Revision: 1466 Modified: sites/oxford.openguides.org/templates/custom_auto_map_link.tt Log: updated custom template to work with new hook Modified: sites/oxford.openguides.org/templates/custom_auto_map_link.tt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sites/oxford.openguides.org/templates/custom_auto_map_link.tt 2013-04-20 = 21:14:12 UTC (rev 1465) +++ sites/oxford.openguides.org/templates/custom_auto_map_link.tt 2013-04-30 = 19:13:39 UTC (rev 1466) @@ -1,7 +1,17 @@ -[% IF os_x AND os_y %] [% IF auto_map_link_in_address %] -(map of this place) + [% IF map_link %] + (map of this place) + [% ELSE %] + [% IF os_x AND os_y %] + (map of this place) + [% END %] + [% END %] [% ELSE %] -Map of this place + [% IF map_link %] + Map of this place + [% ELSE %] + [% IF os_x AND os_y %] + Map of this place + [% END %] + [% END %] [% END %] -[% END %] --===============0329849708175097423==-- From dom@earth.li Tue Apr 30 20:14:03 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] e57e8e: Add (hook for) automatic map links Date: Tue, 30 Apr 2013 12:13:54 -0700 Message-ID: <518017f2d137a_22751295e18350c4@hookshot-fe4-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1856536085510495659==" --===============1856536085510495659== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/auto_map_links Home: https://github.com/OpenGuides/OpenGuides Commit: e57e8e3023c2d7cd84598246602a3007f7dd9afd https://github.com/OpenGuides/OpenGuides/commit/e57e8e3023c2d7cd8459824= 6602a3007f7dd9afd Author: Dominic Hargreaves Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M CUSTOMISATION A t/907_auto_map_link.t M templates/display_metadata.tt Log Message: ----------- Add (hook for) automatic map links Allow a custom template, custom_auto_map_link.tt to populate map links in node metadata --===============1856536085510495659==-- From dom@earth.li Tue Apr 30 20:14:39 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 7bf310: Add (hook for) automatic map links Date: Tue, 30 Apr 2013 12:14:30 -0700 Message-ID: <51801816ad09d_6b67767e1010265a@hookshot-fe1-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8828102600630810278==" --===============8828102600630810278== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/auto_map_links Home: https://github.com/OpenGuides/OpenGuides Commit: 7bf3106a4c0023fcfce4053154a7637bc57082da https://github.com/OpenGuides/OpenGuides/commit/7bf3106a4c0023fcfce4053= 154a7637bc57082da Author: Dominic Hargreaves Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M CUSTOMISATION A t/907_auto_map_link.t M templates/display_metadata.tt Log Message: ----------- Add (hook for) automatic map links Allow a custom template, custom_auto_map_link.tt to populate map links in node metadata --===============8828102600630810278==-- From dom@earth.li Tue Apr 30 20:21:35 2013 From: Dominic Hargreaves To: openguides-commits@lists.openguides.org Subject: [openguides-commits] [OpenGuides/OpenGuides] 937e9d: add new file to MANIFEST Date: Tue, 30 Apr 2013 12:21:33 -0700 Message-ID: <518019bd7fac9_25a9b05e1429436@hookshot-fe4-pe1-prd.aws.github.net.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0497955327298062503==" --===============0497955327298062503== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Branch: refs/heads/auto_map_links Home: https://github.com/OpenGuides/OpenGuides Commit: 937e9dce0abbad22c17f4f83761468d24661f2aa https://github.com/OpenGuides/OpenGuides/commit/937e9dce0abbad22c17f4f8= 3761468d24661f2aa Author: Dominic Hargreaves Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M MANIFEST Log Message: ----------- add new file to MANIFEST --===============0497955327298062503==--