diff --git a/ddportfolioservice/public/images/agplv3-88x31.png b/ddportfolioservice/public/images/agplv3-88x31.png new file mode 100644 index 0000000..1035191 Binary files /dev/null and b/ddportfolioservice/public/images/agplv3-88x31.png differ diff --git a/ddportfolioservice/public/images/openlogo-100.jpg b/ddportfolioservice/public/images/openlogo-100.jpg new file mode 100644 index 0000000..db6caf4 Binary files /dev/null and b/ddportfolioservice/public/images/openlogo-100.jpg differ diff --git a/ddportfolioservice/public/stylesheets/style.css b/ddportfolioservice/public/stylesheets/style.css index b052126..6e90f2c 100644 --- a/ddportfolioservice/public/stylesheets/style.css +++ b/ddportfolioservice/public/stylesheets/style.css @@ -3,6 +3,19 @@ html, body { font-size:10pt; } +#debianlogo { + float:right; +} + +#content { + clear:both; +} + +#agpllogo { + float:left; + margin-right:10px; +} + table { border-collapse:collapse; width:100%; @@ -12,6 +25,23 @@ th, td { border:1px solid grey; } +tr.section { + background-color: #a0a0a0; + color: #f0f0f0; +} + +tr.odd td { + background-color: #f0f0f0; +} + +tr.even td { + background-color: #e0e0ff; +} + +tr.error td { + background-color: #ffe0e0; +} + td { vertical-align:top; padding:2px; @@ -23,6 +53,5 @@ td p { } .errormsg { - font-size:80%; color:red; } \ No newline at end of file diff --git a/ddportfolioservice/templates/base.mako b/ddportfolioservice/templates/base.mako new file mode 100644 index 0000000..dfece67 --- /dev/null +++ b/ddportfolioservice/templates/base.mako @@ -0,0 +1,45 @@ + +<%doc> +Template for the data input form. +Copyright (c) 2009 Jan Dittberner + +This file is part of DDPortfolio service. + +DDPortfolio service is free software: you can redistribute it and/or +modify it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +DDPortfolio service is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public +License along with this program. If not, see +. + + + + ${_('Debian Developer Portfolio Service')}${self.titleaddon()} + ${h.stylesheet_link('/stylesheets/style.css')} + + + +
+ ${self.body()} +
+ + + diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako index ddbf79e..8aeae8b 100644 --- a/ddportfolioservice/templates/showform.mako +++ b/ddportfolioservice/templates/showform.mako @@ -1,5 +1,4 @@ - +<%inherit file="base.mako" /> <%doc> Template for the data input form. Copyright (c) 2009 Jan Dittberner @@ -20,87 +19,82 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . - - - ${_('Debian Developer Portfolio')} - ${h.stylesheet_link('/stylesheets/style.css')} - - - ${h.form(h.url_for(action='urllist'), method='get')} -
- ${_('Debian Developer Portfolio')} -
-
- ${h.text('email', value=request.params.get('email', None))}
-
-
-
- ${h.text('name', value=request.params.get('name', None))}
-
-
-
- ${h.text('gpgfp', value=request.params.get('gpgfp', None))}
-
-
-
- ${h.text('username', - value=request.params.get('username', None))}
-
-
-
- ${h.text('nonddemail', - value=request.params.get('nonddemail', None))}
-
-
-
- ${h.text('aliothusername', - value=request.params.get('username', None))}
-
-
-
- ${_('HTML')} ${h.radio('mode', 'html', - checked=(request.params.get('mode', - 'html') == 'html'))} ${_('JSON')} ${h.radio('mode', - 'json', checked=(request.params.get('mode', 'html') == 'json'))}
- ${h.submit('submit', value=_('Build DD Portfolio URLs'))} -
-
- ${h.end_form()} - - +<%def name="titleaddon()"> + - ${_('Enter your personal information')} + +${h.form(h.url_for(action='urllist'), method='get')} +
+ ${_('Debian Developer Portfolio')} +
+
+ ${h.text('email', request.params.get('email', None), id='email')}
+
+
+
+ ${h.text('name', request.params.get('name', None), id='name')}
+
+
+
+ ${h.text('gpgfp', request.params.get('gpgfp', None), id='gpgfp')}
+
+
+
+ ${h.text('username', request.params.get('username', None), + id='username')}
+
+
+
+ ${h.text('nonddemail', request.params.get('nonddemail', None), + id='nonddemail')}
+
+
+
+ ${h.text('aliothusername', request.params.get('username', None), + id='aliothusername')}
+
+
+
+ ${_('HTML')} ${h.radio('mode', 'html', + checked=(request.params.get('mode', + 'html') == 'html'))} ${_('JSON')} ${h.radio('mode', + 'json', checked=(request.params.get('mode', 'html') == 'json'))}
+ ${h.submit('submit', value=_('Build DD Portfolio URLs'))} +
+
+${h.end_form()} diff --git a/ddportfolioservice/templates/showurls.mako b/ddportfolioservice/templates/showurls.mako index b272043..29f7f3a 100644 --- a/ddportfolioservice/templates/showurls.mako +++ b/ddportfolioservice/templates/showurls.mako @@ -1,5 +1,4 @@ - +<%inherit file="base.mako" /> <%doc> Template for the url output page. Copyright (c) 2009 Jan Dittberner @@ -20,41 +19,43 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . - - - ${_('Debian Developer Portfolio')} - ${h.stylesheet_link('/stylesheets/style.css')} - - - % if c.urldata: -
- ${_('Debian Developer Portfolio')} - - - - - - % for row in c.urldata: - % if row[0] == 'section': - - % elif row[0] == 'error': - - - - - % else: - - - - - % endif - % endfor - -
${_('Usage')}${_('URL')}
${row[2]}
${h.textile(row[4])}${_('Error during URL creation')}
- ${row[3].replace("\n", - '
')}
${h.textile(row[4])}${h.link_to(h.truncate(row[3], length=120), row[3])}
-
- % endif -

${h.link_to(_('Restart'), h.url_for(action='index'))}

- - +<%def name="titleaddon()"> + - ${_('Your personal links')} + +% if c.urldata: +
+ ${_('Debian Developer Portfolio')} + + + + + + % for row in c.urldata: + % if row[0] == 'section': + + <% urlclass = 'odd' %> + % elif row[0] == 'error': + + + + + % else: + + + + + <% + if urlclass == 'odd': + urlclass = 'even' + else: + urlclass = 'odd' + %> + % endif + % endfor + +
${_('Usage')}${_('URL')}
${row[2]}
${h.textile(row[4])}${_('Error during URL creation:')} + ${row[3].replace("\n", + '
')}
${h.textile(row[4])}${h.link_to(h.truncate(row[3], length=120), row[3])}
+
+% endif +

${h.link_to(_('Restart'), h.url_for(action='index'))}