diff --git a/gnuviechadminweb/public/stylesheets/gva.css b/gnuviechadminweb/public/stylesheets/gva.css index aa95828..02e83c8 100644 --- a/gnuviechadminweb/public/stylesheets/gva.css +++ b/gnuviechadminweb/public/stylesheets/gva.css @@ -7,4 +7,26 @@ html { padding-right:10px; border-right:1px solid black; margin-right:10px; -} \ No newline at end of file + width:100px; +} + +#content { + float:left; +} + +.msgbox { + padding:10px 10px 10px 25px; + width:400px; +} + +#messages { + border:1px solid green; + background-color:#80ff80; + color:#008000; +} + +#errors { + border:1px solid red; + background-color:#ff8080; + color:#800000; +} diff --git a/gnuviechadminweb/templates/chpassword.mako b/gnuviechadminweb/templates/chpassword.mako index 3d79850..45cb285 100644 --- a/gnuviechadminweb/templates/chpassword.mako +++ b/gnuviechadminweb/templates/chpassword.mako @@ -2,11 +2,24 @@ <%inherit file="site.mako" /> <h1>Change your password</h1> ${h.form(h.url(action='updatepassword'), method='post')} -Old password: ${h.password_field('oldpassword')} -New password: ${h.password_field('password')} -Confirm new password: ${h.password_field('confirm')} -${h.submit('Change password')} +<table> + <tr> + <td><label for="oldpassword">Old password:</label></td> + <td>${h.password_field('oldpassword')}</td> + </tr> + <tr> + <td><label for="password">New password:</label></td> + <td>${h.password_field('password')}</td> + </tr> + <tr> + <td><label for="confirm">Confirm new password:</label></td> + <td>${h.password_field('confirm')}</td> + </tr> + <tr> + <td colspan="2">${h.submit('Change password')}</td> + </tr> +</table> ${h.end_form()} <%def name="headlines()"> <title>Change your password</title> -</%def> \ No newline at end of file +</%def> diff --git a/gnuviechadminweb/templates/site.mako b/gnuviechadminweb/templates/site.mako index 290a62c..b4b7135 100644 --- a/gnuviechadminweb/templates/site.mako +++ b/gnuviechadminweb/templates/site.mako @@ -11,25 +11,25 @@ ${h.stylesheet_link_tag('gva.css')} <li class="${h.cssclasses(item)}">${h.menulink(item)}</li> % endfor </ul> +<div id="content"> % if c.messages['errors']: -<ul id="errors"> +<ul id="errors" class="msgbox"> % for msg in c.messages['errors']: <li>${msg}</li> % endfor </ul> % endif % if c.messages['messages']: -<ul id="messages"> +<ul id="messages" class="msgbox"> % for msg in c.messages['messages']: <li>${msg}</li> % endfor </ul> % endif -<div id="content"> ${next.body()} </div> </body> </html> <%def name="headlines()"> <title>Site</title> -</%def> \ No newline at end of file +</%def>