share/views/public/js/rbbt/actions.js in rbbt-rest-1.2.33 vs share/views/public/js/rbbt/actions.js in rbbt-rest-1.2.34

- old
+ new

@@ -48,11 +48,11 @@ element = unescape(element) var name = [action, element].join(" - "); var a = $('<a>').attr('href', url).html(name); var li = $('<li>').append(a); - var icon = $('<i class="general foundicon-minus">') + var icon = $('<i class="general fi-minus">') var remove = $('<a class=remove_element></a>').append(icon) li.prepend(remove) job_list.append(li); } @@ -72,10 +72,11 @@ var controller = tool.element; controller.on('click', '> ul.actions li', function(e){ tool._activate_action(this); return false}); controller.on('click', '> ul.controls > li.reload', function(e){ tool._reload_action(this); return false}); controller.on('click', '> ul.controls > li.parameters', function(e){ tool._display_parameters(this); return false}); + controller.on('click', '> ul.controls > li.description', function(e){ tool._display_description(this); return false}); controller.on('click', '> ul.controls > li.pin', function(e){ tool._toggle_pin(this); return false}); controller.on('click', '> ul.controls > li.url', function(e){ tool._toogle_track(this); return false}); $('#top_menu li.user ul.jobs').on('click', 'a.remove_element', function(){ var link = $(this).next('a') tool._untrack(link.attr('href')) @@ -119,10 +120,15 @@ action_controller.find('ul.controls > li.pin').addClass('active'); }else{ action_controller.find('ul.controls > li.parameters').removeClass('active'); action_controller.find('ul.controls > li.pin').removeClass('active'); } + if (action_div.find('> .action_card > .action_description').length > 0){ + action_controller.find('ul.controls > li.description').addClass('active'); + }else{ + action_controller.find('ul.controls > li.description').removeClass('active'); + } } this._load(); this._update_jobs(); }, @@ -222,12 +228,32 @@ if(! $(e).hasClass('active')){ return false} var link = $(e); var action_controller = link.parents('.action_controller').first() var action_loader = action_controller.next('.action_loader').first(); var action_parameters = action_loader.find('.action_parameters').first(); + var action_description = action_loader.find('.action_description').first(); var action_content = action_parameters.next('.action_content').first(); action_parameters.toggleClass('active'); + action_description.removeClass('active'); + action_content.toggleClass('shifted'); + + $.scrollTo(this.element, {axis:'y', offset:{top: -$("#top_menu").height() - 20}}) + + return false + }, + + _display_description: function(e){ + if(! $(e).hasClass('active')){ return false} + var link = $(e); + var action_controller = link.parents('.action_controller').first() + var action_loader = action_controller.next('.action_loader').first(); + var action_parameters = action_loader.find('.action_parameters').first(); + var action_description = action_loader.find('.action_description').first(); + var action_content = action_parameters.next('.action_content').first(); + + action_description.toggleClass('active'); + action_parameters.removeClass('active'); action_content.toggleClass('shifted'); $.scrollTo(this.element, {axis:'y', offset:{top: -$("#top_menu").height() - 20}}) return false