[Mpuls-commits] r4217 - in base/trunk: . mpulsweb/lib mpulsweb/templates/casemanagement mpulsweb/templates/casemanagement/dialogs mpulsweb/templates/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Nov 17 12:31:28 CET 2010
Author: roland
Date: 2010-11-17 12:31:26 +0100 (Wed, 17 Nov 2010)
New Revision: 4217
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/lib/renderer.py
base/trunk/mpulsweb/templates/casemanagement/caselist.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
base/trunk/mpulsweb/templates/casemanagement/digest.mako
base/trunk/mpulsweb/templates/casemanagement/search.mako
base/trunk/mpulsweb/templates/dialogs/confirm.mako
Log:
issue1390: fixed issues with Internet Explorer (6)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/ChangeLog 2010-11-17 11:31:26 UTC (rev 4217)
@@ -1,5 +1,16 @@
2010-11-17 Roland Geider <roland.geider at intevation.de>
+ * mpulsweb/lib/renderer.py,
+ mpulsweb/templates/dialogs/confirm.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_export.mako,
+ mpulsweb/templates/casemanagement/search.mako,
+ mpulsweb/templates/casemanagement/caselist.mako,
+ mpulsweb/templates/casemanagement/digest.mako: issue1390: fixed
+ issues with Internet Explorer when PNG images don't have an explicit
+ "width" and "height" attribute
+
+2010-11-17 Roland Geider <roland.geider at intevation.de>
+
* mpulsweb/public/styles/ie6.css,
mpulsweb/public/styles/ie7.css,
mpulsweb/public/styles/ie8.css: issue1403: fix issue with IE not
Modified: base/trunk/mpulsweb/lib/renderer.py
===================================================================
--- base/trunk/mpulsweb/lib/renderer.py 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/mpulsweb/lib/renderer.py 2010-11-17 11:31:26 UTC (rev 4217)
@@ -523,7 +523,8 @@
depth = 1 #visibleDepth(node)
if text:
out.append('<p class="text">')
- out.append(tag("img", src=icon("formular/info.png")))
+ out.append(tag("img", src=icon("formular/info.png"), width="48",
+ height="48"))
out.append(escape(text))
out.append('</p>')
self.toTarget(Item("".join(out)), meta.getTarget())
@@ -1139,7 +1140,10 @@
out = []
out.append(tag("div", class_=("widget dialog %s" % css_class)))
out.append('<h1>')
- out.append(tag("img", src=title_icon, alt=''))
+
+ # Note: The icons' sizes are set to 48x48 here. Expand function if more
+ # flexibility is needed
+ out.append(tag("img", src=title_icon, alt='', width='48', height='48'))
out.append(escape(title))
out.append('</h1>')
out.append('<ol>')
Modified: base/trunk/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2010-11-17 11:31:26 UTC (rev 4217)
@@ -114,7 +114,7 @@
<%def name="get_validity_icon(case)">
% for validity in g.mpuls_config.get('validities', 'enabled'):
% if validity['id'] == case.getValidity():
- <img src="${h.url_for('/images/icons/%s' % validity['icon'])}" alt="${validity['name']}" title="${validity['name']} ">
+ <img src="${h.url_for('/images/icons/%s' % validity['icon'])}" alt="${validity['name']}" title="${validity['name']}" width="22" height="22">
% endif
% endfor
</%def>
@@ -123,7 +123,7 @@
<% phase = case.getState().getPhase() %>
<% running = not phase%2 and 'running' or 'finished' %>
<% description = h.literal(c.phases.get_phase(str(phase)).getDescription())%>
- <img src="${h.url_for(str('/images/icons/case_status/%s_%s.png' % (description[0].lower(), running)) )}" alt="${description}" title="${description}">
+ <img src="${h.url_for(str('/images/icons/case_status/%s_%s.png' % (description[0].lower(), running)) )}" alt="${description}" title="${description}" width="22" height="22">
</%def>
<%def name="render_phase_legend()">
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2010-11-17 11:31:26 UTC (rev 4217)
@@ -5,9 +5,11 @@
<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_export')}</a></li>
</%def>
-<div class="dialog" />
+<div class="dialog">
<h1><img src="${h.url_for('/images/icons/info/question.png')}"
- alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
+ alt="achtung"
+ width="48"
+ height="48">${c.dialog_title or c.confirm_for}</h1>
<form action="${h.url_for(controller='/case_bundle', action='exportAction')}"
method="GET">
<% case_bundle = session.get('casebundle') %>
Modified: base/trunk/mpulsweb/templates/casemanagement/digest.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-11-17 11:31:26 UTC (rev 4217)
@@ -77,7 +77,9 @@
% else:
<h1>
<img src="${h.url_for('/images/icons/info/question.png')}"
- alt="achtung"/>Inaktiver Fall?
+ alt="achtung"
+ width="48"
+ height="48">Inaktiver Fall?
</h1>
<p>
Für die Fallakte konnte seit
Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-11-17 11:31:26 UTC (rev 4217)
@@ -55,19 +55,19 @@
<td>
<input type="checkbox" name="state" id="show_open" value="1">
<label for="show_open">
- <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}">Bearbeitbare Fallakten</label><br>
+ <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}" height="22" width="22">Bearbeitbare Fallakten</label><br>
<input type="checkbox" name="state" id="show_markdelete" value="3" checked="checked">
<label for="show_markdelete">
- <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}">Schwebend gelöscht (${c.count_del})
+ <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}" height="22" width="22">Schwebend gelöscht (${c.count_del})
</label><br>
% if g.mpuls_config.is_enabled('case-module', 'anonymize'):
<input type="checkbox" name="state" id="show_markanonymize" value="4" checked="checked">
<label for="show_markanonymize">
- <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Schwebend anonymisiert (${c.count_markanon})
+ <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}" height="22" width="22">Schwebend anonymisiert (${c.count_markanon})
</label><br>
<input type="checkbox" name="state" id="show_anonymized" value="5" checked="checked">
<label for="show_anonymized">
- <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Anonymisiert (${c.count_anon})
+ <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}" height="22" width="22">Anonymisiert (${c.count_anon})
</label>
% endif
</td>
Modified: base/trunk/mpulsweb/templates/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/confirm.mako 2010-11-17 11:07:35 UTC (rev 4216)
+++ base/trunk/mpulsweb/templates/dialogs/confirm.mako 2010-11-17 11:31:26 UTC (rev 4217)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
-<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/question.png')}" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
+<div class="dialog">
+<h1><img src="${h.url_for('/images/icons/info/question.png')}" alt="achtung" width="48" height="48">${c.dialog_title or c.confirm_for}</h1>
<p>${h.literal(c.dialog_text or c.question)}</p>
<a class="button" href="${c.url_yes}">${_('dialog_header_confirm_option_yes')}</a>
<a class="button" href="${c.url_no}">${_('dialog_header_confirm_option_no')}</a>
More information about the Mpuls-commits
mailing list