From fa3df1e7148975fa76f32d64fba3963146de151d Mon Sep 17 00:00:00 2001 From: Marcelo JĂșnior Date: Tue, 18 Nov 2014 15:05:11 -0300 Subject: [PATCH] virtuoso: change add triple feature ui to colorbox --- plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb | 5 +---- plugins/virtuoso/public/style.css | 11 +++++++++-- plugins/virtuoso/public/triples_management.js | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- plugins/virtuoso/views/virtuoso_plugin_admin/add_triple.html.erb | 10 ++++++---- plugins/virtuoso/views/virtuoso_plugin_admin/triple_management.html.erb | 2 +- 5 files changed, 74 insertions(+), 36 deletions(-) diff --git a/plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb b/plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb index 8cba474..b133a32 100644 --- a/plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb +++ b/plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb @@ -57,10 +57,7 @@ class VirtuosoPluginAdminController < AdminController triples_management = VirtuosoPlugin::TriplesManagement.new(environment) triples_management.add_triple(triple) - @triples = [] - - session[:notice] = _('Triple succesfully added.') - render :action => :triple_management + render json: { :ok => true, :message => _('Triple succesfully added.') } end end diff --git a/plugins/virtuoso/public/style.css b/plugins/virtuoso/public/style.css index 3629e90..719d029 100644 --- a/plugins/virtuoso/public/style.css +++ b/plugins/virtuoso/public/style.css @@ -2,7 +2,8 @@ margin: 10px 0; } -#virtuoso-triples-management input[type="text"] { +#virtuoso-triples-management input[type="text"], +#virtuoso-triples-management-add-triple input[type="text"] { width: 100% } @@ -10,7 +11,8 @@ width: 99%; } -#virtuoso-triples-management ul { +#virtuoso-triples-management ul, +#virtuoso-triples-management-add-triple ul { list-style-type: none; padding: 0; } @@ -29,3 +31,8 @@ #virtuoso-triples-management #triples-list .triple-actions { text-align: right; } + +#virtuoso-triples-management-add-triple { + width: 500px; + border: 1px solid white; +} diff --git a/plugins/virtuoso/public/triples_management.js b/plugins/virtuoso/public/triples_management.js index 75b384a..9e0c93c 100644 --- a/plugins/virtuoso/public/triples_management.js +++ b/plugins/virtuoso/public/triples_management.js @@ -1,3 +1,35 @@ +function add_triple() { + graph = jQuery("input#triple_graph").val(); + subject = jQuery("input#triple_subject").val(); + predicate = jQuery("input#triple_predicate").val(); + object = jQuery("input#triple_object").val(); + + var formData = { triple: { graph: graph, subject: subject, predicate: predicate, object: object } } + + jQuery.ajax({ + cache: false, + type: 'POST', + url: '/admin/plugin/virtuoso/add_triple', + data: formData, + dataType: 'json', + success: function(data, status, ajax){ + if ( !data.ok ) { + display_notice(data.error.message); + jQuery.colorbox.close(); + } + else { + display_notice(data.message); + jQuery.colorbox.close(); + } + }, + error: function(ajax, status, errorThrown) { + alert('Send request - HTTP '+status+': '+errorThrown); + } + }); + + return false; +} + function remove_triple(triple_id) { graph = jQuery("input#graph_uri").val(); subject = jQuery("input#triples_triple" + triple_id + "_from_subject").val(); @@ -7,31 +39,31 @@ function remove_triple(triple_id) { var formData = { triple: { graph: graph, subject: subject, predicate: predicate, object: object } } jQuery.ajax({ - cache: false, - type: 'POST', - url: '/admin/plugin/virtuoso/remove_triple', - data: formData, - dataType: 'json', - success: function(data, status, ajax){ - if ( !data.ok ) { - display_notice(data.error.message); - } - else { - display_notice(data.message); - jQuery("li#triple-" + triple_id).fadeOut(700, function() { - if (jQuery("ul#triples-list > li").length == 1) { - jQuery("form#form-triples-edit").remove(); - } - else { - jQuery("li#triple-" + triple_id).remove(); - } - }); - } - }, - error: function(ajax, status, errorThrown) { - alert('Send request - HTTP '+status+': '+errorThrown); + cache: false, + type: 'POST', + url: '/admin/plugin/virtuoso/remove_triple', + data: formData, + dataType: 'json', + success: function(data, status, ajax){ + if ( !data.ok ) { + display_notice(data.error.message); + } + else { + display_notice(data.message); + jQuery("li#triple-" + triple_id).fadeOut(700, function() { + if (jQuery("ul#triples-list > li").length == 1) { + jQuery("form#form-triples-edit").remove(); + } + else { + jQuery("li#triple-" + triple_id).remove(); + } + }); } - }); + }, + error: function(ajax, status, errorThrown) { + alert('Send request - HTTP '+status+': '+errorThrown); + } + }); - return false; + return false; } diff --git a/plugins/virtuoso/views/virtuoso_plugin_admin/add_triple.html.erb b/plugins/virtuoso/views/virtuoso_plugin_admin/add_triple.html.erb index 080879f..6aee115 100644 --- a/plugins/virtuoso/views/virtuoso_plugin_admin/add_triple.html.erb +++ b/plugins/virtuoso/views/virtuoso_plugin_admin/add_triple.html.erb @@ -1,7 +1,8 @@ -
-

<%= _('Virtuoso settings » Triples Management » Add Triple')%>

+
- <%= form_tag('/admin/plugin/virtuoso/add_triple', :method => 'post') do %> +

<%= _('Add Triple')%>

+ + <%= form_tag do %>
  • @@ -19,7 +20,8 @@
<% button_bar do %> - <%= submit_button(:save, _('Save')) %> + <%= button :add, _('Add'), {}, :href => '#', :onclick => "add_triple(); return false;" %> + <%= colorbox_close_button(_('Close')) %> <% end %> <% end %> diff --git a/plugins/virtuoso/views/virtuoso_plugin_admin/triple_management.html.erb b/plugins/virtuoso/views/virtuoso_plugin_admin/triple_management.html.erb index 598bc96..2096d97 100644 --- a/plugins/virtuoso/views/virtuoso_plugin_admin/triple_management.html.erb +++ b/plugins/virtuoso/views/virtuoso_plugin_admin/triple_management.html.erb @@ -6,7 +6,7 @@ <%= labelled_form_field(_('Query SPARQL:'), text_area_tag(:query, @query, :rows => 7)) %> <% button_bar do %> <%= submit_button(:search, _('Search triples')) %> - <%= button :add, _('Add triple'), :action => :add_triple %> + <%= colorbox_button('add', _('Add a triple'), { :action => 'add_triple' }) %> <% end %> <% end %> -- libgit2 0.21.2