github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 22:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for testing the installed version in the thank-you.html. Changed the menu generation to use the "menu" metadata, if filled the entry is used as the menu name. Fixed favicon.ico Changed the tickets.markdown, but I don't know if this is okay (used to forward), this is called from Greenshot!

Browse source
This commit is contained in:
Robin 2016-10-17 23:41:37 +02:00
commit a6510677bf
20 changed files with 144 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,4 +1,6 @@
/_site
/*.lock
**/*.*~
import-wp.sh
import-wp.sh
.jekyll-metadata
Gemfile.lock

25
_includes/donate.html
View file

@ -90,10 +90,6 @@ You can send us donations directly via money transfer. Please use the account de
<th>Bank Adress</th>
<td>Theodor-Heuss-Allee 106<br>60486 Frankfurt am Main<br>Germany</td>
</tr>
<tbody id="international">
<tr>
<th colspan="2" style="color:#000000">International transfers</th>
</tr>
<tr>
<th>IBAN</th>
<td>DE25500105175410753447</td>
@ -103,19 +99,6 @@ You can send us donations directly via money transfer. Please use the account de
<td>INGDDEFF</td>
</tr>
</tbody>
<tbody id="germany">
<tr>
<th colspan="2" style="color:#000000">For transfers from German accounts:</th>
</tr>
<tr>
<th>Kontonummer (Account number)</th>
<td>5410753447</td>
</tr>
<tr>
<th>BLZ (Bank code)</th>
<td>500 105 17</td>
</tr>
</tbody>
</table>
</div>
<div id="tabs-amazon" class="tabs-content">
@ -124,13 +107,13 @@ You can send us donations directly via money transfer. Please use the account de
The best thing is: there are no additional costs for you :)</p>
<p>Please choose your amazon store:<br/>
<em>[Advertisement]</em></p>
<p><a rel="nofollow" href="http://www.amazon.com/gp/redirect.html?ie=UTF8&amp;location=http%3A%2F%2Fwww.amazon.com%2F&amp;tag=greenshot-20&amp;linkCode=ur2&amp;camp=1789&amp;creative=9325" class="icon amazon"><img width="16" height="11" title="us" alt="us" src="/assets/wp-content/themes/greenshot/images/flags/us.gif"> amazon.com</a><img width="1" border="0" height="1" alt="" src="http://www.assoc-amazon.com/e/ir?t=greenshot-20&amp;l=ur2&amp;o=1" style="border: medium none ! important; margin: 0px ! important;"/><br>
<a rel="nofollow" href="http://www.amazon.co.uk/?_encoding=UTF8&tag=greenshot-21&linkCode=ur2&camp=1634&creative=6738" class="icon amazon"><img width="16" height="11" title="uk" alt="uk" src="/assets/wp-content/themes/greenshot/images/flags/gb.gif"> amazon.co.uk</a><img width="1" border="0" height="1" alt="" src="http://www.assoc-amazon.co.uk/e/ir?t=greenshot-21&amp;l=ur2&amp;o=2" style="border: medium none ! important; margin: 0px ! important;"/><br>
<a rel="nofollow" href="http://www.amazon.de/gp/redirect.html?ie=UTF8&amp;location=http%3A%2F%2Fwww.amazon.de%2F&amp;site-redirect=de&amp;tag=greenshot2-21&amp;linkCode=ur2&amp;camp=1638&amp;creative=6742" class="icon amazon"><img width="16" height="11" title="de" alt="de" src="/assets/wp-content/themes/greenshot/images/flags/de.gif"> amazon.de</a><img width="1" border="0" height="1" alt="" src="http://www.assoc-amazon.de/e/ir?t=greenshot2-21&amp;l=ur2&amp;o=3" style="border: medium none ! important; margin: 0px ! important;"/></p>
<p><a rel="nofollow" href="http://www.amazon.com/gp/redirect.html?ie=UTF8&amp;location=http%3A%2F%2Fwww.amazon.com%2F&amp;tag=greenshot-20&amp;linkCode=ur2&amp;camp=1789&amp;creative=9325" class="icon amazon"><img width="16" height="11" title="us" alt="us" src="/assets/flags/us.gif"> amazon.com</a><img width="1" border="0" height="1" alt="" src="http://www.assoc-amazon.com/e/ir?t=greenshot-20&amp;l=ur2&amp;o=1" style="border: medium none ! important; margin: 0px ! important;"/><br>
<a rel="nofollow" href="http://www.amazon.co.uk/?_encoding=UTF8&tag=greenshot-21&linkCode=ur2&camp=1634&creative=6738" class="icon amazon"><img width="16" height="11" title="uk" alt="uk" src="/assets/flags/gb.gif"> amazon.co.uk</a><img width="1" border="0" height="1" alt="" src="http://www.assoc-amazon.co.uk/e/ir?t=greenshot-21&amp;l=ur2&amp;o=2" style="border: medium none ! important; margin: 0px ! important;"/><br>
<a rel="nofollow" href="http://www.amazon.de/gp/redirect.html?ie=UTF8&amp;location=http%3A%2F%2Fwww.amazon.de%2F&amp;site-redirect=de&amp;tag=greenshot2-21&amp;linkCode=ur2&amp;camp=1638&amp;creative=6742" class="icon amazon"><img width="16" height="11" title="de" alt="de" src="/assets/flags/de.gif"> amazon.de</a><img width="1" border="0" height="1" alt="" src="http://www.assoc-amazon.de/e/ir?t=greenshot2-21&amp;l=ur2&amp;o=3" style="border: medium none ! important; margin: 0px ! important;"/></p>
</div>
<div id="amazon2">
<p><strong>
<span lang="de"><img width="16" height="11" title="de" alt="de" src="/assets/wp-content/themes/greenshot/images/flags/de.gif"> Kunden von Amazon.de können uns gerne unterstützem, indem Sie uns etwas von unserer <a href="http://www.amazon.de/registry/wishlist/14V0E5HW3WQ9Z" target="_blank">Wunschliste</a> kaufen (Gutscheine sind immer willkommen :) bitte verwenden Sie getgreenshot@gmail.com als Empfängeradresse).</span><br>
<span lang="de"><img width="16" height="11" title="de" alt="de" src="/assets/flags/de.gif"> Kunden von Amazon.de können uns gerne unterstützem, indem Sie uns etwas von unserer <a href="http://www.amazon.de/registry/wishlist/14V0E5HW3WQ9Z" target="_blank">Wunschliste</a> kaufen (Gutscheine sind immer willkommen :) bitte verwenden Sie getgreenshot@gmail.com als Empfängeradresse).</span><br>
(Amazon.de customers may support us by buying us something from our <a href="http://www.amazon.de/registry/wishlist/14V0E5HW3WQ9Z" target="_blank">wish list</a> (gift coupons are always welcome :) please use getgreenshot@gmail.com as recipient address).)</strong></p>
</div>
</div>

