[Mpuls-commits] r3458 - in base/trunk: . mpulsweb/templates/evaluation

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-26 16:31:30 +0200 (Thu, 26 Aug 2010)
New Revision: 3458

Removed:
   base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako
Modified:
   base/trunk/ChangeLog
Log:
* mpulsweb/templates/evaluation/evaluate_adele.mako: Removed.
It's not used anymore and its functionality is handled by
mpulsweb/templates/evaluation/evaluate.mako


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-26 14:25:46 UTC (rev 3457)
+++ base/trunk/ChangeLog	2010-08-26 14:31:30 UTC (rev 3458)
@@ -1,5 +1,11 @@
 2010-08-26  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/evaluation/evaluate_adele.mako: Removed.
+	It's not used anymore and its functionality is handled by
+	mpulsweb/templates/evaluation/evaluate.mako
+
+2010-08-26  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/evaluation/evaluate.mako: evaluate.mako and
 	evaluate_adele.mako are almost identical.  The only difference is
 	that in the adele version some input elements are disabled.

Deleted: base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako	2010-08-26 14:25:46 UTC (rev 3457)
+++ base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako	2010-08-26 14:31:30 UTC (rev 3458)
@@ -1,91 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="/main.mako"/>
-<%!  import mpulsweb.lib.helper.filters as F %>
-<div>
-  ##<div class="widget modusfield actions">
-  ##  <ul>
-  ##    <li><a href="${h.url_for(controller='/administration', action='resetPassword', id=c.user.id)}">${_('Reset password')}</a></li>
-  ##    <li><a href="${h.url_for(controller='/administration', action='listUsers')}">${_('Back to userlist')}</a></li>
-  ##  </ul>
-  ##</div>
-  <div class="header">
-    <h1>${_('Evaluation configuration')}</h1>
-  </div>
-</div>
-<div>
-<form action="${h.url_for(controller='/evaluate', action='evaluateAction')}" method="POST" target="_blank">
-<input type="hidden" name="id">
-<table>
-  <tr>
-    <td class="label">${_('Name')}</td>
-    <td>${c.evalconfig.get_setname()}</td>
-  </tr>
-  <tr>
-    <td class="label">${_('Description')}</td>
-    <td>${c.evalconfig.get_setdesc()}</td>
-  </tr>
-  <tr>
-    <td class="label">Phase</td>
-    <td>
-      <input type="checkbox" name="phase" id="phase_x" value="-1" disabled="disabled"> 
-      <label for="phase_x">
-        ${_('Unknown')}<br>
-      </label>
-      % for n,p in enumerate(g.mpuls_config.get('phases', 'phases')):
-        <input type="checkbox" name="phase" id="phase_${n}" value="${p}" disabled="disabled"> 
-          <label for="phase_${n}">
-            ${g.mpuls_config.get('phases', 'description')[0].get(p)}<br>
-          </label>
-      % endfor
-    </td>
-  </tr>
-  <tr>
-    <td class="label">Start</td>
-    <td>
-      <input type="text" name="start_date" class="datefield" disabled="disabled"><form:error name="start_date" format="">
-    </td>
-  </tr>
-  <tr>
-    <td class="label">Ende</td>
-    <td>
-      <input type="text" name="end_date" class="datefield" disabled="disabled"><form:error name="end_date" format="">
-    </td>
-  </tr>
-  % if session.has_key('evaluation.options'):
-  <tr>
-    <td class="label">${_('Filter')}</td>
-    <td>
-      Yes (<a href="${h.url_for(controller='/evaluate', action='resetFilter', id=c.evalconfig.get_setid())}">Reset</a>)<br>
-      ${session['evaluation.options'].get('sql')}
-    </td>
-  </tr>
-  % endif
-</table>
-<h2>${_('Available evaluations')}</h2>
-<p>${_('Please select one or more evaluations')}</p>
-<table style="table-layout:auto">
-  <tr>
-    <th colspan="2">${_('Evaluations')}</th>
-  </tr>
-  % for num, id in enumerate(c.evalconfig.get_evaluations()):
-  <tr>
-    <td class="${num%2 and 'hl' or ''}">
-      <input type="checkbox" name="typelist" value="${id}" id="${id}">
-    </td>
-    <td class="${num%2 and 'hl' or ''}">
-      <h3><label for="${id}">${c.evalconfig.get_name(id)}</label></h3>
-      <p><label for="${id}">${c.evalconfig.get_desc(id)}</label></p>
-    </td>
-  </tr>
-  % endfor
-</table>
-<table>
-  <tr>
-    <td colspan="3"><input type="checkbox" name="show_percent" id="show_percent"> <label for="show_percent">${_('Show percent')}</label></td> 
-  </tr>
-  <tr>
-    <td colspan="3"><input type="submit" name="setup_evaluation" value="${_('evaluate')}"></td> 
-  </tr>
-</table>
-</form>
-</div>