Index: openacs-4/packages/acs-templating/resources/lists/select-menu.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/select-menu.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-templating/resources/lists/select-menu.adp 26 Sep 2006 11:52:03 -0000 1.4 +++ openacs-4/packages/acs-templating/resources/lists/select-menu.adp 16 Jun 2015 08:53:38 -0000 1.5 @@ -24,7 +24,7 @@ # } # - The recieving page variable must be of the type :multiple # since the filter sends the values in the following way: -# filter_name=filter_value&filter_name=filter_value&....&extra_variables=extra_values +# filter_name=filter_value&filter_name=filter_value&....&extra_variables=extra_values %> Index: openacs-4/packages/acs-templating/www/doc/design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/design.html,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/design.html 27 Oct 2014 16:40:13 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/design.html 16 Jun 2015 08:53:38 -0000 1.4 @@ -319,8 +319,7 @@ the same handler, it doesn't matter that adp take precendence.
  • If a .tcl file is present, - its ad_page_contract in the -properties block indicates a set of data sources that will be made available to the template. Index: openacs-4/packages/acs-templating/www/doc/developer-guide.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/developer-guide.html,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/developer-guide.html 10 Feb 2004 12:16:40 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/developer-guide.html 16 Jun 2015 08:53:38 -0000 1.4 @@ -64,7 +64,7 @@
  • Handling errors
  • @@ -95,9 +95,7 @@ the special tags. The resulting HTML page is written to the connection (i.e., returned to the user). -
    ad_return_template
    +
    ad_return_template
    Normally, does nothing at all. With the -string option you get the resulting HTML page @@ -115,9 +113,7 @@ a filename relative to the directory of the tcl script.

    -
    ad_page_contract
    +
    ad_page_contract
    Normally, complaints about incorrect parameters are written directly to the connection, and the script is aborted. With the Index: openacs-4/packages/acs-templating/www/doc/index.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/index.html,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-templating/www/doc/index.html 27 Oct 2014 16:40:13 -0000 1.5 +++ openacs-4/packages/acs-templating/www/doc/index.html 16 Jun 2015 08:53:38 -0000 1.6 @@ -14,7 +14,7 @@ - + @@ -23,19 +23,19 @@ - + - + @@ -45,21 +45,21 @@ - - + - + - + Index: openacs-4/packages/acs-templating/www/doc/migration.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/migration.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/migration.adp 27 Oct 2014 16:40:14 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/migration.adp 16 Jun 2015 08:53:38 -0000 1.3 @@ -387,15 +387,15 @@ # alert has been disabled set status "Disabled" set action " - <a href=\"/bboard/alert-reenable\"> - Re-enable</a>" + <a href="\"/bboard/alert-reenable\"> +" Re-enable</a>" } else { # alert is enabled set status " <font color=red>Enabled</font>" set action " - <a href=\"/bboard/alert-disable\"> - Disable</a>" + <a href="\"/bboard/alert-disable\"> +" Disable</a>" } append existing_alert_rows "<tr> Index: openacs-4/packages/acs-templating/www/doc/demo/contract.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/contract.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/demo/contract.adp 27 Oct 2014 16:40:19 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/demo/contract.adp 16 Jun 2015 08:53:38 -0000 1.3 @@ -12,7 +12,7 @@ - +
    RequirementsRequirements What the template system should do for you.
    A revision in 5.0 that escapes all html codes by default.
    DesignDesign Gets more specific and discusses the way the templating system integrates with ACS. Gory details.
    Designer GuideDesigner Guide Writing a Template, the ADP part of a page
              - Tags + Tags Template markup tag reference
    Upgrading and writing new pages with noquote.
    Developer Guide + Developer Guide   API for programming the Tcl part of a page
    API, TclDoc API Viewer    API, TclDoc API Viewer     Object and API Reference
    MigrationMigration Bringing legacy tcl pages to use the template system.
    DemonstrationDemonstration Samples of the various mechanisms, with both Tcl and ADP parts.
    (optional)
    Index: openacs-4/packages/acs-templating/www/doc/demo/fibo-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/fibo-master.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/fibo-master.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/fibo-master.adp 16 Jun 2015 08:53:38 -0000 1.2 @@ -1,8 +1,8 @@ - +
    - + - +
    colspan=2 >@level@ colspan="2" >@level@
    Index: openacs-4/packages/acs-templating/www/doc/demo/grid.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/grid.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/grid.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/grid.adp 16 Jun 2015 08:53:38 -0000 1.2 @@ -8,7 +8,7 @@

    Sample Users

    - +
    Index: openacs-4/packages/acs-templating/www/doc/demo/group.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/group.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/group.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/group.adp 16 Jun 2015 08:53:38 -0000 1.2 @@ -8,7 +8,7 @@

    Sample Users by State

    -
    +
    Index: openacs-4/packages/acs-templating/www/doc/demo/if.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/if.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/demo/if.adp 13 Mar 2002 22:50:53 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/demo/if.adp 16 Jun 2015 08:53:38 -0000 1.3 @@ -10,7 +10,7 @@ The value of bool_f_p is @bool_f_p@
    The value of bool_0_p is @bool_0_p@

    -

    +
    Index: openacs-4/packages/acs-templating/www/doc/demo/multirow.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/multirow.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/multirow.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/multirow.adp 16 Jun 2015 08:53:38 -0000 1.2 @@ -9,9 +9,9 @@ - - - + + +
    Operator Test
    @body.rownum@ @body.name@@body.diameter@@body.mass@@body.r_orbit@@body.diameter@@body.mass@@body.r_orbit@
    Index: openacs-4/packages/acs-templating/www/doc/demo/reference.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/reference.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/reference.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/reference.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -5,15 +5,15 @@ Here are all sample users.
    -
    +
    The following have an "e" in their first names.
    -
    +
    Index: openacs-4/packages/acs-templating/www/doc/demo/sandwich-grid.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/sandwich-grid.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/sandwich-grid.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/sandwich-grid.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -14,9 +14,9 @@ - +
    +
    - +
    - +
    Sandwich Name   @@ -27,7 +27,7 @@
    Protein   - +
    @@ -51,7 +51,7 @@ - +
    Vitamins   - +
    @@ -75,7 +75,7 @@


    Index: openacs-4/packages/acs-templating/www/doc/demo/skin-fancy.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/skin-fancy.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/skin-fancy.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/skin-fancy.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -8,7 +8,7 @@

    Sample Users

    - +
    Index: openacs-4/packages/acs-templating/www/doc/demo/state.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/state.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/demo/state.adp 27 Oct 2014 16:40:19 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/demo/state.adp 16 Jun 2015 08:53:39 -0000 1.3 @@ -17,7 +17,7 @@ -
    First NameLast Name
    +
    Index: openacs-4/packages/acs-templating/www/doc/demo/user-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/user-edit.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/user-edit.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/user-edit.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -9,7 +9,7 @@

    Please search for a user to edit by specifying any portion of a first or last name.

    -
    @state_abbrev@
    +
    Index: openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp 30 Nov 2002 17:24:40 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp 16 Jun 2015 08:53:39 -0000 1.3 @@ -35,7 +35,7 @@
    please indicate your primary telephone


    @@ -68,7 +68,7 @@ -
    You currently have no entries in your addressbook
    You currently have no entries in your addressbook
    Index: openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp 27 Oct 2014 16:40:22 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp 16 Jun 2015 08:53:39 -0000 1.4 @@ -17,7 +17,7 @@ Now, for some basic contact information: - +
    Name:@name@
    Name:@name@
    Address:@address@
    Email:@email
    Index: openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-2.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-2.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -1,10 +1,10 @@ <master> and <slave> Demo: -

    +

    while the rest of the page stays the same. -

    +

    next Index: openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -1,11 +1,11 @@ <master> and <slave> Demo: -

    +

    Be sure to note how the url has changed to reflect the slave's file name, and not the master's.
    (In this case the master file is the same one you've been working with all along, of course)
    -

    +

    next Index: openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-4.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-4.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-4.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-4.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -1,10 +1,10 @@ <master> and <slave> Demo: -

    +

    Okay, I think you get the point. -

    +

    back to the problem set Index: openacs-4/packages/acs-templating/www/doc/exercise/slave-sample.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/slave-sample.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/exercise/slave-sample.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/exercise/slave-sample.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -7,10 +7,10 @@ -

    +

    The point of all this clicking about is just to show how this text area can be varied... -

    +

    next Index: openacs-4/packages/acs-templating/www/doc/gen/namespace-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/namespace-list.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/gen/namespace-list.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/gen/namespace-list.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -6,7 +6,7 @@ All Namespaces
    -
    +   @namespace_urls.name@
    Index: openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp 22 May 2003 14:17:28 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp 16 Jun 2015 08:53:39 -0000 1.3 @@ -38,7 +38,7 @@

    Method Detail

    -

    +

    * indicates required

    @@ -61,7 +61,7 @@

    -

    +

    * indicates required

    Index: openacs-4/packages/acs-templating/www/doc/gen/package-template.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/package-template.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/gen/package-template.adp 22 May 2003 14:17:28 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/gen/package-template.adp 16 Jun 2015 08:53:39 -0000 1.3 @@ -5,7 +5,7 @@

    -

    ATS and CMS Tcl Procedure Specifications

    +

    ATS and CMS Tcl Procedure Specifications

    Index: openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp 16 Jun 2015 08:53:39 -0000 1.2 @@ -1,4 +1,4 @@ -
    + @@ -13,13 +13,13 @@
    @info.proc_name@
      by @info.author@
    - - @@ -35,8 +35,8 @@
    Options:
    @params.name@ + @params.name@ @required_marker@ + - default @params.default@; + default @params.default@; @params.description@
    - - +
    @options.name@ +
    @options.name@ default @options.default@; Index: openacs-4/packages/acs-templating/www/doc/guide/index.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/index.html,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/guide/index.html 14 Mar 2005 18:03:44 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/guide/index.html 16 Jun 2015 08:53:39 -0000 1.4 @@ -74,7 +74,7 @@ The design of the templating system makes it easier to include reusable presentation components as included templates and master templates, as - explained in "Composite Page". + explained in "Composite Page". Moreover, the ACS Core pages are templated which enables users of the ACS who want to customize their look and feel to update a site-wide master or the individual Index: openacs-4/packages/acs-templating/www/doc/guide/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/master.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/guide/master.adp 27 Oct 2014 16:40:23 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/guide/master.adp 16 Jun 2015 08:53:39 -0000 1.3 @@ -37,24 +37,24 @@ formatting preferences may also be applied for registered users.

    Write the Master Template

    A master template to implement the page layout shown above would have this basic structure:

    -<html><body><table width=100% cellspacing=0 cellpadding=0 border=0>
    +<html><body><table width="100%" cellspacing="0" cellpadding="0" border="0">
     
     <tr>
       <td><!-- LOGO --></td>
    -  <td colspan=2><!-- AD BANNER --></td>
    +  <td colspan="2"><!-- AD BANNER --></td>
     </tr>
     
    -<tr><td colspan=3><!-- NAVIGATION/CONTEXT BAR --></td></tr>
    +<tr><td colspan="3"><!-- NAVIGATION/CONTEXT BAR --></td></tr>
     
     <tr>
       <td><!-- SECTION LINKS --></td>
    -  <td colspan=2>
    +  <td colspan="2">
         <!-- CONTENT -->
         <slave>
       </td>
     </tr>
     
    -<tr><td colspan=3><!-- FOOTER --></td></tr>
    +<tr><td colspan="3"><!-- FOOTER --></td></tr>
     
     </table></body></html>
     

    The only special feature of this master template is the Index: openacs-4/packages/acs-templating/www/doc/widgets/input.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/widgets/input.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/doc/widgets/input.adp 27 Oct 2014 16:40:26 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/widgets/input.adp 16 Jun 2015 08:53:39 -0000 1.3 @@ -5,7 +5,7 @@

    The Input Widgets

    Overview

    These widgets provide a variety of HTML controls, all of which -are based on <input type=...>. In particular, +are based on <input type="...">. In particular, the hidden, text, radio and checkbox widgets are currently implemented; their use is demonstrated in the acs-templating demo.

    The Hidden Widget

    This is simply an <input type=hidden> widget, which is used for passing pre-set variables along with the Index: openacs-4/packages/acs-templating/www/doc/widgets/input.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/widgets/input.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/widgets/input.html 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/widgets/input.html 16 Jun 2015 08:53:39 -0000 1.2 @@ -12,7 +12,7 @@

    Overview

    These widgets provide a variety of HTML controls, all of which are based on -<input type=...>. In particular, the hidden, text, radio and +<input type="...">. In particular, the hidden, text, radio and checkbox widgets are currently implemented; their use is demonstrated in the acs-templating demo.