[Mpuls-commits] r2290 - in wasko/branches/2.0: . mpulsweb/templates mpulsweb/templates/annotations mpulsweb/templates/auth mpulsweb/templates/casemanagement mpulsweb/templates/home mpulsweb/templates/settings waskaweb/templates waskaweb/templates/casemanagement waskaweb/templates/info waskaweb/templates/start
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Apr 9 09:04:51 CEST 2010
Author: roland
Date: 2010-04-09 09:04:49 +0200 (Fri, 09 Apr 2010)
New Revision: 2290
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/mpulsweb/templates/annotations/main.mako
wasko/branches/2.0/mpulsweb/templates/auth/main.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/search.mako
wasko/branches/2.0/mpulsweb/templates/home/remindlist.mako
wasko/branches/2.0/mpulsweb/templates/main.mako
wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/search.mako
wasko/branches/2.0/waskaweb/templates/info/info.mako
wasko/branches/2.0/waskaweb/templates/main_help.mako
wasko/branches/2.0/waskaweb/templates/start/remindlist.mako
wasko/branches/2.0/waskaweb/templates/start/responsible.mako
Log:
Graphic clean-up
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/ChangeLog 2010-04-09 07:04:49 UTC (rev 2290)
@@ -1,3 +1,22 @@
+2010-04-08 Roland Geider <roland.geider at intevation.de>
+
+ Graphic clean-up: updated icons and adapted templates and
+ colour palette
+
+ * mpulsweb/templates/home/remindlist.mako:
+ * mpulsweb/templates/annotations/main.mako:
+ * mpulsweb/templates/settings/edit.mako:
+ * mpulsweb/templates/auth/main.mako:
+ * mpulsweb/templates/casemanagement/search.mako:
+ * mpulsweb/templates/casemanagement/caselist.mako:
+ * mpulsweb/templates/main.mako:
+ * waskaweb/templates/main_help.mako:
+ * waskaweb/templates/casemanagement/search.mako:
+ * waskaweb/templates/casemanagement/caselist.mako:
+ * waskaweb/templates/info/info.mako:
+ * waskaweb/templates/start/remindlist.mako:
+ * waskaweb/templates/start/responsible.mako:
+
2010-04-08 Torsten Irländer <torsten.irlaender at intevation.de>
* jmdweb/public/formed/formedtree.xml: Added new date-sequence rules.
Modified: wasko/branches/2.0/mpulsweb/templates/annotations/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/annotations/main.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/annotations/main.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -29,7 +29,7 @@
<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">
+ <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
</div>
</div>
<div id="content_login">
Modified: wasko/branches/2.0/mpulsweb/templates/auth/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/auth/main.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/auth/main.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -3,7 +3,7 @@
<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">
+ <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
</div>
</div>
<div id="content_login">
Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -104,7 +104,7 @@
alt="${_('case_state_label_open')}"
title="${_('case_state_label_open')}">
% elif case.getState().getState() == 3:
- <img src="/images/icons/delete_grey.gif" border="0"
+ <img src="/images/icons/delete_inactive_22.png" border="0"
alt="${_('case_state_label_delete')}"
title="${_('case_state_label_delete')}">
% elif case.getState().getState() == 4:
@@ -140,7 +140,7 @@
% endif
% if case.getState().getState() in (3, 4):
<a href="/case/restore/${case.id}/0/">
- <img src="/images/icons/recover_red.gif" border="0"
+ <img src="/images/icons/refresh_active_22.png" border="0"
alt="${_('cm_overview_a_restore')}"
title="${_('cm_overview_a_restore')}"></a>
% endif
Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/search.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/search.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -45,7 +45,7 @@
% if h.hasRole(['admin_ka']):
<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="/images/icons/delete_grey.gif">Schwebend gelöscht (${c.count_del})
+ <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
</label><br>
<input type="checkbox" name="state" id="show_markanonymize" value="4" checked="checked">
<label for="show_markanonymize">
@@ -132,7 +132,7 @@
## % if h.hasRole(['admin_ka']):
## <input type="checkbox" name="show_markdelete" id="show_markdelete" value="1" checked="checked">
## <label for="show_markdelete">
-## <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_grey.gif">Schwebend gelöscht (${c.count_del})
+## <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
## </label>
## <input type="checkbox" name="show_markanonymize" id="show_markanonymize" value="1" checked="checked">
## <label for="show_markanonymize">
Modified: wasko/branches/2.0/mpulsweb/templates/home/remindlist.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/home/remindlist.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/home/remindlist.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -5,5 +5,5 @@
</%def>
<%def name="showKeepActiveActions(appointment)">
<a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
- <img src="/images/icons/recover_red.gif" border="0" alt="${_('cm_overview_a_keepactive')}" title="${_('cm_overview_a_keepactive')}"></a>
+ <img src="/images/icons/refresh_active_22.png" border="0" alt="${_('cm_overview_a_keepactive')}" title="${_('cm_overview_a_keepactive')}"></a>
</%def>
Modified: wasko/branches/2.0/mpulsweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/main.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/main.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -11,12 +11,10 @@
% else:
<strong>${h.getUserLastname()}</strong>
% endif
- |
+ <!--|
<a href="${h.url_for(controller='/usersettings', action='showSettings',
id=h.getUserId())}"
- onclick="return checkModification();">
- ${_('sm_menu_link_settings')}
- </a>
+ onclick="return checkModification();">${_('sm_menu_link_settings')}</a>-->
</div>
</%def>
@@ -42,9 +40,9 @@
${_('sm_menu_link_responsible')}</a>
</li>-->
<li>
- <a href="${h.url_for(controller='/help')}"
+ <!--<a href="${h.url_for(controller='/help')}"
onclick="return checkModification();">
- ${_('sm_menu_link_help')}</a>
+ ${_('sm_menu_link_help')}</a>-->
<a href="${h.url_for(controller='/help')}"
onclick="return checkModification();"><img src = "/images/icons/info/question_22.png"
alt = "${_('sm_menu_link_help')}"
@@ -53,9 +51,9 @@
height = "22"></a>
</li>
<li>
- <a href="${h.url_for(controller='/auth', action='logout')}"
+ <!--<a href="${h.url_for(controller='/auth', action='logout')}"
onclick="return checkModification();">
- ${_('sm_menu_link_logout')}</a>
+ ${_('sm_menu_link_logout')}</a>-->
<a href="${h.url_for(controller='/auth', action='logout')}"
onclick="return checkModification();"><img src = "/images/icons/logout_22.png"
alt = "${_('sm_menu_link_logout')}"
@@ -255,7 +253,7 @@
<div class="left" id="logo">
<a href="${h.url_for(controller='/')}"
onclick="return checkModification();">
- <img src="${h.url_for('/images/logo_ka_75.png')}"
+ <img src="${h.url_for('/images/logos/logo_ka_75.png')}"
alt="Logo Einrichtung" border="0">
</a>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/edit.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/mpulsweb/templates/settings/edit.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -97,7 +97,7 @@
<div class="waska_form_element w100">
% if c.form_errors.get('anon_transfer'):
<a href="#error_list">
- <img class="smallicon" src="/images/error_small.png">
+ <img class="smallicon" alt="" src="/images/icons/info/failure_22.png">
</a>
% endif
% if c.agency.isAnonTransfer():
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -98,7 +98,7 @@
alt="${_('case_state_label_open')}"
title="${_('case_state_label_open')}">
% elif case.getState().getState() == 3:
- <img src="/images/icons/delete_grey.gif" border="0"
+ <img src="/images/icons/delete_inactive_22.png" border="0"
alt="${_('case_state_label_delete')}"
title="${_('case_state_label_delete')}">
% elif case.getState().getState() == 4:
@@ -134,7 +134,7 @@
% endif
% if case.getState().getState() in (3, 4):
<a href="/case/restore/${case.id}/0/">
- <img src="/images/icons/recover_red.gif" border="0"
+ <img src="/images/icons/refresh_active_22.png" border="0"
alt="${_('cm_overview_a_restore')}"
title="${_('cm_overview_a_restore')}"></a>
% endif
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/search.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/search.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/search.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -26,7 +26,7 @@
% if h.hasRole(['admin_ka']):
<input type="checkbox" name="show_markdelete" id="show_markdelete" value="1" checked="checked">
<label for="show_markdelete">
- <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_grey.gif">Schwebend gelöscht (${c.count_del})
+ <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
</label>
<input type="checkbox" name="show_markanonymize" id="show_markanonymize" value="1" checked="checked">
<label for="show_markanonymize">
Modified: wasko/branches/2.0/waskaweb/templates/info/info.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/info/info.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/waskaweb/templates/info/info.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -73,7 +73,7 @@
</div>
<div class="traeger_name_img">
<a href="http://www.intevation.de/" target="_blank">
- <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+ <img src="/images/logos/logo_intevation.png" alt="Logo Intevation" style="border:0">
</a>
</div>
</div>
@@ -89,7 +89,7 @@
</div>
<div class="traeger_name_img">
<a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
- <img src="/images/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
+ <img src="/images/logos/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
</a>
</div>
</div>
@@ -109,7 +109,7 @@
</div>
<div class="traeger_name_img">
<a href="http://ips.datenschutz-cert.de/bremen/" target="_blank">
- <img src="/images/datenschutz_nord.jpg" alt="Logo DS nord" style="border:0">
+ <img src="/images/logos/datenschutz_nord.jpg" alt="Logo DS nord" style="border:0">
</a>
</div>
</div>
@@ -123,7 +123,7 @@
</p>
<div class="traeger_name_img">
<a href="http://intevation.de">
- <img src="/images/logo_intevation.png" alt="Logo Intevation GmbH" style="border:0"></a>
+ <img src="/images/logos/logo_intevation.png" alt="Logo Intevation GmbH" style="border:0"></a>
</div>
</div>
</div>
@@ -141,16 +141,16 @@
<div class="traeger_name_img">
<a href="http://www.bmfsfj.de/" target="_blank">
<img class="" title="Logo bmfsj" alt="Logo bmfsj"
- src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+ src="/images/logos/BMFSFJ_C_M_web.jpg" border="0" >
</a>
<a href="http://www.esf-regiestelle.eu/content/index_ger.html" target="_blank">
<img class="" title="Logo ESF Deutschland" alt="Logo ESF Deutschland"
- src="/images/logo__esf__klein.jpg" border="0" >
+ src="/images/logos/logo__esf__klein.jpg" border="0" >
</a>
<a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
<img class="" title="Logo europäische union - europäischer sozialfonds"
alt="Logo europäische union - europäischer sozialfonds"
- src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+ src="/images/logos/eu_logo_4c_pos_web2.jpg" border="0" >
</a>
</div>
</div>
Modified: wasko/branches/2.0/waskaweb/templates/main_help.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/main_help.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/waskaweb/templates/main_help.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -29,7 +29,7 @@
<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">
+ <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
</div>
</div>
<div id="content_login">
Modified: wasko/branches/2.0/waskaweb/templates/start/remindlist.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/start/remindlist.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/waskaweb/templates/start/remindlist.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -5,5 +5,5 @@
</%def>
<%def name="showKeepActiveActions(appointment)">
<a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
- <img src="/images/icons/recover_red.gif" border="0" alt="${_('cm_overview_a_keepactive')}" title="${_('cm_overview_a_keepactive')}"></a>
+ <img src="/images/icons/refresh_active_22.png" border="0" alt="${_('cm_overview_a_keepactive')}" title="${_('cm_overview_a_keepactive')}"></a>
</%def>
Modified: wasko/branches/2.0/waskaweb/templates/start/responsible.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/start/responsible.mako 2010-04-08 16:02:15 UTC (rev 2289)
+++ wasko/branches/2.0/waskaweb/templates/start/responsible.mako 2010-04-09 07:04:49 UTC (rev 2290)
@@ -73,7 +73,7 @@
</div>
<div class="traeger_name_img">
<a href="http://www.intevation.de/" target="_blank">
- <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+ <img src="/images/logos/logo_intevation.png" alt="Logo Intevation" style="border:0">
</a>
</div>
</div>
@@ -89,7 +89,7 @@
</div>
<div class="traeger_name_img">
<a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
- <img src="/images/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
+ <img src="/images/logos/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
</a>
</div>
</div>
@@ -109,7 +109,7 @@
</div>
<div class="traeger_name_img">
<a href="http://ips.datenschutz-cert.de/bremen/" target="_blank">
- <img src="/images/datenschutz_nord.jpg" alt="Logo DS nord" style="border:0">
+ <img src="/images/logos/datenschutz_nord.jpg" alt="Logo DS nord" style="border:0">
</a>
</div>
</div>
@@ -123,7 +123,7 @@
</p>
<div class="traeger_name_img">
<a href="http://intevation.de">
- <img src="/images/logo_intevation.png" alt="Logo Intevation GmbH" style="border:0"></a>
+ <img src="/images/logos/logo_intevation.png" alt="Logo Intevation GmbH" style="border:0"></a>
</div>
</div>
</div>
@@ -141,16 +141,16 @@
<div class="traeger_name_img">
<a href="http://www.bmfsfj.de/" target="_blank">
<img class="" title="Logo bmfsj" alt="Logo bmfsj"
- src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+ src="/images/logos/BMFSFJ_C_M_web.jpg" border="0" >
</a>
<a href="http://www.esf-regiestelle.eu/content/index_ger.html" target="_blank">
<img class="" title="Logo ESF Deutschland" alt="Logo ESF Deutschland"
- src="/images/logo__esf__klein.jpg" border="0" >
+ src="/images/logos/logo__esf__klein.jpg" border="0" >
</a>
<a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
<img class="" title="Logo europäische union - europäischer sozialfonds"
alt="Logo europäische union - europäischer sozialfonds"
- src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+ src="/images/logos/eu_logo_4c_pos_web2.jpg" border="0" >
</a>
</div>
</div>
More information about the Mpuls-commits
mailing list