13
_includes/head.html
View file

@ -11,13 +11,18 @@
<link rel="stylesheet" href="{{ '/css/normalize.min.css' | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
{% if page.tags contains "uses_alerts" %}
<link rel="stylesheet" href="{{ '/css/alerts.css' | prepend: site.baseurl }}">
{% endif %}
<link href='http://fonts.googleapis.com/css?family=Lato|Bangers' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="shortcut icon" href="/favicon.ico" sizes="16x16">
<script src="{{ '/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' | prepend: site.baseurl }}"></script>
<script src="{{ '/js/vendor/modernizr-3.3.1.min.js' | prepend: site.baseurl }}"></script>
<script src="{{ '/js/vendor/jquery-1.11.1.min.js' | prepend: site.baseurl }}"></script>
<script src="{{ '/js/vendor/jquery-3.1.1.min.js' | prepend: site.baseurl }}"></script>
<script src="{{ '/js/vendor/jquery.slides.min.js' | prepend: site.baseurl }}"></script>
</head>
</head>

11
_includes/header.html
View file

@ -19,16 +19,17 @@
<a href="/" class="logo"><img src="/assets/greenshot-logo.png"></a>
<nav>
<ul>
{% for availablepage in site.pages %}
{% if availablepage.tags contains "menu" %}
{% for availablepage in site.pages %}{% if availablepage.menu %}
<li>
<a {% if page.url == availablepage.url %}class="active"{% endif %} href="{{ availablepage.url }}">{{ availablepage.title }}</a>
<a {% if page.url == availablepage.url %}class="active"{% endif %} href="{{ availablepage.url }}">{{ availablepage.menu }}</a>
</li>
{% endif %}
{% endfor %}
{% endif %}{% endfor %}
</ul>
</nav>
<div class="servicelinks">
Report a <a href="https://greenshot.atlassian.net/browse/BUG">bug</a> &middot;
Suggest a <a href="https://greenshot.atlassian.net/browse/FEATURE">feature</a> &middot;
Ask a <a href="https://greenshot.atlassian.net/browse/SUPPORT">support question</a> &middot;
<a href="/sitemap/">sitemap</a> &middot;
<a href="/impressum/">impressum</a>
</div>

