diff options
Diffstat (limited to 'python/templates')
| -rw-r--r-- | python/templates/includes/frontpage/new_repoman | 10 | ||||
| -rw-r--r-- | python/templates/includes/frontpage/new_repoman_qa | 18 | ||||
| -rw-r--r-- | python/templates/pages/home/index.html | 4 | ||||
| -rw-r--r-- | python/templates/pages/new/index.html | 4 | ||||
| -rw-r--r-- | python/templates/pages/new/logs/build/index.html | 14 | ||||
| -rw-r--r-- | python/templates/pages/new/repoman/index.html (renamed from python/templates/pages/new/repomanqa/index.html) | 22 | ||||
| -rw-r--r-- | python/templates/pages/packages/category/index.html | 11 | ||||
| -rw-r--r-- | python/templates/pages/packages/ebuilds/ebuild/index.html | 33 | ||||
| -rw-r--r-- | python/templates/pages/packages/ebuilds/index.html | 29 |
9 files changed, 86 insertions, 59 deletions
diff --git a/python/templates/includes/frontpage/new_repoman b/python/templates/includes/frontpage/new_repoman new file mode 100644 index 0000000..1e54e2b --- /dev/null +++ b/python/templates/includes/frontpage/new_repoman @@ -0,0 +1,10 @@ +<table class="table table-striped frontpage-table"> + {% for PR in PR_tmp %} + <tr> + <td class="frontpage-table-package-atom"><a href="/repoman/{{ PR.PackageId.PackageId }}/" title="{{ PR.PackageId.CategoryId.Category }}/{{ PR.PackageId.Package }}::{{ PR.PackageId.RepoId.Repo }}"> + {{ PR.PackageId.CategoryId.Category }}/{{ PR.PackageId.Package }}::{{ PR.PackageId.RepoId.Repo }}</a> + </td> + <td><p title="{{ PR.RepomanText }}">{{ PR.RepomanText|truncatewords:3 }}</p></td> + </tr> + {% endfor %} +</table> diff --git a/python/templates/includes/frontpage/new_repoman_qa b/python/templates/includes/frontpage/new_repoman_qa deleted file mode 100644 index 61ac691..0000000 --- a/python/templates/includes/frontpage/new_repoman_qa +++ /dev/null @@ -1,18 +0,0 @@ -<table class="table table-striped frontpage-table"> - {% for QA in QA_tmp %} - <tr> - <td class="frontpage-table-package-atom"><a href="/repoman_qa/{{ QA.BuildLogId.BuildLogId }}/" title="{{ QA.BuildLogId.EbuildId.PackageId.CategoryId.Category }}/{{ QA.BuildLogId.EbuildId.PackageId.Package }}-{{ QA.BuildLogId.EbuildId.Version }}::{{ QA.BuildLogId.EbuildId.PackageId.RepoId.Repo }}"> - {{ QA.BuildLogId.EbuildId.PackageId.CategoryId.Category }}/{{ QA.BuildLogId.EbuildId.PackageId.Package }}-{{ QA.BuildLogId.EbuildId.Version }}::{{ QA.BuildLogId.EbuildId.PackageId.RepoId.Repo }}</a> - </td> - <td><p title="{{ QA.SummeryText }}">{{ QA.SummeryText|truncatewords:3 }}</p></td> - </tr> - {% endfor %} - {% for PR in PR_tmp %} - <tr> - <td class="frontpage-table-package-atom"><a href="/repoman/{{ PR.PackageId.PackageId }}/" title="{{ PR.PackageId.CategoryId.Category }}/{{ PR.PackageId.Package }}::{{ PR.PackageId.RepoId.Repo }}"> - {{ PR.PackageId.CategoryId.Category }}/{{ PR.PackageId.Package }}::{{ PR.PackageId.RepoId.Repo }}</a> - </td> - <td><p title="{{ PR.RepomanText }}">{{ PR.RepomanText|truncatewords:3 }}</p></td> - </tr> - {% endfor %} -</table>
\ No newline at end of file diff --git a/python/templates/pages/home/index.html b/python/templates/pages/home/index.html index c355c11..570202e 100644 --- a/python/templates/pages/home/index.html +++ b/python/templates/pages/home/index.html @@ -18,8 +18,8 @@ {% include "includes/frontpage/new_build_req" %} </div> <div class="col-xs-12 col-md-6"> - <h2>New Repoman or QA's <small>on the <a href="/new/repomanqa/">New Repoman or QA's</a></small></h2> - {% include "includes/frontpage/new_repoman_qa" %} + <h2>New Repoman's <small>on the <a href="/new/repoman/">New Repoman's</a></small></h2> + {% include "includes/frontpage/new_repoman" %} </div> </div> diff --git a/python/templates/pages/new/index.html b/python/templates/pages/new/index.html index 608b40e..085f180 100644 --- a/python/templates/pages/new/index.html +++ b/python/templates/pages/new/index.html @@ -17,8 +17,8 @@ {% include "includes/frontpage/new_build_req" %} </div> <div class="col-xs-12 col-md-6"> - <h2>New Repoman or QA's <small>on the <a href="/new/repomanqa/">New Repoman or QA's</a></small></h2> - {% include "includes/frontpage/new_repoman_qa" %} + <h2>New Repoman's <small>on the <a href="/new/repoman/">New Repoman's</a></small></h2> + {% include "includes/frontpage/new_repoman" %} </div> </div> diff --git a/python/templates/pages/new/logs/build/index.html b/python/templates/pages/new/logs/build/index.html index 487a397..5c2a9b6 100644 --- a/python/templates/pages/new/logs/build/index.html +++ b/python/templates/pages/new/logs/build/index.html @@ -54,9 +54,17 @@ </div> <div class="row-fluid"> <div class=span12> - {% if BLI.RepomanQA %} - <p class="lead">Repoman QA Summery: </p> - {{ BLI.RepomanQA|linebreaks }} + {% if BLI.Repoman %} + <p class="lead">Repoman Summery: </p> + {{ BLI.Repoman|linebreaks }} + {% endif %} + </div> + </div> + <div class="row-fluid"> + <div class=span12> + {% if BLI.QA %} + <p class="lead">QA Summery: </p> + {{ BLI.QA|linebreaks }} {% endif %} </div> </div> diff --git a/python/templates/pages/new/repomanqa/index.html b/python/templates/pages/new/repoman/index.html index 637c917..7df33e9 100644 --- a/python/templates/pages/new/repomanqa/index.html +++ b/python/templates/pages/new/repoman/index.html @@ -1,25 +1,8 @@ {% extends "layout/base.html" %} {% block content %} <div class="row"> - <h2>New Repoman and QA's</h2> + <h2>New Repoman's</h2> <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> - {% for QA in QA_tmp %} - <div class="panel panel-default"> - <div class="panel-heading" role="tab" id="heading{{ QA.Id }}"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{ QA.Id }}" aria-expanded="false" aria-controls="collapse{{ Qa.Id }}"> - {{ QA.BuildLogId.EbuildId.PackageId.CategoryId.Category }}/{{ QA.BuildLogId.EbuildId.PackageId.Package }}-{{ QA.BuildLogId.EbuildId.Version }}::{{ QA.BuildLogId.EbuildId.PackageId.RepoId.Repo }} - {{ QA.SummeryText|truncatewords:6 }} - </a> - </h4> - </div> - <div id="collapse{{ QA.Id }}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading{{ QA.Id }}"> - <div class="panel-body"> - {{ QA.SummeryText|linebreaksbr }} - </div> - </div> - </div> - {% endfor %} {% for PR in PR_tmp %} <div class="panel panel-default"> <div class="panel-heading" role="tab" id="heading{{ PR.Id }}"> @@ -39,5 +22,4 @@ {% endfor %} </div> </div> - -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/python/templates/pages/packages/category/index.html b/python/templates/pages/packages/category/index.html index 7bad0b4..d86b3cb 100644 --- a/python/templates/pages/packages/category/index.html +++ b/python/templates/pages/packages/category/index.html @@ -16,6 +16,17 @@ {% if PM.Repoman %} <a class="btn btn-warning btn-xs" href="/repoman/{{PM.PackageId }}/">Repoman</a> {% endif %} + {% if PM.Qa %} + <a class="btn btn-warning btn-xs" >Qa</a> + {% endif %} + {% if PM.Bl %} + {% if PM.Blf %} + <a class="btn btn-danger btn-xs"> + {% else %} + <a class="btn btn-success btn-xs"> + {% endif %} + Build</a> + {% endif %} </p> </td> </tr> diff --git a/python/templates/pages/packages/ebuilds/ebuild/index.html b/python/templates/pages/packages/ebuilds/ebuild/index.html index e000a53..4752be1 100644 --- a/python/templates/pages/packages/ebuilds/ebuild/index.html +++ b/python/templates/pages/packages/ebuilds/ebuild/index.html @@ -9,13 +9,6 @@ <td class="frontpage-table-package-atom"> <p" title="{{ E.PackageId.CategoryId.Category }}/{{ E.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.PackageId.RepoId.Repo }}">{{ E.PackageId.Package }}-{{ E.Version }}::{{ E.PackageId.RepoId.Repo }}</p> <a class="btn btn-default btn-xs" href="/buildpackage/{{ E.EbuildId.EbuildId }}/">Build</a> - {% for BL in BL_tmp %} - {% if BL.Fail %} - <a class="btn btn-danger btn-xs" href="/buildlog/{{ BL.BuildLogId }}/">Fail</a> - {% else %} - <a class="btn btn-success btn-xs" href="/buildlog/{{ BL.BuildLogId }}/">Success</a> - {% endif %} - {% endfor %} </td> <td> {% for K in EK_tmp %} @@ -43,5 +36,31 @@ {% endfor %} </table> </div> + <div class="col-xs-12 col-md-9"> + <table class="table table-striped frontpage-table"> + {% for BL in BL_tmp %} + <tr> + <td class="frontpage-table-package-atom"> + {% if BL.Fail %} + <span class="label label-danger">Build</span> + {% else %} + <span class="label label-success">Build</span> + {% endif %} + {% for BLR in BLR_tmp %} + {% if BLR.BuildLogId.BuildLogId == BL.BuildLogId%} + <span class="label label-danger">Repoman</span> + {% endif %} + {% endfor %} + {% for BLQ in BLQ_tmp %} + {% if BLQ.BuildLogId.BuildLogId == BL.BuildLogId%} + <span class="label label-danger">Qa</span> + {% endif %} + {% endfor %} + <a class="btn btn-default btn-xs" href="/new/logs/build/{{ BL.BuildLogId }}/">More info</a> + </td> + </tr> + {% endfor %} + </table> + </div> </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 b941c62..a9cef7d 100644 --- a/python/templates/pages/packages/ebuilds/index.html +++ b/python/templates/pages/packages/ebuilds/index.html @@ -11,13 +11,17 @@ <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> - {% 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 %} - {% if K.Status == 'Unstable' %}<span class="label label-warning">{{ K.KeywordId.Keyword }}</span>{% endif %} - {% if K.Status == 'Negative' %}{{ K.KeywordId.Keyword }}{% endif %} - {% endif %} - {% endfor %} + {% for FI in fi_tmp %} + {% if FI.EbuildId == E.EbuildId.EbuildId %} + {% if FI.qa %}<span class="label label-warning">Qa</span>{% endif %} + {% if FI.repoman %}<span class="label label-warning">Repoman</span>{% endif %} + {% if FI.fail %} + <span class="label label-danger">Build</span> + {% else %} + <span class="label label-success">Build</span> + {% endif %} + {% endif %} + {% endfor %} </td> </tr> {% endfor %} @@ -26,5 +30,16 @@ {% if PR %} <a class="btn btn-warning btn-xs" href="/repoman/{{P.PackageId.PackageId }}/">Repoman</a> {% endif %} + {% if QA %} + <a class="btn btn-warning btn-xs" href="/qa/{{P.PackageId.PackageId }}/">Qa</a> + {% endif %} + {% if Bl %} + {% if Blf %} + <a class="btn btn-danger btn-xs"> + {% else %} + <a class="btn btn-success btn-xs"> + {% endif %} + Build</a> + {% endif %} </div> {% endblock %}
\ No newline at end of file |