Commits June 2019

commits@lists.geany.org

1 participants
70 discussions

[geany/www.geany.org] 5171e3: Add Geany-Themes page with theme preview
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/issue5_geany_themes_preview Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 09:26:40 UTC Commit: 5171e31573551a6f318936474378acd637ca61c7 https://github.com/geany/www.geany.org/commit/5171e31573551a6f318936474378a… Log Message: ----------- Add Geany-Themes page with theme preview The themes in the preview list are loaded from the Geany-Themes repository on Github on the fly (but cached for one hour). Modified Paths: -------------- page_content/download/themes.md static_docs/github_client.py static_docs/templates/pages/download/themes.html static_docs/urls.py static_docs/views.py Modified: page_content/download/themes.md 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +## Geany Themes + +Geany-Themes is a collection of color schemes for Geany, either written originally by the Geany community or ported from color schemes for other editors. +These schemes are compatible with Geany 1.22 and greater. + +To use one the themes below, download the configuration file and save it to the folder `colorschemes` in your Geany configuration directory (usually `~/.config/geany/colorschemes/`). + +For more information and detailed configuration instructions, see https://github.com/geany/geany-themes. + + Modified: static_docs/github_client.py 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -30,9 +30,11 @@ class GitHubApiClient: """""" # ---------------------------------------------------------------------- - def get_file_contents(self, filename): - url_parameters = dict(user=GITHUB_USER, - repository=GITHUB_REPOSITORY, + def get_file_contents(self, filename, user=None, repository=None): + user = user or GITHUB_USER + repository = repository or GITHUB_REPOSITORY + url_parameters = dict(user=user, + repository=repository, filename=filename) url = 'https://api.github.com/repos/%(user)s/%(repository)s/contents/%(filename)s' % \ url_parameters Modified: static_docs/templates/pages/download/themes.html 65 lines changed, 65 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,65 @@ +{% extends "pages/richtextpage.html" %} + +{% load mezzanine_tags pages_tags static %} + +{% block extra_css %} +<link rel="stylesheet" href="{% static "mezzanine/css/magnific-popup.css" %}"> +<style> + .img-thumbnail { + cursor: zoom-in; + } +</style> +{% endblock %} + +{% block richtext_content %} +{{ block.super }} + +<h3>Available Themes</h3> + +<div class="row"> + +{% for theme in theme_index.values|dictsort:"name" %} + <div class="col-md-4"> + <div class="panel panel-default"> + <div class="panel-heading"> + <strong>{{ theme.name }}</strong> + <span class="pull-right"><a href="{{ theme.colorscheme }}">Download</a></span> + </div> + <div class="panel-body gallery"> + <a href="{{ theme.screenshot }}" title="{{ theme.name }} - {{ theme.description }}"> + <img + src="data:image/png;base64,{{ theme.thumbnail }}" + width="64" + height="64" + class="img-responsive img-thumbnail center-block" + alt="Thumbnail of colorscheme {{ theme.name }}" /> + </a> + <div class="text-center">{{ theme.description }}</div> + </div> + </div> + </div> + + {% if forloop.counter|divisibleby:3 %} + </div> + <div class="row"> + {% endif %} +{% endfor %} +</div> + +{% endblock %} + +{% block extra_js %} +{{ block.super }} +<script src="{% static "mezzanine/js/magnific-popup.js" %}"></script> +<script> +$(document).ready(function() { + $('.gallery').magnificPopup({ + delegate: 'a', + type: 'image', + gallery: { + enabled: true, + } + }); +}); +</script> +{% endblock %} Modified: static_docs/urls.py 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -14,10 +14,12 @@ from django.conf.urls import url -from static_docs.views import I18NStatisticsView, ReleaseNotesView, ToDoView +from static_docs.views import I18NStatisticsView, ReleaseNotesView, ThemesView, ToDoView urlpatterns = ( # pylint: disable=invalid-name + url(r'^download/themes/$', ThemesView.as_view(), name='themes'), + url(r'^documentation/todo/$', ToDoView.as_view(), name='todo'), url(r'^documentation/releasenotes/$', ReleaseNotesView.as_view(), name='releasenotes'), Modified: static_docs/views.py 29 lines changed, 27 insertions(+), 2 deletions(-) =================================================================== @@ -56,9 +56,9 @@ def __init__(self, *args, **kwargs): self._file_contents = None # ---------------------------------------------------------------------- - def _fetch_file_via_github_api(self, filename): + def _fetch_file_via_github_api(self, filename, user=None, repository=None): client = GitHubApiClient() - self._file_contents = client.get_file_contents(filename) + self._file_contents = client.get_file_contents(filename, user=user, repository=repository) class ReleaseNotesView(StaticDocsView): @@ -240,3 +240,28 @@ def _get_i18n_statistics(self): settings.STATIC_DOCS_GEANY_I18N_STATISTICS_FILENAME) with open(filename) as input_file: return json.load(input_file) + + +class ThemesView(StaticDocsView): + """ + Fetch the Geany-Themes index from https://github.com/geany/geany-themes/tree/master/index + """ + + template_name = "pages/download/themes.html" + + # ---------------------------------------------------------------------- + def get_context_data(self, **kwargs): + theme_index = self._get_theme_index() + context = super(ThemesView, self).get_context_data(**kwargs) + context['theme_index'] = theme_index + return context + + # ---------------------------------------------------------------------- + @cache_function(CACHE_TIMEOUT_1HOUR) + def _get_theme_index(self): + self._fetch_file_via_github_api('index/index.json', repository='geany-themes') + return self._parse_themes_index() + + # ---------------------------------------------------------------------- + def _parse_themes_index(self): + return json.loads(self._file_contents) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 0be960: Add trailing slashes for old deep link redirects
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 09:12:47 UTC Commit: 0be9605106fdf340aac60d45629c56a19c5abae9 https://github.com/geany/www.geany.org/commit/0be9605106fdf340aac60d45629c5… Log Message: ----------- Add trailing slashes for old deep link redirects This increases matching as some clients (probably bots and spiders) sometimes add trailing slashes themselves and Django adds the slashes in the first place as well if there is no match without the slash. Modified Paths: -------------- geany/urls_legacy.py Modified: geany/urls_legacy.py 112 lines changed, 56 insertions(+), 56 deletions(-) =================================================================== @@ -18,66 +18,66 @@ URL_MAPPING = { # old urls mapped to new ones - '/Category/DocumentationToDo': 'https://github.com/geany/geany/issues/', - '/Category/Manual': '/documentation/manual/', - '/Contribute/Developers': '/contribute/development/', - '/Contribute/Documentation': '/contribute/documentation/', - '/Contribute/Support': '/contribute/support/', - '/Contribute/Translators': '/contribute/translation/', + '/Category/DocumentationToDo/': 'https://github.com/geany/geany/issues/', + '/Category/Manual/': '/documentation/manual/', + '/Contribute/Developers/': '/contribute/development/', + '/Contribute/Documentation/': '/contribute/documentation/', + '/Contribute/Support/': '/contribute/support/', + '/Contribute/Translators/': '/contribute/translation/', '/i18n/': '/contribute/translation/statistics/', - '/Developers/Developers': '/contribute/development/', - '/Documentation/ChangeLog': 'https://github.com/geany/geany/commits/master', # page dropped - '/Documentation/Documentation': '/documentation/manual/', - '/Documentation/FAQ': '/documentation/faq/', - '/Documentation/FAQdata': '/documentation/faq/', - '/Documentation/Manual': '/documentation/manual/', - '/Documentation/Questions': '/documentation/faq/', - '/Documentation/ReleaseNotes': '/documentation/releasenotes/', - '/Documentation/ReleaseNotesOld': '/documentation/releasenotes/', - '/Documentation/Screenshots': '/documentation/screenshots/', - '/Documentation/ToDo': 'https://github.com/geany/geany/issues/', - '/Download/Extras': 'https://wiki.geany.org/', # page dropped - '/Download/Git': '/download/git/', - '/Download/OldExtras': 'https://wiki.geany.org/', # page dropped + '/Developers/Developers/': '/contribute/development/', + '/Documentation/ChangeLog/': 'https://github.com/geany/geany/commits/master', # page dropped + '/Documentation/Documentation/': '/documentation/manual/', + '/Documentation/FAQ/': '/documentation/faq/', + '/Documentation/FAQdata/': '/documentation/faq/', + '/Documentation/Manual/': '/documentation/manual/', + '/Documentation/Questions/': '/documentation/faq/', + '/Documentation/ReleaseNotes/': '/documentation/releasenotes/', + '/Documentation/ReleaseNotesOld/': '/documentation/releasenotes/', + '/Documentation/Screenshots/': '/documentation/screenshots/', + '/Documentation/ToDo/': 'https://github.com/geany/geany/issues/', + '/Download/Extras/': 'https://wiki.geany.org/', # page dropped + '/Download/Git/': '/download/git/', + '/Download/OldExtras/': 'https://wiki.geany.org/', # page dropped '/Download/': '/download/releases/', - '/Download/Releases': '/download/releases/', - '/Download/SVN': '/download/git/', - '/Download/ThirdPartyPackages': '/download/third-party/', - '/Gallery/Main': '/documentation/screenshots/', - '/Gallery/Test': '/documentation/screenshots/', - '/Geany/ChangeLog': 'https://github.com/geany/geany/commits/master', # page dropped - '/Geany/FAQ': '/documentation/faq/', - '/Geany/Screenshots': '/documentation/screenshots/', - '/Geany/Support': '/support/', - '/Geany/Troubleshooting': '/support/', - '/Main/About': '/about/geany/', - '/Main/AboutThisSite': '/', - '/Main/AllFiletypes': '/about/filetypes/', - '/Main/Authors': '/about/geany/', - '/Main/Blog': '/news/', - '/Main/BlogArchive': '/news/', - '/Main/HomePage': '/', - '/main/homepage': '/', - '/Main/Reviews': '/', # page dropped - '/Main/Thanks': '/', # page dropped - '/Main/WikiSandbox': '/', # page dropped + '/Download/Releases/': '/download/releases/', + '/Download/SVN/': '/download/git/', + '/Download/ThirdPartyPackages/': '/download/third-party/', + '/Gallery/Main/': '/documentation/screenshots/', + '/Gallery/Test/': '/documentation/screenshots/', + '/Geany/ChangeLog/': 'https://github.com/geany/geany/commits/master', # page dropped + '/Geany/FAQ/': '/documentation/faq/', + '/Geany/Screenshots/': '/documentation/screenshots/', + '/Geany/Support/': '/support/', + '/Geany/Troubleshooting/': '/support/', + '/Main/About/': '/about/geany/', + '/Main/AboutThisSite/': '/', + '/Main/AllFiletypes/': '/about/filetypes/', + '/Main/Authors/': '/about/geany/', + '/Main/Blog/': '/news/', + '/Main/BlogArchive/': '/news/', + '/Main/HomePage/': '/', + '/main/homepage/': '/', + '/Main/Reviews/': '/', # page dropped + '/Main/Thanks/': '/', # page dropped + '/Main/WikiSandbox/': '/', # page dropped '/Site/AllRecentChanges/': '/news/feed/', - '/Site/Authors': '/about/geany/', - '/Support/Bugs': '/support/bugs/', - '/Support/BuildingFromSource': 'https://www.geany.org/manual/index.html#installation', - '/Support/BuildingOnWin32': 'https://wiki.geany.org/howtos/win32/msys2', - '/Support/Contributions': '/contribute/', - '/Support/CrossCompile': 'https://wiki.geany.org/howtos/win32/crosscompile', - '/Support/Developers': '/contribute/development/', - '/Support/Hacking': '/documentation/hacking/', - '/Support/I18N': '/contribute/translation/', - '/Support/IRC': '/support/irc/', - '/Support/MailingList': '/support/mailing-lists/', - '/Support/PluginWishlist': + '/Site/Authors/': '/about/geany/', + '/Support/Bugs/': '/support/bugs/', + '/Support/BuildingFromSource/': 'https://www.geany.org/manual/index.html#installation', + '/Support/BuildingOnWin32/': 'https://wiki.geany.org/howtos/win32/msys2', + '/Support/Contributions/': '/contribute/', + '/Support/CrossCompile/': 'https://wiki.geany.org/howtos/win32/crosscompile', + '/Support/Developers/': '/contribute/development/', + '/Support/Hacking/': '/documentation/hacking/', + '/Support/I18N/': '/contribute/translation/', + '/Support/IRC/': '/support/irc/', + '/Support/MailingList/': '/support/mailing-lists/', + '/Support/PluginWishlist/': 'https://github.com/geany/geany-plugins/issues?q=is%%3Aissue+label%%3Afeatur…', - '/Support/Plugins': '/support/plugins/', - '/Support/RunningOnWindows': 'https://wiki.geany.org/howtos/win32/running', - '/Support/VerifyGPGSignature': '/support/verify-gpg-signature/', + '/Support/Plugins/': '/support/plugins/', + '/Support/RunningOnWindows/': 'https://wiki.geany.org/howtos/win32/running', + '/Support/VerifyGPGSignature/': '/support/verify-gpg-signature/', # various old deep links (catch all) '/images/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 9ff5dd: Add some more catchalls for redirecting old deep links
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 09:09:55 UTC Commit: 9ff5ddd476b267d4243799eafede8f02ed4cdec2 https://github.com/geany/www.geany.org/commit/9ff5ddd476b267d4243799eafede8… Log Message: ----------- Add some more catchalls for redirecting old deep links Modified Paths: -------------- geany/urls_legacy.py Modified: geany/urls_legacy.py 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -49,6 +49,7 @@ '/Geany/FAQ': '/documentation/faq/', '/Geany/Screenshots': '/documentation/screenshots/', '/Geany/Support': '/support/', + '/Geany/Troubleshooting': '/support/', '/Main/About': '/about/geany/', '/Main/AboutThisSite': '/', '/Main/AllFiletypes': '/about/filetypes/', @@ -61,6 +62,7 @@ '/Main/Thanks': '/', # page dropped '/Main/WikiSandbox': '/', # page dropped '/Site/AllRecentChanges/': '/news/feed/', + '/Site/Authors': '/about/geany/', '/Support/Bugs': '/support/bugs/', '/Support/BuildingFromSource': 'https://www.geany.org/manual/index.html#installation', '/Support/BuildingOnWin32': 'https://wiki.geany.org/howtos/win32/msys2', @@ -80,7 +82,15 @@ # various old deep links (catch all) '/images/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', '/uploads/Gallery/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', - '/PmWiki/.*': '/', + '/Category.*': '/', + '/Developers.*': '/', + '/Documentation.*': '/', + '/Download.*': '/', + '/Geany.*': '/', + '/PmWiki.*': '/', + '/Profiles.*': '/', + '/Site.*': '/', + '/Support.*': '/', # migrated news items '/Main/20060117': '/news/geany-in-linuxuser/', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 318070: Add a script to generate screenshots/README.md
by Matthew Brush 23 Jun '19

