diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2017-01-15 20:44:38 +0100 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2020-04-09 07:38:53 +0200 |
| commit | 593e2eed315dbac85b6318a3cf4dd9fa390c8041 (patch) | |
| tree | c6ebb3044ebda6a4db180ee458d1afe538ee6e7e /python/templates | |
| parent | fix ame 'adict' is not defined line 273 (diff) | |
| download | tinderbox-cluster-www-593e2eed315dbac85b6318a3cf4dd9fa390c8041.tar.gz tinderbox-cluster-www-593e2eed315dbac85b6318a3cf4dd9fa390c8041.tar.bz2 tinderbox-cluster-www-593e2eed315dbac85b6318a3cf4dd9fa390c8041.zip | |
Update code to use gosbs backend
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
Diffstat (limited to 'python/templates')
59 files changed, 376 insertions, 1260 deletions
diff --git a/python/templates/includes/downloads/alpha.html b/python/templates/includes/downloads/alpha.html deleted file mode 100644 index 15d2d27..0000000 --- a/python/templates/includes/downloads/alpha.html +++ /dev/null @@ -1,17 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> - <div class="list-group"> - {% include partials/download-link.html type="iso" arch="alpha" id="minimal" title="Minimal Installation CD" %} - </div> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="alpha" id="alpha" title="Stage 3" %} - </div> -</div> -<div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> - <ul> - <li><a href="http://distfiles.gentoo.org/releases/alpha/autobuilds/current-install-alpha-minimal/">Minimal Installation CD</a></li> - <li><a href="http://distfiles.gentoo.org/releases/alpha/autobuilds/current-stage3-alpha/">Stage 3</a></li> - </ul> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/amd64.html b/python/templates/includes/downloads/amd64.html deleted file mode 100644 index 556519f..0000000 --- a/python/templates/includes/downloads/amd64.html +++ /dev/null @@ -1,6 +0,0 @@ -<div class="alert alert-info"> - <strong><span class="fa fa-fw fa-info-circle"></span> Processor Compatibility</strong> - <p> - The <em>amd64</em> architecture is intended for use on AMD 64-bit CPUs as well as 64-bit <strong>Intel Pentium/Core/Xeon</strong> processors. - </p> -</div> diff --git a/python/templates/includes/downloads/arch-default.html b/python/templates/includes/downloads/arch-default.html deleted file mode 100644 index 529abbf..0000000 --- a/python/templates/includes/downloads/arch-default.html +++ /dev/null @@ -1,33 +0,0 @@ -<h4>Boot Media</h4> -<div class="list-group"> - {% for iso in download.isos %} - {% if iso.id == 'minimal' %} - {% include "includes/partials/download-link-raw.html" with arch=download.arch id=iso.id title=iso.title tag=iso.tag link=iso.link date=iso.date size=iso.size urlprefix=site.download_url %} - {% endif %} - {% endfor %} - {% if download.arch == 'amd64' %} - {% include "includes/partials/download-link-raw.html" with urlprefix='http://bouncer.gentoo.org/fetch/gentoo-20140826-livedvd/' link='amd64/' title='Hybrid ISO (LiveDVD)' size='2800000000' date='2014-08-26' %} - {% elif download.arch == 'x86' %} - {% include "includes/partials/download-link-raw.html" with urlprefix='http://bouncer.gentoo.org/fetch/gentoo-20140826-livedvd/' link='x86/' title='Hybrid ISO (LiveDVD)' size='2800000000' date='2014-08-26' %} - {% endif %} -</div> - -<h4>Stage Archives</h4> -<div class="list-group"> - {% for stage3 in download.stage3s %} - {% if stage3.defaultstage %} - {% include "includes/partials/download-link-raw.html" with arch=download.arch id=stage3.id title=stage3.title tag=stage3.tag link=stage3.link date=stage3.date size=stage3.size urlprefix=site.download_url %} - {% endif %} - {% endfor %} -</div> - -<h4>Details (Contents, Hashes, and Signatures)</h4> -<p> - <a href="{{site.download_url }}/{{ download.arch }}/autobuilds/current-install-{{ download.arch }}-minimal/">Minimal Installation CD</a>, - <a href="http://bouncer.gentoo.org/fetch/gentoo-20140826-livedvd/{{ download.arch }}/">Hybrid ISO</a>, - {% for stage3 in download.stage3s %} - {% if stage3.defaultstage %} - <a href="{{site.download_url }}/{{ download.arch }}/autobuilds/current-stage3-{% if stage3.tag %}{{ stage3.tag }}{% else %}{{ download.arch }}{% endif %}/">Stage 3</a> - {% endif %} - {% endfor %} -</p>
\ No newline at end of file diff --git a/python/templates/includes/downloads/arch-main.html b/python/templates/includes/downloads/arch-main.html deleted file mode 100644 index f4cecd0..0000000 --- a/python/templates/includes/downloads/arch-main.html +++ /dev/null @@ -1,29 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> - <div class="list-group"> - {% for iso in download.isos %} - {% include "includes/partials/download-link-raw.html" with arch=key id=iso.id title=iso.title urlprefix=site.download_url tag=iso.tag link=iso.link date=iso.date size=iso.size %} - {% endfor %} - </div> - - - <h4>Stage Archives</h4> - <div class="list-group"> - {% for stage3 in download.stage3s %} - {% include "includes/partials/download-link-raw.html" with arch=key id=stage3.id title=stage3.title urlprefix=site.download_url tag=stage3.tag link=stage3.link date=stage3.date size=stage3.size %} - {% endfor %} - </div> -</div> -<div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> - <ul> - <li><a href="{{site.download_url }}{{ key }}/autobuilds/current-install-{{ key }}-minimal/">Minimal Installation CD</a></li> - {% for stage3 in download.stage3s %} - {% if stage3.defaultstage %} - <li><a href="{{site.download_url }}{{ key }}/autobuilds/current-stage3-{% if stage3.tag %}{{ stage3.tag }}{% else %}{{ key }}{% endif %}/">Stage 3</a></li> - {% endif %} - {% endfor %} - <li><a href="{{site.download_url }}{{ key }}/autobuilds/">All Stages</a></li> - </ul> - {% include "includes/downloads/warnings.html" with key=key %} -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/arm.html b/python/templates/includes/downloads/arm.html deleted file mode 100644 index a2bf23e..0000000 --- a/python/templates/includes/downloads/arm.html +++ /dev/null @@ -1,17 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="arm" id="armv4tl" title="Stage 3" tag="ARMv4tl" %} - {% include partials/download-link.html type="stage3" arch="arm" id="armv5tel" title="Stage 3" tag="ARMv5tel" %} - {% include partials/download-link.html type="stage3" arch="arm" id="armv6j" title="Stage 3" tag="ARMv6j" %} - {% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp" title="Stage 3" tag="ARMv6j | HardFP" %} - {% include partials/download-link.html type="stage3" arch="arm" id="armv7a" title="Stage 3" tag="ARMv7a" %} - {% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp" title="Stage 3" tag="ARMv7a | HardFP" %} - </div> -</div> -<div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> - <ul> - <li><a href="http://distfiles.gentoo.org/releases/arm/autobuilds/">Stage 3</a></li> - </ul> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/experimental.html b/python/templates/includes/downloads/experimental.html deleted file mode 100644 index e6fc030..0000000 --- a/python/templates/includes/downloads/experimental.html +++ /dev/null @@ -1,12 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>mips</h4> - <div class="list-group"> - <a href="http://distfiles.gentoo.org/experimental/mips/stages/" data-relurl="../experimental/mips/stages/" class="list-group-item download-link download-link-mirrorable"> - <span class="fa fa-download fa-fw"></span> - <strong>MIPS stages</strong> - </a> - </div> -</div> -<div class="col-xs-12 col-md-6"> - -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/hppa.html b/python/templates/includes/downloads/hppa.html deleted file mode 100644 index 908eb7a..0000000 --- a/python/templates/includes/downloads/hppa.html +++ /dev/null @@ -1,18 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> - <div class="list-group"> - {% include partials/download-link.html type="iso" arch="hppa" id="minimal" title="Minimal Installation CD" %} - </div> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1" title="Stage 3" tag="HPPA 1.1" %} - {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0" title="Stage 3" tag="HPPA 2.0" %} - </div> -</div> -<div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> - <ul> - <li><a href="http://distfiles.gentoo.org/releases/hppa/autobuilds/current-install-hppa-minimal/">Minimal Installation CD</a></li> - <li><a href="http://distfiles.gentoo.org/releases/hppa/autobuilds/">Stage 3</a></li> - </ul> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/ia64.html b/python/templates/includes/downloads/ia64.html deleted file mode 100644 index 46aee26..0000000 --- a/python/templates/includes/downloads/ia64.html +++ /dev/null @@ -1,25 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> - <div class="list-group"> - {% include partials/download-link.html type="iso" arch="ia64" id="minimal" title="Minimal Installation CD" %} - </div> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="ia64" id="ia64" title="Stage 3" %} - </div> -</div> -<div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> - <ul> - <li><a href="http://distfiles.gentoo.org/releases/ia64/autobuilds/current-iso/">Minimal Installation CD</a></li> - <li><a href="http://distfiles.gentoo.org/releases/ia64/autobuilds/current-stage3/">Stage 3</a></li> - </ul> - - <div class="alert alert-warning"> - <strong><i class="fa fa-fw fa-warning"></i> Confirm Processor Compatibility</strong> - <p> - The <em>ia64</em> architecture is intended for use on <strong>Intel Itanium</strong> processors only.<br /> - If you have a 64-bit <strong>Intel Pentium/Core/Xeon</strong> processor, you need to use the <a href="#amd64" class="alert-link"><em>amd64</em></a> architecture. - </p> - </div> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/ppc.html b/python/templates/includes/downloads/ppc.html deleted file mode 100644 index 1880dde..0000000 --- a/python/templates/includes/downloads/ppc.html +++ /dev/null @@ -1,12 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> - <div class="list-group"> - {% include partials/download-link.html type="iso" arch="ppc" id="minimal" title="Minimal Installation CD" %} - </div> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="ppc" id="ppc" title="PPC Stage 3" %} - {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-32ul" title="PPC64 Stage 3" tag="32ul" %} - {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-64ul" title="PPC64 Stage 3" tag="64ul" %} - </div> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/s390.html b/python/templates/includes/downloads/s390.html deleted file mode 100644 index a93064b..0000000 --- a/python/templates/includes/downloads/s390.html +++ /dev/null @@ -1,7 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="s390" id="s390" title="Stage 3" tag="S390" %} - {% include partials/download-link.html type="stage3" arch="s390" id="s390x" title="Stage 3" tag="S390X" %} - </div> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/sh.html b/python/templates/includes/downloads/sh.html deleted file mode 100644 index 8bd2b03..0000000 --- a/python/templates/includes/downloads/sh.html +++ /dev/null @@ -1,7 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="sh" id="sh4" title="Stage 3" tag="SH4" %} - {% include partials/download-link.html type="stage3" arch="sh" id="sh4a" title="Stage 3" tag="SH4A" %} - </div> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/sparc.html b/python/templates/includes/downloads/sparc.html deleted file mode 100644 index 7e91ad3..0000000 --- a/python/templates/includes/downloads/sparc.html +++ /dev/null @@ -1,11 +0,0 @@ -<div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> - <div class="list-group"> - {% include partials/download-link.html type="iso" arch="sparc" id="minimal" title="Minimal Installation CD" %} - </div> - <h4>Stage Archives</h4> - <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64" title="Stage 3" %} - {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64-multilib" title="Stage 3" tag="multilib" %} - </div> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/warnings.html b/python/templates/includes/downloads/warnings.html deleted file mode 100644 index 38a1eb5..0000000 --- a/python/templates/includes/downloads/warnings.html +++ /dev/null @@ -1,11 +0,0 @@ -<div class="alert alert-info"> - <strong><span class="fa fa-fw fa-info-circle"></span> Processor Compatibility</strong> - <p> - {% if key == 'amd64' %} - The <em>amd64</em> architecture is intended for use on AMD 64-bit CPUs as well as 64-bit <strong>Intel Pentium/Core/Xeon</strong> processors. - {% elif key == 'x86' %} - There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br /> - Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used. - {% endif %} - </p> -</div>
\ No newline at end of file diff --git a/python/templates/includes/downloads/x86-default.html b/python/templates/includes/downloads/x86-default.html deleted file mode 100644 index 03fc9b5..0000000 --- a/python/templates/includes/downloads/x86-default.html +++ /dev/null @@ -1,17 +0,0 @@ -<h4>Boot Media</h4> -<div class="list-group"> - {% include partials/download-link.html type="iso" arch="x86" id="minimal" title="Minimal Installation CD" %} - {% include partials/download-link-raw.html url='http://bouncer.gentoo.org/fetch/gentoo-20140826-livedvd/x86/' title='Hybrid ISO (LiveDVD)' size='2800000000' date='2014-08-26' %} -</div> - -<h4>Stage Archives</h4> -<div class="list-group"> - {% include partials/download-link.html type="stage3" arch="x86" id="i686" title="Stage 3" tag="i686" %} -</div> - -<h4>Details (Contents, Hashes, and Signatures)</h4> -<p> - <a href="http://distfiles.gentoo.org/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a>, - <a href="http://bouncer.gentoo.org/fetch/gentoo-20140826-livedvd/x86/">Hybrid ISO</a>, - <a href="http://distfiles.gentoo.org/releases/x86/autobuilds/current-stage3-i686/">Stage 3</a> -</p>
\ No newline at end of file diff --git a/python/templates/includes/downloads/x86.html b/python/templates/includes/downloads/x86.html deleted file mode 100644 index f1a04c9..0000000 --- a/python/templates/includes/downloads/x86.html +++ /dev/null @@ -1,7 +0,0 @@ -<div class="alert alert-warning"> - <strong><i class="fa fa-fw fa-warning"></i> Confirm Processor Compatibility</strong> - <p> - There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br /> - Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used. - </p> -</div> diff --git a/python/templates/includes/frontpage/new_build_req b/python/templates/includes/frontpage/new_build_req index 52a41fe..3a47530 100644 --- a/python/templates/includes/frontpage/new_build_req +++ b/python/templates/includes/frontpage/new_build_req @@ -1,16 +1,15 @@ -{% for k, v in BJ.items %} -<tr> - <td> - <a href="/new_build_req/{{ k }}"> - <span class="text-muted">{{ v.C }}/</span>/<strong>{{ v.P }}-{{ v.V }}::{{ v.R }}</strong> - </a> - </td> - <td> - {% if v.Status == 'Building' %} +<table class="table table-striped frontpage-table"> + {% for k, v in BJ.items %} + <tr> + <td class="frontpage-table-package-atom"><a href="/new_build_req/{{ k }}" title="{{ v.C }}/{{ v.P }}-{{ v.V }}::{{ v.R }}">{{ v.C }}/{{ v.P }}-{{ v.V }}::{{ v.R }}</a></td> + <td><p title="{{ v.title }}">{{ v.title|truncatewords:2}}</p> + <td class="text-right"> + {% if v.Status == 'Building' %} <span class="label label-primary">{{ v.Status }}</span> {% else %} <span class="label label-default">{{ v.Status }}</span> {% endif %} - </td> -</tr> -{% endfor %} + </td></td> + </tr> + {% endfor %} +</table>
\ No newline at end of file diff --git a/python/templates/includes/frontpage/new_logs b/python/templates/includes/frontpage/new_logs index 49db4c3..3074c4d 100644 --- a/python/templates/includes/frontpage/new_logs +++ b/python/templates/includes/frontpage/new_logs @@ -1,31 +1,27 @@ -{% for BL in BL_tmp %} -<tr> - <td> - <a href="/logs/build/{{ BL.BuildLogId }}/"> - <span class="text-muted">{{ BL.C }}/</span>/<strong>{{ BL.P }}-{{ BL.V }}::{{ BL.R }}</strong> - </a> - </td> - <td> - <p title="{{ BL.SummeryText }}">{{ BL.SummeryText|truncatewords:5 }}</p> - {% if BL.Fail %} +<table class="table table-striped frontpage-table"> + {% for B in BL%} + <tr> + <td class="frontpage-table-package-atom"><a href="/new_logs/{{ B.BuildLogId }}/" title="{{ B.C }}/{{ B.P }}-{{ B.V }}::{{ B.R }}"> + {{ B.C }}/{{ B.P }}-{{ B.V }}::{{ B.R }}</a></td> + <td><p title="{{ B.SummeryText }}">{{ B.SummeryText|truncatewords:3 }}</p> + <td class="text-right"> + {% if B.Fail %} {% for BE in B.BE_tmp %} {% if BE.BuildLogId.BuildLogId == B.BuildLogId %} {% if BE.ErrorId.ErrorId == 1 or BE.ErrorId.ErrorId == 2 %} <span class="label label-warning">{{ BE.ErrorId.ErrorName|upper }}</span> - {% endif %} - {% if BE.ErrorId.ErrorId == 3 %} - <span class="label label-info">{{ BE.ErrorId.ErrorName|upper }}</span> - {% elif BE.ErrorId.ErrorId > 3 %} + {% elif BE.ErrorId.ErrorId == 3 %} + <span class="label label-info">OTHERS</span> + {% else %} <span class="label label-danger">{{ BE.ErrorId.ErrorName|upper }}</span> {% endif %} {% endif %} {% endfor %} - {% if not B.FailB %} - <span class="label label-success">BUILD</span> - {% endif %} - {% else %} - <span class="label label-success">Ok</span> - {% endif %} - </td> -</tr> -{% endfor %} + {% else %} + <span class="label label-success">OK</span> + {% endif %} + </td> + </td> + </tr> + {% endfor %} +</table>
\ No newline at end of file diff --git a/python/templates/includes/frontpage/new_packages b/python/templates/includes/frontpage/new_packages index 297ca8b..6c845b7 100644 --- a/python/templates/includes/frontpage/new_packages +++ b/python/templates/includes/frontpage/new_packages @@ -1,10 +1,10 @@ -{% for P in PM %} -<tr> - <td> - <a href="/packages/{{ P.PackageId.PackageId }}"> - <span class="text-muted">{{ P.PackageId.CategoryId.Category }}</span>/<strong>{{ P.PackageId.Package }}</strong> - </a> - </td> - <td>{{ P.Descriptions }}</td> -</tr> -{% endfor %} +<table class="table table-striped frontpage-table"> + {% for E in EM %} + <tr> + <td class="frontpage-table-package-atom"> + <a href="/packages/{{ E.EbuildId.PackageId.PackageId }}/" title="{{ E.EbuildId.PackageId.CategoryId.Category }}/{{ E.EbuildId.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}"> + {{ E.EbuildId.PackageId.CategoryId.Category }}/{{ E.EbuildId.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}</a></td> + <td><p title="{{ E.Descriptions }}">{{ E.Descriptions }}</p></td> + </tr> + {% endfor %} +</table>
\ No newline at end of file diff --git a/python/templates/includes/frontpage/new_qa b/python/templates/includes/frontpage/new_qa deleted file mode 100644 index 5b3607b..0000000 --- a/python/templates/includes/frontpage/new_qa +++ /dev/null @@ -1,10 +0,0 @@ -<table class="table table-striped frontpage-table"> - {% for QA in QA_tmp %} - <tr> - <td class="frontpage-table-package-atom"><a href="/logs/build/{{ QA.BuildLogId.BuildLogId }}"> - {{ QA.BuildLogId.EbuildId.PackageId.CategoryId.Category }}/{{ QA.BuildLogId.EbuildId.PackageId.Package }}::{{ QA.BuildLogId.EbuildId.PackageId.RepoId.Repo }}</a> - </td> - <td><p title="{{ QA.SummeryText }}">{{ QA.SummeryText|truncatewords:3 }}</p></td> - </tr> - {% endfor %} -</table> diff --git a/python/templates/includes/frontpage/new_repoman b/python/templates/includes/frontpage/new_repoman deleted file mode 100644 index e03b095..0000000 --- a/python/templates/includes/frontpage/new_repoman +++ /dev/null @@ -1,10 +0,0 @@ -<table class="table table-striped frontpage-table"> - {% for RM in RM_tmp %} - <tr> - <td class="frontpage-table-package-atom"><a href="/logs/build/{{ RM.BuildLogId.BuildLogId }}"> - {{ RM.BuildLogId.EbuildId.PackageId.CategoryId.Category }}/{{ RM.BuildLogId.EbuildId.PackageId.Package }}::{{ RM.BuildLogId.EbuildId.PackageId.RepoId.Repo }}</a> - </td> - <td><p title="{{ RM.SummeryText }}">{{ RM.SummeryText|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 new file mode 100644 index 0000000..61ac691 --- /dev/null +++ b/python/templates/includes/frontpage/new_repoman_qa @@ -0,0 +1,18 @@ +<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/includes/frontpage/news b/python/templates/includes/frontpage/news index 27d9dc4..1f1a7d3 100644 --- a/python/templates/includes/frontpage/news +++ b/python/templates/includes/frontpage/news @@ -1,6 +1,13 @@ {% for post in posts %} <article> - <h2><a href="{{ post.url }}">{{ post.title }}</a> <small>({{ post.TimeStamp }})</small></h2> - {{ post.text|safe|escape }} +<h2 class="stick-top newsitem-bullet"> + <span class="fa fa-fw fa-chevron-circle-right" title="News item"> </span> + </h2> + <h2 class="stick-top newsitem-headline"> + <a href="{{ post.url }}">{{ post.title }}</a> <small>{{ post.created_at }}</small> + </h2> + <div class="newsitem-content"> + <p>{{ post.text|safe|escape }}</p> + </div> </article> -{% endfor %}
\ No newline at end of file +{% endfor %} diff --git a/python/templates/includes/frontpage/updated_packages b/python/templates/includes/frontpage/updated_packages deleted file mode 100644 index 78dc027..0000000 --- a/python/templates/includes/frontpage/updated_packages +++ /dev/null @@ -1,77 +0,0 @@ -{% for E in EM_list %} -<li class="list-group-item kk-package-detailed"> - <div class="row"> - <div class="col-xs-12 col-md-6"> - <h4 class="stick-top"><a href="/packages/{{ E.CId }}/{{ E.PId }}">{{ E.C }}/{{ E.P }}::{{ E.R }}</a></h4> - <div class="kk-package-detailed-toolbox"> - <div class="btn-group"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <span class="fa fa-fw fa-navicon"></span> - </button> - <ul class="dropdown-menu dropdown-menu-right"> - <li><a href="https://bugs.gentoo.org/buglist.cgi?quicksearch={{ E.C }}/{{ E.P }}" target="_blank"> - <span class="fa fa-fw fa-bug"></span> - Related bugs - </a></li> - <li><a href="https://wiki.gentoo.org/index.php?title=Special%3ASearch&fulltext=Search&search={{ E.P }}" target="_blank"> - <span class="fa fa-fw fa-book"></span> - Documentation - </a></li> - <li><a href="https://forums.gentoo.org/search.php?search_terms=all&show_results=topics&search_keywords={{ E.P }}&mode=results" target="_blank"> - <span class="fa fa-fw fa-comments-o"></span> - Forums posts - </a></li> - <li role="separator" class="divider"></li> - <li><a href="https://gitweb.gentoo.org/repo/{{ E.R }}.git/tree/{{ E.C }}/{{ E.P }}" target="_blank"> - <span class="fa fa-fw fa-code-fork"></span> - Git repository browser - </a></li> - <li><a href="https://gitweb.gentoo.org/repo/{{ E.R }}.git/log/{{ E.C }}/{{ E.P }}?showmsg=1" target="_blank"> - <span class="fa fa-fw fa-history"></span> - Git log - </a></li> - <li><a href="https://gitweb.gentoo.org/repo/{{ E.R }}.git/atom/{{ E.C }}/{{ E.P }}?h=master" target="_blank"> - <span class="fa fa-fw fa-rss"></span> - Changes feed - </a></li> - <li role="separator" class="divider"></li> - <li><a href="http://www.portagefilelist.de/site/query/listPackageVersions/?category={{ E.C }}&package={{ E.P }}&do#result" target="_blank"> - <span class="fa fa-fw fa-files-o"></span> - Installed files <small>(via PFL<span class="fa fa-fw fa-external-link-square"></span>)</small> - </a></li> - </ul> - </div> - </div> - {{ E.Descriptions }} - <br> - <small class="text-muted"> - </small> - <div class="kk-inline-changelog-entry"> - <a href="https://gitweb.gentoo.org/repo/{{ E.R }}.git/commit/?id={{ E.CommitId }}" title="Git commit"> - <span class="octicon octicon-git-pull-request"></span> - <span class="kk-commit-message"> - {{ E.CommitMsg}} - </span> - </a> - </div> - </div> - <div class="col-xs-12 col-md-6"> - <small class="text-muted pull-right"> - <span>{{ E.TimeStamp|date:"D d b Y G i" }}</span> - </small> - <div class="kk-version-card"> - <p><strong>{{ E.V }}</strong><span class="kk-slot"> : {{ E.Slot }} 0</span></p> - <p> - {% for K in E.EK_tmp %} - {% if K.EbuildId.EbuildId == E.EbuildId and K.KeywordId.Keyword != '*' and '-' not in K.KeywordId.Keyword %} - {% if K.Status == 'Stable' %}<span class="label kk-keyword-stable" title="{{ E.V }} is stable on {{ K.KeywordId.Keyword }}">{{ K.KeywordId.Keyword }}</span>{% endif %} - {% if K.Status == 'Unstable' %}<span class="label kk-keyword-testing" title="{{ E.V }} is testing on {{ K.KeywordId.Keyword }}">~{{ K.KeywordId.Keyword }}</span>{% endif %} - {% if K.Status == 'Negative' %}<span class="label kk-keyword-negative" title="{{ E.V }} is negative on {{ K.KeywordId.Keyword }}">-{{ K.KeywordId.Keyword }}{% endif %} - {% endif %} - {% endfor %} - </p> - </div> - </div> - </div> -</li> -{% endfor %} diff --git a/python/templates/includes/hero-section/end b/python/templates/includes/hero-section/end deleted file mode 100644 index 492b151..0000000 --- a/python/templates/includes/hero-section/end +++ /dev/null @@ -1,3 +0,0 @@ - </div> -</div> -<div class="container"><div class="row"><div class="col-md-12">
\ No newline at end of file diff --git a/python/templates/includes/hero-section/start b/python/templates/includes/hero-section/start deleted file mode 100644 index 8e9d73c..0000000 --- a/python/templates/includes/hero-section/start +++ /dev/null @@ -1,3 +0,0 @@ -</div></div></div> -<div class="hero-section {{ class_include }}"> - <div class="container">
\ No newline at end of file diff --git a/python/templates/includes/layout/footer.html b/python/templates/includes/layout/footer.html index 6767871..a6860e6 100644 --- a/python/templates/includes/layout/footer.html +++ b/python/templates/includes/layout/footer.html @@ -2,30 +2,37 @@ <div class="container"> <div class="row"> <div class="col-xs-12 col-md-offset-2 col-md-7"> - {% include "includes/layout/footer_db_update.html" %} + {% if page.footer %}{{ page.footer }}{% endif %} </div> <div class="col-xs-12 col-md-3"> <h3 class="footerhead">Questions or comments?</h3> - Please feel free to <a href="{{ site.contact }}">contact us</a>. + Please feel free to <a href="{{ contact.PageId.nav1 }}/{{ contact.nav2}}/">contact us</a>. </div> </div> + </div> + <div class="container-sitemap"> + <div class="container"> + {% include "includes/layout/footer_sitemap.html" %} + </div> + </div> + <div class="container"> <div class="row"> - <div class="col-xs-2 col-sm-3 col-md-2"> + <div class="col-xs-3 col-md-2"> <ul class="footerlinks three-icons"> - <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li> + <li><a href="http://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li> <li><a href="https://plus.google.com/+Gentoo" title="+Gentoo on Google+"><span class="fa fa-google-plus fa-fw"></span></a></li> <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li> </ul> </div> - <div class="col-xs-10 col-sm-9 col-md-10"> + <div class="col-xs-9 col-md-9"> <strong>© 2001-{% now "Y" %} Gentoo Foundation, Inc.</strong><br> <small> Gentoo is a trademark of the Gentoo Foundation, Inc. The contents of this document, unless otherwise expressly stated, are licensed under the - <a href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license. - The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply. + <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license. + The <a href="/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply. </small> </div> </div> </div> -</footer> +</footer>
\ No newline at end of file diff --git a/python/templates/includes/layout/footer_db_update.html b/python/templates/includes/layout/footer_db_update.html deleted file mode 100644 index 60284a5..0000000 --- a/python/templates/includes/layout/footer_db_update.html +++ /dev/null @@ -1,10 +0,0 @@ -<h3 class="footerhead">Gentoo Packages Database</h3> - <div class="row"> - <div class="col-xs-12 col-md-4"> - <span class="kk-group-header">Data currrent as of</span><br><span>{{ jobs.TimeStamp|date:"D d b Y G i" }}</span> - </div> - <div class="col-xs-12 col-md-4"> - </div> - <div class="col-xs-12 col-md-4"> - </div> -</div> diff --git a/python/templates/includes/layout/footer_sitemap.html b/python/templates/includes/layout/footer_sitemap.html new file mode 100644 index 0000000..3923ce3 --- /dev/null +++ b/python/templates/includes/layout/footer_sitemap.html @@ -0,0 +1,12 @@ +<div class="row row-sitemap hidden-xs"> + {% for page in pages %} + {% if page.nav1 != 'donate' %} + <div class="col-xs-12 col-sm-4 col-md-2"> + <h3 class="footerhead"><a href="{{ page.url }}">{{ page.nav_title }}</a></h3> + <ul class="sitemap"> + {% include "includes/navigation/sitemap_secondary" %} + </ul> + {% endif %} + </div> + {% endfor %} +</div>
\ No newline at end of file diff --git a/python/templates/includes/layout/head.html b/python/templates/includes/layout/head.html index 8e403ee..7f17fd8 100644 --- a/python/templates/includes/layout/head.html +++ b/python/templates/includes/layout/head.html @@ -13,17 +13,13 @@ <link rel="icon" sizes="192x192" href="https://www.gentoo.org/assets/img/logo/icon-192.png"> <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen"> <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen"> - <link href="https://www.gentoo.org/assets/css/screen.css" rel="stylesheet" media="screen"> - <link rel="stylesheet" media="all" href="https://packages.gentoo.org/assets/application-7fdbe7860b8aec801e4bc160268077e26a710facc864c06d9ad875d9251ee6e9.css" data-turbolinks-track="true" /> - <script src="https://packages.gentoo.org/assets/application-8c602231766f320e4b09bdeed673d188f3719a0c4a277dd54e95992ea8e7a689.js" data-turbolinks-track="true"></script> - <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script> - <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script> - {% if page.extracss %}{% for css in page.extracss %}<link href="https://www.gentoo.org/assets/css/{{ css }}" rel="stylesheet" media="screen">{% endfor %}{% endif %} - <link rel="icon" href="/favicon.ico" type="image/x-icon"> + <link href="https://assets/css/screen.css" rel="stylesheet" media="screen"> + + <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon"> <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/www-gentoo-org.xml" title="Gentoo Website"> <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/forums-gentoo-org.xml" title="Gentoo Forums"> <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/bugs-gentoo-org.xml" title="Gentoo Bugzilla"> <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/packages-gentoo-org.xml" title="Gentoo Packages"> <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/archives-gentoo-org.xml" title="Gentoo List Archives"> - {% if page.meta %}{{ page.meta|safe|escape }}{% endif %} + <link rel="alternate" type="application/atom+xml" title="Gentoo Linux news" href="https://www.gentoo.org/feeds/news.xml"> </head> diff --git a/python/templates/includes/layout/header.html b/python/templates/includes/layout/header.html index 4968f1f..63cba60 100644 --- a/python/templates/includes/layout/header.html +++ b/python/templates/includes/layout/header.html @@ -4,24 +4,24 @@ <div class="row"> <div class="site-title-buttons"> <div class="btn-group btn-group-sm"> - <a href="http://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a> + <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong>Get Gentoo!</strong></a> <div class="btn-group btn-group-sm"> - <button type="button" class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown"> - <span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span> - </button> - <ul class="dropdown-menu"> - <li><a href="http://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li> - <li><a href="http://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text fa-fw"></span> Wiki</a></li> + <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#"> + <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs">gentoo.org sites</span> <span class="caret"></span> + </a> + <ul class="dropdown-menu dropdown-menu-right"> + <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li> + <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li> <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li> - <li><a href="http://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li> - <li><a href="http://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li> + <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li> + <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li> <li class="divider"></li> - <li><a href="http://overlays.gentoo.org/" title="Collaborate on maintaining packages"><span class="fa fa-code-fork fa-fw"></span> Overlays</a></li> - <li><a href="http://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li> - <li><a href="http://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li> - <li><a href="http://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li> + <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li> + <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li> + <li><a href="https://gitweb.gentoo.org/" title="Browse our source code in Gitweb"><span class="fa fa-code fa-fw"></span> Gitweb</a></li> + <li><a href="https://sources.gentoo.org/" title="Browse our source code in CVS"><span class="fa fa-code fa-fw"></span> CVS sources</a></li> <li class="divider"></li> - <li><a href="http://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-tasks fa-fw"></span> Infra Status</a></li> + <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra status</a></li> </ul> </div> </div> @@ -29,10 +29,10 @@ <div class="logo"> <a href="/" title="Back to the homepage" class="site-logo"> <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml"> - <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo"> + <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux logo"> </object> </a> - <span class="site-label">Tinderbox-cluster</span> + </div> </div> </div> @@ -52,22 +52,16 @@ <ul class="nav navbar-nav"> {% include "includes/navigation/primary" %} </ul> - <div class="btn-group btn-group-sm"> - <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"> - User <span class="caret"></span> - </button> - <ul class="dropdown-menu"> - {% if user.is_authenticated %} - <li><a href="/user/password_change/"><span class="fa fa-file-text fa-fw"></span> Change password</a></li> - <li class="divider"></li> - <li><a href="/user/bugzillalogin/"><span class="fa fa-file-text fa-fw"></span> Bugzilla Login</a></li> - <li class="divider"></li> - <li><a href="/user/logout/"><span class="fa fa-home fa-fw"></span> Log out</a></li> - {% else %} - <li><a href="/user/login/"><span class="fa fa-tasks fa-fw"></span> Log in</a></li> - {% endif %} - </ul> - </div> + <ul class="nav navbar-nav navbar-right"> + <li class=""><a href="http://www.gentoo.org/donate/"><span class="fa fa-heart" style="color:#d9534f;"></span> Donate</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li class=""><span class="" style="color:#d9534f;"></span> + {% if user.is_authenticated %} + Welcome, {{ user.username }}. Thanks for logging in. + {% endif %} + </li> + </ul> </div> </div> </div> diff --git a/python/templates/includes/layout/sponsor.html b/python/templates/includes/layout/sponsor.html new file mode 100644 index 0000000..9ebd19a --- /dev/null +++ b/python/templates/includes/layout/sponsor.html @@ -0,0 +1,9 @@ +<div class="row sponsor"> +{% for sponsor in sponsors %} +<div class="col-xs-12 col-md-2 col-md-offset-2 sponsorlogo"> +<!-- sponsor{name:{{ sponsor.name }},weight:{{ sponsor.weight }}} --> +<a href="{{ sponsor.link }}" title="{{ sponsor.title }}"> +<img src="https://www.gentoo.org/assets/img/sponsors/ads/{{ sponsor.img }}" alt="{{ sponsor.alt }}"> +</a></div> +{% endfor %} +</div> diff --git a/python/templates/includes/navigation/primary b/python/templates/includes/navigation/primary index 76fa273..9db245d 100644 --- a/python/templates/includes/navigation/primary +++ b/python/templates/includes/navigation/primary @@ -1,9 +1,10 @@ -{% for node in pages %} - {% if node.nav1_show %}{% if node.nav1 != 'login' %} - {% if page.nav1 == node.nav1 %} - <li class="active"><a href="/{{ node.url }}/" class="active">{% if node.nav_title %}{{ node.nav_title }}{% else %}{{node.title}}{% endif %}</a></li> +{% for meny in menys %} + {% if meny.view %} + {% if activemeny.name == meny.name %} + <li class="active"> {% else %} - <li><a href="/{{ node.url }}/">{% if node.nav_title %}{{ node.nav_title }}{% else %}{{node.title}}{% endif %}</a></li> + <li class=""> {% endif %} - {% endif %}{% endif %} + <a href="/{{ meny.url }}/">{{meny.title}}</a></li> + {% endif %} {% endfor %} diff --git a/python/templates/includes/navigation/secondary b/python/templates/includes/navigation/secondary index 60898ab..ad11ad5 100644 --- a/python/templates/includes/navigation/secondary +++ b/python/templates/includes/navigation/secondary @@ -1,5 +1,10 @@ -{% for node in subpages %} - {% if page.PageId == node.PageId.PageId %} - <li><a href="{{node.url }}">{% if node.navtitle %}{{ node.navtitle }}{% else %}{{node.title}}{% endif %}</a></li> +{% for meny in submenys %} + {% if meny.view %} + {% if subactivemeny == meny.name %} + <li class="active"> + {% else %} + <li class=""> {% endif %} + <a href="{% url meny.url %}">{{meny.title}}</a></li> + {% endif %} {% endfor %} diff --git a/python/templates/includes/navigation/tertiary b/python/templates/includes/navigation/tertiary deleted file mode 100644 index 500c358..0000000 --- a/python/templates/includes/navigation/tertiary +++ /dev/null @@ -1,12 +0,0 @@ -{% assign pages_list2 = pages_list | sort:"nav3-weight" %} -{% for node in pages_list2 %} - {% if page.nav1 == node.nav1 and page.nav2 == node.nav2 and node.nav3-show == true %} - {% if page.nav3 == node.nav3 %} - <li class="active"><a href="{{node.url | replace:'index.html',''}}" class="active">{% if node.navtitle %}{{ node.navtitle }}{% else %}{{node.title}}{% endif %}</a></li> - {% else %} - <li><a href="{{node.url | replace:'index.html',''}}">{% if node.navtitle %}{{ node.navtitle }}{% else %}{{node.title}}{% endif %}</a></li> - {% endif %} - {% endif %} -{% endfor %} -{% assign pages_list = nil %} -{% assign pages_list2 = nil %}
\ No newline at end of file diff --git a/python/templates/includes/partials/download-link-raw.html b/python/templates/includes/partials/download-link-raw.html deleted file mode 100644 index 0de2157..0000000 --- a/python/templates/includes/partials/download-link-raw.html +++ /dev/null @@ -1,5 +0,0 @@ -<a href="{{ urlprefix }}{{ link }}" data-relurl="{{ link }}" class="list-group-item download-link {% if urlprefix %} download-link-mirrorable{% endif %}"> - <span class="fa fa-download fa-fw"></span> - <strong>{{ title }}</strong>{%if tag %}<span class="label label-primary download-tag"> {{ tag }}</span>{% endif %} - <span class="pull-right"><small class="download-date">{{ date }}</small> <span class="label label-default download-size hidden-xs">{{ size }}</span></span> -</a>
\ No newline at end of file diff --git a/python/templates/includes/partials/download-link.html b/python/templates/includes/partials/download-link.html deleted file mode 100644 index 14a2939..0000000 --- a/python/templates/includes/partials/download-link.html +++ /dev/null @@ -1,4 +0,0 @@ -{% capture url %}{{ include.arch }}/autobuilds/{{ site.data.downloads[include.arch][include.type][include.id].filename }}{% endcapture %} -{% assign date = site.data.downloads[include.arch][include.type][include.id].date %} -{% assign size = site.data.downloads[include.arch][include.type][include.id].size %} -{% include partials/download-link-raw.html title=include.title tag=include.tag url=url urlprefix='http://distfiles.gentoo.org/releases/' date=date size=size %}
\ No newline at end of file diff --git a/python/templates/includes/partials/irc-channel.html b/python/templates/includes/partials/irc-channel.html deleted file mode 100644 index b7e6dba..0000000 --- a/python/templates/includes/partials/irc-channel.html +++ /dev/null @@ -1,8 +0,0 @@ -<tr> - <th> - <a href="irc://irc.gentoo.org/{{ channel.name }}"><tt>#{{ channel.name }}</tt></a> - </th> - <td> - {{ channel.description }} - </td> -</tr>
\ No newline at end of file diff --git a/python/templates/includes/partials/mailinglist.html b/python/templates/includes/partials/mailinglist.html deleted file mode 100644 index 39a9af1..0000000 --- a/python/templates/includes/partials/mailinglist.html +++ /dev/null @@ -1,21 +0,0 @@ -<tr> - <th> - {{ list.name }} - {% if list.moderated %} - <span class="label label-warning pull-right" title="This list is moderated"><span class="fa fa-fw fa-lock"></span></span> - {% endif %} - </th> - <td> - {{ list.description }} - {% if list.moderators %} - <br><small>Moderators: {{ list.moderators | join:', '}}</small> - {% endif %} - </td> - <td class="ml-actions hidden-xs"> - <div class="btn-group btn-group-xs" role="group" aria-label="Mailing list actions for {{ list.name }}@lists.gentoo.org"> - <a href="mailto:{{ list.name }}@lists.gentoo.org" title="Post to this list" class="btn btn-default"><span class="fa fa-fw fa-send"></span></a> - <a href="mailto:{{ list.name }}+subscribe@lists.gentoo.org" title="Subscribe to this list" class="btn btn-default"><span class="fa fa-fw fa-plus-square"></span></a> - <a href="http://archives.gentoo.org/{{ list.name }}/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span></a> - </div> - </td> -</tr>
\ No newline at end of file diff --git a/python/templates/includes/partials/sponsor.html b/python/templates/includes/partials/sponsor.html deleted file mode 100644 index 056d14e..0000000 --- a/python/templates/includes/partials/sponsor.html +++ /dev/null @@ -1,14 +0,0 @@ -<div class="row sponsor"> - <div class="col-xs-12 col-md-3 sponsorlogo"> - {% if sponsor.img and sponsor.link %} - <a href="{{ sponsor.link }}"><img src="/assets/img/sponsors/{{ sponsor.img }}" alt="{{ sponsor.name }}" /></a> - {% elsif sponsor.img %} - <img src="/assets/img/sponsors/{{ sponsor.img }}" alt="{{ sponsor.name }}" /> - {% endif %} - </div> - <div class="col-xs-12 col-md-9 sponsortext text-justify"> - <h3>{{ sponsor.name }}</h3> - {{ sponsor.blurb | markdownify }} - </div> -</div> -<hr />
\ No newline at end of file diff --git a/python/templates/layout/base.html b/python/templates/layout/base.html index 8f10f6e..bc31ee4 100644 --- a/python/templates/layout/base.html +++ b/python/templates/layout/base.html @@ -1,21 +1,20 @@ <!DOCTYPE html> <html> {% include "includes/layout/head.html" %} - <body class="{{ page.body_class }}"> + <body class=""> {% include "includes/layout/header.html" %} <div class="container"> <div class="row"> - <div id="content" class="col-xs-12"> + <div id="content" class="col-md-12"> {% block content %}{% endblock %} + {% include "includes/layout/sponsor.html" %} </div> </div> </div> {% include "includes/layout/footer.html" %} - {% if page.extrajs %}{% for js in page.extrajs %}<script src="{{ STATIC_ROOT }}/js/{{ js }}"></script>{% endfor %}{% endif %} - {% if page.inlinejs %}<script>{{ page.inlinejs }}</script>{% endif %} <script type="text/javascript"> var _paq = _paq || []; _paq.push(["disableCookies"]); @@ -29,5 +28,7 @@ })(); </script> <noscript><p><img src="//piwik.gentoo.org/piwik.php?idsite=7" style="border:0;" alt="" /></p></noscript> + <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script> + <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script> </body> </html> diff --git a/python/templates/pages/build_req/index.html b/python/templates/pages/build_req/index.html deleted file mode 100644 index 979921c..0000000 --- a/python/templates/pages/build_req/index.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">New Build Requst On Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_build_req" %} - </table> - </div> -</div> -{% endblock %} diff --git a/python/templates/pages/categories/index.html b/python/templates/pages/categories/index.html deleted file mode 100644 index f9463e9..0000000 --- a/python/templates/pages/categories/index.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - <ol class="breadcrumb"> - <li><a href="/home/">Home</a></li> - <li class="active">Packages</li> -</ol> - -<h1>Packages</h1> - -<div class="row"> - <div class="col-md-9"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Browse Categories</h3> - </div> - <div class="panel-body"> - <ul class="kk-col-list kk-4col-list kk-category-listing"> - {% for C_list in CM_tmp %} - <li class="kk-col-list-header"><span class="kk-group-header">{{ C_list.letter }}</span></li> - {% for CM in C_list.CM_list %} - <li><a title="{{ CM.Descriptions }}" data-toggle="tooltip" data-placement="right" href="/categories/packages/{{ CM.CategoryId }}/">{{CM.Category }}</a></li> - {% endfor %} - {% endfor %} - </ul> - </div> - </div> - </div> - <div class="col-md-3"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Update Feeds</h3> - </div> - <div class="list-group"> - <a href="/packages/added" class="list-group-item"> - <span class="fa fa-fw fa-history"></span> - Added Packages - </a> - <a href="/packages/updated" class="list-group-item"> - <span class="fa fa-fw fa-asterisk"></span> - Updated Packages - </a> - <a href="/packages/stable" class="list-group-item"> - <span class="fa fa-fw fa-check-circle-o"></span> - Newly Stable Packages - </a> - <a href="/packages/keyworded" class="list-group-item"> - <span class="fa fa-fw fa-circle-o"></span> - <span class="translation_missing" title="translation missing: en.keyworded_packages">Keyworded Packages</span> - </a> - </div> - </div> - </div> -</div> - - </div> - </div> -</div> -{% endblock %} diff --git a/python/templates/pages/categories/packages/index.html b/python/templates/pages/categories/packages/index.html deleted file mode 100644 index 0e5678d..0000000 --- a/python/templates/pages/categories/packages/index.html +++ /dev/null @@ -1,63 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - <ol class="breadcrumb"> - <li><a href="/home/">Home</a></li> - <li><a href="/categories">Packages</a></li> - <li class="active">{{ C.CategoryId.Category }}</li> -</ol> - -<div class="row"> - <div class="col-md-4"> - <h1 class="stick-top"> - <span class="fa fa-fw fa-cubes"></span> - {{ C.CategoryId.Category }} - </h1> - </div> - <div class="col-md-8"> - <p class="lead" style="margin: 0;"> - {{ C.Descriptions }} - </p> - </div> -</div> -<hr> - -<div class="row"> - <div class="col-md-9"> - <!--<p> - <input type="text" class="form-control form-control-xl" placeholder="Search packages in app-accessibility"> - </p>--> - - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">All packages</h3> - </div> - <table class="table"> -{% for PM in PM_tmp %} - <tr> - <th class="kk-nobreak-cell"><a href="/categories/packages/versions/{{ PM.PackageId.PackageId }}">{{ PM.PackageId.Package }}</a></th> - <td>{{ PM.Descriptions }}</td> - </tr> -{% endfor %} - - </table> - </div> - </div> - <div class="col-md-3"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Statistics</h3> - </div> - <div class="panel-body"> - {{ PM_tmp|length }} Packages - </div> - </div> - </div> -</div> - - </div> - </div> -</div> -{% endblock %} diff --git a/python/templates/pages/categories/packages/versions/index.html b/python/templates/pages/categories/packages/versions/index.html deleted file mode 100644 index 7300f07..0000000 --- a/python/templates/pages/categories/packages/versions/index.html +++ /dev/null @@ -1,233 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="kk-header-container"> - <div class="container"> - <div class="row"> - <div class="col-xs-12"> - <ol class="breadcrumb"> - <li><a href="/">Home</a></li> - <li><a href="/categories">Packages</a></li> - <li><a href="/categories/packages/P.PackageId.PackageId">{{ P.PackageId.CategoryId.Category }}</a></li> - <li class="active">{{ P.PackageId.Package }}</li> - </ol> - - <div class="row"> - <div class="col-md-4"> - <h1 class="stick-top kk-package-title" id="package-title" data-atom="{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}" data-category="{{ P.PackageId.CategoryId.Category }}" data-name="{{ P.PackageId.Package }}"> - <small class="kk-package-cat">{{ P.PackageId.Package }}/</small> - <div> - <svg height="32" class="octicon octicon-package right left kk-package-icon" aria-label="Package icon" viewBox="0 0 16 16" version="1.1" width="32" role="img"><path d="M1 4.27v7.47c0 .45.3.84.75.97l6.5 1.73c.16.05.34.05.5 0l6.5-1.73c.45-.13.75-.52.75-.97V4.27c0-.45-.3-.84-.75-.97l-6.5-1.74a1.4 1.4 0 0 0-.5 0L1.75 3.3c-.45.13-.75.52-.75.97zm7 9.09l-6-1.59V5l6 1.61v6.75zM2 4l2.5-.67L11 5.06l-2.5.67L2 4zm13 7.77l-6 1.59V6.61l2-.55V8.5l2-.53V5.53L15 5v6.77zm-2-7.24L6.5 2.8l2-.53L15 4l-2 .53z"></path></svg> - <div class="kk-package-name">{{ P.PackageId.Package }}</div> - </div> - </h1> - </div> - <div class="col-md-8"> - <p class="lead kk-package-maindesc"> - {{ P.Descriptions }} - </p> - - <p class="kk-package-homepage"> - <a href="https://wiki.gnome.org/Accessibility" rel="nofollow">https://wiki.gnome.org/Accessibility</a> - </p> - </div> - </div> - </div> - </div> - </div> -</div> - - -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - -<div class="row"> - <div class="col-md-9"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - Available Versions - </h3> - </div> - {% for E in EM_info %} - <table class="table table-bordered kk-versions-table"> -<tr> - <td> - <strong>{{ E.Version }}</strong><span class="kk-slot"> :{{ E.Slot }}:</span>{{ P.PackageId.RepoId.Repo }} - {% for R in E.ER_tmp %} - <span class="label label-danger kk-restrict-label" titel="The following feature are restricted: {{ R.RestrictionId.Restriction}}">{{ R.RestrictionId.Restriction|first|upper }}</span> - {% endfor %} - <small class="text-muted pull-right"> - <span>{{ E.TimeStamp|date:"D d b Y G i" }}</span> - </small> - </td> -</tr> -<tr> - <td> - {% for K in E.EK_tmp %} - {% if K.EbuildId.EbuildId == E.EbuildId and K.KeywordId.Keyword != '*' and '-' not in K.KeywordId.Keyword %} - {% if K.Status == 'Stable' %}<span class="label kk-keyword-stable" title="{{ E.V }} is stable on {{ K.KeywordId.Keyword }}">{{ K.KeywordId.Keyword }}</span>{% endif %} - {% if K.Status == 'Unstable' %}<span class="label kk-keyword-testing" title="{{ E.V }} is testing on {{ K.KeywordId.Keyword }}">~{{ K.KeywordId.Keyword }}</span>{% endif %} - {% if K.Status == 'Negative' %}<span class="label kk-keyword-negative" title="{{ E.V }} is negative on {{ K.KeywordId.Keyword }}">-{{ K.KeywordId.Keyword }}{% endif %} - {% endif %} - {% endfor %} - </td> -</tr> -<tr> - <td> - {% for U in E.EU_tmp %} - {% if U.Status %} - <span class="label label-info">{{ U.UseId.Flag }}</span> - {% endif %} - {% endfor %} - </td> -</tr> -<tr> - <td> - {% for BL in E.BL_tmp %} - {% for FI in E.fi_tmp %} - {% if FI.BuildLogId == BL.BuildLogId %} - {% if FI.Blo %} - <span class="label label-info">Others</span> - {% else %} - {% if FI.qa %} - <span class="label label-warning">Qa</span> - {% else %} - <span class="label label-success">Qa</span> - {% endif %} - {% if FI.repoman %} - <span class="label label-warning">Repoman</span> - {% else %} - <span class="label label-success">Repoman</span> - {% endif %} - - {% if FI.Blb %} - <span class="label label-danger">Build</span> - {% else %} - <span class="label label-success">Build</span> - {% endif %} - {% endif %} - {% endif %} - {% endfor %} - <a class="btn btn-default btn-xs" href="/new/logs/build/{{ BL.BuildLogId }}/">More info</a> - {% endfor %} - </td> -</tr> -</table> -{% endfor %} -</div> - - - - - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Package Metadata</h3> - </div> - <ul class="list-group kk-metadata-list"> - <li class="kk-metadata-item list-group-item"> - <div class="row"> - <div class="col-xs-12 col-md-3 kk-metadata-key"> - <span class="fa fa-fw fa-sliders"></span> - USE flags - </div> - <div class="col-xs-12 col-md-9"> - - - - </div> - </div> - </li> - <li class="kk-metadata-item list-group-item"> - <div class="row"> - <div class="col-xs-12 col-md-3 kk-metadata-key"> - <span class="fa fa-fw fa-legal"></span> - License - </div> - <div class="col-xs-12 col-md-9"> - <a href="https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LGPL-2+">LGPL-2+</a> - </div> - </div> - </li> - <li class="kk-metadata-item list-group-item"> - <div class="row"> - <div class="col-xs-12 col-md-3 kk-metadata-key"> - <span class="fa fa-fw fa-user"></span> - Maintainer(s) - </div> - <div class="col-xs-12 col-md-9"> - <a title="gnome@gentoo.org" href="mailto:gnome@gentoo.org">Gentoo GNOME Desktop</a> - </div> - </div> - </li> - </ul> -</div> - - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Changelog</h3> - </div> - <ul class="list-group" id="changelog-container"> - <li class="list-group-item kk-panel-content-sorry"> - <span class="fa fa-refresh fa-spin fa-3x"></span> - <noscript> - <br><br> - Inline Changelog cannot be displayed. - <br><br> - <a href="https://gitweb.gentoo.org/repo/gentoo.git/log/{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}?showmsg=1" class="btn btn-default"> - <span class="fa fa-fw fa-history"></span> - View Git Changelog - </a> - </noscript> - </li> - </ul> -</div> - - </div> - <div class="col-md-3"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Resources</h3> - </div> - <div class="list-group"> - <a href="https://bugs.gentoo.org/buglist.cgi?quicksearch={{ P.PackageId.CategoryId.Category }}%2{{ P.PackageId.Package }}" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-bug"></span> - Related bugs - </a> - <a href="https://wiki.gentoo.org/index.php?title=Special%3ASearch&fulltext=Search&search={{ P.PackageId.Package }}" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-book"></span> - Documentation - </a> - <a href="https://forums.gentoo.org/search.php?search_terms=all&show_results=topics&search_keywords={{ P.PackageId.Package }}&mode=results" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-comments-o"></span> - Forums posts - </a> - <a href="https://gitweb.gentoo.org/repo/gentoo.git/tree/{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-code-fork"></span> - Git repository browser - </a> - <a href="https://gitweb.gentoo.org/repo/gentoo.git/log/{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}?showmsg=1" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-history"></span> - Git log - </a> - <a href="https://gitweb.gentoo.org/repo/gentoo.git/atom/{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}?h=master" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-rss"></span> - Changes feed - </a> - <a href="http://www.portagefilelist.de/site/query/listPackageVersions/?category={{ P.PackageId.CategoryId.Category }}&package={{ P.PackageId.Package }}&do#result" class="list-group-item" target="_blank"> - <span class="fa fa-fw fa-files-o"></span> - Installed files <small>(via PFL<span class="fa fa-fw fa-external-link-square"></span>)</small> - </a> - </div> -</div> - - </div> -</div> - -<script src="https://packages.gentoo.org/assets/packages/show-c78475ea4f81a974351958c07ed5c4892c04b77054506dec44f177cd8cb9271d.js"></script> - - </div> - </div> -</div> - -{% endblock %} diff --git a/python/templates/pages/home/index.html b/python/templates/pages/home/index.html deleted file mode 100644 index 2d91149..0000000 --- a/python/templates/pages/home/index.html +++ /dev/null @@ -1,70 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="jumbotron"> - <h2 class="site-welcome stick-top">Welcome to the Home of <span class="text-primary">19,363</span> Gentoo Packages</h2> - <form action="/packages/search" method="get"> - <div class="typeahead-container"> - <div class="typeahead-field"> - <span class="typeahead-query"> - <input id="q" name="q" type="search" autocomplete="off" placeholder="Find Packages" aria-label="Find Packages" autofocus> - </span> - <span class="typeahead-button"> - <button type="submit" title="Find" aria-label="Find"> - <span class="typeahead-search-icon"></span><span class="sr-only">Find</span> - </button> - </span> - </div> - </div> - </form> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">Added Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_packages" %} - </table> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-asterisk"></span> - <a href="/packages/updated">Updated Packages</a> - </h3> - </div> - <ul class="list-group"> - {% include "includes/frontpage/updated_packages" %} - </ul> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">New Build Requst On Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_build_req" %} - </table> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">New Build Logs On Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_logs" %} - </table> - </div> -</div> -{% endblock %} diff --git a/python/templates/pages/logs/all/build/index.html b/python/templates/pages/logs/all/build/index.html deleted file mode 100644 index efac3b3..0000000 --- a/python/templates/pages/logs/all/build/index.html +++ /dev/null @@ -1,103 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - Build Logs On Packages - </h3> - {% if BL_tmp.has_other_pages %} - <ul class="pagination"> - {% if BL_tmp.has_previous %} - <li><a href="?page={{ BL_tmp.previous_page_number }}">«</a></li> - {% else %} - <li class="disabled"><span>«</span></li> - {% endif %} - {% for i in BL_tmp.paginator.page_range %} - {% if BL_tmp.number == i %} - <li class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></li> - {% else %} - <li><a href="?page={{ i }}">{{ i }}</a></li> - {% endif %} - {% endfor %} - {% if BL_tmp.has_next %} - <li><a href="?page={{ BL_tmp.next_page_number }}">»</a></li> - {% else %} - <li class="disabled"><span>»</span></li> - {% endif %} - </ul> -{% endif %} - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% for BL in BL_tmp %} -<tr> - <td> - <a href="/logs/build/{{ BL.BuildLogId }}/"> - <span class="text-muted">{{ BL.C }}/</span>/<strong>{{ BL.P }}-{{ BL.V }}::{{ BL.R }}</strong> - </a> - </td> - <td> - <p title="{{ BL.SummeryText }}">{{ BL.SummeryText|truncatewords:5 }}</p> - {% if BL.Fail %} - {% if BL.FI.others %} - <span class="label label-info">Others</span> - {% else %} - {% if BL.FI.qa %} - <span class="label label-warning"> - {% else %} - <span class="label label-success"> - {% endif %} - Qa</span> - {% if BL.FI.repoman %} - <span class="label label-warning"> - {% else %} - <span class="label label-success"> - {% endif %} - Repoman</span> - {% if BL.FI.TestRun %} - {% if BL.FI.test %} - <span class="label label-danger"> - {% else %} - <span class="label label-success"> - {% endif %} - Test</span> - {% endif %} - {% if BL.FI.build %} - <span class="label label-danger">{{ BL.FI.builderror }} - {% else %} - <span class="label label-success">Build - {% endif %} - </span> - {% endif %} - {% else %} - <span class="label label-success">Ok</span> - {% endif %} - </td> -</tr> -{% endfor %} - </table> - </div> -</div> -{% if BL_tmp.has_other_pages %} - <ul class="pagination"> - {% if BL_tmp.has_previous %} - <li><a href="?page={{ BL_tmp.previous_page_number }}">«</a></li> - {% else %} - <li class="disabled"><span>«</span></li> - {% endif %} - {% for i in BL_tmp.paginator.page_range %} - {% if BL_tmp.number == i %} - <li class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></li> - {% else %} - <li><a href="?page={{ i }}">{{ i }}</a></li> - {% endif %} - {% endfor %} - {% if BL_tmp.has_next %} - <li><a href="?page={{ BL_tmp.next_page_number }}">»</a></li> - {% else %} - <li class="disabled"><span>»</span></li> - {% endif %} - </ul> -{% endif %} -{% endblock %} diff --git a/python/templates/pages/logs/build/index.html b/python/templates/pages/logs/build/index.html deleted file mode 100644 index 0bbc96b..0000000 --- a/python/templates/pages/logs/build/index.html +++ /dev/null @@ -1,114 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="row"> - <h2>{{ BLI.C }}/{{ BLI.P }}-{{ BLI.V }}::{{ BLI.R }} - {% if FI.others %} - <span class="label label-info">Others</span> - {% else %} - {% if FI.qa %} - <span class="label label-warning"> - {% else %} - <span class="label label-success"> - {% endif %} - Qa</span> - {% if FI.repoman %} - <span class="label label-warning"> - {% else %} - <span class="label label-success"> - {% endif %} - Repoman</span> - {% if FI.TestRun %} - {% if FI.test %} - <span class="label label-danger"> - {% else %} - <span class="label label-success"> - {% endif %} - Test</span> - {% endif %} - {% if FI.build %} - <span class="label label-danger">{{ FI.builderror }} - {% else %} - <span class="label label-success">Build - {% endif %} - </span> - {% endif %} - </h2> - {% if BLI.BugId %} - <span class="label label-info"> - <a href="https://bugs.gentoo.org/show_bug.cgi?id={{ BLI.BugId}}" target=_blank>Bug Gentoo {{ BLI.BugId }}</a> - </span> - {% endif %} -</div> -<div class="row-fluid"> - <div class=span3> - <p class="lead">Host information</p> - Host: {{ BLI.hostname }}<br /> - Config: {{BLI.config }}<br /> - Profile: {{BLI.profile }}<br/> - Emerge options : - </div> - {% if BLI.use_enable %} - <div class="span3 "> - <p class="lead">Enabled useflags</p> - {% for use in BLI.use_enable %} - {{ use }} - {% endfor %} - </div> - {% endif %} - {% if BLI.use_disable %} - <div class=span3> - <p class="lead">Disabled useflags</p> - {% for use in BLI.use_disable %} - {{ use }} - {% endfor %} - </div> -{% endif %} - </div> - <div class="row-fluid"> - <div class=span12> - {% if BLI.Summery_text %} - <p class="lead">Summery: </p> - {{ BLI.Summery_text|linebreaks }} - {% endif %} - </div> - </div> - <div class="row-fluid"> - <div class=span12> - {% 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> - <div class="row-fluid"> - <div class=span12> - <p class="lead">Emerge Info: </p> - {{ BLI.emerge_info_text|linebreaks }} - </div> - </div> - <div class="row-fluid"> - <div class="span12"> - {% if BLI.logname %} - <br /> - Log file name:{{ BLI.logname }}<br /> - <a href="{{ STATIC_URL }}/logs/{{BLI.hostname}}/{{BLI.config}}/{{ BLI.logname }}">Raw log<a/><br /> - {% if user.is_authenticated %} - {% if bugzillalogin %} - <a href="/logs/build/submitlog/{{BLI.BuildLogId}}/"> - {% else %} - <a href="/user/bugzillalogin/"> - {% endif %} - Summit log to Gentoo's bugzilla</a> - {% endif %} - {% endif %} - </div> - </div> -{% endblock %} diff --git a/python/templates/pages/logs/build/submitbug/index.html b/python/templates/pages/logs/build/submitbug/index.html deleted file mode 100644 index 4f1458f..0000000 --- a/python/templates/pages/logs/build/submitbug/index.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<form action="/logs/build/submitlog/{{B.BuildLogId}}/" method="post"> -{% csrf_token %} -{{ form.as_p }} -<input type="submit" value="Submit" /> -</form> -{% endblock %} diff --git a/python/templates/pages/logs/index.html b/python/templates/pages/logs/index.html deleted file mode 100644 index ff5f354..0000000 --- a/python/templates/pages/logs/index.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "layout/base.html" %} -{% block content %} -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">New Build Logs On Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_logs" %} - </table> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">New Repoman Logs On Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_repoman" %} - </table> - </div> -</div> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"> - <span class="fa fa-fw fa-history"></span> - <a href="/packages/added">New Qa Logs On Packages</a> - </h3> - </div> - <div class="table-responsive"> - <table class="table table-striped"> - {% include "includes/frontpage/new_qa" %} - </table> - </div> -</div> -{% endblock %} diff --git a/python/templates/pages/packages/category/index.html b/python/templates/pages/packages/category/index.html new file mode 100644 index 0000000..2538f88 --- /dev/null +++ b/python/templates/pages/packages/category/index.html @@ -0,0 +1,33 @@ +{% extends "layout/base.html" %} +{% block content %} +<div class="row"> + <h2>Packages in {{ C.Category }}</h2> + <div class="col-xs-12 col-md-5"> + {% for PM in PM_tmp %} + <table class="table table-striped frontpage-table"> + <tr> + <td class="frontpage-table-package-atom"> + <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ PM.Package }}">{{ C.Category }}/{{ PM.Package }}</a> + <p title="{{ PM.Commitlog }}">Commit Log</p> + </td> + <td> + <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p> + <p title="{% for P in PM.Ebuilds %}{{ PM.Package }}/{{ P }}{% endfor %}">Versions + {% if PM.Repoman %} + <a class="btn btn-warning btn-xs" href="/repoman/{{PM.PackageId }}/">Repoman</a> + {% endif %} + </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/categories/packages/versions/ebuild/index.html b/python/templates/pages/packages/ebuilds/ebuild/index.html index 49ad3e5..e000a53 100644 --- a/python/templates/pages/categories/packages/versions/ebuild/index.html +++ b/python/templates/pages/packages/ebuilds/ebuild/index.html @@ -9,6 +9,13 @@ <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 %} @@ -36,40 +43,5 @@ {% 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"> - {% for FI in fi_tmp %} - {% if FI.BuildLogId == BL.BuildLogId %} - {% if FI.Blo %} - <span class="label label-info">Others</span> - {% else %} - {% if FI.qa %} - <span class="label label-warning">Qa</span> - {% else %} - <span class="label label-success">Qa</span> - {% endif %} - {% if FI.repoman %} - <span class="label label-warning">Repoman</span> - {% else %} - <span class="label label-success">Repoman</span> - {% endif %} - - {% if FI.Blb %} - <span class="label label-danger">Build</span> - {% else %} - <span class="label label-success">Build</span> - {% endif %} - {% endif %} - {% 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 new file mode 100644 index 0000000..630b524 --- /dev/null +++ b/python/templates/pages/packages/ebuilds/index.html @@ -0,0 +1,30 @@ +{% extends "layout/base.html" %} +{% block content %} +<div class="row"> + <div class="col-xs-12 col-md-9"> + <h2>{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}</h2> + <p>Commit log</p> + <p>{{ P.Gitlog|linebreaksbr }}</p> + <table class="table table-striped frontpage-table"> + {% for E in EM_tmp %} + <tr> + <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 %} + </td> + </tr> + {% endfor %} + </table> + </div> + {% if PR %} + <a class="btn btn-warning btn-xs" href="/repoman/{{P.PackageId.PackageId }}/">Repoman</a> + {% endif %} +</div> +{% endblock %}
\ No newline at end of file diff --git a/python/templates/pages/packages/index.html b/python/templates/pages/packages/index.html new file mode 100644 index 0000000..7139c87 --- /dev/null +++ b/python/templates/pages/packages/index.html @@ -0,0 +1,28 @@ +{% extends "layout/base.html" %} +{% block content %} +<div class="row"> +<h2>Categories</h2> + <div class="col-xs-8 col-md-4"> + {% for CM in CM_tmp %} + <table class="table table-striped frontpage-table"> + <tr> + <td class="frontpage-table-package-atom"> + <a href="/categories/{{ CM.CategoryId }}/" title="{{ CM.Category }}">{{CM.Category }}</a> + </td> + <td> + <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p> + <p title="{% for P in CM.Packages %}{{ CM.Category}}/{{ 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 diff --git a/python/templates/pages/projects/add/index.html b/python/templates/pages/projects/add/index.html new file mode 100644 index 0000000..ec46b8d --- /dev/null +++ b/python/templates/pages/projects/add/index.html @@ -0,0 +1,8 @@ +{% extends "layout/base.html" %} +{% block content %} +<form action="{{ Project.uuid }}" method="post"> + {% csrf_token %} + {{ Form }} + <input type="submit" value="Submit"> +</form> +{% endblock %} diff --git a/python/templates/pages/projects/detail/index.html b/python/templates/pages/projects/detail/index.html new file mode 100644 index 0000000..afee9d5 --- /dev/null +++ b/python/templates/pages/projects/detail/index.html @@ -0,0 +1,4 @@ +{% extends "layout/base.html" %} +{% block content %} +<p>Hej</p> +{% endblock %} diff --git a/python/templates/pages/projects/index.html b/python/templates/pages/projects/index.html new file mode 100644 index 0000000..2edf849 --- /dev/null +++ b/python/templates/pages/projects/index.html @@ -0,0 +1,19 @@ +{% extends "layout/base.html" %} +{% block content %} +<div class="panel panel-default"> + <div class="table-responsive"> + <table class="table table-striped"> + <table class="table table-striped frontpage-table"> + {% for project in Projects %} + <tr> + <td class="frontpage-table-project-atom"><a href="{% url 'projects:detail' project.uuid %}" title="{{ project.title }}">{{ project.title }}</a></td> + <td><p title="{{ project.description }}">{{ project.description }}</p> + <td class="text-right"> + </td></td> + </tr> + {% endfor %} +</table> + </table> + </div> +</div> +{% endblock %} diff --git a/python/templates/pages/projects/repos/index.html b/python/templates/pages/projects/repos/index.html new file mode 100644 index 0000000..bc349da --- /dev/null +++ b/python/templates/pages/projects/repos/index.html @@ -0,0 +1,31 @@ +{% extends "layout/base.html" %} +{% block content %} +<div class="panel panel-default"> + <div class="table-responsive"> + <table class="table table-striped"> + <table class="table table-striped frontpage-table"> + {% for project in Projects %} + <tr> + <td class="frontpage-table-project-atom"><a href="{% url 'projects:detail' project.uuid %}" title="{{ project.title }}">{{ project.title }}</a></td> + <td><p title="{{ project.description }}">{{ project.description }}</p> + <td class="text-right"> + </td></td> + </tr> + {% endfor %} +</table> + </table> +<table class="table table-striped"> + <table class="table table-striped frontpage-table"> + {% for project in Projects %} + <tr> + <td class="frontpage-table-project-atom"><a href="{% url 'projects:detail' project.uuid %}" title="{{ project.title }}">{{ project.title }}</a></td> + <td><p title="{{ project.description }}">{{ project.description }}</p> + <td class="text-right"> + </td></td> + </tr> + {% endfor %} +</table> + </table> + </div> +</div> +{% endblock %} diff --git a/python/templates/pages/www/index.html b/python/templates/pages/www/index.html new file mode 100644 index 0000000..a8fdf61 --- /dev/null +++ b/python/templates/pages/www/index.html @@ -0,0 +1,49 @@ +{% extends "layout/base.html" %} +{% block content %} +{% include "includes/container/start" %} +<div class="row"> + <div class="col-xs-12 col-sm-8 col-md-9"> + <p> + Welcome to Gentoo . + </p> + </div> + <div class="col-xs-12 col-sm-4 col-md-3 buttons"> + <a href="/get-started/about/" class="btn btn-default btn-block">Learn more</a> + <a href="/get-started/" class="btn btn-primary btn-block"><i class="fa fa-fw fa-rocket"></i> Get started now</a> + </div> +</div> +{% include "includes/container/end" %} +<section id="news"> +{% include "includes/frontpage/news" %} +</section> + +<div class="news-more"> + <a href="/news" class="btn btn-xs">All news items <span class="fa fa-fw fa-chevron-right"></span></a> +<hr> +</div> + +<div class="row"> + <div class="col-xs-12 col-md-6"> + <h2>New Packages <small>more at the <a href="/new_packages/">New Packages</a></small></h2> + {% include "includes/frontpage/new_packages" %} + </div> + <div class="col-xs-12 col-md-6"> + <h2>New Logs <small>more at the <a href="/new_logs/">New Logs</a></small></h2> + {% include "includes/frontpage/new_logs" %} + </div> +</div> + +<div class="row"> + <div class="col-xs-12 col-md-6"> + <h2>New Build Requests <small>more at the <a href="/new_build_req">New Build Requests</a></small></h2> + {% 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" %} + </div> +</div> + +<hr> + +{% endblock %} diff --git a/python/templates/registration/password_change_form.html b/python/templates/registration/password_change_form.html new file mode 100644 index 0000000..7761fe4 --- /dev/null +++ b/python/templates/registration/password_change_form.html @@ -0,0 +1,13 @@ +{% extends 'layout/base.html' %} + +{% block title %}Change you password{% endblock %} + +{% block content %} + <h1>Change you password</h1> + <p>Use the form below to change your password.</p> + <form action="." method="post"> + {{ form.as_p }} + <p><input type="submit" value="Change"></p> + {% csrf_token %} + </form> +{% endblock %} |