diff options
| author | Jochen Topf <jochen@topf.org> | 2013-01-23 19:03:38 +0100 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2013-01-23 19:03:38 +0100 |
| commit | 47ec7124db3083a9a2838eec2479ec56f7990d5c (patch) | |
| tree | 75ce7be0fbf6f663881f1adab98caed97fe5da49 | |
| parent | c601fa9d219e846f1651751e003f6b6c9e8f7d7f (diff) | |
| download | taginfo-47ec7124db3083a9a2838eec2479ec56f7990d5c.tar taginfo-47ec7124db3083a9a2838eec2479ec56f7990d5c.tar.gz | |
Add view for embedding relation info in wiki
| -rw-r--r-- | web/lib/ui/embed.rb | 7 | ||||
| -rw-r--r-- | web/views/embed/key.erb | 2 | ||||
| -rw-r--r-- | web/views/embed/layout.erb | 16 |
3 files changed, 14 insertions, 11 deletions
diff --git a/web/lib/ui/embed.rb b/web/lib/ui/embed.rb index 80e67b1..1968b6b 100644 --- a/web/lib/ui/embed.rb +++ b/web/lib/ui/embed.rb @@ -15,4 +15,11 @@ class Taginfo < Sinatra::Base erb :'embed/tag', :layout => :'embed/layout' end + get '/embed/relation' do + @rtype = params[:rtype] + @dbrtype = @db.select("SELECT * FROM db.relation_types").condition('rtype = ?', @rtype).execute()[0] + @roles = @db.select("SELECT role FROM db.prevalent_roles WHERE rtype=? ORDER BY count DESC LIMIT 10", @rtype).execute().map{ |row| row['role'] == '' ? '<i>(empty role)</i>' : row['role'] } + erb :'embed/relation', :layout => :'embed/layout' + end + end diff --git a/web/views/embed/key.erb b/web/views/embed/key.erb index 8517ddf..1dd0ac6 100644 --- a/web/views/embed/key.erb +++ b/web/views/embed/key.erb @@ -2,7 +2,7 @@ <a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a> <p>Statistics about the key will appear here.</p> <% elsif @dbkey.nil? %> -<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/tags/?key=<%= escape(@key) %>&value=<%= escape(@value) %>">tag<b>info</b> [More...]</a> +<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/keys/?key=<%= escape(@key) %>">tag<b>info</b> [More...]</a> <p>This key does not appear in the OSM database.</p> <% else %> <a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/keys/?key=<%= escape(@key) %>">tag<b>info</b> [More...]</a> diff --git a/web/views/embed/layout.erb b/web/views/embed/layout.erb index edb3c28..5bda56e 100644 --- a/web/views/embed/layout.erb +++ b/web/views/embed/layout.erb @@ -14,12 +14,8 @@ div.main { width: 180px; background-color: #ffffff; border: 1px solid #a0a0a0; + border-radius: 4px; padding: 4px; - -moz-border-radius: 4px; - -khtml-border-radius: 4px; - -webkit-border-radius: 4px; - -chrome-border-radius: 4px; - -o-border-radius: 4px; } a img { @@ -47,10 +43,10 @@ div.content td.ft { } </style> - </head> - <body> - <div class="main"> +</head> +<body> +<div class="main"> <%= yield %> - </div> - </body> +</div> +</body> </html> |