23 Jun '19

Branch: refs/heads/gen-screenshot-readme Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 22 Jun 2019 22:34:55 UTC Commit: 318070abc9cd7799f9e1da26dae6e1e1f51c33e6 https://github.com/geany/geany-themes/commit/318070abc9cd7799f9e1da26dae6e1… Log Message: ----------- Add a script to generate screenshots/README.md Modified Paths: -------------- Makefile screenshots/README.md scripts/screenshots-readme.py Modified: Makefile 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -10,7 +10,7 @@ MISMATCH_MESSAGE = Warning: Possible wrong version of Geany installed ARCHIVE_NAME = geany-themes-$(THEMES_VERSION).tar.bz2 ARCHIVE_TEMP_DIR = geany-themes-$(THEMES_VERSION) -all: autobump index +all: autobump index screenshots/README.md install: mkdir -p $(COLORSCHEME_DIR) @@ -27,6 +27,9 @@ index: scripts/versions.log autobump: $(THEMES) python scripts/autobump.py +screenshots/README.md: $(THEMES) + python scripts/screenshots-readme.py > $@ + clean: make -C index clean Modified: screenshots/README.md 126 lines changed, 66 insertions(+), 60 deletions(-) =================================================================== @@ -1,3 +1,9 @@ +### [The Monokai Theme](../colorschemes/monokai.conf) + +[![monokai.png](monokai.png)](monokai.png "The Monokai Theme") + +[The Monokai Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + ### [The Bespin Theme](../colorschemes/bespin.conf) @@ -6,11 +12,11 @@ [The Bespin Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Black Theme](../colorschemes/black.conf) +### [The Black Scheme Theme](../colorschemes/black.conf) -[![black.png](black.png)](black.png "The Black Theme") +[![black.png](black.png)](black.png "The Black Scheme Theme") -[The Black Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Black Scheme Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Darcula Theme](../colorschemes/darcula.conf) @@ -20,18 +26,18 @@ [The Darcula Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The DarkColors Theme](../colorschemes/dark-colors.conf) +### [The Dark Colors Theme](../colorschemes/dark-colors.conf) -[![dark-colors.png](dark-colors.png)](dark-colors.png "The DarkColors Theme") +[![dark-colors.png](dark-colors.png)](dark-colors.png "The Dark Colors Theme") -[The DarkColors Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Dark Colors Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The DarkFruitSalad Theme](../colorschemes/dark-fruit-salad.conf) +### [The Dark Fruit Salad Theme](../colorschemes/dark-fruit-salad.conf) -[![dark-fruit-salad.png](dark-fruit-salad.png)](dark-fruit-salad.png "The DarkFruitSalad Theme") +[![dark-fruit-salad.png](dark-fruit-salad.png)](dark-fruit-salad.png "The Dark Fruit Salad Theme") -[The DarkFruitSalad Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Dark Fruit Salad Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Dark Theme](../colorschemes/dark.conf) @@ -41,11 +47,11 @@ [The Dark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The DeltDark Theme](../colorschemes/delt-dark.conf) +### [The Delt Dark Theme](../colorschemes/delt-dark.conf) -[![delt-dark.png](delt-dark.png)](delt-dark.png "The DeltDark Theme") +[![delt-dark.png](delt-dark.png)](delt-dark.png "The Delt Dark Theme") -[The DeltDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Delt Dark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Epsilon Theme](../colorschemes/epsilon.conf) @@ -69,11 +75,11 @@ [The Gedit Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Github Theme](../colorschemes/github.conf) +### [The GitHub Theme](../colorschemes/github.conf) -[![github.png](github.png)](github.png "The Github Theme") +[![github.png](github.png)](github.png "The GitHub Theme") -[The Github Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The GitHub Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Himbeere Theme](../colorschemes/himbeere.conf) @@ -83,46 +89,46 @@ [The Himbeere Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Inkpot Theme](../colorschemes/inkpot.conf) +### [The InkPot Theme](../colorschemes/inkpot.conf) -[![inkpot.png](inkpot.png)](inkpot.png "The Inkpot Theme") +[![inkpot.png](inkpot.png)](inkpot.png "The InkPot Theme") -[The Inkpot Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The InkPot Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Mc Theme](../colorschemes/mc.conf) +### [The Kugel Theme](../colorschemes/kugel.conf) -[![mc.png](mc.png)](mc.png "The Mc Theme") +[![kugel.png](kugel.png)](kugel.png "The Kugel Theme") -[The Mc Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Kugel Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The MetallicBottle Theme](../colorschemes/metallic-bottle.conf) +### [The Ralesk's MC Theme](../colorschemes/mc.conf) -[![metallic-bottle.png](metallic-bottle.png)](metallic-bottle.png "The MetallicBottle Theme") +[![mc.png](mc.png)](mc.png "The Ralesk's MC Theme") -[The MetallicBottle Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Ralesk's MC Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Monokai Theme](../colorschemes/monokai.conf) +### [The Metallic Bottle Theme](../colorschemes/metallic-bottle.conf) -[![monokai.png](monokai.png)](monokai.png "The Monokai Theme") +[![metallic-bottle.png](metallic-bottle.png)](metallic-bottle.png "The Metallic Bottle Theme") -[The Monokai Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Metallic Bottle Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The NotepadPlusPlus Theme](../colorschemes/notepad-plus-plus.conf) +### [The Notepad-plus-plus Theme](../colorschemes/notepad-plus-plus.conf) -[![notepad-plus-plus.png](notepad-plus-plus.png)](notepad-plus-plus.png "The NotepadPlusPlus Theme") +[![notepad-plus-plus.png](notepad-plus-plus.png)](notepad-plus-plus.png "The Notepad-plus-plus Theme") -[The NotepadPlusPlus Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Notepad-plus-plus Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Oblivion2 Theme](../colorschemes/oblivion2.conf) +### [The Oblivion 2 Theme](../colorschemes/oblivion2.conf) -[![oblivion2.png](oblivion2.png)](oblivion2.png "The Oblivion2 Theme") +[![oblivion2.png](oblivion2.png)](oblivion2.png "The Oblivion 2 Theme") -[The Oblivion2 Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Oblivion 2 Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Pygments Theme](../colorschemes/pygments.conf) @@ -132,11 +138,11 @@ [The Pygments Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Railcasts2 Theme](../colorschemes/railcasts2.conf) +### [The Railcasts 2 Theme](../colorschemes/railcasts2.conf) -[![railcasts2.png](railcasts2.png)](railcasts2.png "The Railcasts2 Theme") +[![railcasts2.png](railcasts2.png)](railcasts2.png "The Railcasts 2 Theme") -[The Railcasts2 Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Railcasts 2 Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Retro Theme](../colorschemes/retro.conf) @@ -146,39 +152,39 @@ [The Retro Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The SleepyPastel Theme](../colorschemes/sleepy-pastel.conf) +### [The Sleepy Pastel Theme](../colorschemes/sleepy-pastel.conf) -[![sleepy-pastel.png](sleepy-pastel.png)](sleepy-pastel.png "The SleepyPastel Theme") +[![sleepy-pastel.png](sleepy-pastel.png)](sleepy-pastel.png "The Sleepy Pastel Theme") -[The SleepyPastel Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Sleepy Pastel Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The Slushpoppies Theme](../colorschemes/slushpoppies.conf) +### [The Slush and Poppies Theme](../colorschemes/slushpoppies.conf) -[![slushpoppies.png](slushpoppies.png)](slushpoppies.png "The Slushpoppies Theme") +[![slushpoppies.png](slushpoppies.png)](slushpoppies.png "The Slush and Poppies Theme") -[The Slushpoppies Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Slush and Poppies Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The SolarizedDark Theme](../colorschemes/solarized-dark.conf) +### [The Solarized (dark) Theme](../colorschemes/solarized-dark.conf) -[![solarized-dark.png](solarized-dark.png)](solarized-dark.png "The SolarizedDark Theme") +[![solarized-dark.png](solarized-dark.png)](solarized-dark.png "The Solarized (dark) Theme") -[The SolarizedDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Solarized (dark) Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The SolarizedLight Theme](../colorschemes/solarized-light.conf) +### [The Solarized (light) Theme](../colorschemes/solarized-light.conf) -[![solarized-light.png](solarized-light.png)](solarized-light.png "The SolarizedLight Theme") +[![solarized-light.png](solarized-light.png)](solarized-light.png "The Solarized (light) Theme") -[The SolarizedLight Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Solarized (light) Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The SpyderDark Theme](../colorschemes/spyder-dark.conf) +### [The Spyder Dark Theme](../colorschemes/spyder-dark.conf) -[![spyder-dark.png](spyder-dark.png)](spyder-dark.png "The SpyderDark Theme") +[![spyder-dark.png](spyder-dark.png)](spyder-dark.png "The Spyder Dark Theme") -[The SpyderDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Spyder Dark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Steampunk Theme](../colorschemes/steampunk.conf) @@ -188,18 +194,18 @@ [The Steampunk Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The TangoDark Theme](../colorschemes/tango-dark.conf) +### [The Tango Theme](../colorschemes/tango-dark.conf) -[![tango-dark.png](tango-dark.png)](tango-dark.png "The TangoDark Theme") +[![tango-dark.png](tango-dark.png)](tango-dark.png "The Tango Theme") -[The TangoDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Tango Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The TangoLight Theme](../colorschemes/tango-light.conf) +### [The Tango Light Theme](../colorschemes/tango-light.conf) -[![tango-light.png](tango-light.png)](tango-light.png "The TangoLight Theme") +[![tango-light.png](tango-light.png)](tango-light.png "The Tango Light Theme") -[The TangoLight Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Tango Light Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Tinge Theme](../colorschemes/tinge.conf) @@ -216,11 +222,11 @@ [The Ubuntu Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… -### [The VibrantInk Theme](../colorschemes/vibrant-ink.conf) +### [The Vibrant Theme](../colorschemes/vibrant-ink.conf) -[![vibrant-ink.png](vibrant-ink.png)](vibrant-ink.png "The VibrantInk Theme") +[![vibrant-ink.png](vibrant-ink.png)](vibrant-ink.png "The Vibrant Theme") -[The VibrantInk Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… +[The Vibrant Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… ### [The Zenburn Theme](../colorschemes/zenburn.conf) Modified: scripts/screenshots-readme.py 59 lines changed, 59 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +""" +Generates the screenshots/README.md file. +""" + +import os +import sys +from geanyscheme.confparse import ConfParse + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +THEME_DIR = os.path.join(BASE_DIR, "colorschemes") +SCREENSHOT_DIR = os.path.join(BASE_DIR, "screenshots") +RAW_URL = 'https://raw.githubusercontent.com/geany/geany-themes/master/colorschemes/' + +class ColorScheme: + def __init__(self, name, theme, screenshot): + self.name = name + self.theme = theme + self.screenshot = screenshot + + @property + def title(self): + return "The %s Theme" % self.name + + @property + def theme_url(self): + return RAW_URL + os.path.basename(self.theme) + + @property + def markdown(self): + code = '### [%s](%s)\n' % (self.title, self.theme) + code += '\n' + code += '[![%s](%s)](%s "%s")\n' % ( + self.screenshot, self.screenshot, self.screenshot, self.title) + code += '\n' + code += '[%s Direct Download](%s)\n' % (self.title, self.theme_url) + code += '\n\n' + return code + +def list_colorschemes(): + schemes = [] + for fn in os.listdir(THEME_DIR): + path = os.path.join(THEME_DIR, fn) + conf = ConfParse(path) + scheme = ColorScheme( + conf.get("theme_info", "name"), + os.path.join("..", "colorschemes", fn), + os.path.splitext(fn)[0] + ".png") + schemes.append(scheme) + return schemes + +def main(args): + for scheme in list_colorschemes(): + sys.stdout.write(scheme.markdown) + return 0 + +if __name__ == "__main__": + sys.exit(main(sys.argv)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] b77a43: Add preview to the screenshot folder (for #29) (#30)
by suntong 22 Jun '19

