Changeset 15


Ignore:
Timestamp:
Apr 20, 2003, 12:13:57 AM (19 years ago)
Author:
kake
Message:

Merged in Earle's template changes

Location:
trunk/templates
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/templates/edit_form.tt

    r14 r15  
    44
    55<form action="[% cgi_url %]" method="POST" enctype="application/x-www-form-urlencoded">
    6 <b>Phone:</b> <input type="text" name="phone" value="[% phone %]"><br />
    7 <b>Website:</b> <input type="text" size="70" name="website" value="[% website %]"><br />
    8 <b>Opening hours:</b> <input type="text" size="70" name="hours_text" value="[% hours_text %]"><br />
    96<b>Content:</b><br />
    107<textarea name="content" rows="10" cols="70">[% content %]</textarea>
     
    2219[% END %]
    2320</textarea><br />
     21<b>Phone:</b> <input type="text" name="phone" value="[% phone %]"><br />
     22<b>Fax:</b> <input type="text" name="fax" value="[% fax %]"><br />
     23<b>Website:</b> <input type="text" size="70" name="website" value="[% website %]"><br />
     24<b>Opening hours:</b> <input type="text" size="70" name="hours_text" value="[% hours_text %]"><br />
     25<b>Postcode:</b> <input type="text" name="postcode" value="[% postcode %]"><br />
     26<b>Address:</b> <input type="text" name="address" value="[% address %]"><br />
    2427<b>OS X co-ord:</b> <input type="text" name="os_x" value="[% os_x %]">
    2528<b>OS Y co-ord:</b> <input type="text" name="os_y" value="[% os_y %]"><br />
    26 <b>Postcode:</b> <input type="text" name="postcode" value="[% postcode %]"><br />
    2729<br />
    2830<b>Your username:</b> <input type="text" name="username" value="[% username %]"><br />
     
    3840[% IF preview_html %]
    3941  <h2>Preview</h2>
     42  [% INCLUDE display_metadata.tt %]
     43
    4044  [% preview_html %]
    4145[% END %]
    42 
    4346[% INCLUDE footer.tt %]
  • trunk/templates/home_node.tt

    r14 r15  
    4646</dl>
    4747
    48 <p><b><a href="[% cgi_url %]?action=edit&id=[% node_param %]">Edit this page</a></b></p>
     48<p><b><a href="[% cgi_url %]?action=edit;id=[% node_param %]">Edit this page</a></b></p>
    4949
    5050</div>
  • trunk/templates/navbar.tt

    r14 r15  
    1212    </ul><br />
    1313    [% ELSE %]
    14       <li><a href="[% cgi_url %]?id=[% node_param %]&action=edit">Edit this page</a></li>
     14      <li><a href="[% cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></li>
    1515    </ul>
    1616    [% END %]
    1717<strong>Search:</strong><br>
    18 <input type="hidden" name="action" value="search">
    19 <input type="text" size="15" name="terms">
     18<input type="hidden" name="action" value="search" />
     19<input type="text" size="15" name="terms" />
    2020</form>
    2121</div>
  • trunk/templates/node.tt

    r14 r15  
    1414[% END %]
    1515
    16 [% IF os_x %]
    17   <small>OS X co-ord: [% CGI.escapeHTML(os_x) %]</small>
    18   &nbsp;&nbsp;&nbsp;[% END %]
    19 [% IF os_y %]
    20   <small>OS Y co-ord: [% CGI.escapeHTML(os_y) %]</small>
    21   &nbsp;&nbsp;&nbsp;
    22 [% END %]
    23 [% IF postcode %]
    24   <small>Postcode: [% CGI.escapeHTML(postcode) %]</small>
    25   &nbsp;&nbsp;&nbsp;
    26 [% END %]
    27 <small><a href="wiki.cgi?action=rss&feed=chef_moz&id=[% node_param %]">ChefMoz RSS</a></small>
    28 &nbsp;&nbsp;&nbsp;
    29 <small><a href="wiki.cgi?action=rss&feed=chef_dan&id=[% node_param %]">ChefDan RDF/XML</a></small>
    30 <br />
    31 
    32 [% IF phone OR website OR hours_text %]
    33   <ul>
    34     [% IF phone %]
    35       <li><b>Phone:</b> [% CGI.escapeHTML(phone) %]</li>
    36     [% END %]
    37     [% IF website %]
    38       <li><b>Website:</b> <a href="[% CGI.escape(website) %]">[% CGI.escapeHTML(website) %]</a></li>
    39     [% END %]
    40     [% IF hours_text %]
    41       <li><b>Opening Hours:</b> [% CGI.escapeHTML(hours_text) %]</li>
    42     [% END %]
    43   </ul>
    44 [% END %]
     16[% INCLUDE display_metadata.tt %]
    4517
    4618[% content %]
     
    5729    </select>
    5830    of here.
    59     <input type="hidden" name="id" value="[% node_name %]">
    60     <input type="hidden" name="action" value="find_within_distance">
    61     <input type="submit" name="Go" value="Go">
     31    <input type="hidden" name="id" value="[% node_name %]" />
     32    <input type="hidden" name="action" value="find_within_distance" />
     33    <input type="submit" name="Go" value="Go" />
    6234  </form>
    6335[% END %]
    6436
     37<br clear="all" />
     38
    6539[% IF categories %]
    66   <hr>
     40  <hr />
    6741  <small><b>Categories:</b>
    6842  [% FOREACH category = categories %]
     
    7347
    7448[% IF locales %]
    75   <hr>
     49  <hr />
    7650  <small><b>Locale:</b>
    7751  [% FOREACH locale = locales %]
     
    8155[% END %]
    8256
    83 <hr>
     57<hr />
    8458
    8559[% IF current %]
     
    9165
    9266[% IF version > 1 %]
    93   <a href="wiki.cgi?action=list_all_versions&id=[% node_param %]">List all
     67  <a href="wiki.cgi?action=list_all_versions;id=[% node_param %]">List all
    9468  versions</a><br />
    9569[% END %]
     
    9771<p>
    9872  <form action="wiki.cgi" method="get">
    99     <input type="hidden" name="action" value="search">
    100     <input type="text" size="50" name="terms">
    101     <input type="submit" name="Search" value="Search">
     73    <input type="hidden" name="action" value="search" />
     74    <input type="text" size="50" name="terms" />
     75    <input type="submit" name="Search" value="Search" />
    10276  </form>
    10377</p>
  • trunk/templates/recent_changes.tt

    r14 r15  
    1515      [% END %]
    1616      [% IF node.username %]
    17         ..... <a href="[% cgi_url %]?username=[% node.username %]&action=userstats">[% node.username %]</a>
     17        ..... <a href="[% cgi_url %]?username=[% node.username %];action=userstats">[% node.username %]</a>
    1818      [% END %]
    1919  </li>
     
    2222
    2323<p>
    24   <a href="[% cgi_url %]?id=[% node_param %]&action=edit">Edit this page</a>
     24  <a href="[% cgi_url %]?id=[% node_param %];action=edit">Edit this page</a>
    2525</p>
    2626
Note: See TracChangeset for help on using the changeset viewer.