[Mpuls-commits] r3601 - in jmd/trunk: . jmdstrukturweb/public/images jmdstrukturweb/public/images/logos jmdstrukturweb/templates jmdstrukturweb/templates/auth jmdweb/public/images/logos jmdweb/templates jmdweb/templates/auth

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Sep 13 12:41:24 CEST 2010 

Author: torsten
Date: 2010-09-13 12:41:22 +0200 (Mon, 13 Sep 2010)
New Revision: 3601

Added:
   jmd/trunk/jmdstrukturweb/public/images/logos/
   jmd/trunk/jmdstrukturweb/public/images/logos/jugend-staerken.jpg
   jmd/trunk/jmdstrukturweb/public/images/logos/logo_jmd.gif
   jmd/trunk/jmdstrukturweb/templates/auth/
   jmd/trunk/jmdstrukturweb/templates/auth/main.mako
   jmd/trunk/jmdweb/public/images/logos/jugend-staerken.jpg
   jmd/trunk/jmdweb/public/images/logos/logo_jmd.gif
   jmd/trunk/jmdweb/templates/auth/
   jmd/trunk/jmdweb/templates/auth/main.mako
Modified:
   jmd/trunk/ChangeLog
Log:
Issue949: Jmd-specific login


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-09-13 10:02:38 UTC (rev 3600)
+++ jmd/trunk/ChangeLog	2010-09-13 10:41:22 UTC (rev 3601)
@@ -4,7 +4,16 @@
 	* jmdstrukturweb/templates/info/info.mako: Issue1161:
 	  Added copy of info text to jmdstrukturweb/templates/info 
 	* jmdweb/public/images/mpuls.ico,
-	  jmdstrukturweb/public/images/mpuls.ico: Issue949: JMD-specific favicons 
+	  jmdstrukturweb/public/images/mpuls.ico: Issue949: JMD-specific favicons
+	* jmdweb/public/images/logos/jugend-staerken.jpg,
+	  jmdweb/public/images/logos/logo_jmd.gif,
+	  jmdweb/templates/auth,
+	  jmdweb/templates/auth/main.mako,
+	  jmdstrukturweb/public/images/logos,
+	  jmdstrukturweb/public/images/logos/jugend-staerken.jpg,
+	  jmdstrukturweb/public/images/logos/logo_jmd.gif,
+	  jmdstrukturweb/templates/auth,
+	  jmdstrukturweb/templates/auth/main.mako: Issue949: JMD-specific Login
 
 2010-09-08  Bernhard Herzog  <bh at intevation.de>
 

Copied: jmd/trunk/jmdstrukturweb/public/images/logos (from rev 3598, jmd/trunk/jmdweb/public/images/logos)


Property changes on: jmd/trunk/jmdstrukturweb/public/images/logos
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: jmd/trunk/jmdstrukturweb/public/images/logos/jugend-staerken.jpg
===================================================================
(Binary files differ)


Property changes on: jmd/trunk/jmdstrukturweb/public/images/logos/jugend-staerken.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jmd/trunk/jmdstrukturweb/public/images/logos/logo_jmd.gif
===================================================================
(Binary files differ)


Property changes on: jmd/trunk/jmdstrukturweb/public/images/logos/logo_jmd.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