22 Jun '19

Branch: refs/heads/master Author: suntong <suntong(a)cpan.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 22 Jun 2019 21:53:39 UTC Commit: b77a43c9c496dec9f36bf225b47198fdc036a2e8 https://github.com/geany/geany-themes/commit/b77a43c9c496dec9f36bf225b47198… Log Message: ----------- Add preview to the screenshot folder (for #29) (#30) * Create README.md * Update README.md As per #30's new requirement Modified Paths: -------------- screenshots/README.md Modified: screenshots/README.md 232 lines changed, 232 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,232 @@ + +### [The Bespin Theme](../colorschemes/bespin.conf) + +[![bespin.png](bespin.png)](bespin.png "The Bespin Theme") + +[The Bespin Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Black Theme](../colorschemes/black.conf) + +[![black.png](black.png)](black.png "The Black Theme") + +[The Black Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Darcula Theme](../colorschemes/darcula.conf) + +[![darcula.png](darcula.png)](darcula.png "The Darcula Theme") + +[The Darcula Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The DarkColors Theme](../colorschemes/dark-colors.conf) + +[![dark-colors.png](dark-colors.png)](dark-colors.png "The DarkColors Theme") + +[The DarkColors Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The DarkFruitSalad Theme](../colorschemes/dark-fruit-salad.conf) + +[![dark-fruit-salad.png](dark-fruit-salad.png)](dark-fruit-salad.png "The DarkFruitSalad Theme") + +[The DarkFruitSalad Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Dark Theme](../colorschemes/dark.conf) + +[![dark.png](dark.png)](dark.png "The Dark Theme") + +[The Dark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The DeltDark Theme](../colorschemes/delt-dark.conf) + +[![delt-dark.png](delt-dark.png)](delt-dark.png "The DeltDark Theme") + +[The DeltDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Epsilon Theme](../colorschemes/epsilon.conf) + +[![epsilon.png](epsilon.png)](epsilon.png "The Epsilon Theme") + +[The Epsilon Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Fluffy Theme](../colorschemes/fluffy.conf) + +[![fluffy.png](fluffy.png)](fluffy.png "The Fluffy Theme") + +[The Fluffy Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Gedit Theme](../colorschemes/gedit.conf) + +[![gedit.png](gedit.png)](gedit.png "The Gedit Theme") + +[The Gedit Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Github Theme](../colorschemes/github.conf) + +[![github.png](github.png)](github.png "The Github Theme") + +[The Github Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Himbeere Theme](../colorschemes/himbeere.conf) + +[![himbeere.png](himbeere.png)](himbeere.png "The Himbeere Theme") + +[The Himbeere Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Inkpot Theme](../colorschemes/inkpot.conf) + +[![inkpot.png](inkpot.png)](inkpot.png "The Inkpot Theme") + +[The Inkpot Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Mc Theme](../colorschemes/mc.conf) + +[![mc.png](mc.png)](mc.png "The Mc Theme") + +[The Mc Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The MetallicBottle Theme](../colorschemes/metallic-bottle.conf) + +[![metallic-bottle.png](metallic-bottle.png)](metallic-bottle.png "The MetallicBottle Theme") + +[The MetallicBottle Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Monokai Theme](../colorschemes/monokai.conf) + +[![monokai.png](monokai.png)](monokai.png "The Monokai Theme") + +[The Monokai Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The NotepadPlusPlus Theme](../colorschemes/notepad-plus-plus.conf) + +[![notepad-plus-plus.png](notepad-plus-plus.png)](notepad-plus-plus.png "The NotepadPlusPlus Theme") + +[The NotepadPlusPlus Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Oblivion2 Theme](../colorschemes/oblivion2.conf) + +[![oblivion2.png](oblivion2.png)](oblivion2.png "The Oblivion2 Theme") + +[The Oblivion2 Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Pygments Theme](../colorschemes/pygments.conf) + +[![pygments.png](pygments.png)](pygments.png "The Pygments Theme") + +[The Pygments Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Railcasts2 Theme](../colorschemes/railcasts2.conf) + +[![railcasts2.png](railcasts2.png)](railcasts2.png "The Railcasts2 Theme") + +[The Railcasts2 Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Retro Theme](../colorschemes/retro.conf) + +[![retro.png](retro.png)](retro.png "The Retro Theme") + +[The Retro Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The SleepyPastel Theme](../colorschemes/sleepy-pastel.conf) + +[![sleepy-pastel.png](sleepy-pastel.png)](sleepy-pastel.png "The SleepyPastel Theme") + +[The SleepyPastel Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Slushpoppies Theme](../colorschemes/slushpoppies.conf) + +[![slushpoppies.png](slushpoppies.png)](slushpoppies.png "The Slushpoppies Theme") + +[The Slushpoppies Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The SolarizedDark Theme](../colorschemes/solarized-dark.conf) + +[![solarized-dark.png](solarized-dark.png)](solarized-dark.png "The SolarizedDark Theme") + +[The SolarizedDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The SolarizedLight Theme](../colorschemes/solarized-light.conf) + +[![solarized-light.png](solarized-light.png)](solarized-light.png "The SolarizedLight Theme") + +[The SolarizedLight Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The SpyderDark Theme](../colorschemes/spyder-dark.conf) + +[![spyder-dark.png](spyder-dark.png)](spyder-dark.png "The SpyderDark Theme") + +[The SpyderDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Steampunk Theme](../colorschemes/steampunk.conf) + +[![steampunk.png](steampunk.png)](steampunk.png "The Steampunk Theme") + +[The Steampunk Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The TangoDark Theme](../colorschemes/tango-dark.conf) + +[![tango-dark.png](tango-dark.png)](tango-dark.png "The TangoDark Theme") + +[The TangoDark Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The TangoLight Theme](../colorschemes/tango-light.conf) + +[![tango-light.png](tango-light.png)](tango-light.png "The TangoLight Theme") + +[The TangoLight Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Tinge Theme](../colorschemes/tinge.conf) + +[![tinge.png](tinge.png)](tinge.png "The Tinge Theme") + +[The Tinge Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Ubuntu Theme](../colorschemes/ubuntu.conf) + +[![ubuntu.png](ubuntu.png)](ubuntu.png "The Ubuntu Theme") + +[The Ubuntu Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The VibrantInk Theme](../colorschemes/vibrant-ink.conf) + +[![vibrant-ink.png](vibrant-ink.png)](vibrant-ink.png "The VibrantInk Theme") + +[The VibrantInk Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + +### [The Zenburn Theme](../colorschemes/zenburn.conf) + +[![zenburn.png](zenburn.png)](zenburn.png "The Zenburn Theme") + +[The Zenburn Theme Direct Download](https://raw.githubusercontent.com/geany/geany-themes/master/color… + + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] aa5414: Update legacy URL redirects
by Enrico Tröger 21 Jun '19

