Skip to content

Commit

Permalink
Merge pull request #2514 from cjmayo/external-links
Browse files Browse the repository at this point in the history
Update links to external resources
  • Loading branch information
samuelhwilliams committed Sep 3, 2024
2 parents 8f2764e + d356109 commit 7473206
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 56 deletions.
6 changes: 3 additions & 3 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Flask-Admin includes some bundled software to ease installation.
Select2
=======

Distributed under `APLv2 <http://www.apache.org/licenses/LICENSE-2.0>`_.
Distributed under `APLv2 <https://www.apache.org/licenses/LICENSE-2.0>`_.

Bootstrap
=================

v3.1.0 and subsequent versions distributed under `MIT <http://opensource.org/licenses/MIT>`_.
Versions prior to v3.1.0 distributed under `APLv2 <http://www.apache.org/licenses/LICENSE-2.0>`_.
v3.1.0 and subsequent versions distributed under `MIT <https://opensource.org/license/MIT>`_.
Versions prior to v3.1.0 distributed under `APLv2 <https://www.apache.org/licenses/LICENSE-2.0>`_.
21 changes: 9 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Flask-Admin

The project was recently moved into its own organization. Please update
your references to `git@github.com:pallets-eco/flask-admin.git`.
your references to `https://github.com/pallets-eco/flask-admin.git`.

