Changeset 341

Show
Ignore:
Timestamp:
05/02/08 16:34:13 (7 months ago)
Author:
johnbywater
Message:

Unified list/listall/find/search templates, avoids repeating list table column extensions definitions in concrete object templates.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/dm/django/templates/registry/find.html

    r339 r341  
    1 {% extends "registry/master.html" %} 
     1{% extends "registry/list.html" %} 
    22 
    3 {% block title %}Search {{registryAttribute}}{% endblock %} 
    43 
    5 {% block content %} 
    6  
    7 <h2>Search {{registryAttribute}}</h2> 
    8  
    9   {% if isResultsRequest %} 
    10     {% if resultsCount %} 
    11       {% if isResultSingular %} 
    12 <p>There was one {{domainClassName}} found.</p> 
    13       {% else %} 
    14 <p>There were {{resultsCount}} {{registryAttribute}} found.</p> 
    15       {% endif %} 
    16     {% else %} 
    17       {% if userQuery %} 
    18 <p><em>Sorry, no {{registryAttribute}} were found in that search.</em></p> 
    19       {% else %} 
    20 <p><em>Sorry, no {{registryAttribute}} were found under this letter.</em></p> 
    21       {% endif %} 
    22     {% endif %} 
    23   {% else %} 
    24  
    25 <p>Please search for registered {{registryAttribute}} below.</p> 
    26   {% endif %} 
    27 <div id="alphasearch"> 
    28   <a href="{{uriPrefix}}/{{registryAttribute}}/find/a/">A</a> 
    29   <a href="{{uriPrefix}}/{{registryAttribute}}/find/b/">B</a> 
    30   <a href="{{uriPrefix}}/{{registryAttribute}}/find/c/">C</a> 
    31   <a href="{{uriPrefix}}/{{registryAttribute}}/find/d/">D</a> 
    32   <a href="{{uriPrefix}}/{{registryAttribute}}/find/e/">E</a> 
    33   <a href="{{uriPrefix}}/{{registryAttribute}}/find/f/">F</a> 
    34   <a href="{{uriPrefix}}/{{registryAttribute}}/find/g/">G</a> 
    35   <a href="{{uriPrefix}}/{{registryAttribute}}/find/h/">H</a> 
    36   <a href="{{uriPrefix}}/{{registryAttribute}}/find/i/">I</a> 
    37   <a href="{{uriPrefix}}/{{registryAttribute}}/find/j/">J</a> 
    38   <a href="{{uriPrefix}}/{{registryAttribute}}/find/k/">K</a> 
    39   <a href="{{uriPrefix}}/{{registryAttribute}}/find/l/">L</a> 
    40   <a href="{{uriPrefix}}/{{registryAttribute}}/find/m/">M</a> 
    41   <a href="{{uriPrefix}}/{{registryAttribute}}/find/n/">N</a> 
    42   <a href="{{uriPrefix}}/{{registryAttribute}}/find/o/">O</a> 
    43   <a href="{{uriPrefix}}/{{registryAttribute}}/find/p/">P</a> 
    44   <a href="{{uriPrefix}}/{{registryAttribute}}/find/q/">Q</a> 
    45   <a href="{{uriPrefix}}/{{registryAttribute}}/find/r/">R</a> 
    46   <a href="{{uriPrefix}}/{{registryAttribute}}/find/s/">S</a> 
    47   <a href="{{uriPrefix}}/{{registryAttribute}}/find/t/">T</a> 
    48   <a href="{{uriPrefix}}/{{registryAttribute}}/find/u/">U</a> 
    49   <a href="{{uriPrefix}}/{{registryAttribute}}/find/v/">V</a> 
    50   <a href="{{uriPrefix}}/{{registryAttribute}}/find/w/">W</a> 
    51   <a href="{{uriPrefix}}/{{registryAttribute}}/find/x/">X</a> 
    52   <a href="{{uriPrefix}}/{{registryAttribute}}/find/y/">Y</a> 
    53   <a href="{{uriPrefix}}/{{registryAttribute}}/find/z/">Z</a> 
    54   <a href="{{uriPrefix}}/{{registryAttribute}}/find/0/">0</a> 
    55   <a href="{{uriPrefix}}/{{registryAttribute}}/find/1/">1</a> 
    56   <a href="{{uriPrefix}}/{{registryAttribute}}/find/2/">2</a> 
    57   <a href="{{uriPrefix}}/{{registryAttribute}}/find/3/">3</a> 
    58   <a href="{{uriPrefix}}/{{registryAttribute}}/find/4/">4</a> 
    59   <a href="{{uriPrefix}}/{{registryAttribute}}/find/5/">5</a> 
    60   <a href="{{uriPrefix}}/{{registryAttribute}}/find/6/">6</a> 
    61   <a href="{{uriPrefix}}/{{registryAttribute}}/find/7/">7</a> 
    62   <a href="{{uriPrefix}}/{{registryAttribute}}/find/8/">8</a> 
    63   <a href="{{uriPrefix}}/{{registryAttribute}}/find/9/">9</a> 
    64 </div><!-- /alphasearch --> 
    65  
    66 <form action="{{uriPrefix}}/{{registryAttribute}}/search/" method="post"> 
    67 <input type="text" id="user-search-terms" name="userQuery" value="{{ userQuery }}" /> 
    68 <input type="submit" name="search" value="Search &raquo;" /> 
    69 </form> 
    70  
    71   {% if resultsCount %} 
    72 <br /> 
    73 <table> 
    74   <tr> 
    75     {% block search_key_name %}<th>{{domainClassName}}</th>{% endblock %} 
    76     {% block find_table_head_extn %}{% endblock %} 
    77     {% if view.canUpdateDomainObject %} 
    78     <th>Actions</th> 
    79     {% endif %} 
    80   </tr> 
    81     {% for domainObject in domainObjectList %} 
    82   <tr{% block is_domain_object_inactive%}{% endblock %}> 
    83     {% block search_key_value %} 
    84     <td> 
    85       <a href="{{uriPrefix}}/{{registryAttribute}}/{{ domainObject.getRegisterKeyValue }}/" title="{{ domainObject.getPersonalLabelValue }}">{{ domainObject.getPersonalLabel }}</a> 
    86     </td> 
    87     {% endblock %} 
    88     {% block find_table_row_extn %}{% endblock %} 
    89     {% if view.canUpdateDomainObject %} 
    90     <td> 
    91       {% block find_item_update_btn %} 
    92       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/update/" title="{{domainObject.getRegisterKeyValue}}" title="Update"> 
    93         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-edit.png" alt="Update" /> 
    94       </a> 
    95       {% endblock %} 
    96       {% block find_item_delete_btn %} 
    97       {% if view.canDeleteDomainObject %} 
    98       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/delete/" title="{{domainObject.getRegisterKeyValue}}" title="Delete"> 
    99         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-delete.png" alt="Delete" /> 
    100       </a> 
    101       {% endif %} 
    102       {% endblock %} 
    103       {% block find_item_actions_extn %} 
    104       {% endblock %} 
    105     </td> 
    106     {% endif %} 
    107   </tr> 
    108     {% endfor %} 
    109 </table> 
    110   {% endif %} 
    111  
    112 {% endblock %} 
    113  

  • trunk/src/dm/django/templates/registry/list.html

    r339 r341  
    33{% block content %} 
    44 
     5{% if showRegisterSearch %} 
     6<div style="float: right;"> 
     7  <form action="{{uriPrefix}}/{{registryAttribute}}/search/" method="post"> 
     8    <input type="text" id="user-search-terms" name="userQuery" 
     9      value="{{ userQuery }}" /> 
     10    <input type="submit" name="search" value="Search &raquo;" /> 
     11  </form> 
     12</div> 
     13{% endif %} 
     14 
    515<h2>{{registerNameTitle}}</h2> 
    616 
    7 {% if isRegisterCountZero %} 
     17{% block table_comment %} 
     18  {% if isCountZero %} 
     19  <p>There are no {{registerName}} at this time.</p> 
     20  {% else %} 
     21    {% if isCountSingle %} 
     22  <p>There is only one record.</p> 
     23    {% else %} 
     24  <p> 
     25    There are {{ objectCount }} registered {{registerName}}. 
     26      {% if view.hasListallPage and showRegisterAllLink %} 
     27    <a href="{{uriPrefix}}/{{registryPath}}/listall/">View full list.</a> 
     28      {% endif %} 
     29  </p> 
     30    {% endif %} 
     31  {% endif %} 
     32{% endblock %} 
    833 
    9   <p>There are no {{registerName}} at this time.</p> 
    10  
    11 {% else %} 
    12 {% if isRegisterCountSingle %} 
    13  
    14   <!-- <p>There is one registered.</p> --> 
    15    
    16 {% else %} 
    17  
    18   <p> 
    19     There are {{ registerCount }} registered {{registerName}}. 
    20     {% if not isRegisterCountLow and view.hasListallPage %} 
    21     <a href="{{uriPrefix}}/{{registryPath}}/listall/">View full list.</a> 
    22     {% endif %} 
    23   </p> 
    24  
    25  
    26 {% endif %} 
    27 {% endif %} 
    28  
    29 {% if registerCount %} 
    30 {% if isRegisterCountLow %} 
    31  
    32 <table> 
    33   <tr> 
    34     {% block list_key_name %}<th>{{domainClassName}}</th>{% endblock %} 
    35     {% block list_table_head_extn %}{% endblock %}  
    36     {% if view.canUpdateDomainObject %} 
    37     <th>Actions</th> 
    38     {% endif %} 
    39   </tr> 
    40   {% for domainObject in objectRegister.getSortedList %} 
    41   <tr{% block is_domain_object_inactive%}{% endblock %}> 
    42     {% block list_key_value %} 
    43     <td> 
    44       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/" title="{{domainObject.getRegisterKeyValue}}">{{domainObject.getLabelValue}}</a> 
    45     </td> 
    46     {% endblock %} 
    47     {% block list_table_row_extn %}{% endblock %} 
    48     {% if view.canUpdateDomainObject %} 
    49     <td> 
    50       {% block list_item_update_btn %} 
    51       <a  
    52         href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/update/"  
    53         title="Update" 
    54       ><img  
    55         height="20"  
    56         width="20" 
    57         src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-edit.png" 
    58         alt="Update"  
    59       /></a> 
    60       {% endblock %} 
    61       {% block list_item_delete_btn %} 
    62         {% if view.canDeleteDomainObject %} 
    63       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/delete/" title="{{domainObject.getRegisterKeyValue}}" title="Delete"> 
    64         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-delete.png" alt="Delete" /> 
    65       </a> 
    66         {% endif %} 
    67       {% endblock %} 
    68       {% block list_item_actions_extn %}{% endblock %} 
    69     </td> 
    70     {% endif %} 
    71   </tr> 
    72   {% endfor %} 
    73 </table> 
    74  
    75 {% else %} 
     34{% if showRegisterIndex %} 
    7635<div id="alphasearch"> 
    7736  <a href="{{uriPrefix}}/{{registryPath}}/find/a/">A</a> 
    …… 
    11372</div><!-- /alphasearch --> 
    11473{% endif %} 
     74 
     75{% if showRegisterTable %} 
     76<table> 
     77  <tr> 
     78  {% block table_key_name %}<th>{{domainClassName}}</th>{% endblock %} 
     79  {% block table_head_extn %}{% endblock %}  
     80  {% if view.canUpdateDomainObject %} 
     81    <th>Actions</th> 
     82  {% endif %} 
     83  </tr> 
     84  {% for domainObject in domainObjectList %} 
     85  <tr{% block is_domain_object_inactive%}{% endblock %}> 
     86    {% block table_key_value %} 
     87    <td> 
     88      <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/" title="{{domainObject.getRegisterKeyValue}}">{{domainObject.getLabelValue}}</a> 
     89    </td> 
     90    {% endblock %} 
     91    {% block table_row_extn %}{% endblock %} 
     92    {% if view.canUpdateDomainObject %} 
     93    <td> 
     94      {% block table_item_update_btn %} 
     95      <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/update/" title="Update"><img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-edit.png" alt="Update"/></a> 
     96      {% endblock %} 
     97      {% block table_item_delete_btn %} 
     98        {% if view.canDeleteDomainObject %} 
     99      <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/delete/" title="{{domainObject.getRegisterKeyValue}}" title="Delete"> 
     100        <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-delete.png" alt="Delete" /> 
     101      </a> 
     102        {% endif %} 
     103      {% endblock %} 
     104      {% block table_item_actions_extn %}{% endblock %} 
     105    </td> 
     106    {% endif %} 
     107  </tr> 
     108  {% endfor %} 
     109</table> 
    115110{% endif %} 
    116111 

  • trunk/src/dm/django/templates/registry/listall.html

    r340 r341  
    1 {% extends "registry/master.html" %} 
     1{% extends "registry/list.html" %} 
    22 
    3 {% block content %} 
    43 
    5 <h2>{{registerNameTitle}}</h2> 
    64 
    7 {% block list_table_comment %} 
    8   {% if isRegisterCountZero %} 
    9   <p>There are no {{registerName}} at this time.</p> 
    10     {% else %} 
    11     {% if isRegisterCountSingle %} 
    12   <!-- <p>There is one registered.</p> --> 
    13     {% else %} 
    14   <p> 
    15     There are {{ registerCount }} registered {{registerName}}. 
    16   </p> 
    17     {% endif %} 
    18   {% endif %} 
    19   {% block list_table_comment_extn %}{% endblock %} 
    20 {% endblock %} 
    21  
    22 {% if registerCount %} 
    23  
    24 <table> 
    25   <tr> 
    26     <th>{{domainClassName}}</th> 
    27     {% block list_table_head_extn %}{% endblock %}  
    28     {% if view.canUpdateDomainObject %} 
    29     <th>Actions</th> 
    30     {% endif %} 
    31   </tr> 
    32   {% for domainObject in objectRegister.getSortedList %} 
    33   <tr{% block is_domain_object_inactive%}{% endblock %}> 
    34     <td> 
    35       {% block list_item_key_label %} 
    36       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/" title="{{domainObject.getRegisterKeyValue}}">{{domainObject.getLabelValue}}</a> 
    37       {% endblock %} 
    38     </td> 
    39     {% block list_table_row_extn %}{% endblock %}  
    40     {% if view.canUpdateDomainObject %} 
    41     <td> 
    42       {% block list_item_update_btn %} 
    43       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/update/" title="Update"> 
    44         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-edit.png" alt="Update" /> 
    45       </a> 
    46       {% endblock %} 
    47       {% block list_item_delete_btn %} 
    48       {% if view.canDeleteDomainObject %} 
    49       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/delete/" title="Delete"> 
    50         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-delete.png" alt="Delete" /> 
    51       </a> 
    52       {% endif %} 
    53       {% endblock %} 
    54       {% block list_item_actions_extn %}{% endblock %} 
    55     </td> 
    56     {% endif %} 
    57   </tr> 
    58   {% endfor %} 
    59 </table> 
    60  
    61 {% endif %} 
    62  
    63 {% endblock %} 
    64  

  • trunk/src/dm/django/templates/registry/search.html

    r339 r341  
    1 {% extends "registry/master.html" %} 
     1{% extends "registry/list.html" %} 
    22 
    3 {% block title %}Search {{registryAttribute}}{% endblock %} 
    43 
    5 {% block content %} 
    6  
    7 <h2>Search {{registryAttribute}}</h2> 
    8  
    9   {% if isResultsRequest %} 
    10     {% if resultsCount %} 
    11       {% if isResultSingular %} 
    12 <p>There was one {{domainClassName}} found.</p> 
    13       {% else %} 
    14 <p>There were {{resultsCount}} {{registryAttribute}} found.</p> 
    15       {% endif %} 
    16     {% else %} 
    17       {% if userQuery %} 
    18 <p><em>Sorry, no {{registryAttribute}} were found in that search.</em></p> 
    19       {% else %} 
    20 <p><em>Sorry, no {{registryAttribute}} were found under this letter.</em></p> 
    21       {% endif %} 
    22     {% endif %} 
    23   {% else %} 
    24  
    25 <p>Please search for registered {{registryAttribute}} below.</p> 
    26   {% endif %} 
    27 <div id="alphasearch"> 
    28   <a href="{{uriPrefix}}/{{registryAttribute}}/find/a/">A</a> 
    29   <a href="{{uriPrefix}}/{{registryAttribute}}/find/b/">B</a> 
    30   <a href="{{uriPrefix}}/{{registryAttribute}}/find/c/">C</a> 
    31   <a href="{{uriPrefix}}/{{registryAttribute}}/find/d/">D</a> 
    32   <a href="{{uriPrefix}}/{{registryAttribute}}/find/e/">E</a> 
    33   <a href="{{uriPrefix}}/{{registryAttribute}}/find/f/">F</a> 
    34   <a href="{{uriPrefix}}/{{registryAttribute}}/find/g/">G</a> 
    35   <a href="{{uriPrefix}}/{{registryAttribute}}/find/h/">H</a> 
    36   <a href="{{uriPrefix}}/{{registryAttribute}}/find/i/">I</a> 
    37   <a href="{{uriPrefix}}/{{registryAttribute}}/find/j/">J</a> 
    38   <a href="{{uriPrefix}}/{{registryAttribute}}/find/k/">K</a> 
    39   <a href="{{uriPrefix}}/{{registryAttribute}}/find/l/">L</a> 
    40   <a href="{{uriPrefix}}/{{registryAttribute}}/find/m/">M</a> 
    41   <a href="{{uriPrefix}}/{{registryAttribute}}/find/n/">N</a> 
    42   <a href="{{uriPrefix}}/{{registryAttribute}}/find/o/">O</a> 
    43   <a href="{{uriPrefix}}/{{registryAttribute}}/find/p/">P</a> 
    44   <a href="{{uriPrefix}}/{{registryAttribute}}/find/q/">Q</a> 
    45   <a href="{{uriPrefix}}/{{registryAttribute}}/find/r/">R</a> 
    46   <a href="{{uriPrefix}}/{{registryAttribute}}/find/s/">S</a> 
    47   <a href="{{uriPrefix}}/{{registryAttribute}}/find/t/">T</a> 
    48   <a href="{{uriPrefix}}/{{registryAttribute}}/find/u/">U</a> 
    49   <a href="{{uriPrefix}}/{{registryAttribute}}/find/v/">V</a> 
    50   <a href="{{uriPrefix}}/{{registryAttribute}}/find/w/">W</a> 
    51   <a href="{{uriPrefix}}/{{registryAttribute}}/find/x/">X</a> 
    52   <a href="{{uriPrefix}}/{{registryAttribute}}/find/y/">Y</a> 
    53   <a href="{{uriPrefix}}/{{registryAttribute}}/find/z/">Z</a> 
    54   <a href="{{uriPrefix}}/{{registryAttribute}}/find/0/">0</a> 
    55   <a href="{{uriPrefix}}/{{registryAttribute}}/find/1/">1</a> 
    56   <a href="{{uriPrefix}}/{{registryAttribute}}/find/2/">2</a> 
    57   <a href="{{uriPrefix}}/{{registryAttribute}}/find/3/">3</a> 
    58   <a href="{{uriPrefix}}/{{registryAttribute}}/find/4/">4</a> 
    59   <a href="{{uriPrefix}}/{{registryAttribute}}/find/5/">5</a> 
    60   <a href="{{uriPrefix}}/{{registryAttribute}}/find/6/">6</a> 
    61   <a href="{{uriPrefix}}/{{registryAttribute}}/find/7/">7</a> 
    62   <a href="{{uriPrefix}}/{{registryAttribute}}/find/8/">8</a> 
    63   <a href="{{uriPrefix}}/{{registryAttribute}}/find/9/">9</a> 
    64 </div><!-- /alphasearch --> 
    65  
    66 <form action="{{uriPrefix}}/{{registryAttribute}}/search/" method="post"> 
    67 <input type="text" id="user-search-terms" name="userQuery" value="{{ userQuery }}" /> 
    68 <input type="submit" name="search" value="Search &raquo;" /> 
    69 </form> 
    70  
    71   {% if resultsCount %} 
    72 <br /> 
    73 <table> 
    74   <tr> 
    75     {% block search_key_name %}<th>{{domainClassName}}</th>{% endblock %} 
    76     {% block search_table_head_extn %}{% endblock %} 
    77     {% if view.canUpdateDomainObject %} 
    78     <th>Actions</th> 
    79     {% endif %} 
    80   </tr> 
    81     {% for domainObject in domainObjectList %} 
    82   <tr{% block is_domain_object_inactive%}{% endblock %}> 
    83     {% block search_key_value %} 
    84     <td> 
    85       <a href="{{uriPrefix}}/{{registryAttribute}}/{{ domainObject.getRegisterKeyValue }}/" title="{{ domainObject.getPersonalLabelValue }}">{{ domainObject.getPersonalLabel }}</a> 
    86     </td> 
    87     {% endblock %} 
    88     {% block search_table_row_extn %}{% endblock %} 
    89     {% if view.canUpdateDomainObject %} 
    90     <td> 
    91       {% block search_item_update_btn %} 
    92       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/update/" title="{{domainObject.getRegisterKeyValue}}" title="Update"> 
    93         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-edit.png" alt="Update" /> 
    94       </a> 
    95       {% endblock %} 
    96       {% block search_item_delete_btn %} 
    97       {% if view.canDeleteDomainObject %} 
    98       <a href="{{uriPrefix}}/{{registryPath}}/{{domainObject.getRegisterKeyValue}}/delete/" title="{{domainObject.getRegisterKeyValue}}" title="Delete"> 
    99         <img height="20" width="20" src="http://{{ systemMediaSocket }}{{ mediaPrefix }}/images/icon-delete.png" alt="Delete" /> 
    100       </a> 
    101       {% endif %} 
    102       {% endblock %} 
    103       {% block search_item_actions_extn %} 
    104       {% endblock %} 
    105     </td> 
    106     {% endif %} 
    107  
    108   <tr> 
    109     {% endfor %} 
    110 </table> 
    111   {% endif %} 
    112  
    113 {% endblock %} 
    114