Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 0 additions & 147 deletions static/css/bootstrap-social.css

This file was deleted.

17 changes: 2 additions & 15 deletions static/css/cover.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
html {
font-size: 14px;
}
@media (min-width: 768px) {
html {
font-size: 16px;
}
}

.container {
max-width: 960px;
}

.pricing-header {
max-width: 700px;
}

.card-deck .card {
min-width: 220px;
.narrow {
max-width: 40rem;
}
123 changes: 61 additions & 62 deletions templates/add_blurb.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,78 +2,77 @@

{% block content %}

<div class="row">
<div class="col-md-12">
<div class="row justify-content-center">
<div class="col-lg-8">
{% if status == "success" %}
<div class="alert alert-success" role="alert">✅ News file (<a href="{{ commit_url }}">{{ path }}</a>) created for <strong><a href="{{ pr_url }}">GH-{{ pr_number }}</a></strong></div>
<h3>📜🤖 Blurb it again?</h3>
<div class="alert alert-success" role="alert">✅ News file (<a href="{{ commit_url }}" class="alert-link">{{ path }}</a>) created for <strong><a href="{{ pr_url }}" class="alert-link">GH-{{ pr_number }}</a></strong></div>
<p class="h4 mb-3">📜🤖 Blurb it again?</p>
{% else %}
{% if status == "failure" %}
<div class="alert alert-danger" role="alert">❌ Cannot create news file for <strong><a href="{{ pr_url }}">GH-{{ pr_number }}</a></strong>! Make sure you have access to that PR!</div>
<h3>📜🤖 Blurb it again?</h3>
<div class="alert alert-danger" role="alert">❌ Cannot create news file for <strong><a href="{{ pr_url }}" class="alert-link">GH-{{ pr_number }}</a></strong>! Make sure you have access to that PR!</div>
<p class="h4 mb-3">📜🤖 Blurb it again?</p>
{% endif %}
{% endif %}

<form action="/add_blurb" method="post" accept-charset="utf-8" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="csrf" value="{{ csrf }}">
<div class="mb-3">
<div class="col form-inline">
<label for="issue_number" class="form-inline">GH Issue #</label><input type="text" class="form-control form-inline" pattern="^\d{1,6}$" maxlength="6" placeholder="12345" id="issue_number" name="issue_number" required>
</div>
<div class="col form-inline">
<small id="issue_number-help" class="form-text text-muted">The CPython GitHub issue number.</small>
</div>
</div>
<div class="mb-3">
<div class="col form-inline">
<label for="pr_number" class="form-inline">GH Pull Request #</label><input type="text" class="form-control form-inline" pattern="^\d{1,6}$" maxlength="6" placeholder="12345" id="pr_number" name="pr_number" required>
</div>
<div class="col form-inline">
<small id="gh-help" class="form-text text-muted">The CPython GitHub pull request number.</small>
</div>
</div>
<div class="mb-3">
<div class="col form-inline">
<label for="section" class="form-inline">Choose an option: </label>
<select id="section" name="section" class="form-control form-inline" required>
<option></option>
<option>Security</option>
<option value="Core_and_Builtins">Core and Builtins</option>
<option>Library</option>
<option>Documentation</option>
<option>Tests</option>
<option>Build</option>
<option>Windows</option>
<option>macOS</option>
<option>iOS</option>
<option>Android</option>
<option>FreeBSD</option>
<option>WASI</option>
<option>Emscripten</option>
<option value="Unsupported_platforms">Unsupported platforms</option>
<option>IDLE</option>
<option value="Tools-Demos">Tools and Demos</option>
<option value="C_API">C API</option>
</select>
</div>
</div>
<div class="mb-3" id="cve-group">
<div class="col form-inline">
<label for="cve" class="form-inline">CVE</label><input type="text" class="form-control form-inline" pattern="^(?:[Cc][Vv][Ee]-)?\d{4}-\d{4,}$" maxlength="20" placeholder="CVE-2025-12345" id="cve" name="cve">
</div>
<div class="col form-inline">
<small id="cve-help" class="form-text text-muted">Optional. The CVE identifier (CVE-YYYY-NNNN) for this security fix.</small>
</div>
</div>
<div class="mb-3">
<textarea class="form-control" id="news_entry" name="news_entry" rows="10" placeholder="Write your Misc/NEWS entry below.
<div class="card shadow-sm">
<div class="card-body p-4">
<h1 class="h4 card-title mb-4">Add a NEWS entry</h1>
<form action="/add_blurb" method="post" accept-charset="utf-8" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="csrf" value="{{ csrf }}">
<div class="row g-3">
<div class="col-sm-6">
<label for="issue_number" class="form-label">GH Issue #</label>
<input type="text" class="form-control" pattern="^\d{1,6}$" maxlength="6" placeholder="12345" id="issue_number" name="issue_number" aria-describedby="issue_number-help" required>
<div id="issue_number-help" class="form-text">The CPython GitHub issue number.</div>
</div>
<div class="col-sm-6">
<label for="pr_number" class="form-label">GH Pull Request #</label>
<input type="text" class="form-control" pattern="^\d{1,6}$" maxlength="6" placeholder="12345" id="pr_number" name="pr_number" aria-describedby="pr_number-help" required>
<div id="pr_number-help" class="form-text">The CPython GitHub pull request number.</div>
</div>
<div class="col-sm-6">
<label for="section" class="form-label">Section</label>
<select id="section" name="section" class="form-select" required>
<option value="">Choose a section</option>
<option>Security</option>
<option value="Core_and_Builtins">Core and Builtins</option>
<option>Library</option>
<option>Documentation</option>
<option>Tests</option>
<option>Build</option>
<option>Windows</option>
<option>macOS</option>
<option>iOS</option>
<option>Android</option>
<option>FreeBSD</option>
<option>WASI</option>
<option>Emscripten</option>
<option value="Unsupported_platforms">Unsupported platforms</option>
<option>IDLE</option>
<option value="Tools-Demos">Tools and Demos</option>
<option value="C_API">C API</option>
</select>
</div>
<div class="col-sm-6" id="cve-group">
<label for="cve" class="form-label">CVE</label>
<input type="text" class="form-control" pattern="^(?:[Cc][Vv][Ee]-)?\d{4}-\d{4,}$" maxlength="20" placeholder="CVE-2025-12345" id="cve" name="cve" aria-describedby="cve-help">
<div id="cve-help" class="form-text">Optional. The CVE identifier (CVE-YYYY-NNNN) for this security fix.</div>
</div>
<div class="col-12">
<label for="news_entry" class="form-label">NEWS entry</label>
<textarea class="form-control" id="news_entry" name="news_entry" rows="8" placeholder="Write your Misc/NEWS entry below.
It should be a simple ReST paragraph.
Don't start with '- Issue #<n>: ' or '- gh-issue-<n>: ' or that sort of stuff." required></textarea>
</div>
<div class="col-12">
<button type="submit" class="btn btn-primary">📜🤖 blurb it!</button>
</div>
</div>
</form>
</div>
<button type="submit" class="btn btn-primary mb-2">📜🤖 blurb it!</button>
</form>
</div>
<p class="text-body-secondary small mt-3">Alternatively, you can use <a href="https://devguide.python.org/getting-started/pull-request-lifecycle/#news-entry">blurb on the command line</a>.</p>
</div>
<div class="col-md-12">Alternatively, you can use <a href="https://devguide.python.org/getting-started/pull-request-lifecycle/#news-entry">blurb on the command line</a>.</div>
</div>

<script>
Expand Down
64 changes: 32 additions & 32 deletions templates/base.html
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
<!doctype html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="viewport" content="width=device-width, initial-scale=1">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://bootswatch.com/4/pulse/bootstrap.min.css">
<link href="/static/css/cover.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/pulse/bootstrap.min.css" integrity="sha384-UdDEQwDvXGE7/pvhxutoJGxqwNNAExBrA2jeFAk3UpSlFrtRNYaxtoG0o61I0Fdt" crossorigin="anonymous">
<link href="/static/css/font-awesome.css" rel="stylesheet">
<link href="/static/css/bootstrap-social.css" rel="stylesheet">
<link href="/static/css/cover.css" rel="stylesheet">

{% block css %}
{% endblock %}
<title>📜🤖 Blurb It!</title>
</head>
<body>
<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
<h5 class="my-0 mr-md-auto font-weight-normal"><a href="/">📜🤖 Blurb it!</a></h5>
<h5 class="my-0 mr-md-auto font-weight-normal"><a href="/howto">How do I use Blurb It?</a></h5>
{% if not username %}
<a class="btn btn-outline-primary btn-social btn-github" href="https://github.com/login/oauth/authorize?client_id={{ client_id }}&scope=repo&redirect_uri={{ app_protocol }}://{{ app_url }}/add_blurb">
<span class="fa fa-github"></span>
Sign in with GitHub
</a>
{% else %}
<span>Hello, <a href="https://github.com/{{ username }}">{{ username }}</a></span>
{% endif %}
</div>
<body class="d-flex flex-column min-vh-100">
<nav class="navbar navbar-expand-md bg-body border-bottom shadow-sm mb-4">
<div class="container">
<a class="navbar-brand" href="/">📜🤖 Blurb it!</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbar">
<ul class="navbar-nav me-auto">
<li class="nav-item"><a class="nav-link" href="/howto">How do I use Blurb It?</a></li>
</ul>
{% if not username %}
<a class="btn btn-dark" href="https://github.com/login/oauth/authorize?client_id={{ client_id }}&scope=repo&redirect_uri={{ app_protocol }}://{{ app_url }}/add_blurb">
<span class="fa fa-github me-1" aria-hidden="true"></span>
Sign in with GitHub
</a>
{% else %}
<span class="navbar-text">Hello, <a href="https://github.com/{{ username }}">{{ username }}</a></span>
{% endif %}
</div>
</div>
</nav>

<div class="container">
<main class="container flex-grow-1">
{% if error_message %}
<div class="alert alert-danger" role="alert">
{{ error_message }}
{{ error_message }}
</div>
{% endif %}
{% block content %}
{% endblock %}
</div>
</main>

<footer class="pt-4 my-md-5 pt-md-5 border-top">
<div class="row">
<div class="col-12 col-md text-center">
<small class="d-block mb-3 text-muted">&copy; 2018 <a href="https://www.python.org/psf-landing/">Python Software Foundation</a> | <a href="https://github.com/python/blurb_it">View source</a> | <a href="https://github.com/python/blurb_it/issues/new">Report an issue</a></small>
</div>
<footer class="border-top py-4 mt-5">
<div class="container text-center text-body-secondary small">
&copy; 2018 <a href="https://www.python.org/psf-landing/">Python Software Foundation</a> | <a href="https://github.com/python/blurb_it">View source</a> | <a href="https://github.com/python/blurb_it/issues/new">Report an issue</a>
</div>
</footer>

<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
</body>
</html>
8 changes: 4 additions & 4 deletions templates/error.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block content %}
<a href="/"><img class="mb-4" src="https://www.python.org/static/community_logos/python-logo-master-v3-TM.png" alt="" height="72"></a>

<h1>{{ status }}</h1>
<h1> {{ error_message }}</h1>
<div class="text-center py-5">
<a href="/"><img class="mb-4" src="https://www.python.org/static/community_logos/python-logo-master-v3-TM.png" alt="" height="72"></a>
<h1>{{ status }}</h1>
</div>
{% endblock %}
Loading
Loading