[![image](https://d322cqt584bo4o.cloudfront.net/flask-admin/localized.svg)](https://crowdin.com/project/flask-admin) [![image](https://github.com/pallets-eco/flask-admin/actions/workflows/test.yaml/badge.svg)](https://github.com/pallets-eco/flask-admin/actions/workflows/test.yaml)
[![image](https://d322cqt584bo4o.cloudfront.net/flask-admin/localized.svg)](https://crowdin.com/project/flask-admin) [![image](https://github.com/pallets-eco/flask-admin/actions/workflows/tests.yaml/badge.svg?branch=master)](https://github.com/pallets-eco/flask-admin/actions/workflows/test.yaml)

## Pallets Community Ecosystem

Expand All @@ -18,20 +18,20 @@ your references to `git@github.com:pallets-eco/flask-admin.git`.
## Introduction

Flask-Admin is a batteries-included, simple-to-use
[Flask](http://flask.pocoo.org/) extension that lets you add admin
[Flask](https://flask.palletsprojects.com/) extension that lets you add admin
interfaces to Flask applications. It is inspired by the *django-admin*
package, but implemented in such a way that the developer has total
control over the look, feel, functionality and user experience of the resulting
application.

Out-of-the-box, Flask-Admin plays nicely with various ORM\'s, including

- [SQLAlchemy](http://www.sqlalchemy.org/)
- [pymongo](http://api.mongodb.org/python/current/)
- [SQLAlchemy](https://www.sqlalchemy.org/)
- [pymongo](https://pymongo.readthedocs.io/)
- and [Peewee](https://github.com/coleifer/peewee).

It also boasts a simple file management interface and a [Redis
client](http://redis.io/) console.
client](https://redis.io/) console.

The biggest feature of Flask-Admin is its flexibility. It aims to provide a
set of simple tools that can be used to build admin interfaces of
Expand Down Expand Up @@ -91,9 +91,6 @@ To build the docs in your local environment, from the project directory:

tox -e docs-html

And if you want to preview any *.rst* snippets that you may want to
contribute, please go to <http://rst.ninjs.org/>.

## Installation

To install Flask-Admin, simply:
Expand All @@ -103,7 +100,7 @@ To install Flask-Admin, simply:
Or alternatively, you can download the repository and install manually
by doing:

git clone git@github.com:pallets-eco/flask-admin.git
git clone https://github.com/pallets-eco/flask-admin.git
cd flask-admin
pip install .

Expand Down Expand Up @@ -154,9 +151,9 @@ You can also run the tests on multiple environments using *tox*.
## 3rd Party Stuff

Flask-Admin is built with the help of
[Bootstrap](http://getbootstrap.com/),
[Bootstrap](https://getbootstrap.com/),
[Select2](https://github.com/ivaynberg/select2) and
[Bootswatch](http://bootswatch.com/).
[Bootswatch](https://bootswatch.com/).

If you want to localize your application, install the
[Flask-Babel](https://pypi.python.org/pypi/Flask-Babel) package.
Expand Down
8 changes: 4 additions & 4 deletions doc/_templates/sidebarintro.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<h3>Useful Links</h3>
<ul>
<li><a href="http://flask.pocoo.org/" target="_blank">Flask</a></li>
<li><a href="http://github.com/pallets-eco/flask-admin" target="_blank">Flask-Admin @ github</a></li>
<li><a href="https://flask.palletsprojects.com/" target="_blank">Flask</a></li>
<li><a href="https://github.com/pallets-eco/flask-admin" target="_blank">Flask-Admin @ github</a></li>
</ul>

<a class="github" href="http://github.com/pallets-eco/flask-admin" target="_blank"><img style="position: fixed; top: 0; right: 0; border: 0;"
src="//s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
<a class="github" href="https://github.com/pallets-eco/flask-admin" target="_blank"><img style="position: fixed; top: 0; right: 0; border: 0;"
src="https://github.blog/wp-content/uploads/2008/12/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
2 changes: 1 addition & 1 deletion doc/_themes/flask/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{%- block footer %}
<div class="footer">
&copy; Copyright {{ copyright }}.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a>.
</div>
{% if pagename == 'index' %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions doc/_themes/flask_small/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
{% block relbar1 %}{% endblock %}
{% block relbar2 %}
{% if theme_github_fork %}
<a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
<a href="https://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
src="https://github.blog/wp-content/uploads/2008/12/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
{% endif %}
{% endblock %}
{% block sidebar1 %}{% endblock %}
Expand Down
10 changes: 5 additions & 5 deletions doc/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ file / image uploads that need to be tied to a field in your model.
WYSIWIG Text Fields
*******************
To handle complicated text content, you can use
`CKEditor <http://ckeditor.com/>`_ by subclassing some of the built-in WTForms
`CKEditor <https://ckeditor.com/>`_ by subclassing some of the built-in WTForms
classes as follows::

from wtforms import TextAreaField
Expand Down Expand Up @@ -260,9 +260,9 @@ Some notable features include:
with map data from `Mapbox <https://www.mapbox.com>`_.
- Geographic information, including points, lines and polygons, can be edited
interactively using `Leaflet.Draw <https://github.com/Leaflet/Leaflet.draw>`_.
- Graceful fallback: `GeoJSON <http://geojson.org/>`_ data can be edited in a ``<textarea>``, if the
- Graceful fallback: `GeoJSON <https://geojson.org/>`_ data can be edited in a ``<textarea>``, if the
user has turned off Javascript.
- Works with a `Geometry <https://geoalchemy-2.readthedocs.io/en/latest/types.html#geoalchemy2.types.Geometry>`_ SQL field that is integrated with `Shapely <http://toblerity.org/shapely/>`_ objects.
- Works with a `Geometry <https://geoalchemy-2.readthedocs.io/en/latest/types.html#geoalchemy2.types.Geometry>`_ SQL field that is integrated with `Shapely <https://shapely.readthedocs.io/>`_ objects.

To get started, define some fields on your model using GeoAlchemy's *Geometry*
field. Next, add model views to your interface using the ModelView class
Expand Down Expand Up @@ -455,7 +455,7 @@ Features:
- Inline editing of related models;

In order to use peewee integration, you need to install two additional Python
packages: `peewee <http://docs.peewee-orm.com/>`_ and `wtf-peewee <https://github.com/coleifer/wtf-peewee/>`_.
packages: `peewee <https://docs.peewee-orm.com/>`_ and `wtf-peewee <https://github.com/coleifer/wtf-peewee/>`_.

Known issues:

Expand Down Expand Up @@ -517,7 +517,7 @@ applications out there on the web.

Flask-Admin follows this same design philosophy. So even though it provides you with several tools for getting up &
running quickly, it will be up to you, as a developer, to tell Flask-Admin what should be displayed and how. Even
though it is easy to get started with a simple `CRUD <http://en.wikipedia.org/wiki/Create,_read,_update_and_delete>`_
though it is easy to get started with a simple `CRUD <https://en.wikipedia.org/wiki/Create,_read,_update_and_delete>`_
interface for each model in your application, Flask-Admin doesn't fix you to this approach, and you are free to
define other ways of interacting with some, or all, of your models.

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

# General information about the project.
project = u'flask-admin'
copyright = u'2012-2019, Flask-Admin Team'
copyright = u'2012-2024, Flask-Admin Team'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
4 changes: 2 additions & 2 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flask-Admin
###########

**Why Flask?** As a micro-framework, `Flask <http://flask.pocoo.org/>`_ lets you build web services with very little overhead.
**Why Flask?** As a micro-framework, `Flask <https://flask.palletsprojects.com/>`_ lets you build web services with very little overhead.
It offers freedom for you, the designer, to implement your project in a way that suits your
particular application.

Expand Down Expand Up @@ -39,7 +39,7 @@ in the `examples` directory.
Support
-------

Python 3.6 or higher.
Python 3.8 or higher.

Indices And Tables
------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ For this you could override only the view in question, and all the links to it w
Working With the Built-in Templates
===================================

Flask-Admin uses the `Jinja2 <http://jinja.pocoo.org/docs/>`_ templating engine.
Flask-Admin uses the `Jinja2 <https://jinja.palletsprojects.com/>`_ templating engine.

.. _extending-builtin-templates:

Expand Down
2 changes: 1 addition & 1 deletion examples/sqla-association_proxy/README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Example of how to use (and filter on) an association proxy with the SQLAlchemy backend.

For information about association proxies and how to use them, please visit:
http://docs.sqlalchemy.org/en/latest/orm/extensions/associationproxy.html
https://docs.sqlalchemy.org/en/latest/orm/extensions/associationproxy.html

To run this example:

Expand Down
2 changes: 1 addition & 1 deletion flask_admin/contrib/geoa/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class LeafletWidget(TextArea):
data_role = 'leaflet'

"""
`Leaflet <http://leafletjs.com/>`_ styled map widget. Inherits from
`Leaflet <https://leafletjs.com>`_ styled map widget. Inherits from
`TextArea` so that geographic data can be stored via the <textarea>
(and edited there if the user's browser does not have Javascript).
Expand Down
2 changes: 1 addition & 1 deletion flask_admin/form/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

"""
An understanding of WTForms's Custom Widgets is helpful for understanding this code:
http://wtforms.simplecodes.com/docs/0.6.2/widgets.html#custom-widgets
https://wtforms.readthedocs.io/widgets/#custom-widgets
"""

__all__ = ['DateTimeField', 'TimeField', 'Select2Field', 'Select2TagsField',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Adding A Model Backend
# http://flask-admin.readthedocs.io/en/latest/adding_a_new_model_backend/
# https://flask-admin.readthedocs.io/en/latest/adding_a_new_model_backend/
#
# Copyright (C) 2012-2015, Serge S. Koval
# This file is distributed under the same license as the flask-admin
Expand Down
26 changes: 13 additions & 13 deletions flask_admin/translations/zh_Hans_CN/LC_MESSAGES/advanced.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Advanced Functionality
# http://flask-admin.readthedocs.io/en/latest/advanced/
# https://flask-admin.readthedocs.io/en/latest/advanced/
#
# Copyright (C) 2012-2015, Serge S. Koval
# This file is distributed under the same license as the flask-admin
Expand Down Expand Up @@ -169,10 +169,10 @@ msgstr "WYSIWIG 文本字段"
#: ../../doc/advanced.rst:132
msgid ""
"To handle complicated text content, you can use `CKEditor "
"<http://ckeditor.com/>`_ by subclassing some of the built-in WTForms "
"<https://ckeditor.com/>`_ by subclassing some of the built-in WTForms "
"classes as follows::"
msgstr ""
"要处理复杂的文本内容,可以通过子类化一些内置的 WTForms 类来集成 `CKEditor <http://ckeditor.com/>`_ "
"要处理复杂的文本内容,可以通过子类化一些内置的 WTForms 类来集成 `CKEditor <https://ckeditor.com/>`_ "
"编辑器,示例如下::"

#: ../../doc/advanced.rst:158
Expand Down Expand Up @@ -239,11 +239,11 @@ msgstr "一些显著的功能包括:"

#: ../../doc/advanced.rst:186
msgid ""
"Maps are displayed using the amazing `Leaflet <http://leafletjs.com/>`_ "
"Maps are displayed using the amazing `Leaflet <https://leafletjs.com/>`_ "
"Javascript library, with map data from `Mapbox "
"<https://www.mapbox.com/>`_."
msgstr ""
"使用惊人的 `Leaflet <http://leafletjs.com/>`_ Javascript 库显示地图,地图数据来自 `Mapbox "
"使用惊人的 `Leaflet <https://leafletjs.com/>`_ Javascript 库显示地图,地图数据来自 `Mapbox "
"<https://www.mapbox.com/>`_。"

#: ../../doc/advanced.rst:188
Expand All @@ -257,20 +257,20 @@ msgstr ""

#: ../../doc/advanced.rst:190
msgid ""
"Graceful fallback: `GeoJSON <http://geojson.org/>`_ data can be edited in"
"Graceful fallback: `GeoJSON <https://geojson.org/>`_ data can be edited in"
" a ``<textarea>``, if the user has turned off Javascript."
msgstr ""
"后备支持:如果用户已关闭 Javascript,则可以在 ``<textarea>`` 中编辑 `GeoJSON "
"<http://geojson.org/>`_ 数据。"
"<https://geojson.org/>`_ 数据。"

#: ../../doc/advanced.rst:192
msgid ""
"Works with a `Geometry "
"<https://geoalchemy-2.readthedocs.io/en/latest/types.html#geoalchemy2.types.Geometry>`_"
" SQL field that is integrated with `Shapely "
"<http://toblerity.org/shapely/>`_ objects."
"<https://shapely.readthedocs.io/>`_ objects."
msgstr ""
"使用与 `Shapely <http://toblerity.org/shapely/>`_ 对象集成的 `Geometry "
"使用与 `Shapely <https://shapely.readthedocs.io/>`_ 对象集成的 `Geometry "
"<https://geoalchemy-2.readthedocs.io/en/latest/types.html#geoalchemy2.types.Geometry>`_"
" SQL 字段。"

Expand Down Expand Up @@ -683,10 +683,10 @@ msgstr "相关模型的行内编辑"
#: ../../doc/advanced.rst:398
msgid ""
"In order to use peewee integration, you need to install two additional "
"Python packages: `peewee <http://docs.peewee-orm.com/>`_ and `wtf-peewee "
"Python packages: `peewee <https://docs.peewee-orm.com/>`_ and `wtf-peewee "
"<https://github.com/coleifer/wtf-peewee/>`_."
msgstr ""
"为了使用 peewee,您需要安装 2 个 Python 包:`peewee <http://docs.peewee-orm.com/>`_ 和 "
"为了使用 peewee,您需要安装 2 个 Python 包:`peewee <https://docs.peewee-orm.com/>`_ 和 "
"`wtf-peewee <https://github.com/coleifer/wtf-peewee/>`_。"

#: ../../doc/advanced.rst:403
Expand Down Expand Up @@ -794,14 +794,14 @@ msgid ""
"provides you with several tools for getting up & running quickly, it will"
" be up to you, as a developer, to tell Flask-Admin what should be "
"displayed and how. Even though it is easy to get started with a simple "
"`CRUD <http://en.wikipedia.org/wiki/Create,_read,_update_and_delete>`_ "
"`CRUD <https://en.wikipedia.org/wiki/Create,_read,_update_and_delete>`_ "
"interface for each model in your application, Flask-Admin doesn't fix you"
" to this approach, and you are free to define other ways of interacting "
"with some, or all, of your models."
msgstr ""
"Flask-Admin 遵循同样的设计理念。因此,即使它为您提供了几种快速启动和运行的工具,作为开发人员,还是应该由您告诉 Flask-Admin"
" 应该显示什么以及如何显示。即使可以很容易的为应用程序的每个模型构建一个简单的 `CRUD "
"<http://en.wikipedia.org/wiki/Create,_read,_update_and_delete>`_ 接口"
"<https://en.wikipedia.org/wiki/Create,_read,_update_and_delete>`_ 接口"
",Flask-Admin 也不能完全解决所有问题,您可以灵活的定义与模块的交互方法,来实现所有功能。"

#: ../../doc/advanced.rst:467
Expand Down
2 changes: 1 addition & 1 deletion flask_admin/translations/zh_Hans_CN/LC_MESSAGES/api.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# API
# http://flask-admin.readthedocs.io/en/latest/api/
# https://flask-admin.readthedocs.io/en/latest/api/
#
# Copyright (C) 2012-2015, Serge S. Koval
# This file is distributed under the same license as the flask-admin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changelog
# http://flask-admin.readthedocs.io/en/latest/changelog/
# https://flask-admin.readthedocs.io/en/latest/changelog/
#
# Copyright (C) 2012-2015, Serge S. Koval
# This file is distributed under the same license as the flask-admin
Expand Down
6 changes: 3 additions & 3 deletions flask_admin/translations/zh_Hans_CN/LC_MESSAGES/index.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Flask-Admin
# http://flask-admin.readthedocs.io/en/latest/
# https://flask-admin.readthedocs.io/en/latest/
#
# Copyright (C) 2012-2015, Serge S. Koval
# This file is distributed under the same license as the flask-admin
Expand All @@ -25,12 +25,12 @@ msgstr "Flask-Admin"

#: ../../index.rst:6
msgid ""
"**Why Flask?** As a micro-framework, `Flask <http://flask.pocoo.org/>`_ "
"**Why Flask?** As a micro-framework, `Flask <https://flask.palletsprojects.com/>`_ "
"lets you build web services with very little overhead. It offers freedom "
"for you, the designer, to implement your project in a way that suits your"
" particular application."
msgstr ""
"**为什么选择 Flask?** 作为一个微框架,`Flask <http://flask.pocoo.org/>`_ "
"**为什么选择 Flask?** 作为一个微框架,`Flask <https://flask.palletsprojects.com/>`_ "
"允许您以非常少的开销构建 Web 服务。它为您的设计提供了自由,使您能够以适合特定应用程序"
"的方式实现您的项目。"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Introduction To Flask-Admin
# http://flask-admin.readthedocs.io/en/latest/introduction/
# https://flask-admin.readthedocs.io/en/latest/introduction/
#
# Copyright (C) 2012-2015, Serge S. Koval
# This file is distributed under the same license as the flask-admin
Expand Down Expand Up @@ -454,9 +454,9 @@ msgstr "使用内置模板"

#: ../../doc/introduction.rst:352
msgid ""
"Flask-Admin uses the `Jinja2 <http://jinja.pocoo.org/docs/>`_ templating "
"Flask-Admin uses the `Jinja2 <https://jinja.palletsprojects.com/>`_ templating "
"engine."
msgstr "Flask-Admin 使用 `Jinja2 <http://jinja.pocoo.org/docs/>`_ 模板引擎。"
msgstr "Flask-Admin 使用 `Jinja2 <https://jinja.palletsprojects.com/>`_ 模板引擎。"

#: ../../doc/introduction.rst:357
msgid "Extending the Built-in Templates"
Expand Down

0 comments on commit 7473206

Please sign in to comment.