[Mpuls-commits] r2173 - in wasko/branches/2.0: . jmdweb/templates mpulsweb/templates/annotations

Thu Mar 25 12:50:19 CET 2010

Author: torsten
Date: 2010-03-25 12:50:17 +0100 (Thu, 25 Mar 2010)
New Revision: 2173

Added:
   wasko/branches/2.0/mpulsweb/templates/annotations/main.mako
Removed:
   wasko/branches/2.0/jmdweb/templates/main_help.mako
Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/templates/annotations/annotation.mako
Log:
Moved parent template for annotations into mpulsbase. Adapt annotations.mako
to new filename.


Modified: wasko/branches/2.0/ChangeLog
===================================================================

--- wasko/branches/2.0/ChangeLog	2010-03-25 11:44:36 UTC (rev 2172)
+++ wasko/branches/2.0/ChangeLog	2010-03-25 11:50:17 UTC (rev 2173)
@@ -28,6 +28,23 @@
 	mpulsweb now.
 	* jmdweb/controllers/case.py (CaseController.select): Deleted. Defined
 	in mpulsweb now.
+	* mpulsweb/templates/formularpage/formular.mako: Do not escape
+	Formularheaders.
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.deleteUser): Do not render trace.mako on
+	exception.
+	* mpulsweb/controllers/usersettings.py
+	(UsersettingsController.changePasswordAction): Do not render
+	trace.mako on exception.
+	* mpulsweb/controllers/usersettings.py
+	(UsersettingsController.changePasswordOnLoginAction): Do not render
+	trace.mako on exception.
+	* mpulsweb/controllers/appointment.py
+	(AppointmentController.createAction): Do not render trace.mako on
+	exception
+	* mpulsweb/controllers/appointment.py
+	(AppointmentController.editAction): Do not render trace.mako on
+	exception
 
 2010-03-24  Torsten Irländer <torsten.irlaender at intevation.de>
 

Deleted: wasko/branches/2.0/jmdweb/templates/main_help.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/main_help.mako	2010-03-25 11:44:36 UTC (rev 2172)
+++ wasko/branches/2.0/jmdweb/templates/main_help.mako	2010-03-25 11:50:17 UTC (rev 2173)
@@ -1,42 +0,0 @@
-## -*- coding: utf-8 -*-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title>WASKO</title>
-    <meta name="generator" content="vim">
-    <meta name="author" content="Torsten Irlaender">
-    <meta name="date" content="2007-08-07">
-    <meta name="copyright" content="">
-    <meta name="keywords" content="">
-    <meta name="description" content="">
-    <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta http-equiv="content-style-type" content="text/css">
-    <meta http-equiv="expires" content="0">
-    <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
-    % if c.print_version:
-    <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
-    <link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" type="text/css">
-    <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
-    % else:
-    <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
-    <link href="${h.url_for('/styles/screen.css')}" media="screen" rel="stylesheet" type="text/css">
-    <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
-    <!--[if gt IE 5]><link href="${h.url_for('/styles/ie6.css')}" media="screen" rel="stylesheet" type="text/css"><![endif]-->
-    % endif
-  </head>
-  <body>
-    <div id="wrapper_login" >
-      <div id="header_login">
-        <div id="logo_login">
-          <img src="${h.url_for('/images/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
-        </div>
-      </div>
-      <div id="content_login">
-        ${self.body()}
-      </div>
-      <div id="footer_login">
-      </div>
-    </div>	
-  </body>
-</html>

Modified: wasko/branches/2.0/mpulsweb/templates/annotations/annotation.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/annotations/annotation.mako	2010-03-25 11:44:36 UTC (rev 2172)
+++ wasko/branches/2.0/mpulsweb/templates/annotations/annotation.mako	2010-03-25 11:50:17 UTC (rev 2173)
@@ -1,5 +1,5 @@
 ## -*- coding: utf-8 -*-
-<%inherit file="../main_help.mako" />
+<%inherit file="main.mako" />
 <h1>${c.annotation_header}</h1>
 <h2>${c.annotation_title}</h2>
 <p>${c.annotation_text}</p>

Copied: wasko/branches/2.0/mpulsweb/templates/annotations/main.mako (from rev 2171, wasko/branches/2.0/jmdweb/templates/main_help.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/annotations/main.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

