diff --git a/app/assets/javascripts/application/collections.coffee b/app/assets/javascripts/application/collections.coffee index 8fbbd33029d3108b41bf282838b580152b5ee6a1..0289e4e56c771c88f98948a2259740103a4cf2af 100644 --- a/app/assets/javascripts/application/collections.coffee +++ b/app/assets/javascripts/application/collections.coffee @@ -100,13 +100,14 @@ $(document).on 'click', '.collection-selector', -> if this.checked if selected_objects.indexOf(this.value) < 0 selected_objects.push { "class" : $(this).attr('data-type'), "value" : this.value} - console.log(selected_objects) $(document).trigger('check_selected_collection') return else - index = selected_objects.indexOf(this.value) - if !!(~index) - selected_objects.splice(index, 1) + i = 0 + while i < selected_objects.length + if (selected_objects[i].value == this.value) + selected_objects.splice(i, 1) + i++ $(document).trigger('check_selected_collection') return @@ -137,14 +138,14 @@ $(document).on 'click', '.collection-button', -> collection = $('.collection-show-page').data('cid') index = permitted_types.indexOf($(this).data('action')) urls = [] - los = [] + learning_objects = [] if permitted_types[index] == 'remove' if ($('.collection-button').data('class') == 'collections') i = 0 while i < selected_objects.length - los.push selected_objects[i]["value"] + learning_objects.push selected_objects[i]["value"] i++ - urls.push '/collections/' + encodeURIComponent(collection) + '/learning_objects/' + encodeURIComponent(los.join(',')) + urls.push '/collections/' + encodeURIComponent(collection) + '/learning_objects/' + encodeURIComponent(learning_objects.join(',')) else i = 0 while i < selected_objects.length diff --git a/app/views/bookmarks/show.html.erb b/app/views/bookmarks/show.html.erb index 9654a664e767ea0d6ccc39f7f2c5e6e8d4736da6..db21f6fefae40a4476214574027cbdbf157b6a8b 100644 --- a/app/views/bookmarks/show.html.erb +++ b/app/views/bookmarks/show.html.erb @@ -8,7 +8,6 @@ <li> <input type="checkbox" class="count-collections-objects" data-toggle="tooltip" data-placement="bottom" title="Selecionar todos"> <%= bookmark_length @user %> - </a> </li> </ul> </div> @@ -19,19 +18,19 @@ <div class="container-fluid"> <a class="navbar-brand" data-toggle="tooltip" data-placement="bottom" ></a> <ul class="nav navbar-nav navbar-right"> - <li class="set-align collection-button" data-action="download"> + <li class="set-align collection-button" data-action="download" data-class="bookmarks"> <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Download_01.png"), class: "logo-image", size: "35x35" %></span><span style="color: white"> Salvar no <br>computador</span></a> </li> - <li class="set-align collection-button" data-action="copy"> + <li class="set-align collection-button" data-action="copy" data-class="bookmarks"> <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Copiar_Seleção.png"), class: "logo-image", size: "35x35" %></span><span style="color: white"> Copiar <br>para</span></a> </li> - <li class="set-align collection-button" data-action="move"> + <li class="set-align collection-button" data-action="move" data-class="bookmarks"> <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Mover_Seleção.png"), class: "logo-image", size: "35x35" %></span><span style="color: white"> Mover <br>para</span></a> </li> - <li class="set-align collection-button" data-action="remove"> + <li class="set-align collection-button" data-action="remove" data-class="bookmarks"> <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Remover_da_Coleção_Seleção.png"), class: "logo-image", size: "35x35" %></span><span style="color: white"> Remover da <br>coleção</span></a> </li> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 01d3d53a8683c88e9a71a230441933c4bca79f1f..5eca08657ad41165b2a2ceb551823ff224eba1b1 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -57,17 +57,17 @@ $('.Facebook-button').click(function(){ $('#social-modal-continue').empty(); $('#social-modal-continue').append('<button type="button" class="btn btn-danger" style="float:left;" data-dismiss="modal">Recusar</button>'); - $('#social-modal-continue').append('<%= button_to "Aceitar", user_omniauth_authorize_path(:facebook), class: 'btn btn-primary' %>'); + $('#social-modal-continue').append('<%= button_to "Aceitar", user_omniauth_authorize_path(:facebook), class: 'btn btn-success' %>'); }); $('.Google-button').click(function(){ $('#social-modal-continue').empty(); $('#social-modal-continue').append('<button type="button" class="btn btn-danger" style="float:left;" data-dismiss="modal">Recusar</button>'); - $('#social-modal-continue').append('<%= button_to "Aceitar", user_omniauth_authorize_path(:google_oauth2), class: 'btn btn-primary' %>'); + $('#social-modal-continue').append('<%= button_to "Aceitar", user_omniauth_authorize_path(:google_oauth2), class: 'btn btn-success' %>'); }); $('.Twitter-button').click(function(){ $('#social-modal-continue').empty(); $('#social-modal-continue').append('<button type="button" class="btn btn-danger" style="float:left;" data-dismiss="modal">Recusar</button>'); - $('#social-modal-continue').append('<%= button_to "Aceitar", user_omniauth_authorize_path(:twitter), class: 'btn btn-primary' %>'); + $('#social-modal-continue').append('<%= button_to "Aceitar", user_omniauth_authorize_path(:twitter), class: 'btn btn-success' %>'); }); </script> diff --git a/app/views/shared/application/_search.erb b/app/views/shared/application/_search.erb index da844e70f8941b027f89828617add63475ed9553..e239aa2859cdbd26ddca883903044f91c9141e3a 100644 --- a/app/views/shared/application/_search.erb +++ b/app/views/shared/application/_search.erb @@ -1,7 +1,7 @@ <div class="search-input"> <form action="/search" method="get"> <div class="input-group" id="search"> - <input type="text" data-lo="<%=number_with_delimiter(LearningObject.count, delimiter: ".") %>" data-user="<%= number_with_delimiter(User.count, delimiter: ".") %>" data-collection="<%= number_with_delimiter(Collection.count, delimiter: ".") %>" placeholder="" class="form-control" name="query" id="main_search"> + <input type="text" data-lo="<%=number_with_delimiter(LearningObject.count, delimiter: ".") %>" data-user="<%= number_with_delimiter(User.count, delimiter: ".") %>" data-collection="<%= number_with_delimiter(Collection.where(privacy: 'public').count, delimiter: ".") %>" placeholder="" class="form-control" name="query" id="main_search"> <select name="search_class" id="search_class" class="form-control"> <option value="LearningObject" selected>Conteúdos Educacionais</option> <option value="Collection">Coleções</option>