diff options
author | Jochen Topf <jochen@topf.org> | 2014-09-19 09:45:34 +0200 |
---|---|---|
committer | Jochen Topf <jochen@topf.org> | 2014-09-19 09:51:13 +0200 |
commit | d3482cff9698d1e636669d7e4680b240d92fbdef (patch) | |
tree | cbd1ccbb05d9734e20518be3c5c8cb16fa8ea9bd /web | |
parent | e923eca67ece443773022c1c4f6b3650839af722 (diff) | |
download | taginfo-d3482cff9698d1e636669d7e4680b240d92fbdef.tar taginfo-d3482cff9698d1e636669d7e4680b240d92fbdef.tar.gz |
Disable JOSM tab on key and tag pages.
Superseded by the new Project tab.
Diffstat (limited to 'web')
-rw-r--r-- | web/views/key.erb | 10 | ||||
-rw-r--r-- | web/views/tag.erb | 10 | ||||
-rw-r--r-- | web/viewsjs/key.js.erb | 24 | ||||
-rw-r--r-- | web/viewsjs/tag.js.erb | 24 |
4 files changed, 0 insertions, 68 deletions
diff --git a/web/views/key.erb b/web/views/key.erb index 7b809e6..49f0c94 100644 --- a/web/views/key.erb +++ b/web/views/key.erb @@ -40,7 +40,6 @@ <li><a href="#combinations"><%= h(t.taginfo.key_combinations) %></a></li> <li><a href="#map"><%= h(t.taginfo.map) %></a></li> <li><a href="#wiki"><%= h(t.sources.wiki.name) %></a></li> - <li><a href="#josm"><%= h(t.sources.josm.name) %></a></li> <li><a href="#projects"><%= h(t.taginfo.projects) %></a></li> </ul> <div id="overview"> @@ -102,15 +101,6 @@ <p><a class="extlink" target="_blank" rel="nofollow" href="//wiki.openstreetmap.org/w/index.php?action=edit&title=Key:<%= @key_uri %>"><%= h(t.pages.key.wiki_pages.create) %></a></p> <% end %> </div> - <div id="josm"> - <h2><%= h(t.pages.key.josm.title) %></h2> -<% if @josm_count > 0 %> - <table id="grid-josm"> - </table> -<% else %> - <p class="empty"><%= h(t.pages.key.josm.no_styles) %></p> -<% end %> - </div> <div id="projects"> <h2><%= h(t.pages.key.projects.title) %></h2> <table id="grid-projects"> diff --git a/web/views/tag.erb b/web/views/tag.erb index 28e7a2a..dda4594 100644 --- a/web/views/tag.erb +++ b/web/views/tag.erb @@ -39,7 +39,6 @@ <li><a href="#combinations"><%= h(t.taginfo.combinations) %></a></li> <li><a href="#map"><%= h(t.taginfo.map) %></a></li> <li><a href="#wiki"><%= h(t.sources.wiki.name) %></a></li> - <li><a href="#josm"><%= h(t.sources.josm.name) %></a></li> <li><a href="#projects"><%= h(t.taginfo.projects) %></a></li> </ul> <div id="overview"> @@ -99,15 +98,6 @@ <p><a class="extlink" target="_blank" rel="nofollow" href="//wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>"><%= h(t.pages.tag.wiki_pages.create) %></a></p> <% end %> </div> - <div id="josm"> - <h2><%= h(t.pages.tag.josm.title) %></h2> -<% if @josm_count > 0 %> - <table id="grid-josm"> - </table> -<% else %> - <p class="empty"><%= h(t.pages.key.josm.no_styles) %></p> -<% end %> - </div> <div id="projects"> <h2><%= h(t.pages.tag.projects.title) %></h2> <table id="grid-projects"> diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb index 9b8698f..a8b99fa 100644 --- a/web/viewsjs/key.js.erb +++ b/web/viewsjs/key.js.erb @@ -121,30 +121,6 @@ var create_flexigrid_for = { } }); }, - josm: function(key, filter_type) { - create_flexigrid('grid-josm', { - url: '/api/4/key/josm/style/rules?style=standard&key=' + encodeURIComponent(key), - colModel: [ - { display: '<%= h(osm.value) %>', name: 'value', width: 400, sortable: true }, - { display: '<%= h(misc.icon) %>', name: 'icon', width: 40, sortable: false, align: 'center' }, - { display: '<%= h(misc.line) %>', name: 'line', width: 40, sortable: false, align: 'center' }, - { display: '<%= h(misc.area) %>', name: 'area', width: 40, sortable: false, align: 'center' } - ], - sortname: 'value', - sortorder: 'asc', - preProcess: function(data) { - data.rows = jQuery.map(data.data, function(row, i) { - return { 'cell': [ - fmt_josm_value(row.key, row.value, row.value_bool), - fmt_josm_icon('standard', row.icon), - fmt_josm_line(row.line_width, row.line_color), - fmt_josm_area(row.area_color) - ] }; - }); - return data; - } - }); - }, projects: function(key, filter_type) { create_flexigrid('grid-projects', { url: '/api/4/key/projects?key=' + encodeURIComponent(key) + '&filter=' + encodeURIComponent(filter_type), diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb index 4616acc..3626aa3 100644 --- a/web/viewsjs/tag.js.erb +++ b/web/viewsjs/tag.js.erb @@ -101,30 +101,6 @@ var create_flexigrid_for = { } }); }, - josm: function(key, value) { - create_flexigrid('grid-josm', { - url: '/api/4/tag/josm/style/rules?style=standard&key=' + encodeURIComponent(key) + '&value=' + encodeURIComponent(value), - colModel: [ - { display: '<%= h(osm.value) %>', name: 'value', width: 400, sortable: false }, - { display: '<%= h(misc.icon) %>', name: 'icon', width: 40, sortable: false, align: 'center' }, - { display: '<%= h(misc.line) %>', name: 'line', width: 40, sortable: false, align: 'center' }, - { display: '<%= h(misc.area) %>', name: 'area', width: 40, sortable: false, align: 'center' } - ], - sortname: 'value', - sortorder: 'asc', - preProcess: function(data) { - data.rows = jQuery.map(data.data, function(row, i) { - return { 'cell': [ - fmt_josm_value(row.key, row.value, row.value_bool), - fmt_josm_icon('standard', row.icon), - fmt_josm_line(row.line_width, row.line_color), - fmt_josm_area(row.area_color) - ] }; - }); - return data; - } - }); - }, projects: function(key, value, filter_type) { create_flexigrid('grid-projects', { url: '/api/4/tag/projects?key=' + encodeURIComponent(key) + '&value=' + encodeURIComponent(value) + '&filter=' + encodeURIComponent(filter_type), |