Skip to content

Commit

Permalink
Add goldsmiley + fix dates in files
Browse files Browse the repository at this point in the history
  • Loading branch information
arendjantetteroo committed May 25, 2020
1 parent 9d04987 commit 1760169
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 The Green Web Foundation
Copyright (c) 2014-2020 The Green Web Foundation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions thegreenweb/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Chrome functions for The Green Web addon
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2017
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down Expand Up @@ -77,7 +77,7 @@ function getCurrentTime()
function getGreencheck(url, tabId)
{
var currentTime = getCurrentTime();

var cache = window.localStorage.getItem(url);
if (cache !== null) {
// Item in cache, check cachetime
Expand Down
2 changes: 1 addition & 1 deletion thegreenweb/green-page-links.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Pagemod for all external links on site
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2014
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down
Binary file added thegreenweb/images/goldsmiley20x20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions thegreenweb/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"48" : "/icons/48.gif",
"128": "/icons/128.gif"
},
"homepage_url": "http://www.thegreenwebfoundation.org/add-ons",
"homepage_url": "https://www.thegreenwebfoundation.org/add-ons",
"page_action": {
"default_icon": "icon.png",
"default_title": "The Green Web"
Expand All @@ -31,7 +31,8 @@
"images/greenfan20x20.gif",
"images/greenhouse20x20.gif",
"images/greenquestion20x20.gif",
"images/grey20x20.gif"
"images/grey20x20.gif",
"images/goldsmiley20x20.png"
],
"permissions": [
"http://api.thegreenwebfoundation.org/",
Expand Down
7 changes: 7 additions & 0 deletions thegreenweb/options.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* Options page
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
* Saves options to Chrome storage api.
*
Expand Down
2 changes: 1 addition & 1 deletion thegreenweb/search-bing.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Bing search pagemod functions
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2017
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion thegreenweb/search-ecosia.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Ecosia search pagemod functions (Based on bing search)
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2017
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion thegreenweb/search-google.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Google search pagemod functions
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2017
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion thegreenweb/search-yahoo.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Yahoo search pagemod functions
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2017
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down
9 changes: 5 additions & 4 deletions thegreenweb/thegreenweb-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Utilities for the greenweb add-on
*
* @author Arend-Jan Tetteroo <[email protected]>
* @copyright Cleanbits/The Green Web Foundation 2010-2014
* @copyright Cleanbits/The Green Web Foundation 2010-2020
*/

/**
Expand Down Expand Up @@ -156,12 +156,13 @@ function getImagePath(file)
icons.greenquestion = chrome.runtime.getURL("/images/greenquestion20x20.gif");
icons.greenfan = chrome.runtime.getURL("/images/greenfan20x20.gif");
icons.greenhouse = chrome.runtime.getURL("/images/greenhouse20x20.gif");
icons.goldsmiley = chrome.runtime.getURL("/images/goldsmiley20x20.png");

if (icons[file]) {
return icons[file];
}

return 'http://images.cleanbits.net/icons/' + file + "20x20.gif";
return 'https://api.thegreenwebfoundation.org/icons/' + file + "20x20.gif";
}

/**
Expand Down Expand Up @@ -227,14 +228,14 @@ function getTitleWithLink(data)
}
if (data.green) {
if (data.hostedby) {
return data.url + ' ' + '<a target=\'_blank\' href=\'http://www.thegreenwebfoundation.org/thegreenweb/#/providers/' + data.hostedbyid + '\'>' + ' is sustainably hosted by ' + ' ' + data.hostedby + '</a>';
return data.url + ' ' + '<a target=\'_blank\' href=\'https://www.thegreenwebfoundation.org/thegreenweb/#/providers/' + data.hostedbyid + '\'>' + ' is sustainably hosted by ' + ' ' + data.hostedby + '</a>';
}
return data.url + ' ' + 'is sustainably hosted';
}

if (data.data === false) {
// No data available, show help message
return "No data available yet for this country domain. Wanna help? Contact us through " + " <a target=\'_blank\' href=\'http://www.thegreenwebfoundation.org\'>www.thegreenwebfoundation.org</a>";
return "No data available yet for this country domain. Wanna help? Contact us through " + " <a target=\'_blank\' href=\'https://www.thegreenwebfoundation.org\'>www.thegreenwebfoundation.org</a>";
}

// Data available, so show grey site
Expand Down

0 comments on commit 1760169

Please sign in to comment.