7
_includes/tickets.html Normal file
View file

@ -0,0 +1,7 @@
<h4>Got Feedback or Bugs?</h4>
First, please have a look at our <a href="/faq/">FAQ</a> and <a href="/help/">help</a> pages.<p/>
<ul>
<li>Report a <a href="https://greenshot.atlassian.net/browse/BUG">bug</a></li>
<li>Suggest a <a href="https://greenshot.atlassian.net/browse/FEATURE">feature</a></li>
<li>Ask a <a href="https://greenshot.atlassian.net/browse/SUPPORT">support question</a></li>
</ul>

8
css/alerts.css Normal file
View file

@ -0,0 +1,8 @@
/*!
* bootswatch v3.2.0
* Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park
* Licensed under MIT
* Based on Bootstrap
*//*! normalize.css v3.0.1 | MIT License | git.io/normalize */
.collapse{display:none}.alert{padding:15px;margin-bottom:18px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{background-color:#fcf8e3;border-color:#fbeed5;color:#c09853}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{background-color:#f2dede;border-color:#eed3d7;color:#b94a48}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}

BIN
favicon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

4
js/vendor/jquery-3.1.1.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

11
js/vendor/modernizr-2.6.2-respond-1.1.0.min.js vendored
View file

File diff suppressed because one or more lines are too long

3
js/vendor/modernizr-3.3.1.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

5
pages/blog.html
View file

@ -2,7 +2,10 @@
layout: page
title: Blog
permalink: /blog/
tags: menu
menu: Blog
categories: []
comments: []
tags: []
---
<div class="container-fluid">

4
pages/downloads.markdown
View file

@ -3,9 +3,11 @@ layout: page
status: publish
published: true
title: Downloads
menu: Downloads
permalink: /downloads/
categories: []
comments: []
tags: menu
tags: []
---
{% assign latest_release = site.github.releases | where:"prerelease",false | where:"draft",false | first %}
<div class="two-col left-box">

5
pages/faq.html
View file

@ -1,8 +1,11 @@
---
layout: page
title: FAQ
tags: menu
menu: FAQ
permalink: /faq/
categories: []
comments: []
tags: []
---
<div class="row">

3
pages/help.markdown
View file

@ -3,9 +3,10 @@ layout: page
status: publish
published: true
title: Help
menu: Help
permalink: /help/
categories: []
tags: menu
tags: []
comments: []
---
<div class="pull-right">{% include help-nav.html %}</div>

3
pages/impressum.markdown
View file

@ -3,6 +3,9 @@ layout: page
title: Impressum
permalink: /impressum/
metarobots: noindex,nofollow
categories: []
comments: []
tags: []
---
<p><a href="http://en.wikipedia.org/wiki/Impressum" target="_blank" style="color:#999999">What is this?</a></p>
<p>Information in accordance with §5 TMG (Telemedia Act - Germany)</p>

3
pages/index.html
View file

@ -2,6 +2,9 @@
layout: page
permalink: /
title: Greenshot
categories: []
comments: []
tags: []
---

5
pages/screenshots.html
View file

@ -2,7 +2,10 @@
layout: page
title: Screenshots
permalink: /screenshots/
tags: menu
menu: Screenshots
categories: []
comments: []
tags: []
---

5
pages/support-greenshot.html
View file

@ -2,6 +2,9 @@
layout: page
title: Support us
permalink: /support-greenshot/
tags: menu
menu: Support us
categories: []
comments: []
tags: []
---
{% include donate.html %}

66
pages/thank-you.html
View file

@ -2,7 +2,73 @@
layout: page
title: Thank you for using Greenshot
permalink: /thank-you/
categories: []
comments: []
tags: [uses_alerts]
---
<div id="currentVersion" class="alert alert-success collapse" role="alert">
You just installed the most recent version of Greenshot.
</div>
<div id="oldVersion" class="alert alert-danger collapse" role="alert">
<strong>The version you just installed is an older Greenshot version.</strong><br/>
You might want to download the newest version, which is {{ latest_release.tag_name }}, from <a href="/downloads/">here</a>.
</div>
<p>
<strong>We are happy that you installed Greenshot. If you like it, please consider to support the development of this open source screenshot tool with a donation.</strong></p>
{% include donate.html %}
<script>
// The following checks if the passed version in the URL is lower or equal to the known release.
// Depending on the outcome, it will show a warning or a positive message.
// Return 1 if a > b
// Return -1 if a < b
// Return 0 if a == b
function compareVersion(a, b) {
if (a === b) {
return 0;
}
var a_components = a.split(".");
var b_components = b.split(".");
var len = Math.min(a_components.length, b_components.length);
// loop while the components are equal
for (var i = 0; i < len; i++) {
// A bigger than B
if (parseInt(a_components[i]) > parseInt(b_components[i])) {
return 1;
}
// B bigger than A
if (parseInt(a_components[i]) < parseInt(b_components[i])) {
return -1;
}
}
// If one's a prefix of the other, the longer one is greater.
if (a_components.length > b_components.length) {
return 1;
}
if (a_components.length < b_components.length) {
return -1;
}
// Otherwise they are the same.
return 0;
}
{% assign latest_release = site.github.releases | where:"prerelease",false | where:"draft",false | first %}
var installedVersion = /version=([^&]+)/.exec(location)[1];
var greenshotTag = {% if latest_release.tag_name %}"{{ latest_release.tag_name }}"{% else %}"Greenshot-Test-1.2.8.12"{% endif %};
var releaseVersion = /.*(\d+\.\d+\.\d+\.\d+)/.exec(greenshotTag)[1];
var compare=compareVersion(releaseVersion, installedVersion);
if (compare >= 1) {
jQuery('#oldVersion').slideToggle();
} else if (compare == 0) {
jQuery('#currentVersion').slideToggle();
}
</script>

13
pages/tickets.markdown
View file

@ -1,9 +1,10 @@
---
layout: page
title: Greenshot Tickets
title: Got Feedback or Bugs?
permalink: /tickets/
categories: []
comments: []
tags: []
---
<p>You will be redirected to our issue tracking system within seconds.</p>
<p>If the redirect does not work, <a href="https://greenshot.atlassian.net/">please click here</a>.</p>
<script type="text/javascript">
window.setTimeout('window.location.href=unescape("https://greenshot.atlassian.net/"),5000');
</script>
{% include tickets.html %}