Property changes on: jmd/trunk/jmdstrukturweb/templates/auth
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: jmd/trunk/jmdstrukturweb/templates/auth/main.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/auth/main.mako	2010-09-13 10:02:38 UTC (rev 3600)
+++ jmd/trunk/jmdstrukturweb/templates/auth/main.mako	2010-09-13 10:41:22 UTC (rev 3601)
@@ -0,0 +1,47 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../base.mako" />
+<div id="wrapper_login" >
+  <div id="header_login">
+    <div id="logo_login">
+      <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
+    </div>
+  </div>
+  <div id="content_login">
+    ${next.body()}
+  </div>
+  <div id="footer_login">
+    <p>${_('main_login_bmf_phrase') % h.get_app_title()}</p>
+     <a target="_blank" href="http://www.bmfsfj.de">
+      <img src="${h.url_for('/images/logos/BMFSFJ_C_M_web.jpg')}" 
+        alt="Logo Bundesministerium f&#252;r Familie, Senioren, Frauen und Jugend" border="0">
+    </a>
+     <a target="_blank" href="http://www.jugend-staerken.de/).">
+      <img src="${h.url_for('/images/logos/jugend-staerken.jpg')}" 
+        alt="Logo Programm 'Jugend Stärken'" border="0">
+    </a>
+     <a target="_blank" href="http://www.jugendmigrationsdienste.de">
+      <img src="${h.url_for('/images/logos/logo_jmd.gif')}" 
+        alt="Logo Jugendmigrationsdienste" border="0">
+    </a>
+  </div>
+</div>
+
+<%def name="buildFormErrors()">
+    <%
+      # Please fill this dictionary in the templates if you want to substitute
+      # the formular identifier
+      formular_labels = {'passwd': 'adm_form_newuser_passwd',
+                          'passwd2': 'adm_form_newuser_passwd_confirm'
+                          }
+    %>
+  % if len(c.form_errors) > 0:
+  <div class="form_errors">
+    <a name="error_list"><h1>${_('main_login_formular_input_error')}</h1></a>
+    <ul>
+      % for key, value in c.form_errors.iteritems():
+        <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>
+      % endfor
+    </ul>
+  </div>
+  % endif
+</%def>

Added: jmd/trunk/jmdweb/public/images/logos/jugend-staerken.jpg
===================================================================
(Binary files differ)


Property changes on: jmd/trunk/jmdweb/public/images/logos/jugend-staerken.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jmd/trunk/jmdweb/public/images/logos/logo_jmd.gif
===================================================================
(Binary files differ)


Property changes on: jmd/trunk/jmdweb/public/images/logos/logo_jmd.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jmd/trunk/jmdweb/templates/auth/main.mako
===================================================================
--- jmd/trunk/jmdweb/templates/auth/main.mako	2010-09-13 10:02:38 UTC (rev 3600)
+++ jmd/trunk/jmdweb/templates/auth/main.mako	2010-09-13 10:41:22 UTC (rev 3601)
@@ -0,0 +1,47 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../base.mako" />
+<div id="wrapper_login" >
+  <div id="header_login">
+    <div id="logo_login">
+      <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
+    </div>
+  </div>
+  <div id="content_login">
+    ${next.body()}
+  </div>
+  <div id="footer_login">
+    <p>${_('main_login_bmf_phrase') % h.get_app_title()}</p>
+     <a target="_blank" href="http://www.bmfsfj.de">
+      <img src="${h.url_for('/images/logos/BMFSFJ_C_M_web.jpg')}" 
+        alt="Logo Bundesministerium f&#252;r Familie, Senioren, Frauen und Jugend" border="0">
+    </a>
+     <a target="_blank" href="http://www.jugend-staerken.de/).">
+      <img src="${h.url_for('/images/logos/jugend-staerken.jpg')}" 
+        alt="Logo Programm 'Jugend Stärken'" border="0">
+    </a>
+     <a target="_blank" href="http://www.jugendmigrationsdienste.de">
+      <img src="${h.url_for('/images/logos/logo_jmd.gif')}" 
+        alt="Logo Jugendmigrationsdienste" border="0">
+    </a>
+  </div>
+</div>
+
+<%def name="buildFormErrors()">
+    <%
+      # Please fill this dictionary in the templates if you want to substitute
+      # the formular identifier
+      formular_labels = {'passwd': 'adm_form_newuser_passwd',
+                          'passwd2': 'adm_form_newuser_passwd_confirm'
+                          }
+    %>
+  % if len(c.form_errors) > 0:
+  <div class="form_errors">
+    <a name="error_list"><h1>${_('main_login_formular_input_error')}</h1></a>
+    <ul>
+      % for key, value in c.form_errors.iteritems():
+        <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>
+      % endfor
+    </ul>
+  </div>
+  % endif
+</%def>

More information about the Mpuls-commits mailing list