From svnadmin@urchin.earth.li Tue Jun 12 23:39:10 2007 From: svnadmin@urchin.earth.li To: openguides-commits@lists.openguides.org Subject: [openguides-commits] r1076 - sites/oxford.openguides.org/templates Date: Tue, 12 Jun 2007 23:39:09 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6065609592231432766==" --===============6065609592231432766== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: dom Date: 2007-06-12 23:39:09 +0100 (Tue, 12 Jun 2007) New Revision: 1076 Added: sites/oxford.openguides.org/templates/custom_header.tt sites/oxford.openguides.org/templates/navbar_this_page.tt Removed: sites/oxford.openguides.org/templates/display_metadata.tt.old sites/oxford.openguides.org/templates/header.tt sites/oxford.openguides.org/templates/navbar.tt sites/oxford.openguides.org/templates/needing_moderation.tt Modified: sites/oxford.openguides.org/templates/display_metadata.tt sites/oxford.openguides.org/templates/map_index.tt Log: Sync with 0.60 templates Added: sites/oxford.openguides.org/templates/custom_header.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_header.tt = (rev 0) +++ sites/oxford.openguides.org/templates/custom_header.tt 2007-06-12 22:39:0= 9 UTC (rev 1076) @@ -0,0 +1,3 @@ +[% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] + +[% END %] Modified: 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 2007-06-12 22:2= 2:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/display_metadata.tt 2007-06-12 22:3= 9:09 UTC (rev 1076) @@ -5,14 +5,27 @@ node_image %]
[% IF node_image %] -
- 3D"Picture -
+
+ [% IF node_image_url %][% END %] + 3D"Picture + [% IF node_image_url %][% END %] + [% IF node_image_copyright %] +
+ [% IF node_image_licence %] + © + [% node_image_copyright %] + [% ELSE %] + © [% node_image_copyright %] + [% END %] +
+ [% END %] +
[% ELSE %] - + [% END %] =20 - + [% node_name %] [% IF phone OR fax OR address OR postcode OR formatted_website_text OR hours_text OR map_link %]=20 @@ -20,12 +33,12 @@ =20 [% IF phone %]
  • - [% CGI.escapeHTML(phone) %] + = [% CGI.escapeHTML(phone) %]
  • [% END %] [% IF fax %]
  • -
  • [% END %] [% IF address %] @@ -35,15 +48,17 @@ [% IF map_link %] (map of this place) [% ELSIF os_x AND os_y %] - (map of this place) - + (map of this place) [% END %] [% ELSIF map_link %]
  • + [% ELSIF os_x AND os_y %] +
  • + +
  • [% END %] [% IF postcode %]
  • Deleted: sites/oxford.openguides.org/templates/display_metadata.tt.old =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.old 2007-06-12 = 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/display_metadata.tt.old 2007-06-12 = 22:39:09 UTC (rev 1076) @@ -1,86 +0,0 @@ -[% USE CGI %] - - -
    -[% 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) %] -
      - [% IF categories.size AND categories.size > 0 %] -
    • - - [% FOREACH category =3D categories %] - [% category.name %] - [% "/" UNLESS loop.last %] - [% END %] -
    • - [% END %] - - [% IF locales.size AND locales.size > 0 %] -
    • - - [% FOREACH locale =3D locales %] - [% locale.name %] - [% "/" UNLESS loop.last %] - [% END %] -
    • - [% END %] -
    -[% END %] -
    - - Deleted: sites/oxford.openguides.org/templates/header.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/header.tt 2007-06-12 22:22:53 UTC (= rev 1075) +++ sites/oxford.openguides.org/templates/header.tt 2007-06-12 22:39:09 UTC (= rev 1076) @@ -1,52 +0,0 @@ - - - - - [% IF page_title %] - [% page_title %] - [% ELSE %] - [% node_name %] - [% site_name %] - [% END %] - [% IF contact_email %] - - [% END %] - [% IF summary %] - - [% END %] - [% IF stylesheet %] - - [% END %] - [% IF feed_base %] - - - [% END %] - [% IF latitude AND longitude %] - - - [% END %] - - - [% IF deter_robots %] - - [% END %] - [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - - - [% END %] - - - [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - - [% END %] Modified: sites/oxford.openguides.org/templates/map_index.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/map_index.tt 2007-06-12 22:22:53 UT= C (rev 1075) +++ sites/oxford.openguides.org/templates/map_index.tt 2007-06-12 22:39:09 UT= C (rev 1076) @@ -1,4 +1,4 @@ -[% INCLUDE header.tt page_title =3D "Map of all nodes" %] +[% INCLUDE header.tt page_title =3D criterion.name || "Map of all nodes" %] [% INCLUDE banner.tt %]
    Link to this page Deleted: sites/oxford.openguides.org/templates/navbar.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/navbar.tt 2007-06-12 22:22:53 UTC (= rev 1075) +++ sites/oxford.openguides.org/templates/navbar.tt 2007-06-12 22:39:09 UTC (= rev 1076) @@ -1,60 +0,0 @@ -
    - - Back to home - -
    -
    Tools:
    - - - - - [% IF geocache_link AND latitude AND longitude %] - - [% END %] -
    - - [% UNLESS omit_help_links %] -
    -
    Help: /
    -
    FAQ = /
    - - [% IF formatting_rules_link %] - - [% END %] - -
    - [% END %] - -
    -
    Options:
    - -
    - -
    -
    Search:
    -
    -
    - - - -
    -
    - -
    - - [% UNLESS not_editable %] - - [% END %] - -
    Added: sites/oxford.openguides.org/templates/navbar_this_page.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/navbar_this_page.tt = (rev 0) +++ sites/oxford.openguides.org/templates/navbar_this_page.tt 2007-06-12 22:3= 9:09 UTC (rev 1076) @@ -0,0 +1,17 @@ +[% UNLESS not_editable %] +
    +
    This page:
    + +
    +[% END %] Deleted: sites/oxford.openguides.org/templates/needing_moderation.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/needing_moderation.tt 2007-06-12 22= :22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/needing_moderation.tt 2007-06-12 22= :39:09 UTC (rev 1076) @@ -1,27 +0,0 @@ -[% INCLUDE header.tt page_title =3D "Pages Needing Moderation - $site_name" = %] -[% INCLUDE banner.tt %] -
    -[% INCLUDE navbar.tt %] -
    -

    Pages Needing Moderation

    -

    -These are nodes which have been created/edited, but not yet moderated. -

    - - - [% FOREACH node =3D nodes %] - - - - - - - [% END %] -
    Node namePending VersionLatest Moderated VersionAction
    [% node.name %][% node.version %][% node.moderated_version %]Moderate this version - or Delete this version - or View this version - or See changes -
    - -
    -[% INCLUDE footer.tt %] --===============6065609592231432766==--