21 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 21 Jun 2019 15:42:23 UTC Commit: aa54145d99f3392ef4f39fefb417f4b774ef8821 https://github.com/geany/www.geany.org/commit/aa54145d99f3392ef4f39fefb417f… Log Message: ----------- Update legacy URL redirects Modified Paths: -------------- geany/urls_legacy.py Modified: geany/urls_legacy.py 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -18,13 +18,16 @@ URL_MAPPING = { # old urls mapped to new ones + '/Category/DocumentationToDo': 'https://github.com/geany/geany/issues/', + '/Category/Manual': '/documentation/manual/', '/Contribute/Developers': '/contribute/development/', '/Contribute/Documentation': '/contribute/documentation/', '/Contribute/Support': '/contribute/support/', '/Contribute/Translators': '/contribute/translation/', '/i18n/': '/contribute/translation/statistics/', '/Developers/Developers': '/contribute/development/', '/Documentation/ChangeLog': 'https://github.com/geany/geany/commits/master', # page dropped + '/Documentation/Documentation': '/documentation/manual/', '/Documentation/FAQ': '/documentation/faq/', '/Documentation/FAQdata': '/documentation/faq/', '/Documentation/Manual': '/documentation/manual/', @@ -36,13 +39,15 @@ '/Download/Extras': 'https://wiki.geany.org/', # page dropped '/Download/Git': '/download/git/', '/Download/OldExtras': 'https://wiki.geany.org/', # page dropped + '/Download/': '/download/releases/', '/Download/Releases': '/download/releases/', '/Download/SVN': '/download/git/', '/Download/ThirdPartyPackages': '/download/third-party/', '/Gallery/Main': '/documentation/screenshots/', '/Gallery/Test': '/documentation/screenshots/', '/Geany/ChangeLog': 'https://github.com/geany/geany/commits/master', # page dropped '/Geany/FAQ': '/documentation/faq/', + '/Geany/Screenshots': '/documentation/screenshots/', '/Geany/Support': '/support/', '/Main/About': '/about/geany/', '/Main/AboutThisSite': '/', @@ -51,9 +56,11 @@ '/Main/Blog': '/news/', '/Main/BlogArchive': '/news/', '/Main/HomePage': '/', + '/main/homepage': '/', '/Main/Reviews': '/', # page dropped '/Main/Thanks': '/', # page dropped '/Main/WikiSandbox': '/', # page dropped + '/Site/AllRecentChanges/': '/news/feed/', '/Support/Bugs': '/support/bugs/', '/Support/BuildingFromSource': 'https://www.geany.org/manual/index.html#installation', '/Support/BuildingOnWin32': 'https://wiki.geany.org/howtos/win32/msys2', @@ -70,6 +77,11 @@ '/Support/RunningOnWindows': 'https://wiki.geany.org/howtos/win32/running', '/Support/VerifyGPGSignature': '/support/verify-gpg-signature/', + # various old deep links (catch all) + '/images/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', + '/uploads/Gallery/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', + '/PmWiki/.*': '/', + # migrated news items '/Main/20060117': '/news/geany-in-linuxuser/', '/Main/20060128': '/news/geany-05-is-out/', @@ -149,6 +161,9 @@ '/Main/20180225': '/news/geany-133-is-out/', '/Main/20181216': '/news/geany-134-is-out/', '/Main/20190104': '/news/geany-1341-is-out/', + '/Main/20190428': '/news/geany-135-is-out/', + # catch all for everything else (spiders tend to query even non-existent URLs) + '/Main/.*': '/news/geany-135-is-out/', } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] da5f6a: Fix header filename on nightly builds page
by Enrico Tröger 21 Jun '19

