[Mpuls-commits] r2305 - in wasko/branches/2.0: . jmdweb/public/formed mpulsweb/lib mpulsweb/public/images/svg mpulsweb/public/styles mpulsweb/templates mpulsweb/templates/auth mpulsweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Apr 12 09:35:39 CEST 2010
Author: roland
Date: 2010-04-12 09:35:37 +0200 (Mon, 12 Apr 2010)
New Revision: 2305
Added:
wasko/branches/2.0/mpulsweb/public/images/svg/README
wasko/branches/2.0/mpulsweb/public/styles/menu.css
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/jmdweb/public/formed/formedtree.xml
wasko/branches/2.0/mpulsweb/lib/renderer.py
wasko/branches/2.0/mpulsweb/public/styles/all.css
wasko/branches/2.0/mpulsweb/public/styles/color3.css
wasko/branches/2.0/mpulsweb/public/styles/screen.css
wasko/branches/2.0/mpulsweb/public/styles/widgets.css
wasko/branches/2.0/mpulsweb/templates/auth/main.mako
wasko/branches/2.0/mpulsweb/templates/base.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako
Log:
Many design improvements
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/ChangeLog 2010-04-12 07:35:37 UTC (rev 2305)
@@ -1,3 +1,24 @@
+2010-04-12 Roland Geider <roland.geider at intevation.de>
+
+ Many design improvements
+
+ * mpulsweb/lib/renderer.py:
+ * mpulsweb/public/styles/all.css:
+ * mpulsweb/public/styles/screen.css:
+ * mpulsweb/public/styles/color3.css:
+ * mpulsweb/public/styles/widgets.css:
+ * mpulsweb/templates/base.mako:
+ * mpulsweb/templates/auth/main.mako:
+ * mpulsweb/templates/casemanagement/main.mako: many slight design
+ improvements
+
+ * mpulsweb/public/styles/menu.css: first prototype of CSS menu
+ (currently unused)
+
+ * mpulsweb/public/images/svg/README: added README with explanations
+ about the icons used
+
+
2010-04-09 Bernhard Herzog <bh at intevation.de>
* mpulsweb/lib/renderer.py (ViewRenderer._checkWarnings): Do not
@@ -27,7 +48,7 @@
2010-04-09 Bernhard Herzog <bh at intevation.de>
- * mpulsweb/lib/renderer.py (ChoiceContainer.render)
+ * mpulsweb/lib/renderer.py: (ChoiceContainer.render)
(ViewRenderer.toTarget): Simplify the code.
2010-04-09 Bernhard Herzog <bh at intevation.de>
Modified: wasko/branches/2.0/jmdweb/public/formed/formedtree.xml
===================================================================
--- wasko/branches/2.0/jmdweb/public/formed/formedtree.xml 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/jmdweb/public/formed/formedtree.xml 2010-04-12 07:35:37 UTC (rev 2305)
@@ -818,8 +818,8 @@
<bool alternative="+" description="ausgeprägt" name="bool-192" value="2"/>
<bool alternative="-" description="schwach ausgeprägt" name="bool-193" value="3"/>
<bool alternative="--" description="sehr schwach ausgeprägt" name="bool-194" value="4"/>
- <bool description="Unbekannt" name="bool-195" value="-3"/>
- <bool checked="True" description="Keine Angabe" name="bool-196" value="-1"/>
+ <bool alternative="?" description="Unbekannt" name="bool-195" value="-3"/>
+ <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-196" value="-1"/>
</radio>
<radio description="räumliches Vorstellungsvermögen" name="kf_erg_natur_b">
<bool alternative="++" description="stark ausgeprägt" name="bool-191" value="1"/>
Modified: wasko/branches/2.0/mpulsweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/renderer.py 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/lib/renderer.py 2010-04-12 07:35:37 UTC (rev 2305)
@@ -238,7 +238,8 @@
value=_('Save and proceed'),
tabindex=self.next_tabindex()))
out.append('</div>')
- out.append('<div class="widget formfields">')
+ out.append('<div>')
+ #out.append('<div class="widget formfields">')
out.append(tag("input", type="hidden", name="page",
value=self.page.getIdentifier()))
@@ -697,11 +698,18 @@
out.append('<table class="radiomatrix">')
# write table header
+ nr_of_children = len(self._getMeta(node.getChildren()[0]).children) + 1
+
+ out.append('<thead>')
out.append('<tr>')
- out.append('<th class="label">')
+ out.append('<th class="label" colspan="%s">' % nr_of_children)
out.append(self._renderLabel(node, False))
out.append(self._renderAttributes(node))
out.append('</th>')
+ out.append('</tr>')
+
+ out.append('<tr>')
+ out.append('<th></th>')
for hcol in self._getMeta(node.getChildren()[0]).children:
hcolmeta = hcol
alternative = hcolmeta.getAlternative()
@@ -712,10 +720,12 @@
header = alternative
legend.append("<strong>%s</strong>:%s"
% (escape(alternative), escape(description)))
- out.append("<th>%s</th>" % escape(header))
- out.append("</tr>")
+ out.append('<th>%s</th>' % escape(header))
+ out.append('</tr>')
+ out.append('</thead>')
# write table body
+ out.append('<tbody>')
for num, row in enumerate(node.getChildren()):
out.append('<tr>')
out.append('<td class="label %s">' % (num%2 and "hl" or ""))
@@ -749,6 +759,7 @@
out.append(self._renderErrors(node))
out.append('</td>')
out.append('</tr>')
+ out.append('</tbody>')
out.append('</table>')
out.append('<br>')
self.toTarget(Item("".join(out)), meta.getTarget())
Added: wasko/branches/2.0/mpulsweb/public/images/svg/README
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/README 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/README 2010-04-12 07:35:37 UTC (rev 2305)
@@ -0,0 +1,15 @@
+This folder contains the SVG sources for all the icons used. The PNG counterparts
+have mostly the same name as the original, except in some cases with the
+"*_inactive" and "*_active" versions.
+
+
+The icon set as well as the colour palette are from the Tango Project which can
+be found here:
+- Project: http://tango.freedesktop.org/Tango_Desktop_Project
+- Icons: http://tango.freedesktop.org/Tango_Icon_Library
+- Additional icons: http://commons.wikimedia.org/wiki/Tango_icons
+
+In addition, some icons from the Gnome desktop were used (they are also based
+on the tango icons)
+
+- Icons: http://commons.wikimedia.org/wiki/GNOME_Desktop_icons
Modified: wasko/branches/2.0/mpulsweb/public/styles/all.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/all.css 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/public/styles/all.css 2010-04-12 07:35:37 UTC (rev 2305)
@@ -44,7 +44,7 @@
font-size: 0.9em;
font-weight: bold;
background-color: #babdb6; /*#d3d7cf;*/
- border-bottom: 1pt solid;
+ border-bottom: 1pt solid black;
}
td.label {
@@ -61,8 +61,8 @@
table th {
- padding: 0 0.6em 0 0.25em!important;
- padding: 0.1em 0.6em 0.1em 0.25em;
+ padding: 0.1em; /*0 0.6em 0 0.25em !important;*/
+ /*padding: 0.1em 0.6em 0.1em 0.25em;*/
}
table th.number_field {
@@ -71,7 +71,7 @@
table td {
vertical-align: top;
- padding: 0.1em 1em 0.1em 0.25em;
+ padding: 0.1em; /*1em 0.1em 0.25em;*/
}
table td.number_field {
@@ -80,7 +80,7 @@
table td.label {
vertical-align: top;
- font-weight: bold;
+ /*font-weight: bold;*/
width: 8em;
border-right: 1pt solid;
padding-right: 0.25em;
@@ -92,7 +92,7 @@
vertical-align: top;
}
-//tr {width:50em}
+/* tr {width:50em}*/
tr {width:auto}
.table_checkbox {
@@ -138,12 +138,12 @@
table {
width:50em;
- //overflow: hidden;
+ /*overflow: hidden;*/
}
div.evaluation table {
width:auto;
- //overflow: hidden;
+ /*overflow: hidden;*/
}
.table_checkbox {
@@ -208,6 +208,11 @@
table-layout: fixed;
}
+.formularpage .radiomatrix{
+ table-layout: auto;
+ border: 1px solid black;
+}
+
.formularpage .widget {
margin: 0.5em 0 0.5em 0;
}
@@ -221,7 +226,10 @@
}
.formularpage input[type="submit"] {
- width: auto;
+ width: auto;
+ border: 1px solid #555753;
+ background-color: #babdb6;
+ -moz-border-radius: 3px;
}
.formularpage label, input, select {
@@ -256,6 +264,11 @@
.formularpage .radiomatrix {
}
+.formularpage .radiomatrix thead .label{
+ text-align: center;
+ border-bottom: 0px;
+}
+
.formularpage .radiomatrix td, .formularpage .radiomatrix th {
text-align: center;
}
@@ -263,6 +276,7 @@
.formularpage .radiomatrix .label {
text-align: left;
border-right: None;
+ width: 50%;
}
.formularpage .radiomatrix .legend {
@@ -272,18 +286,20 @@
}
.formularpage .repeatgroup .container {
- background-color: #f6f6f6;
- border-top: 1pt solid;
- border-left: 1pt solid;
- border-right: 1pt solid;
+ /*background-color: #f6f6f6;*/
+ border-top: 3px solid #babdb6;
+ border-left: 1px solid #babdb6;
+ /*border-right: 1px solid;*/
}
+/* Only apply the border radius to the first (container-) element in the repeat group */
+.formularpage .repeatgroup tr:first-child td[class~=container]{
+ -moz-border-radius: 5px 0px 0px 0px;
+}
.formularpage .repeatgroup .hcontrol {
- background-color: #E6E6E6;
- border-top: 1pt solid;
- border-bottom: 1pt solid;
- border-left: 1pt solid;
- border-right: 1pt solid;
+ background-color: #d3d7cf;
+ -moz-border-radius: 0px 0px 5px 5px;
+ border: 1px solid #babdb6;
font-size: 0.8em;
}
@@ -293,13 +309,18 @@
}
.formularpage .repeatgroup .vcontrol {
- background-color: #E6E6E6;
- border-top: 1pt solid;
- border-right: 1pt solid;
+ /*background-color: #E6E6E6;*/
+ border-top: 3px solid #babdb6;
+ border-right: 1px solid #babdb6;
font-size: 0.8em;
}
+/* Only apply the border radius to the first (vcontrol-)element in the repeat group */
+.formularpage .repeatgroup tr:first-child td[class~=vcontrol]{
+ -moz-border-radius: 0px 5px 0px 0px;
+}
+
.formbuttons {
background-color: #E6E6E6;
padding: 0.25em;
@@ -616,7 +637,7 @@
table.news td.message {
background: #FFF;
- padding: 2.5 !important; /* would be overwritten by global td-setting */
+ padding: 2.5px !important; /* would be overwritten by global td-setting */
}
div.news {
@@ -651,7 +672,7 @@
table.inconsistency td.type {
font-weight: normal;
text-align: left;
- padding: 2.5 !important; /* would be overwritten by global td-setting */
+ padding: 2.5px !important; /* would be overwritten by global td-setting */
}
div.inconsistency {
Modified: wasko/branches/2.0/mpulsweb/public/styles/color3.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/color3.css 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/public/styles/color3.css 2010-04-12 07:35:37 UTC (rev 2305)
@@ -112,7 +112,7 @@
}
div#modusfield .actions a:hover {
- background:#d5d5d5; /**/
+ /*background:#d5d5d5;*/ /**/
}
@@ -122,7 +122,7 @@
}
.table_row_v, .table_row_v_2 {
- //border-left:0.5pt solid;
+ /*border-left:0.5pt solid;*/
}
.table_header_h th, .table_header_h{
Added: wasko/branches/2.0/mpulsweb/public/styles/menu.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/menu.css 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/public/styles/menu.css 2010-04-12 07:35:37 UTC (rev 2305)
@@ -0,0 +1,42 @@
+ul.mainMenu, ul.mainMenu ul {
+ /*min-width: 230px;*/
+ width: 16.8em;
+ background-color: #204a87; /* a bg-color MUST be included for IE to work properly... */
+ padding-left: 0px;
+ cursor: default;
+ margin-left: 0px; /* Opera 7 final's margin and margin-box model cause problems */
+}
+ul.mainMenu li {
+height:20px;
+ list-style-type: none;
+ /*list-style-image: url("/images/icons/arrow_right_small.png");*/
+ margin: 0px; /* Opera 7 puts large spacings between li elements */
+ position: relative; /* makes the menu blocks be positioned relative to their parent menu item
+ the lack of offset makes these appear normal, but it will make a difference
+ to the absolutely positioned child blocks */
+ color: white; /* sets the default font colour to white */
+
+}
+ul.mainMenu li > ul { /* using the > selector prevents many lesser browsers (and IE - see below) hiding child ULs */
+ display: none; /* hides child menu blocks - one of the most important declarations */
+ position: absolute; /* make child blocks hover without leaving space for them */
+ top: -6px; /* position slightly lower than the parent menu item */
+ left: 16.8em; /* this must not be more than the width of the parent block, or the mouse will
+ have to move off the element to move between blocks, and the menu will close */
+}
+ul.mainMenu li:hover, ul.mainMenu h1:hover, ul.mainMenu li.CSStoHighlight {
+ background-color: #729fcf;
+ color: #000;
+}
+ul.mainMenu ul.CSStoShow { /* must not be combined with the next rule or IE gets confused */
+ display: block; /* specially to go with the className changes in the behaviour file */
+}
+ul.mainMenu li:hover > ul { /* one of the most important declarations - the browser must detect hovering over arbitrary elements
+ the > targets only the child ul, not any child uls of that child ul */
+ display: block; /* makes the child block visible - one of the most important declarations */
+}
+
+/* and some link styles */
+ul.mainMenu li a { color: white; display: block; width: 100%; text-decoration: none; }
+ul.mainMenu li a:hover, ul.mainMenu li a.CSStoHighLink { color: #000; }
+ul.mainMenu li:hover > a { color: #000; } /* supports links in branch headings - should not be display: block; */
Property changes on: wasko/branches/2.0/mpulsweb/public/styles/menu.css
___________________________________________________________________
Name: svn:executable
+ *
Modified: wasko/branches/2.0/mpulsweb/public/styles/screen.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/screen.css 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/public/styles/screen.css 2010-04-12 07:35:37 UTC (rev 2305)
@@ -61,6 +61,8 @@
fieldset {
padding:0.5em;
+ border: 1px solid #babdb6;
+ -moz-border-radius: 5px;
}
.button {
@@ -72,8 +74,8 @@
padding:0.4em;
border:0.5pt solid;
background:white;
- float:left;
- width:51.6em;
+ /*float:left;*/
+ /*width:50em;*/
}
@@ -248,7 +250,7 @@
background-repeat:no-repeat;
background-position:0.1em 0.5em !important;
background-position:0.1em 0.75em;
- padding:0.2em 0.1em 0.25em 0.9em;
+ padding:0.3em 0.1em 0.25em 0.9em;
}
@@ -336,7 +338,7 @@
div.menu .actions a {
display: block;
- padding: 0em 0.4em 0.6em 2.5em !important;
+ padding: 0.1em 0.4em 0.6em 2.5em !important;
padding: 0em 0.4em 0.2em 2.5em;
/* padding-left:2.5em;*/
text-decoration:none;
@@ -439,17 +441,18 @@
}
#content_header #content_ueberschrift li, #content_header_small #content_ueberschrift li, #content_header_large #content_ueberschrift ul {
- padding-bottom:0.em;
+ padding-bottom:0.0em;
}
div#modusfield {
- float: right;
- width:auto !important;
- margin-top:0.4em;
- padding:0.3pt;
- height:auto;
- border: 0.5pt solid;
-
+ float: right;
+ width: auto !important;
+ margin-top: 0.4em;
+ padding: 0.3pt;
+ height: auto;
+ border: 0.5pt solid;
+ background-color: white;
+ -moz-border-radius: 3px;
}
div#modusinfo {
@@ -486,7 +489,7 @@
#content_header #modusfield a, #content_header_small #modusfield a, #content_header_large #modusfield a {
text-decoration:none;
- padding:0 0.4em 0em 1.4em;
+ padding:0.1em 0.4em 0em 1.4em;
background-image:url(../images/icons/arrow_right_small.png);
background-repeat:no-repeat;
background-position:4px 4px!important;
@@ -495,11 +498,36 @@
label, select, input[type="checkbox"], input[type="radio"],
input[type="button"], input[type="submit"], input[type="file"] {
- cursor: pointer;
- cursor: hand;
- overflow:visible;
+ cursor: pointer;
+ cursor: hand;
+ overflow: visible;
}
+select, input[type="text"]{
+ border: 1px solid #babdb6;
+ height: 1.5em;
+}
+
+select{
+ background-color: white;
+ height: 1.5em;
+}
+
+input[type="text"][disabled], input[type="text"][disabled="disabled"]
+{
+ background-color: #d3d7cf;
+ color: #555753;
+ cursor: default;
+}
+
+select[disabled], select[disabled="disabled"]
+{
+ background-color: #d3d7cf;
+ color: #555753;
+ cursor: default;
+}
+
+
.table_header_h th, .wable_header_h{
border-bottom:0.5pt solid #000000;
}
Modified: wasko/branches/2.0/mpulsweb/public/styles/widgets.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/widgets.css 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/public/styles/widgets.css 2010-04-12 07:35:37 UTC (rev 2305)
@@ -26,9 +26,9 @@
.widget {
border: 1pt solid;
margin: 1pt 0 1pt 0;
- border-color: #ccc;
+ border-color: #babdb6;
-webkit-border-radius: 5px;
-moz-border-radius:5px;
}
-// Phases
+/* Phases*/
Modified: wasko/branches/2.0/mpulsweb/templates/auth/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/auth/main.mako 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/templates/auth/main.mako 2010-04-12 07:35:37 UTC (rev 2305)
@@ -12,11 +12,11 @@
<div id="footer_login">
<p>${_('main_login_bmf_phrase')}</p>
<a target="_blank" href="http://www.bmfsfj.de">
- <img src="/images/BMFSFJ_C_M_web.jpg"
+ <img src="/images/logos/BMFSFJ_C_M_web.jpg"
alt="Logo Bundesministerium für Familie, Senioren, Frauen und Jugend" border="0">
</a>
<a target="_blank" href="http://ec.europa.eu/employment_social/esf2000/index_de.html">
- <img src="/images/eu_logo_4c_pos_web2.jpg"
+ <img src="/images/logos/eu_logo_4c_pos_web2.jpg"
alt="Logo Europäische Union - Europäische Sozialfonds" border="0">
</a>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/base.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/base.mako 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/templates/base.mako 2010-04-12 07:35:37 UTC (rev 2305)
@@ -44,6 +44,8 @@
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/menu.css')}" media="screen"
+ rel="stylesheet" type="text/css">
<!--[if gt IE 5]>
<link href="${h.url_for('/styles/ie6.css')}" media="screen"
rel="stylesheet" type="text/css">
Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako 2010-04-09 16:57:42 UTC (rev 2304)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako 2010-04-12 07:35:37 UTC (rev 2305)
@@ -61,6 +61,63 @@
</ul>
</div>
</div>
+
+
+ <!--<div class="menu">
+ <ul class="mainMenu">
+ <li><h1>${_('cm_main_header_data_protection')}</h1>
+ <ul>
+ % if not session.get('case').hasPrivacyStatement():
+ <li>
+ <a href="/privacy/set/${session.get('case').id}"
+ onclick="return checkModification();">${_('cm_main_set_statement')}
+ </a>
+ </li>
+ % elif session.get('case').hasPrivacyStatement():
+ <li>
+ <a href="/privacy/decline/${session.get('case').id}/0"
+ onclick="return checkModification();">${_('cm_main_revoke_statement')}
+ </a>
+ </li>
+ % endif
+ % if session.get('case').getState().getState() not in (4,5):
+ <li>
+ <a href="/case/markForAnonymize/${session.get('case').id}/0"
+ onclick="return checkModification();">${_('cm_main_anonymize_case')}
+ </a>
+ </li>
+ <li>
+ <a href="/privacy/listStatements"
+ onclick="return checkModification();"> ${_('statement_list_statement')}
+ </a>
+ </li>
+ % endif
+ <li>
+ <a href="/privacy/listStatements"
+ onclick="return checkModification();"> Untermenue
+ </a>
+ <ul>
+ <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
+ <li><a href="/privacy/listStatements" onclick="return checkModification();"> ${_('statement_list_statement')}</a></li>
+ <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
+ <li>
+ <a href="/privacy/listStatements"
+ onclick="return checkModification();"> Unteruntermenue
+ </a>
+ <ul>
+ <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
+ <li><a href="/privacy/listStatements" onclick="return checkModification();"> ${_('statement_list_statement')}</a></li>
+ <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>-->
+
+
</div>
% endif
</%def>
More information about the Mpuls-commits
mailing list