commit: 9a6e27cb6c11138eee1af77491d4ac3cd42b3afd Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> AuthorDate: Thu Jul 23 13:55:46 2015 +0000 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> CommitDate: Thu Jul 23 13:55:46 2015 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=9a6e27cb
fix more rows for packages .../templates/pages/packages/category/index.html | 40 +++++++++++++--------- python/templates/pages/packages/ebuilds/index.html | 2 -- python/templates/pages/packages/index.html | 37 ++++++++++++-------- 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/python/templates/pages/packages/category/index.html b/python/templates/pages/packages/category/index.html index 34c1426..edc7cc9 100644 --- a/python/templates/pages/packages/category/index.html +++ b/python/templates/pages/packages/category/index.html @@ -1,23 +1,29 @@ {% extends "layout/base.html" %} {% block content %} <div class="row"> - <div class="col-xs-12 col-md-6"> - <h2>Packages in {{ C.Category }}</h2> - <table class="table table-striped frontpage-table"> - {% for key, PM in PM_tmp.items %} - <tr> - <td class="frontpage-table-package-atom"> - <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ key }}">{{ C.Category }}/{{ key }}</a> - <p title="{{ PM.Changlog }}">Changlog</p> - </td> - <td> - <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p> - <p title="{% for P in PM.Ebuilds %}{{ key }}/{{ P }}{% endfor %}">Versions</p> - </td> - </tr> - {% endfor %} -</table> - </div> + <h2>Packages in {{ C.Category }}</h2> + <div class="col-xs-12 col-md-5"> + {% for key, PM in PM_tmp.items %} + <table class="table table-striped frontpage-table"> + <tr> + <td class="frontpage-table-package-atom"> + <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ key }}">{{ C.Category }}/{{ key }}</a> + <p title="{{ PM.Changlog }}">Changlog</p> + </td> + <td> + <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p> + <p title="{% for P in PM.Ebuilds %}{{ key }}/{{ P }}{% endfor %}">Versions</p> + </td> + </tr> + </table> + {% if forloop.last %} + </div> + {% else %} + {% if forloop.counter|divisibleby:"2" %} + </div><div class="col-xs-12 col-md-5"> + {% endif %} + {% endif %} + {% endfor %} </div> {% endblock %} \ No newline at end of file diff --git a/python/templates/pages/packages/ebuilds/index.html b/python/templates/pages/packages/ebuilds/index.html index 1e034d4..f8e1b4e 100644 --- a/python/templates/pages/packages/ebuilds/index.html +++ b/python/templates/pages/packages/ebuilds/index.html @@ -11,7 +11,6 @@ <td class="frontpage-table-package-atom"> <a href="/ebuild/{{ E.EbuildId.EbuildId }}/" title="{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}">{{ P.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}</a></td> <td> - <td class="text-right"> {% for K in EK_tmp %} {% if K.EbuildId.EbuildId == E.EbuildId.EbuildId and K.KeywordId.Keyword != '*' %} {% if K.Status == 'Stable' %}<span class="label label-success">{{ K.KeywordId.Keyword }}</span>{% endif %} @@ -19,7 +18,6 @@ {% if K.Status == 'Negative' %}{{ K.KeywordId.Keyword }}{% endif %} {% endif %} {% endfor %} - </td> </td> </tr> {% endfor %} diff --git a/python/templates/pages/packages/index.html b/python/templates/pages/packages/index.html index 82ccf59..5e02552 100644 --- a/python/templates/pages/packages/index.html +++ b/python/templates/pages/packages/index.html @@ -1,21 +1,28 @@ {% extends "layout/base.html" %} {% block content %} <div class="row"> - <div class="col-xs-12 col-md-6"> - <h2>Categories</h2> - <table class="table table-striped frontpage-table"> - {% for key, CM in CM_tmp.items %} - <tr> - <td class="frontpage-table-package-atom"> - <a href="/categories/{{ CM.CategoryId }}/" title="{{ key }}">{{ key }}</a></td> - <td> - <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p> - <p title="{% for P in CM.Packages %}{{ key }}/{{ P }}{% endfor %}">Packages</p> - </td> - </tr> - {% endfor %} -</table> - </div> +<h2>Categories</h2> + <div class="col-xs-8 col-md-4"> + {% for key, CM in CM_tmp.items %} + <table class="table table-striped frontpage-table"> + <tr> + <td class="frontpage-table-package-atom"> + <a href="/categories/{{ CM.CategoryId }}/" title="{{ key }}">{{ key }}</a> + </td> + <td> + <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p> + <p title="{% for P in CM.Packages %}{{ key }}/{{ P }}{% endfor %}">Packages</p> + </td> + </tr> + </table> + {% if forloop.last %} + </div> + {% else %} + {% if forloop.counter|divisibleby:"2" %} + </div><div class="col-xs-8 col-md-4"> + {% endif %} + {% endif %} + {% endfor %} </div> {% endblock %} \ No newline at end of file