21 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 21 Jun 2019 15:41:19 UTC Commit: da5f6a73719d1b807c1900cb7ea32414b7b053f9 https://github.com/geany/www.geany.org/commit/da5f6a73719d1b807c1900cb7ea32… Log Message: ----------- Fix header filename on nightly builds page Modified Paths: -------------- nightlybuilds/templatetags/nightlybuilds_tags.py Modified: nightlybuilds/templatetags/nightlybuilds_tags.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -50,7 +50,7 @@ def get_build_log(nightly_build, log_type): # ---------------------------------------------------------------------- @register.simple_tag def get_details(nightly_build): - header_txt = os.path.join(BASE_DIR, nightly_build.nightly_build_target.folder, 'HEADER.txt') + header_txt = os.path.join(BASE_DIR, nightly_build.nightly_build_target.folder, 'header.html') if os.path.exists(header_txt): return format_html( '<a href="https://nightly.geany.org/{}/">Details</a>', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] e1e98e: Remove obsolete settings
by Enrico Tröger 21 Jun '19

21 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 21 Jun 2019 12:38:26 UTC Commit: e1e98ee04a7b4e479ca1d68fed34726cb8ac761a https://github.com/geany/www.geany.org/commit/e1e98ee04a7b4e479ca1d68fed347… Log Message: ----------- Remove obsolete settings Modified Paths: -------------- geany/settings.py geany/sitemaps.py Modified: geany/settings.py 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -171,9 +171,6 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True SITE_ID = 1 -SITE_DOMAIN_WWW = 'www.geany.org' -SITE_DOMAIN_PASTEBIN = 'pastebin.geany.org' -SITE_DOMAIN_NIGHTLY = 'nightly.geany.org' # If you set this to False, Django will make some optimizations so as not # to load the internationalization machinery. Modified: geany/sitemaps.py 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -155,7 +155,8 @@ def __init__(self): # ---------------------------------------------------------------------- def add(self, generator_class, url_patterns, site_domain=None): if site_domain is None: - site_domain = settings.SITE_DOMAIN_WWW + site = Site.objects.get(id=settings.SITE_ID) + site_domain = site.domain sitemap_generator_item = (generator_class, url_patterns, site_domain) self._sitemap_generators.append(sitemap_generator_item) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] a889c9: Fix generated links in Pastebin documentation
by Enrico Tröger 21 Jun '19

