Changeset 843 for WAeUP_SRP/trunk/skins


Ignore:
Timestamp:
11 Nov 2006, 17:40:02 (18 years ago)
Author:
joachim
Message:

show filename in clearance slip
show faculty and department title in admission_view and _slip
pin is not used, if an error occurs in the form,
the pin must therefore be the last entry field.
entry_date and entry_session are set in start_clearance

Location:
WAeUP_SRP/trunk/skins
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_custom/widget_image_render.pt

    r808 r843  
    1313  image_tag options/image_tag;
    1414  ">
     15<span tal:condition="python:0">
    1516  <img tal:condition="python: mode == 'view' and not empty_file"
    1617    tal:replace="structure image_tag" />
     18</span>
     19<span tal:condition="python: mode == 'view' and not empty_file">
     20  <a href="" target="_new"
     21     tal:attributes="href content_url"
     22     tal:content="current_filename" >
     23  </a>
     24</span>
    1725
    1826  <tal:block condition="python: mode == 'edit'">

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

    r837 r843  
    3939          <td tal:content="sc/study_course" />
    4040        </tr>
    41         <tr>
    42           <td>Faculty ID:</td>
    43           <td tal:content="sc/faculty" />
    44         </tr>
    45         <tr>
    46           <td>Department ID:</td>
    47           <td><span tal:content="sc/department" /></td>
    48         </tr>       
    49       </table>       
     41          <span tal:define="f_id sc/faculty;
     42          d_id sc/department;
     43          f_title context/academics/?f_id/Title;
     44          d_title context/academics/?f_id/?d_id/Title"
     45          >
     46            <tr>
     47              <td>Faculty</td>
     48              <td tal:content="f_title" />
     49            </tr>
     50            <tr>
     51              <td>Department</td>
     52              <td><span tal:content="d_title" /></td>
     53            </tr>
     54          </span>
     55        </table>       
    5056
    5157     

  • WAeUP_SRP/trunk/skins/waeup_student/admission_slip.pt

    r837 r843  
    2929          <td tal:content="sc/study_course" />
    3030        </tr>
    31         <tr>
    32           <td>Faculty ID:</td>
    33           <td tal:content="sc/faculty" />
    34         </tr>
    35         <tr>
    36           <td>Department ID:</td>
    37           <td><span tal:content="sc/department" /></td>
    38         </tr>       
    39       </table>       
    40      
    41     </span>
     31        <span tal:define="f_id sc/faculty;
     32                        d_id sc/department;
     33                        f_title context/academics/?f_id/Title;
     34                        d_title context/academics/?f_id/?d_id/Title"
     35                        >
     36            <tr>
     37              <td>Faculty</td>
     38              <td tal:content="f_title" />
     39            </tr>
     40            <tr>
     41              <td>Department</td>
     42              <td><span tal:content="d_title" /></td>
     43            </tr>
     44          </span>
     45        </table>       
     46      </span>
    4247    </metal:main>
    4348  </metal:body>

  • WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt

    r842 r843  
    1010        <span tal:repeat="cell row">
    1111          <span tal:define="widget cell/widget"
    12                 tal:condition="python:cell['widget_id'] not in fields_not_displayed
    13                                        and widget.meta_type!='Image Widget' ">
     12                tal:condition="python:cell['widget_id'] not in fields_not_displayed">
    1413            <div tal:omit-tag=""
    1514                 tal:attributes="class cell/widget_css_class|nothing;">
    … …  
    3534             <div class="ddescription" tal:condition="cell" tal:content="structure cell/widget_rendered"></div>
    3635             <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
    37             </td>
     36              </td>
    3837            </tr>
    39             </div>
    40           </span>
    41           <span tal:define="widget cell/widget;
    42                             title_name string:${cell/widget_id}_filename;"
    43                 tal:condition="python:cell['widget_id'] not in fields_not_displayed
    44                                        and widget.meta_type=='Image Widget'
    45                                        and cell['widget_rendered']">
    46             <div tal:omit-tag=""
    47                  tal:attributes="class cell/widget_css_class|nothing;">
    48             <tr>
    49             <td valign="top"><span tal:content="widget/title" />:</td>
    50             <td>
    51             <a href="" target="slip" tal:attributes="href widget/getWidgetId">
    52             <span tal:content="string: Hier sollte der Dateiname stehen." />
    53             </a>
    54            
    55            
    56             </td>
    57             </tr>
    58             </div>
    59           </span>
     38          </div>
    6039        </span>
     40      </span>
    6141    </span>
    6242  </table>

  • WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py

    r805 r843  
    6464    dc['clr_ac_pin'] = pin
    6565    dc['clr_ac_date'] = current
     66    dc['entry_date'] = current
     67    dc['entry_session'] = "2006/2007"
    6668    info['clear_doc'].edit(mapping = dc)
    6769return redirect("%s/clearance_edit_form" % info['clear'].absolute_url())
Note: See TracChangeset for help on using the changeset viewer.