aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-02-14 11:31:07 +0000
committerSimon McVittie <smcv@debian.org>2014-02-14 11:31:07 +0000
commitb0b3bebff6d0492cc37756d0a0d8efbb3594b54a (patch)
tree50aecd3299b32f0b49897dd83a7e04606b3722fd
parentb8e2c5aaeff96e0ea330d3fc26476590978caaee (diff)
downloadikiwiki-b0b3bebff6d0492cc37756d0a0d8efbb3594b54a.tar
ikiwiki-b0b3bebff6d0492cc37756d0a0d8efbb3594b54a.tar.gz
Replace Google, Yahoo, Flickr icons with versions by Jakub Steiner
Taken from gnome-online-accounts under LGPL-2.1+.
-rw-r--r--debian/copyright24
-rw-r--r--underlays/openid-selector/ikiwiki/openid/goa-account-flickr.pngbin0 -> 592 bytes
-rw-r--r--underlays/openid-selector/ikiwiki/openid/goa-account-google.pngbin0 -> 825 bytes
-rw-r--r--underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.pngbin0 -> 741 bytes
-rw-r--r--underlays/openid-selector/ikiwiki/openid/openid-jquery.js6
5 files changed, 27 insertions, 3 deletions
diff --git a/debian/copyright b/debian/copyright
index e1a81932b..0501d3f2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -211,6 +211,13 @@ Comment:
From http://code.google.com/p/openid-selector/
License: BSD-2-clause
+Files: underlays/openid-selector/ikiwiki/openid/goa-*
+Copyright:
+ © 2011 Red Hat, Inc.
+License: LGPL-2.1+
+Comment:
+ taken from data/icons/16x16/ in gnome-online-accounts git
+
Files: underlays/jquery/*
Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation
@@ -301,3 +308,20 @@ License: Expat
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png b/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png
new file mode 100644
index 000000000..5321642f6
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png
Binary files differ
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-google.png b/underlays/openid-selector/ikiwiki/openid/goa-account-google.png
new file mode 100644
index 000000000..ae1caa8a3
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/goa-account-google.png
Binary files differ
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png b/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png
new file mode 100644
index 000000000..51e1c119b
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png
Binary files differ
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 95c44a69c..3a8114b27 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -8,12 +8,12 @@ This code is licenced under the New BSD License.
var providers_large = {
google: {
name: 'Google',
- icon: 'http://google.com/favicon.ico',
+ icon: 'ikiwiki/openid/goa-account-google.png',
url: 'https://www.google.com/accounts/o8/id'
},
yahoo: {
name: 'Yahoo',
- icon: 'http://yahoo.com/favicon.ico',
+ icon: 'ikiwiki/openid/goa-account-yahoo.png',
url: 'http://me.yahoo.com/'
},
openid: {
@@ -32,7 +32,7 @@ var providers_small = {
},
flickr: {
name: 'Flickr',
- icon: 'http://flickr.com/favicon.ico',
+ icon: 'ikiwiki/openid/goa-account-flickr.png',
label: 'Enter your Flickr username:',
url: 'http://flickr.com/photos/{username}/'
},