Commit Graph

94 Commits (a55bd3640bb7099cbc083c162bf2a37f299cb17b)

Author SHA1 Message Date
Antoine Beaupré 05decdadcb osm: do not override sorting order of layers
(cherry picked from commit 805498bc838218f31d11efac0b02996b11a953d1)
2012-08-25 10:18:19 -04:00
Antoine Beaupré 636e04a13a make layers an array
this simplifies the code, make the configuration more intuitive, at
the cost of making the labels on the layers automatically generated
and therefore less customizable
2012-08-25 08:53:33 -04:00
Antoine Beaupré c7070ddd48 put google layers in parenthesis 2012-08-25 08:20:31 -04:00
Antoine Beaupré 69467738ed openlayers: use the provided layer name and put the source in parenthesis 2012-08-25 08:20:30 -04:00
Antoine Beaupré 081fd38636 make layers completely customizable 2012-08-25 08:20:30 -04:00
Antoine Beaupré 2fb93db1af simplify local tile code, uniform titles 2012-08-25 08:20:30 -04:00
Antoine Beaupré ac775ef8e7 extend default zoom to 19, OSM's maximum, simplify code 2012-08-25 08:20:30 -04:00
Antoine Beaupré acc4d7d7d6 osm: add optional google maps support
for google maps to work, an API key needs to be added to the configuration
2012-08-25 08:20:30 -04:00
Antoine Beaupré b57cad3131 osm: be explicit about projection of data 2012-08-25 08:20:30 -04:00
Geneviève Bastien 8fb42f42f4 OSM plugin: new config option to specify the url to fetch maps from 2012-08-25 08:20:30 -04:00
Joey Hess 917cdb7ade multiple osm fixes
* fix will_render calls to pass proper relative filenames
* fix urls to kml etc files to not assume wiki's top is at /
* avoid building the javascript to display the map in two different
  ways between the cgi and on-page maps
* refactor duplicate code
2012-03-18 17:07:01 -04:00
Joey Hess 4c6e39cb07 Add a few missing jquery UI icons to attachment upload widget underlay. 2012-03-05 16:54:54 -04:00
Joey Hess 2f013cc0c2 move osm.js to osm underlay and osm does not need javascript underlay 2012-03-03 17:39:02 -04:00
Antoine Beaupré 0f7c148494 move js in the right location 2012-03-03 15:54:19 -05:00
Antoine Beaupré 8bc28be4fa split off the javascript in a separate file 2012-03-03 15:19:29 -05:00
Joey Hess 77344163ed add osm.png
Add an underlay for the osm plugin.

Update links to right path to icon. Note that the osm plugin has a
pervasive bug in how it links to icons; it assumes the site is at /.
I did not attempt to fix that; it should be using urlto() to make a correct
relative link.
2012-03-03 12:16:00 -04:00
Paul Menzel 33e712b78e Bug#660549: ikiwiki: [PATCH] openid-jquery.js: Update URL of Wordpress favicon
From a3041e786fe9e09110218e83e996fe688f8376ea Mon Sep 17 00:00:00 2001
From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Sun, 19 Feb 2012 16:05:33 +0100
Subject: [PATCH] openid-jquery.js: Update URL of Wordpress favicon

The URL for the favicon for Wordpress in the OpenID login page [1] is not valid anymore and gives the following access denied error.

<?xml version="1.0" encoding="UTF-8"?>
<Error><Code>AccessDenied</Code><Message>Access Denied</Message><RequestId>C2BF55AE9F76A487</RequestId><HostId>FFmvol84V82UR34uxP1N7pDNGSLWS0QDtLBsP5JKj0GcU//C3jm3TftcIcGzFBbh</HostId></Error>

Looking at the Wordpress site I found a different URL for the favicon [2].

The other URLs only use non-secured HTTP access and therefore I only took the http version, although I do not know about the downsides.

[1] https://ddgw.s3.amazonaws.com/wordpress.org.ico
[2] http://s2.wp.com/i/favicon.ico
2012-02-19 19:26:53 -04:00
Joey Hess 73eb892ba2 jquery source cleanup
* Add unminified jquery js and css files to source.
* Update to jquery 1.6.2, and jquery-ui 1.8.14.

The full files are included in the source but not the binary.

I'm not minifying the files as part of build because I don't want ikiwiki
to build depend on a javascript minifier. (Let alone need one at runtime).
Nor do I want to deal with any breakage caused by the minifier. These
files were taken from the debian packages.

The jquery-tmpl full file was taken from revision
66bb852217c49ae8c9a8f2522150354ae80463de of its git repository, which
matches the minified file I already had. I did not want to deal with possible
breakage in newer versions; this thing claims to need an ancient version of
jquery (1.4.2), and is perhaps only working by luck with the newer versions
as it is.
2011-08-24 16:25:03 -04:00
Joey Hess aef8bef8ac a few more jquery icons 2011-06-21 15:22:35 -04:00
Joey Hess 5f0dfdd1ea move images around
jquery-ui expects to find them in a specific place relative to it
2011-06-15 20:12:16 -04:00
Joey Hess 344a2a2582 jquery-ui icons 2011-06-15 20:04:27 -04:00
Joey Hess c901e1e80c move image 2011-06-15 19:48:33 -04:00
Joey Hess c9781b20bf added jquery templates 2011-06-15 19:33:22 -04:00
Joey Hess f3fd7696cf added jquery-ui for attachment interface 2011-06-15 19:30:34 -04:00
Joey Hess a695b5b2f8 updated jquery and made it its own underlay 2011-06-15 19:15:06 -04:00
Joey Hess e2b43578a6 load attachment javascript into template the clean way 2011-06-15 19:08:40 -04:00
Joey Hess f183fed372 deleted a lot of code ikiwiki does not need
removed most of the css, going for standard plain ikiwiki look

