[Mpuls-commits] r794 - in wasko/branches/2.0: . waskaweb/templates
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 20 17:28:26 CET 2010
Author: bh
Date: 2010-01-20 17:28:24 +0100 (Wed, 20 Jan 2010)
New Revision: 794
Modified:
wasko/branches/2.0/ChangeLog.txt
wasko/branches/2.0/waskaweb/templates/main.mako
Log:
* waskaweb/templates/main.mako: Fix formatting.
Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt 2010-01-20 15:36:24 UTC (rev 793)
+++ wasko/branches/2.0/ChangeLog.txt 2010-01-20 16:28:24 UTC (rev 794)
@@ -1,5 +1,9 @@
2010-01-20 Bernhard Herzog <bh at intevation.de>
+ * waskaweb/templates/main.mako: Fix formatting.
+
+2010-01-20 Bernhard Herzog <bh at intevation.de>
+
* waskaweb/templates/start/start.mako: Fix formatting
2010-01-20 Bernhard Herzog <bh at intevation.de>
Modified: wasko/branches/2.0/waskaweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/main.mako 2010-01-20 15:36:24 UTC (rev 793)
+++ wasko/branches/2.0/waskaweb/templates/main.mako 2010-01-20 16:28:24 UTC (rev 794)
@@ -13,17 +13,44 @@
<%def name="buildStartMenu()">
<div id="startmenu">
<ul>
- <li><a href="${h.url_for(controller='/waska')}" onclick="return checkModification();">${_('sm_menu_link_home')}</a></li>
- <li><a href="${h.url_for(controller='/waska', action='help')}" onclick="return checkModification();">${_('sm_menu_link_help')}</a></li>
- <li><a href="${h.url_for(controller='/waska', action='settings', id=h.getUserId())}" onclick="return checkModification();">${_('sm_menu_link_settings')}</a></li>
- <li><a href="${h.url_for(controller='/waska', action='info')}" onclick="return checkModification();">${_('sm_menu_link_responsible')}</a></li>
- <li><a href="${h.url_for(controller='/waska', action='logout')}" onclick="return checkModification();">${_('sm_menu_link_logout')}</a></li>
+ <li>
+ <a href="${h.url_for(controller='/waska')}"
+ onclick="return checkModification();">
+ ${_('sm_menu_link_home')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/waska', action='help')}"
+ onclick="return checkModification();">
+ ${_('sm_menu_link_help')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/waska', action='settings',
+ id=h.getUserId())}"
+ onclick="return checkModification();">
+ ${_('sm_menu_link_settings')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/waska', action='info')}"
+ onclick="return checkModification();">
+ ${_('sm_menu_link_responsible')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/waska', action='logout')}"
+ onclick="return checkModification();">
+ ${_('sm_menu_link_logout')}
+ </a>
+ </li>
</ul>
</div>
</%def>
<%def name="buildNavipath()">
- <li><a href="${h.url_for(controller='/waska')}" onclick="return checkModification();">${_('np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/waska')}"
+ onclick="return checkModification();">${_('np_root')}</a></li>
</%def>
<%def name="buildInfofield()">
@@ -33,82 +60,130 @@
</%def>
<%def name="buildIco()">
-<span class="menuico"> >></span>
+ <span class="menuico"> >></span>
</%def>
<%def name="buildNavigation()">
- % if (h.getLogin() != 'adm'):
- % if h.hasRole(['cm_ka', 'admin_ka']):
+ % if (h.getLogin() != 'adm'):
+ % if h.hasRole(['cm_ka', 'admin_ka']):
+ <div class="menu">
+ <div class="actions">
+ <h1>${_('np_root')}</h1>
+ <ul>
+ <li>
+ <a href="${h.url_for(controller='/waska')}">
+ ${_('sm_menu_link_home')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/appointment',
+ action='overview')}">
+ ${_('menu_app_link_overview')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/document',
+ action='globalOverview')}">
+ ${_('menu_doc_link_overview')}
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ % endif
+ % if c.isEvaluationServer and h.hasRole(['pb_ka']):
+ <div class="menu">
+ <div class="actions">
+ <h1>${_('menu_header_cm')}</h1>
+ <ul>
+ <li>
+ <a href="${h.url_for(controller='/agency_overview',
+ action='overview', reset=1)}">
+ ${_('menu_cm_link_overview')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/evaluate', action='evaluate',
+ id=1, reset=1)}">
+ ${_('cm_actions_link_evaluate')}
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ % elif not c.isEvaluationServer:
+ <div class="menu">
+ <div class="actions">
+ <h1>${_('menu_header_cm')}</h1>
+ <ul>
+ <li>
+ <a href="${h.url_for(controller='/case_overview',
+ action='overview', reset=1)}">
+ ${_('menu_cm_link_overview')}
+ </a>
+ </li>
+ % if h.hasRole(['cm_ka']):
+ <li>
+ <a href="${h.url_for(controller='/case', action='new')}">
+ ${_('menu_cm_link_new')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/case', action='importCase')}">
+ ${_('menu_cm_link_import')}
+ </a>
+ </li>
+ % endif
+ </ul>
+ </div>
+ </div>
+ % endif
<div class="menu">
<div class="actions">
- <h1>${_('np_root')}</h1>
- <ul>
- <li><a href="${h.url_for(controller='/waska')}">${_('sm_menu_link_home')}</a></li>
- <li><a href="${h.url_for(controller='/appointment', action='overview')}"> ${_('menu_app_link_overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}"> ${_('menu_doc_link_overview')} </a> </li>
- </ul>
+ <h1>${_('Evaluations')}</h1>
+ ${self.buildEvaluations()}
</div>
</div>
- % endif
- % if c.isEvaluationServer and h.hasRole(['pb_ka']):
- <div class="menu">
- <div class="actions">
- <h1>${_('menu_header_cm')}</h1>
- <ul>
- <li><a href="${h.url_for(controller='/agency_overview', action='overview', reset=1)}"> ${_('menu_cm_link_overview')}</a> </li>
- <li><a href="${h.url_for(controller='/evaluate', action='evaluate', id=1, reset=1)}"> ${_('cm_actions_link_evaluate')}</a></li>
- </ul>
+ <div class="menu_spacer">
+ <div class="actions">
+ </div>
</div>
- </div>
- % elif not c.isEvaluationServer:
- <div class="menu">
- <div class="actions">
- <h1>${_('menu_header_cm')}</h1>
- <ul>
- <li><a href="${h.url_for(controller='/case_overview', action='overview', reset=1)}"> ${_('menu_cm_link_overview')}</a> </li>
- % if h.hasRole(['cm_ka']):
- <li><a href="${h.url_for(controller='/case', action='new')}"> ${_('menu_cm_link_new')}</a> </li>
- <li><a href="${h.url_for(controller='/case', action='importCase')}"> ${_('menu_cm_link_import')}</a> </li>
- % endif
- </ul>
- </div>
- </div>
% endif
- <div class="menu">
- <div class="actions">
- <h1>${_('Evaluations')}</h1>
- ${self.buildEvaluations()}
- </div>
- </div>
- <div class="menu_spacer">
- <div class="actions">
- </div>
- </div>
- % endif
% if h.hasRole(['admin_ka']):
- <div class="menu">
- <div class="actions">
- <h1>${_('menu_header_adm')}</h1>
- <ul>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}"> ${_('menu_adm_link_useroverview')}
- </a>
- </li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview')}
- </a>
- </li>
- <li><a href="${h.url_for(controller='/administration', action='showSettings')}"> ${_('menu_adm_link_showsettings')}
- </a>
- </li>
- </ul>
+ <div class="menu">
+ <div class="actions">
+ <h1>${_('menu_header_adm')}</h1>
+ <ul>
+ <li>
+ <a href="${h.url_for(controller='/administration',
+ action='overviewUser')}">
+ ${_('menu_adm_link_useroverview')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/administration',
+ action='overviewUserGroups')}">
+ ${_('menu_adm_link_usergroupoverview')}
+ </a>
+ </li>
+ <li>
+ <a href="${h.url_for(controller='/administration',
+ action='showSettings')}">
+ ${_('menu_adm_link_showsettings')}
+ </a>
+ </li>
+ </ul>
+ </div>
</div>
- </div>
% endif
</%def>
<%def name="buildEvaluations()">
<ul>
% for eval in g.mpuls_config.get('evaluations', 'enabled'):
- <li><a href="/evaluate/evaluate/${eval.get('id')}">${eval.get('name')}</a></li>
+ <li>
+ <a href="/evaluate/evaluate/${eval.get('id')}">${eval.get('name')}</a>
+ </li>
% endfor
</ul>
</%def>
@@ -116,28 +191,30 @@
<%def name="buildFormErrors(labels=None)">
<% formular_labels = labels or {} %>
% if len(c.form_errors) > 0:
- <div class="form_errors">
- <h1><a name="error_list">${_('main_formular_input_error')}</a></h1>
- <ul>
- % for key, value in c.form_errors.iteritems():
- <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>
- % endfor
- </ul>
- </div>
+ <div class="form_errors">
+ <h1><a name="error_list">${_('main_formular_input_error')}</a></h1>
+ <ul>
+ % for key, value in c.form_errors.iteritems():
+ <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>
+ % endfor
+ </ul>
+ </div>
% endif
</%def>
<%def name="buildFooter()">
-<div id="footer">
- <div id="version_str">
- ${g.mpuls_config.get_app_name()} | ${g.mpuls_config.get_releasedate()} | ${g.mpuls_config.get_app_version()}
+ <div id="footer">
+ <div id="version_str">
+ ${g.mpuls_config.get_app_name()}
+ | ${g.mpuls_config.get_releasedate()}
+ | ${g.mpuls_config.get_app_version()}
+ </div>
</div>
-</div>
</%def>
<%def name="buildContentHeader()">
- ${self.buildUeberschrift()}
- ${self.buildModusfield()}
+ ${self.buildUeberschrift()}
+ ${self.buildModusfield()}
</%def>
<%def name="buildUeberschrift()">
@@ -162,26 +239,50 @@
<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">
+ <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]-->
+ <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
<script src="/js/check.js" type="text/javascript"></script>
</head>
<body onload="clearModification();">
- <span class="skiplink"><a href="#startmenu" title="Direkt zum Hauptmenü springen" tabindex="1">
- Zum Hauptmenü springen</a></span>
- <span class="skiplink"><a href="#navigation" title="Direkt zum Bereichsmenü springen" tabindex="1">Zum Bereichsmenü springen</a></span>
- <span class="skiplink"><a href="#content" title="Direkt zum Inhalt springen" tabindex="2">Zum Inhalt springen</a></span>
+ <span class="skiplink">
+ <a href="#startmenu" title="Direkt zum Hauptmenü springen"
+ tabindex="1">
+ Zum Hauptmenü springen
+ </a>
+ </span>
+ <span class="skiplink">
+ <a href="#navigation" title="Direkt zum Bereichsmenü springen"
+ tabindex="1">
+ Zum Bereichsmenü springen
+ </a>
+ </span>
+ <span class="skiplink">
+ <a href="#content" title="Direkt zum Inhalt springen" tabindex="2">
+ Zum Inhalt springen
+ </a>
+ </span>
<div id="header">
<div class="left" id="logo">
- <a href="${h.url_for(controller='/waska', action='start')}" onclick="return checkModification();">
- <img src="${h.url_for('/images/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
+ <a href="${h.url_for(controller='/waska', action='start')}"
+ onclick="return checkModification();">
+ <img src="${h.url_for('/images/logo_ka_75.png')}"
+ alt="Logo Einrichtung" border="0">
</a>
</div>
<div id="rightheader">
@@ -208,7 +309,9 @@
% if c.status_msg:
<span class="redcolor">${c.status_msg}</span>
% else:
- <strong>Hinweis:</strong>Gegen ${h.get_logouttime()} Uhr wird diese Sitzung automatisch beendet. Speichern sie bitte vorher Ihre Eingaben!
+ <strong>Hinweis:</strong>
+ Gegen ${h.get_logouttime()} Uhr wird diese Sitzung automatisch
+ beendet. Speichern sie bitte vorher Ihre Eingaben!
% endif
</div>
${self.buildContentHeader()}
More information about the Mpuls-commits
mailing list