summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--taginfo-config-example.json12
-rw-r--r--web/lib/api/main.rb13
-rw-r--r--web/public/img/instance-ch.pngbin842 -> 0 bytes
-rw-r--r--web/public/img/instance-fr.pngbin140 -> 0 bytes
-rw-r--r--web/public/img/instance-ie.pngbin1143 -> 0 bytes
-rw-r--r--web/public/img/instance-it.pngbin173 -> 0 bytes
-rw-r--r--web/public/img/instance-world.pngbin1617 -> 0 bytes
-rw-r--r--web/public/img/instance.pngbin403 -> 0 bytes
-rw-r--r--web/public/img/logo/ch.pngbin0 -> 325 bytes
-rw-r--r--web/public/img/logo/fr.pngbin0 -> 212 bytes
-rw-r--r--web/public/img/logo/ie.pngbin0 -> 214 bytes
-rw-r--r--web/public/img/logo/it.pngbin0 -> 213 bytes
-rw-r--r--web/public/img/logo/test.pngbin0 -> 571 bytes
-rwxr-xr-xweb/taginfo.rb1
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
deleted file mode 100644
index 539ba3a..0000000
--- a/web/public/img/instance-ch.png
+++ /dev/null
Binary files differ
diff --git a/web/public/img/instance-fr.png b/web/public/img/instance-fr.png
deleted file mode 100644
index 5f9cc39..0000000
--- a/web/public/img/instance-fr.png
+++ /dev/null
Binary files differ
diff --git a/web/public/img/instance-ie.png b/web/public/img/instance-ie.png
deleted file mode 100644
index c01c03c..0000000
--- a/web/public/img/instance-ie.png
+++ /dev/null
Binary files differ
diff --git a/web/public/img/instance-it.png b/web/public/img/instance-it.png
deleted file mode 100644
index c004067..0000000
--- a/web/public/img/instance-it.png
+++ /dev/null
Binary files differ
diff --git a/web/public/img/instance-world.png b/web/public/img/instance-world.png
deleted file mode 100644
index 967ab4b..0000000
--- a/web/public/img/instance-world.png
+++ /dev/null
Binary files differ
diff --git a/web/public/img/instance.png b/web/public/img/instance.png
deleted file mode 100644
index 18b2366..0000000
--- a/web/public/img/instance.png
+++ /dev/null
Binary files differ
diff --git a/web/public/img/logo/ch.png b/web/public/img/logo/ch.png
new file mode 100644
index 0000000..551c110
--- /dev/null
+++ b/web/public/img/logo/ch.png
Binary files differ
diff --git a/web/public/img/logo/fr.png b/web/public/img/logo/fr.png
new file mode 100644
index 0000000..24bc854
--- /dev/null
+++ b/web/public/img/logo/fr.png
Binary files differ
diff --git a/web/public/img/logo/ie.png b/web/public/img/logo/ie.png
new file mode 100644
index 0000000..c81485f
--- /dev/null
+++ b/web/public/img/logo/ie.png
Binary files differ
diff --git a/web/public/img/logo/it.png b/web/public/img/logo/it.png
new file mode 100644
index 0000000..1428f6b
--- /dev/null
+++ b/web/public/img/logo/it.png
Binary files differ
diff --git a/web/public/img/logo/test.png b/web/public/img/logo/test.png
new file mode 100644
index 0000000..96828c0
--- /dev/null
+++ b/web/public/img/logo/test.png
Binary files differ
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'