The following commit has been merged in the master branch: commit 53b418b9c58431bfc1cd36085da2b4eff76061fe Author: Ole Streicher <oleb...@debian.org> Date: Sat Dec 5 16:54:05 2015 +0100
Create lists for Maintainer/Versions/Debian/Upstream/Improvement tags diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml index 9eae4ab..151a79b 100644 --- a/webtools/templates/packages.xhtml +++ b/webtools/templates/packages.xhtml @@ -63,6 +63,17 @@ width: 1px; white-space: nowrap; } +.pkgdesc-full ul { + padding: 0; + margin: 0; +} +.pkgdesc-full ul li { + display: inline; +} + +.pkgdesc-full ul li + li::before { + content: " \2022 "; +} </style> <link rel="shortcut icon" href="http://www.debian.org/favicon.ico" /> <script type="text/javascript"> @@ -279,66 +290,107 @@ function show_fulldesc(hash) { <py:if test="project.responsible != None"> <dt>${maintainer[pstatus]}</dt> <dd> - ${project.responsible} - <py:if test="project.properties.get('changed_by')"> - / ${project.properties['changed_by']} - </py:if> + <ul> + <li> + ${project.responsible} + </li> + <py:if test="project.properties.get('changed_by')"> + <li> + ${project.properties['changed_by']} + </li> + </py:if> + </ul> </dd> </py:if> <py:if test="project.version != []"> <dt>Versions</dt> <dd> - <py:for each="version in project.version"> - <py:choose> - <py:when test="isinstance(version, (str, unicode))"> - ${version} - </py:when> - <py:when test="'amd64' in version['archs'] or 'all' in version['archs']"> - ${version['version']} - (<a href="https://packages.debian.org/${version['release']}/${project.pkg}">${version['release']}</a>), - </py:when> - </py:choose> - </py:for> + <ul> + <py:for each="version in project.version"> + <py:choose> + <py:when test="isinstance(version, (str, unicode))"> + <li>${version}</li> + </py:when> + <py:when test="'amd64' in version['archs'] or 'all' in version['archs']"> + <li> + ${version['version']} + (<a href="https://packages.debian.org/${version['release']}/${project.pkg}">${version['release']}</a>) + </li> + </py:when> + </py:choose> + </py:for> + </ul> </dd> </py:if> <py:if test="project.properties['Enhances'] != {}"> <dt>Enhanced by</dt> <dd> - <py:for each="enh in project.properties['Enhances'].keys()"> - <a href="${project.properties['Enhances'][enh]}">${enh}</a> - </py:for> + <ul> + <py:for each="enh in project.properties['Enhances'].keys()"> + <li> + <a href="${project.properties['Enhances'][enh]}"> + ${enh} + </a> + </li> + </py:for> + </ul> </dd> </py:if> <dt>Debian</dt> <dd> - <py:if test="'wnpp' in project.properties"> - <a href="http://bugs.debian.org/${project.properties['wnpp']}">Announcement</a> - - </py:if> - <a href="https://tracker.debian.org/pkg/${project.pkg}">Maintainer page</a> - - <a href="https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=${project.pkg}">Bugs</a> - <py:if test="project.properties['vcs-browser'] != '#'"> - - - <py:choose> - <py:when test="'vcs-url' in project.properties"> - <a href="${project.properties['vcs-browser']}" title="${project.properties['vcs-url']}"> - ${project.properties['vcs-type']} + <ul> + <py:if test="'wnpp' in project.properties"> + <li> + <a href="http://bugs.debian.org/${project.properties['wnpp']}"> + Announcement </a> - </py:when> - <py:otherwise> - <a href="${project.properties['vcs-browser']}"> - ${project.properties['vcs-type']} - </a> - </py:otherwise> - </py:choose> - </py:if> + </li> + </py:if> + <li> + <a href="https://tracker.debian.org/pkg/${project.pkg}"> + Maintainer page + </a> + </li> + <li> + <a href="https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=${project.pkg}"> + Bugs + </a> + </li> + <py:if test="project.properties['vcs-browser'] != '#'"> + <li> + <py:choose> + <py:when test="'vcs-url' in project.properties"> + <a href="${project.properties['vcs-browser']}" title="${project.properties['vcs-url']}"> + ${project.properties['vcs-type']} + </a> + </py:when> + <py:otherwise> + <a href="${project.properties['vcs-browser']}"> + ${project.properties['vcs-type']} + </a> + </py:otherwise> + </py:choose> + </li> + </py:if> + </ul> </dd> <py:if test="'homepage' in project.properties"> <dt>Upstream</dt> <dd> - <a href="${project.properties['homepage']}">Home page</a> - <py:if test="'registration' in project.properties"> - - <a href="${project.properties['registration']}">Registration</a> - </py:if> + <ul> + <li> + <a href="${project.properties['homepage']}"> + Home page + </a> + </li> + <py:if test="'registration' in project.properties"> + <li> + <a href="${project.properties['registration']}"> + Registration + </a> + </li> + </py:if> + </ul> </dd> </py:if> <py:if test="project.remark"> @@ -350,18 +402,32 @@ function show_fulldesc(hash) { </py:if> <dt>Improve entry</dt> <dd> - <a href="http://screenshots.debian.net/uploadfile?packagename=${project.pkg}">Screenshots</a> - - <a href="http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg}">Debtags</a> - <py:if test="lang != 'en' and project.component == 'main' and project.pkgstatus != 'new' and project.pkgstatus != 'pkgvcs'"> - <py:choose> - <py:when test="lang in project.desc"> - - <a href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg}">${fixtranslation}</a> - </py:when> - <py:otherwise> - - <a href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${project.pkg}">${translatedesc}</a> - </py:otherwise> - </py:choose> - </py:if> + <ul> + <li> + <a href="http://screenshots.debian.net/uploadfile?packagename=${project.pkg}"> + Screenshots + </a> + </li> + <li> + <a href="http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg}">Debtags</a> + </li> + <py:if test="lang != 'en' and project.component == 'main' and project.pkgstatus != 'new' and project.pkgstatus != 'pkgvcs'"> + <li> + <py:choose> + <py:when test="lang in project.desc"> + <a href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg}"> + ${fixtranslation} + </a> + </py:when> + <py:otherwise> + <a href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${project.pkg}"> + ${translatedesc} + </a> + </py:otherwise> + </py:choose> + </li> + </py:if> + </ul> </dd> </dl> </td> -- Static and dynamic websites for Debian Pure Blends _______________________________________________ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit