Changeset 2581


Ignore:
Timestamp:
8 Nov 2007, 10:37:22 (17 years ago)
Author:
Henrik Bettermann
Message:

finished, please test

Location:
WAeUP_SRP/base/skins
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/skins/waeup_layout/layout_application_edit.pt

    r2579 r2581  
    11<metal:define tal:define="isStaff context/isStaff;
    2                           isStudent context/isStudent;">
     2                          isStudent context/isStudent;
     3                          info context/getApplicationInfo;
     4                          app_email info/app_doc/app_email">
    35
    46<metal:block tal:condition="isStaff">             
    … …  
    810
    911<metal:block define-macro="application_student_edit"
    10   tal:condition="isStudent"
     12  tal:condition="python:isStudent and not app_email"
    1113  tal:define="layout options/layout;
    1214  ds options/datastructure;
    … …  
    2123  <table class="layoutDefault" summary="Form layout"
    2224         tal:condition="layout/rows">
    23     <span tal:repeat="row python: layout['rows']" valign="top" >
    24       <span tal:repeat="cell row">
    25         <tr tal:define="widget cell/widget;
    26               wid widget/getWidgetId;
    27               err python:ds.getError(wid);
    28               err_mapping python:ds.getErrorMapping(wid);
    29               is_required python: widget.is_required;
    30               tooltip_id python:wid + '_help';
    31               widget_css_class cell/widget_css_class|nothing;
    32               css_class python:test(err, 'row error','row')"
    33               tal:condition="python: wid != 'passport'"
    34               >
    35           <div tal:attributes="class widget_css_class;
    36           id python:widget.getHtmlWidgetId()+'_widget';"
    37           >
    38             <td>
    39             <div class="label" tal:condition="widget/label_edit"
    40                  tal:attributes="class python:test(is_required, 'label required','label')">
    41               <label tal:content="widget/label_edit"
    42                      tal:attributes="for cell/widget_input_area_id|nothing;">label</label>:
    43             </div>
    44             <button type="button" class="tooltipControl"
    45                     tal:condition="widget/help"
    46                     tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
    47             </td>
    48             <td>
    49             <span class="field">
    50               <div tal:replace="structure cell/widget_rendered"/>
    51             </span>
    52             <div class="tooltipArea" style="visibility: hidden;"
    53                  tal:condition="widget/help"
    54                  tal:attributes="id tooltip_id;
    55                  onclick python:'showElement(false, \'%s\')' % tooltip_id;"
    56                  >
    57               <tal:block tal:content="widget/help">This is the help for this field
    58               </tal:block>
    59             </div>
    60             <tal:block condition="err">
    61               <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
    62                 <br /><em style="color: red"
    63                           tal:content="msg">err</em>
    64               </tal:block>
    65             </tal:block>
    66             </td>
    67           </div>
    68         </tr>
    69       </span>
    70     </span>
    71     <tr tal:condition="widgets/passport|nothing"
    72         tal:define="cell widgets/passport|nothing;">
     25
     26    <tr tal:condition="widgets/app_email|nothing"
     27        tal:define="cell widgets/app_email|nothing;">
    7328      <tal:block tal:define="widget cell/widget;
    7429      wid widget/getWidgetId;
    … …  
    7631      err_mapping python:ds.getErrorMapping(wid);
    7732      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
    78       tooltip_id python:wid + '_help';
    7933      widget_css_class widget/widget_css_class|nothing;
    80       css_class python:test(err, 'row error','row')"
    81       >
     34      css_class python:test(err, 'row error','row')">
    8235        <div tal:attributes="class widget_css_class;
    83         id python:widget.getHtmlWidgetId()+'_widget';"
    84         >
     36        id python:widget.getHtmlWidgetId()+'_widget';">
    8537          <td>
    8638            <div class="label" tal:condition="widget/label_edit"
    … …  
    8941                     tal:attributes="for cell/widget_input_area_id|nothing;">label</label>:
    9042            </div>
    91             <button type="button" class="tooltipControl"
    92                     tal:condition="widget/help"
    93                     tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
    9443          </td>
    9544          <td>
    … …  
    9746              <div tal:replace="structure cell/widget_rendered"/>
    9847            </span>
    99             <div class="tooltipArea" style="visibility: hidden;"
    100                  tal:condition="widget/help"
    101                  tal:attributes="id tooltip_id;
    102                  onclick python:'showElement(false, \'%s\')' % tooltip_id;"
    103                  >
    104               <tal:block tal:content="widget/help">This is the help for this field
    105               </tal:block>
    106             </div>
    10748            <tal:block condition="err">
    10849              <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">

  • WAeUP_SRP/base/skins/waeup_student/admission_form.pt

    r2579 r2581  
    1 <metal:html tal:define="info context/getStudentInfo">
     1<metal:html tal:define="info context/getStudentInfo;
     2                        app_email info/app_doc/app_email">
    23  <span tal:condition="not: info">
    34    <span tal:content="here/illegal_view" />
    … …  
    7677                       (cpsmcat('Confirm that you want to raise an objection.'), )"
    7778                       />
    78                 <input tal:condition="python:review_state in ('admitted', 'objection_raised',)" type="submit" name="application_edit:method"
     79                <input tal:condition="python:review_state in ('admitted', 'objection_raised',) and not app_email" type="submit" name="application_edit:method"
    7980                       class="context" value="Continue"
    8081                       />
     82                <input tal:condition="python:review_state in ('admitted', 'objection_raised',) and app_email" type="submit" name="start_clearance:method"
     83                       class="context" value="Continue"
     84                       />                       
    8185       </form>
    8286    </span>

  • WAeUP_SRP/base/skins/waeup_student/application_edit_form.pt

    r2575 r2581  
    3131        <span tal:omit-tag="" tal:replace="structure rendered_main"/>
    3232      </span>
     33      <br />
    3334      <input type="submit" class="standalone"
    3435             name="cpsdocument_edit_button"
Note: See TracChangeset for help on using the changeset viewer.