diff options
author | Jochen Topf <jochen@topf.org> | 2012-01-20 23:04:56 +0100 |
---|---|---|
committer | Jochen Topf <jochen@topf.org> | 2012-01-20 23:05:15 +0100 |
commit | 6f9e6d0092cdc1efccd452eb54762bdd9dcfacd1 (patch) | |
tree | 955a165768fd785e8daf0d9794f62eb77cc46152 | |
parent | 6fcecfe90094d6a9082dfd0acc16684fd2d7dc41 (diff) | |
download | taginfo-6f9e6d0092cdc1efccd452eb54762bdd9dcfacd1.tar taginfo-6f9e6d0092cdc1efccd452eb54762bdd9dcfacd1.tar.gz |
Add more instance logos and API call to get to instance info
-rw-r--r-- | taginfo-config-example.json | 12 | ||||
-rw-r--r-- | web/lib/api/main.rb | 13 | ||||
-rw-r--r-- | web/public/img/instance-ch.png | bin | 842 -> 0 bytes | |||
-rw-r--r-- | web/public/img/instance-fr.png | bin | 140 -> 0 bytes | |||
-rw-r--r-- | web/public/img/instance-ie.png | bin | 1143 -> 0 bytes | |||
-rw-r--r-- | web/public/img/instance-it.png | bin | 173 -> 0 bytes | |||
-rw-r--r-- | web/public/img/instance-world.png | bin | 1617 -> 0 bytes | |||
-rw-r--r-- | web/public/img/instance.png | bin | 403 -> 0 bytes | |||
-rw-r--r-- | web/public/img/logo/ch.png | bin | 0 -> 325 bytes | |||
-rw-r--r-- | web/public/img/logo/fr.png | bin | 0 -> 212 bytes | |||
-rw-r--r-- | web/public/img/logo/ie.png | bin | 0 -> 214 bytes | |||
-rw-r--r-- | web/public/img/logo/it.png | bin | 0 -> 213 bytes | |||
-rw-r--r-- | web/public/img/logo/test.png | bin | 0 -> 571 bytes | |||
-rwxr-xr-x | web/taginfo.rb | 1 |
14 files changed, 22 insertions, 4 deletions
diff --git a/taginfo-config-example.json b/taginfo-config-example.json index 1ff40a3..4c4a275 100644 --- a/taginfo-config-example.json +++ b/taginfo-config-example.json @@ -1,16 +1,20 @@ -// This is an example of a Taginfo config file. +// This is an example of a taginfo config file. // Copy it to the directory above and name it 'taginfo-config.json', then change your local settings. { // You probably want to change all these. "instance": { - // url prefix for the site + // URL prefix for the site. "url": "http://localhost:4567", // Used in the title of all HTML pages. "name": "OpenStreetMap Taginfo", - // Description of this taginfo instance + // Description of this taginfo instance. "description": "This is a <b>taginfo test instance</b>. Change this text in your <tt>taginfo-config.json</tt>.", // URL path to instance icon in the upper left. - "icon": "/img/logo/world.png" + "icon": "/img/logo/test.png", + // Contact name and email address. + "contact": "Anonymous", + // Geographical area this taginfo instance covers. + "area": "World" }, // For the geodistribution map. See the wiki documentation about these settings. "geodistribution": { diff --git a/web/lib/api/main.rb b/web/lib/api/main.rb new file mode 100644 index 0000000..e48e716 --- /dev/null +++ b/web/lib/api/main.rb @@ -0,0 +1,13 @@ +# web/lib/api/main.rb +class Taginfo < Sinatra::Base + + api(2, 'about', { + }) do + data = {} + [:url, :name, :description, :icon, :contact, :area].each do |k| + data[k] = TaginfoConfig.get("instance.#{k}") + end + return data.to_json + end + +end diff --git a/web/public/img/instance-ch.png b/web/public/img/instance-ch.png Binary files differdeleted file mode 100644 index 539ba3a..0000000 --- a/web/public/img/instance-ch.png +++ /dev/null diff --git a/web/public/img/instance-fr.png b/web/public/img/instance-fr.png Binary files differdeleted file mode 100644 index 5f9cc39..0000000 --- a/web/public/img/instance-fr.png +++ /dev/null diff --git a/web/public/img/instance-ie.png b/web/public/img/instance-ie.png Binary files differdeleted file mode 100644 index c01c03c..0000000 --- a/web/public/img/instance-ie.png +++ /dev/null diff --git a/web/public/img/instance-it.png b/web/public/img/instance-it.png Binary files differdeleted file mode 100644 index c004067..0000000 --- a/web/public/img/instance-it.png +++ /dev/null diff --git a/web/public/img/instance-world.png b/web/public/img/instance-world.png Binary files differdeleted file mode 100644 index 967ab4b..0000000 --- a/web/public/img/instance-world.png +++ /dev/null diff --git a/web/public/img/instance.png b/web/public/img/instance.png Binary files differdeleted file mode 100644 index 18b2366..0000000 --- a/web/public/img/instance.png +++ /dev/null diff --git a/web/public/img/logo/ch.png b/web/public/img/logo/ch.png Binary files differnew file mode 100644 index 0000000..551c110 --- /dev/null +++ b/web/public/img/logo/ch.png diff --git a/web/public/img/logo/fr.png b/web/public/img/logo/fr.png Binary files differnew file mode 100644 index 0000000..24bc854 --- /dev/null +++ b/web/public/img/logo/fr.png diff --git a/web/public/img/logo/ie.png b/web/public/img/logo/ie.png Binary files differnew file mode 100644 index 0000000..c81485f --- /dev/null +++ b/web/public/img/logo/ie.png diff --git a/web/public/img/logo/it.png b/web/public/img/logo/it.png Binary files differnew file mode 100644 index 0000000..1428f6b --- /dev/null +++ b/web/public/img/logo/it.png diff --git a/web/public/img/logo/test.png b/web/public/img/logo/test.png Binary files differnew file mode 100644 index 0000000..96828c0 --- /dev/null +++ b/web/public/img/logo/test.png diff --git a/web/taginfo.rb b/web/taginfo.rb index 6237399..1b60efe 100755 --- a/web/taginfo.rb +++ b/web/taginfo.rb @@ -330,6 +330,7 @@ class Taginfo < Sinatra::Base #-------------------------------------------------------------------------- + load 'lib/api/main.rb' load 'lib/api/db.rb' load 'lib/api/wiki.rb' load 'lib/api/josm.rb' |