Some improvements in the about dialog
* Sponsors => Supporters * Links to individual About dialog tabs from start page * Slight rewording here and there * rel="noopener noreferrer" for external links
This commit is contained in:
parent
73d981ed6b
commit
789e9922d1
9 changed files with 23 additions and 18 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Sponsors
|
||||
# Supporters
|
||||
|
||||
Development of this version of OctoPrint wouldn't have been possible without
|
||||
[financial support by the community](http://octoprint.org/support-octoprint/) -
|
||||
2
setup.py
2
setup.py
|
|
@ -113,7 +113,7 @@ def get_cmdclass():
|
|||
"octoprint/templates/_data": [
|
||||
"AUTHORS.md",
|
||||
"CHANGELOG.md",
|
||||
"SPONSORS.md",
|
||||
"SUPPORTERS.md",
|
||||
"THIRDPARTYLICENSES.md",
|
||||
]
|
||||
}, cmdclass["build_py"] if "build_py" in cmdclass else _build_py)
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@ class Server(object):
|
|||
loaders = [app.jinja_loader, filesystem_loader]
|
||||
if octoprint.util.is_running_from_source():
|
||||
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../.."))
|
||||
allowed = ["AUTHORS.md", "CHANGELOG.md", "SPONSORS.md", "THIRDPARTYLICENSES.md"]
|
||||
allowed = ["AUTHORS.md", "CHANGELOG.md", "SUPPORTERS.md", "THIRDPARTYLICENSES.md"]
|
||||
|
||||
class SourceRootFilesystemLoader(jinja2.FileSystemLoader):
|
||||
def __init__(self, template_filter, prefix, *args, **kwargs):
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ def index():
|
|||
thirdparty=(gettext("Third Party Licenses"), dict(template="dialogs/about/thirdparty.jinja2", _div="about_thirdparty", custom_bindings=False)),
|
||||
authors=(gettext("Authors"), dict(template="dialogs/about/authors.jinja2", _div="about_authors", custom_bindings=False)),
|
||||
changelog=(gettext("Changelog"), dict(template="dialogs/about/changelog.jinja2", _div="about_changelog", custom_bindings=False)),
|
||||
sponsors=(gettext("Sponsors"), dict(template="dialogs/about/sponsors.jinja2", _div="about_sponsors", custom_bindings=False))
|
||||
supporters=(gettext("Supporters"), dict(template="dialogs/about/supporters.jinja2", _div="about_sponsors", custom_bindings=False))
|
||||
)
|
||||
|
||||
# extract data from template plugins
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ default_settings = {
|
|||
"section_octoprint", "server", "folders", "appearance", "logs", "plugin_pluginmanager", "plugin_softwareupdate"
|
||||
],
|
||||
"usersettings": ["access", "interface"],
|
||||
"about": ["about", "sponsors", "authors", "changelog", "license", "thirdparty", "plugin_pluginmanager"],
|
||||
"about": ["about", "supporters", "authors", "changelog", "license", "thirdparty", "plugin_pluginmanager"],
|
||||
"generic": []
|
||||
},
|
||||
"disabled": {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,10 @@ $(function() {
|
|||
self.aboutContent.scrollTop(0);
|
||||
});
|
||||
};
|
||||
|
||||
self.showTab = function(tab) {
|
||||
$("a[href=#" + tab + "]", self.aboutTabs).tab("show");
|
||||
};
|
||||
}
|
||||
|
||||
OCTOPRINT_VIEWMODELS.push([
|
||||
|
|
|
|||
|
|
@ -5,17 +5,18 @@
|
|||
<p>Version <span class="version">{{ display_version }}</span></p>
|
||||
|
||||
<ul>
|
||||
<li>Website: <a href="http://octoprint.org" target="_blank">octoprint.org</a></li>
|
||||
<li>Source Code: <a href="https://github.com/foosel/OctoPrint" target="_blank">github.com/foosel/OctoPrint</a></li>
|
||||
<li>Documentation: <a href="http://docs.octoprint.org" target="_blank">docs.octoprint.org</a></li>
|
||||
<li>Website: <a href="http://octoprint.org" target="_blank" rel="noreferrer noopener">octoprint.org</a></li>
|
||||
<li>Source Code: <a href="https://github.com/foosel/OctoPrint" target="_blank" rel="noreferrer noopener">github.com/foosel/OctoPrint</a></li>
|
||||
<li>Documentation: <a href="http://docs.octoprint.org" target="_blank" rel="noreferrer noopener">docs.octoprint.org</a></li>
|
||||
</ul>
|
||||
|
||||
<p>
|
||||
<strong>OctoPrint is sponsored by a lot of awesome people. Please see "Sponsors" to the left.</strong>
|
||||
<strong>Development of OctoPrint wouldn't be possible without <a href="javascript:void(0)" data-bind="click: function() { showTab('{{ templates.about.entries.supporters[1]._div }}'); }">its supporters</a>.</strong><br>
|
||||
If you enjoy OctoPrint, please consider <a href="http://octoprint.org/support-octoprint/" target="_blank" rel="noreferrer noopener">supporting its ongoing development</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
© 2012-{{ now.strftime("%Y") }} The OctoPrint Authors
|
||||
© 2012-{{ now.strftime("%Y") }} <a href="javascript:void(0)" data-bind="click: function() { showTab('{{ templates.about.entries.authors[1]._div }}'); }">The OctoPrint Authors</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -33,16 +34,16 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
For a copy of the GNU Affero General Public License, see "OctoPrint License"
|
||||
For a copy of the GNU Affero General Public License, see <a href="javascript:void(0)" data-bind="click: function() { showTab('{{ templates.about.entries.license[1]._div }}'); }">{{ templates.about.entries.license[0] }}</a>
|
||||
to the left.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
OctoPrint also utilizes various dependencies under terms of their
|
||||
respective licenses, which can be found under "Third Party Licenses" to
|
||||
respective licenses, which can be found under <a href="javascript:void(0)" data-bind="click: function() { showTab('{{ templates.about.entries.thirdparty[1]._div }}'); }">{{ templates.about.entries.thirdparty[0] }}</a> to
|
||||
the left. Copyright of those dependencies lies with their respective authors
|
||||
</p>
|
||||
|
||||
<p><small>
|
||||
"OctoPrint" is a registered trademark
|
||||
"OctoPrint" is a registered trademark.
|
||||
</small></p>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{% filter markdown %}{% filter offset_markdown_headers(2) %}{% include "_data/SPONSORS.md" ignore missing %}{% endfilter %}{% endfilter %}
|
||||
1
src/octoprint/templates/dialogs/about/supporters.jinja2
Normal file
1
src/octoprint/templates/dialogs/about/supporters.jinja2
Normal file
|
|
@ -0,0 +1 @@
|
|||
{% filter markdown %}{% filter offset_markdown_headers(2) %}{% include "_data/SUPPORTERS.md" ignore missing %}{% endfilter %}{% endfilter %}
|
||||
Loading…
Reference in a new issue