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
416 changes: 0 additions & 416 deletions pmaweb/static/bootstrap/config.json

This file was deleted.

596 changes: 0 additions & 596 deletions pmaweb/static/bootstrap/css/bootstrap-theme.css

This file was deleted.

4,895 changes: 0 additions & 4,895 deletions pmaweb/static/bootstrap/css/bootstrap.css

This file was deleted.

7 changes: 7 additions & 0 deletions pmaweb/static/bootstrap/css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pmaweb/static/bootstrap/css/bootstrap.min.css.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions pmaweb/static/bootstrap/js/bootstrap.bundle.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pmaweb/static/bootstrap/js/bootstrap.bundle.min.js.map

Large diffs are not rendered by default.

789 changes: 0 additions & 789 deletions pmaweb/static/bootstrap/js/bootstrap.js

This file was deleted.

9,814 changes: 0 additions & 9,814 deletions pmaweb/static/bootstrap/js/jquery-2.2.4.js

This file was deleted.

2 changes: 2 additions & 0 deletions pmaweb/static/bootstrap/js/jquery-3.5.1.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pmaweb/static/bootstrap/js/jquery-3.5.1.min.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pmaweb/static/js/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ $(function(){
/* Finally show chosen schema */
showTheme(hash);

$('.themelink').click(function () {
$('.themelink').on('click', function () {
showTheme($(this).data('theme'));
});
}

$('.download_popup').click(function () {
$('.download_popup').on('click', function () {
var $this = $(this);
var pgp = $this.data('pgp');
ga('send', 'event', 'Download', $this.attr('href').replace('https://files.phpmyadmin.net/', ''));
Expand Down
8 changes: 4 additions & 4 deletions pmaweb/templates/_security_contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
Should you find a security issue in the phpMyAdmin programming code, please
contact the <a href="mailto:security@phpmyadmin.net">phpMyAdmin security team</a> in
advance before publishing it. This way we can prepare a fix and release the fix together with your
announcement. You will be also given credit in our security announcement.
announcement. You will be also given credit in our security announcement.
</p>

<p>
You can optionally encrypt your report with PGP key ID
<code>DA68AB39218AB947</code> with following fingerprint:
</p>

<pre>
<pre><code>
pub 4096R/DA68AB39218AB947 2016-08-02
Key fingerprint = 5BAD 38CF B980 50B9 4BD7 FB5B DA68 AB39 218A B947
uid phpMyAdmin Security Team &lt;security@phpmyadmin.net&gt;
sub 4096R/5E4176FB497A31F7 2016-08-02
</pre>
</code></pre>

<p>
The key can be either obtained from the keyserver or is available in
The key can be either obtained from the keyserver or is available in
<a href="https://files.phpmyadmin.net/phpmyadmin.keyring">phpMyAdmin keyring</a>
available on our download server or using <a href="https://keybase.io/phpmyadmin_sec">Keybase</a>.
</p>
Expand Down
59 changes: 27 additions & 32 deletions pmaweb/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
<link rel="alternate" type="application/rss+xml" href="{% url 'feed-news' %}" title="phpMyAdmin news"/>
{% endif %}
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap-theme.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/style.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'colorbox/colorbox.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/font-awesome.min.css' %}">
Expand All @@ -39,8 +38,8 @@
<link rel="vcs-git" href="https://github.com/phpmyadmin/phpmyadmin.git" title="phpMyAdmin Git repository" />
<link rel="vcs-browse" href="https://github.com/phpmyadmin/" title="phpMyAdmin Git repository browser" />
{% compress js %}
<script src="{% static 'bootstrap/js/jquery-2.2.4.js' %}" type="text/javascript"></script>
<script src="{% static 'bootstrap/js/bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'bootstrap/js/jquery-3.5.1.min.js' %}" type="text/javascript"></script>
<script src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}" type="text/javascript"></script>
<script src="{% static 'js/loader.js' %}" type="text/javascript"></script>
<script src="{% static 'colorbox/jquery.colorbox.js' %}" type="text/javascript"></script>
{% endcompress %}
Expand All @@ -49,34 +48,30 @@
</head>
<body>
<header>
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

{% for item in menu %}
<li {% if item.active %}class="active"{% endif %}><a href="{{ item.url }}">{{ item.title }}</a></li>
{% endfor %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="https://github.com/phpmyadmin/phpmyadmin" title="phpMyAdmin is developed on GitHub"><i class="fa fa-github"></i> GitHub</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% for item in menu %}
<li class="nav-item{% if item.active %} active{% endif %}">
<a class="nav-link" href="{{ item.url }}">{{ item.title }}{% if item.active %} <span class="sr-only">(current)</span>{% endif %}</a>
</li>
{% endfor %}
</ul>
<ul class="navbar-nav mr-0">
<li class="nav-item">
<a class="nav-link" href="https://github.com/phpmyadmin/phpmyadmin" title="phpMyAdmin is developed on GitHub"><i class="fa fa-github"></i> GitHub</a>
</li>
</ul>
</div>
</div>
</nav>

<div class="container">
<div class="container mt-4">
<div class="row">
<div class="col-sm-9">
<h1><a href="{% url 'home' %}" rel="home"><span id="logo">phpMyAdmin</span></a> <span class="hidden-sm hidden-xs">Bringing MySQL to the web</span></h1>
Expand Down Expand Up @@ -124,13 +119,13 @@ <h4>Please verify the downloaded file</h4>
<h4>phpMyAdmin needs your continued support to grow and thrive</h4>

<p>
phpMyAdmin would not exist without the work of many volunteers and contractors.
phpMyAdmin would not exist without the work of many volunteers and contractors.
You can support us to make phpMyAdmin even better by <a href="{% url 'donate' %}">donating
to our project</a>. Every donation counts!
<p>

<p>
We have also a <a href="{% url 'sponsors' %}#conditions">sponsorship program</a> for
We have also a <a href="{% url 'sponsors' %}#conditions">sponsorship program</a> for
corporates who are willing to spent more money and get some benefits such as
a logo placement in return.
</p>
Expand Down
27 changes: 20 additions & 7 deletions pmaweb/templates/news/post_archive.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block content %}

<p>Bored of official project news? Then check out developers blogs at
<p>Bored of official project news? Then check out developers blogs at
<a href="https://planet.phpmyadmin.net/">planet phpMyAdmin</a>.</p>

<p>You can also follow us on <a
Expand All @@ -20,10 +20,23 @@ <h2 class="entry-title"><a rel="bookmark" href="{{ item.get_absolute_url }}">{{
</div>
{% endfor %}

<ul class="pagination">
<li {% if page_obj.number == 1 %}class="disabled"{% endif %}><a href="{% url 'news' %}"><i class="fa fa-step-backward"></i></a></li>
<li {% if not page_obj.has_previous %}class="disabled"{% endif %}><a {% if page_obj.has_previous %}href="{% url 'news-page' page=page_obj.previous_page_number %}"{% endif %}><i class="fa fa-backward"></i></a></li>
<li><a>{{ page_obj.number }} / {{ paginator.num_pages }}</a></li>
<li {% if not page_obj.has_next %}class="disabled"{% endif %}><a {% if page_obj.has_next %}href="{% url 'news-page' page=page_obj.next_page_number %}"{% endif %}><i class="fa fa-forward"></i></a></li>
<li {% if page_obj.paginator.num_pages == page_obj.number %}class="disabled"{% endif %}><a href="{% url 'news-page' page=page_obj.paginator.num_pages %}"><i class="fa fa-step-forward"></i></a></li>
<nav aria-label="News page navigation">
<ul class="pagination">
<li class="page-item{% if page_obj.number == 1 %} disabled{% endif %}">
<a class="page-link" href="{% url 'news' %}"{% if page_obj.number == 1 %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-step-backward"></i></a>
</li>
<li class="page-item{% if not page_obj.has_previous %} disabled{% endif %}">
<a class="page-link"{% if page_obj.has_previous %} href="{% url 'news-page' page=page_obj.previous_page_number %}"{% else %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-backward"></i></a>
</li>
<li class="page-item">
<span class="page-link">{{ page_obj.number }} / {{ paginator.num_pages }}</span>
</li>
<li class="page-item{% if not page_obj.has_next %} disabled{% endif %}">
<a class="page-link"{% if page_obj.has_next %} href="{% url 'news-page' page=page_obj.next_page_number %}"{% else %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-forward"></i></a>
</li>
<li class="page-item{% if page_obj.paginator.num_pages == page_obj.number %} disabled{% endif %}">
<a class="page-link" href="{% url 'news-page' page=page_obj.paginator.num_pages %}"{% if page_obj.paginator.num_pages == page_obj.number %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-step-forward"></i></a>
</li>
</ul>
</nav>
{% endblock %}
41 changes: 19 additions & 22 deletions pmaweb/templates/security/_list.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
<div class="col-md-3">
<h2>Announcements</h2>
<h2>Announcements</h2>

<div class="panel-group security" id="accordion" role="tablist" aria-multiselectable="true">

{% regroup pmasas by year as pmasa_list %}
{% for year in pmasa_list %}
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="heading{{ year.grouper }}">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#pmasa{{ year.grouper }}" {% if year.grouper == pmasa_year %}aria-expanded="true"{% endif %} aria-controls="pmasa{{ year.grouper }}" class="ahead">
<span class="badge pull-right">{{ year.list|length }}</span>
{% regroup pmasas by year as pmasa_list %}
<div class="accordion" id="announcementsAccordion">
{% for year in pmasa_list %}
<div class="card">
<div class="card-header" id="heading{{ year.grouper }}">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left{% if year.grouper != pmasa_year %} collapsed{% endif %}" type="button" data-toggle="collapse" data-target="#collapse{{ year.grouper }}" aria-expanded="{% if year.grouper == pmasa_year %}true{% else %}false{% endif %}" aria-controls="collapse{{ year.grouper }}">
{{ year.grouper }}
</a>
</h4>
</div>
<div id="pmasa{{ year.grouper }}" class="panel-collapse collapse {% if year.grouper == pmasa_year %}in{% endif %}" role="tabpanel" aria-labelledby="heading{{ year.grouper }}">
<div class="panel-body">
<ul class="nav nav-pills nav-stacked">
{% for item in year.list %}
<li {% if pmasa == item %}class="active"{% endif %}><a href="{{ item.get_absolute_url }}">{{ item }}</a></li>
{% endfor %}
</ul>
<span class="badge badge-dark float-right">{{ year.list|length }}</span>
</button>
</h2>
</div>
<div id="collapse{{ year.grouper }}" class="collapse{% if year.grouper == pmasa_year %} show{% endif %}" aria-labelledby="heading{{ year.grouper }}" data-parent="#announcementsAccordion">
<div class="list-group list-group-flush">
{% for item in year.list %}
<a href="{{ item.get_absolute_url }}" class="list-group-item list-group-item-action{% if pmasa == item %} active{% endif %}">{{ item }}</a>
{% endfor %}
</div>
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
</div>
14 changes: 7 additions & 7 deletions pmaweb/templates/themes.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h2>Themes</h2>

<h2>Submit Theme</h2>
<p>
You've made a new theme and you want to share it? Please send your pull
You've made a new theme and you want to share it? Please send your pull
request to <a href="https://github.com/phpmyadmin/themes/pulls">https://github.com/phpmyadmin/themes/pulls</a>. The team will check and prepare your theme for downloading here.
</p>

Expand All @@ -36,18 +36,18 @@ <h2>Available Themes</h2>

<ul class="nav nav-pills">
{% for css in themecssversions %}
<li role="presentation">
<a class="themelink {{css.css}}" href="#{{css.css}}" data-theme="{{ css.css }}">{{css.name}}</a>
<li class="nav-item" role="presentation">
<a class="nav-link themelink {{css.css}}" href="#{{css.css}}" data-theme="{{ css.css }}">{{css.name}}</a>
</li>
{% endfor %}
</ul>
</p>
{% for theme in themes %}
<div class="panel panel-default themediv {{theme.get_css}}">
<div class="panel-heading">
<h3 class="panel-title">{{ theme }}</h3>
<div class="card mb-4 themediv {{theme.get_css}}">
<div class="card-header">
<h3 class="card-title">{{ theme }}</h3>
</div>
<div class="panel-body">
<div class="card-body">
<div class="pull-right thumbnail">
<a href="{% static theme.imgname %}" class="colorbox" title="{{theme.name}} theme">
<img src="{% static theme.imgname %}" alt="{{theme.display_name}} thumbnail" class="themeimg" />
Expand Down
18 changes: 8 additions & 10 deletions pmaweb/templates/try.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>Demo Server</h2>
restored, so you just break things for you and other users. Feel free to try
any of the phpMyAdmin features. If you break something, just wait a while. The
database configuration resets every hour. Databases are cleaned weekly, so do
not expect that your data will stay there forever.
not expect that your data will stay there forever.
</p>

<p>
Expand Down Expand Up @@ -70,16 +70,14 @@ <h4>Current documentation and tools</h4>

<h2>Screenshots</h2>

<div class="row images">
<div class="row row-cols-4">
{% for screen in screenshots %}
<div class="col-xs-6 col-md-3">
<a href="{% static screen.image %}"
class="thumbnail colorbox" title="{{screen.title}}">
<img src="{% static screen.image %}"
alt="{{ screen.title }}" /><br />
<div class="caption">
{{ screen.title }}
</div>
<div class="col">
<a class="colorbox" href="{% static screen.image %}" title="{{ screen.title }}">
<figure class="figure">
<img src="{% static screen.image %}" class="figure-img img-thumbnail rounded" alt="{{ screen.title }}">
<figcaption class="figure-caption">{{ screen.title }}</figcaption>
</figure>
</a>
</div>
{% endfor %}
Expand Down