21 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 21 Jun 2019 12:26:03 UTC Commit: a889c9365a375e17e27537cd31336528a5c45a3f https://github.com/geany/www.geany.org/commit/a889c9365a375e17e27537cd31336… Log Message: ----------- Fix generated links in Pastebin documentation Modified Paths: -------------- pastebin/templates/pastebin/api.html pastebin/templates/pastebin/help.html Modified: pastebin/templates/pastebin/api.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,7 @@ <h1>API</h1> fields.append(('lexer', 'python')) encoded_data = urllib.parse.urlencode(fields).encode('utf-8') request = urllib.request.Request( - 'https://{{ request.site.domain }}{% url 'snippet_api' %}', + '{{ request.scheme }}://{{ request.get_host }}{% url 'snippet_api' %}', encoded_data, ) response = urllib.request.urlopen(request) Modified: pastebin/templates/pastebin/help.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -13,7 +13,7 @@ <h2>What is pastebin?</h2> most people use it like this:</p> <ul> <li><a href="{% url 'snippet_new' %}">submit</a> a code fragment to pastebin, -getting a url like https://{{ request.site.domain }}/p/abc1234</li> +getting a url like {{ request.scheme }}://{{ request.get_host }}{% url 'snippet_details' 'abc1234' %}</li> <li>paste the url into an IRC or IM conversation</li> <li>someone responds by reading and perhaps submitting a modification of your code</li> </ul> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 46e1aa: Center headings of feature boxes on homepage
by Enrico Tröger 20 Jun '19