Removed support for image previews, file size limits, delete buttons,
maximum number of files, file size display. Ikiwiki handles all that.

Turned on autoupload.
2011-06-15 18:45:32 -04:00
Joey Hess 9a4e7b6500 add the blueimp jquery fileupload widget
from http://aquantum-demo.appspot.com/file-upload
git version 7f89121

removed some files ikiwiki does not need
2011-06-15 18:41:50 -04:00
Joey Hess 9744c11f80 openid: Syntax tweak to the javascript code to make it work with MSIE 7 (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting the bug and providing access to debug it. 2010-08-17 16:05:17 -04:00
Joey Hess c5b3ea0dd4 avoid insane use of javascript "array" 2010-05-27 23:57:00 -04:00
Joey Hess c305303b42 hide local signin when nothing is selected 2010-05-10 16:04:28 -04:00
Joey Hess bf19c01f29 use labels 2010-05-08 16:16:38 -04:00
Joey Hess c3e9215e1f moved non-openid signin form into same page as openid selector; show/hide as buttons are pressed 2010-05-08 15:57:39 -04:00
Joey Hess f0914b386b Revert "add gmail button"
This reverts commit 32a79523bb.

Buggy and I need sleep.
2010-05-08 02:53:18 -04:00
Joey Hess 32a79523bb add gmail button
It uses the google profile openid url, which results in a nicer openid
than the o8/id url.
2010-05-08 02:38:54 -04:00
Joey Hess 541298e668 avoid setting cookie for promptless buttons
I think it is clearer to not have such a button appear pre-selected
when entering the signin page, because that may suggest to the user
they don't need to click on it, and yet they do.
2010-05-08 02:15:04 -04:00
Joey Hess ac8a91fe06 improve selector layout 2010-05-08 00:40:36 -04:00
Joey Hess f05043ed80 gardening openid provider list
- fix url to flickr profile
- remove blogger; google property and uses their openid system;
  wants to sign user up for a blogger blog
- remove technorati, which dropped openid provider support
- AOL seems to call it a username, not a screenname
2010-05-08 00:18:58 -04:00
Joey Hess 3a1d81bd9c avoid scaling favicons
chromium's rather impressive jaggy-free scaling spoiled me, but in
iceweasel, scaled favicons look crap
2010-05-07 21:54:58 -04:00
Joey Hess ede2d1b46d adapt to ikiwiki
Upstream ships a collection of icons, but the licences of them are very
unclear, since most seem to be taken from the various openid provider
websites. That can't be included in ikiwiki. So, instead hotlink to
favicons of sites, and for large display, include the site name.

Removed vidoop.com, which is gone.

If an url is passed to init as the second parameter, add a "Local Login"
provider, which just links to do=signin.
2010-05-07 21:21:04 -04:00
Joey Hess 0800d25f10 modify labels to input box for consistency 2010-05-07 20:25:43 -04:00
Joey Hess 0f2bdbb968 use ikiwiki's replacement openid logo in input box 2010-05-07 20:20:28 -04:00
Joey Hess 7d152f5be5 modify openid selector to not default to http:// for openid
ikiwiki doesn't care if the http:// is there, and it seems cleaner and less
annoying this way
2010-05-07 20:17:31 -04:00
Joey Hess f8c2a67b3c pretty openid login
* openid: Incorporated a fancy openid-selector signin form.
  (http://code.google.com/p/openid-selector/)
* openid: Use "openid_identifier" as the form field, as required
  by OpenID Authentication v2.0 spec.
2010-05-07 20:14:25 -04:00
Joey Hess 1b8d2ce36b add minified jquery.js from openid-selector svn 2010-05-07 19:29:59 -04:00
Joey Hess 378c647768 patch hidden field setting code
Fixes http://code.google.com/p/openid-selector/issues/detail?id=11#c3
2010-05-07 19:10:50 -04:00
Joey Hess 76f6ff5f6b use me.yahoo.com
Fixes http://code.google.com/p/openid-selector/issues/detail?id=10
2010-05-07 19:02:55 -04:00
Joey Hess 7749350ecd r21 from http://code.google.com/p/openid-selector/source/checkout 2010-05-07 19:02:30 -04:00
Joey Hess e90d67d3c9 Moved javascript files under the ikiwiki/ directory, to avoid cluttering the top of the web root. This is another things that requires a wiki rebuild on upgrade to this version. 2010-04-24 00:54:59 -04:00
Joey Hess 0bd6c32766 fix file, should be symlink 2010-04-16 18:11:30 -04:00