summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2012-01-20 23:04:56 +0100
committerJochen Topf <jochen@topf.org>2012-01-20 23:05:15 +0100
commit6f9e6d0092cdc1efccd452eb54762bdd9dcfacd1 (patch)
tree955a165768fd785e8daf0d9794f62eb77cc46152 /web
parent6fcecfe90094d6a9082dfd0acc16684fd2d7dc41 (diff)
downloadtaginfo-6f9e6d0092cdc1efccd452eb54762bdd9dcfacd1.tar
taginfo-6f9e6d0092cdc1efccd452eb54762bdd9dcfacd1.tar.gz
Add more instance logos and API call to get to instance info
Diffstat (limited to 'web')
-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
13 files changed, 14 insertions, 0 deletions
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'