20 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 20 Jun 2019 10:42:49 UTC Commit: 46e1aaec788059e498e98e3178e60edf414e3dde https://github.com/geany/www.geany.org/commit/46e1aaec788059e498e98e3178e60… Log Message: ----------- Center headings of feature boxes on homepage Modified Paths: -------------- geany/templates/home.html Modified: geany/templates/home.html 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -111,12 +111,12 @@ <h1>Geany - The Flyweight IDE</h1> <div class="row"> <div class="col-md-4 news-list2"> <div class="feature-icon"><span class="glyphicon glyphicon-calendar" aria-hidden="true"></span></div> - <h2>News</h2> + <h2 class="text-center">News</h2> {% get_recent_news %} </div> <div class="col-md-4"> <div class="feature-icon"><span class="glyphicon glyphicon-flash" aria-hidden="true"></span></div> - <h2>Fast & Small</h2> + <h2 class="text-center">Fast & Small</h2> <p>One the primary reasons for Geany's existence is that there is a need for a decent, GUI, lightweight, cross-platform, flexible and powerful IDE/editor. Many editors meet one or more of these @@ -127,7 +127,7 @@ <h2>Fast & Small</h2> </div> <div class="col-md-4"> <div class="feature-icon"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span></div> - <h2>Great Community</h2> + <h2 class="text-center">Great Community</h2> <p>Geany is Good Ol' Fashioned <a href="https://en.wikipedia.org/wiki/Free_software">Free Software</a>. Using the <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 license</a>, @@ -148,7 +148,7 @@ <h2>Great Community</h2> <div class="row"> <div class="col-md-4"> <div class="feature-icon"><span class="glyphicon glyphicon-random" aria-hidden="true"></span></div> - <h2>Easily Customizable</h2> + <h2 class="text-center">Easily Customizable</h2> <p> Many parts of Geany are heavily customizable like color themes (<a href="https://github.com/geany/geany-themes">Geany Themes project</a>) or @@ -161,7 +161,7 @@ <h2>Easily Customizable</h2> </div> <div class="col-md-4"> <div class="feature-icon"><span class="glyphicon glyphicon-file" aria-hidden="true"></span></div> - <h2>Many Filetypes</h2> + <h2 class="text-center">Many Filetypes</h2> <p> Many supported filetypes including popular programming languages like C, Java, PHP, HTML, JavaScript, Python or Perl. @@ -175,7 +175,7 @@ <h2>Many Filetypes</h2> </div> <div class="col-md-4"> <div class="feature-icon"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span></div> - <h2>Many Plugins</h2> + <h2 class="text-center">Many Plugins</h2> <p> With Geany's plugin system, users can get more features into Geany and developers can easily add new features and/or improve existing ones. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2019