diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb index d11a3da9d79c1fa48a5ea8668610ee0e71ef412f..b3664de37c7c8a59a3025c22ec10962ffd089664 100644 --- a/app/controllers/learning_objects_controller.rb +++ b/app/controllers/learning_objects_controller.rb @@ -51,7 +51,7 @@ class LearningObjectsController < ApplicationController def update respond_to do |format| if LearningObject.update(learning_object_params) - format.html { redirect_to @learning_object, notice: 'Learning object was successfully updated.' } + format.html { redirect_to learning_object_build_path(learning_object_id: @learning_object.id, id: :upload_attachments), notice: 'Learning object was successfully updated.' } else format.html { render :edit } end @@ -109,7 +109,7 @@ class LearningObjectsController < ApplicationController # Use callbacks to share common setup or constraints between actions. def set_learning_object - @learning_object = LearningObject.find params[:id] + @learning_object = LearningObject.unscoped.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. diff --git a/app/views/layouts/learning_object_studio.html.erb b/app/views/layouts/learning_object_studio.html.erb index d67fb805b53a75e991d2d19bed4b0e3c84ed1c80..86b3f39669f8e9b73bc7884df38aa6f061bdb490 100644 --- a/app/views/layouts/learning_object_studio.html.erb +++ b/app/views/layouts/learning_object_studio.html.erb @@ -2,7 +2,7 @@ <div class="container"> <div class="row"> <div class="board"> - <h2>Estúdio de criação de conteúdos educacionais <span style="color:#f48260;"><i class="fa fa-book"></i></span></h2> + <h2 style="text-align: center;">Estúdio de criação de conteúdos educacionais <span style="color:#f48260;"><i class="fa fa-book"></i></span></h2> <div class="board-inner"> <%= yield(:learning_object_studio_navigation) %> </div> diff --git a/app/views/learning_objects/_form.html.erb b/app/views/learning_objects/_form.html.erb index 1bd28e920dc924580804aa6af4635a9fb2348671..0a9ed4b0d81072e96587730b8708202aa596aa7a 100644 --- a/app/views/learning_objects/_form.html.erb +++ b/app/views/learning_objects/_form.html.erb @@ -43,7 +43,7 @@ <%= f.label :topics, 'Assuntos' %> <select id='subjectSelect' name="learning_object[topics][]" multiple> <%= @topics.each do |t| %> - <option value='<%= t.id %>'><%= t.name %></option> + <option value='<%= t.id %>' <%= 'selected' if @learning_object.topics.include?(t) %>><%= t.name %></option> <% end %> </select> <span class="help-block">Selecione um ou mais assuntos</span> diff --git a/app/views/learning_objects/build/_file_upload_form.html.erb b/app/views/learning_objects/build/_file_upload_form.html.erb index dd36d0a9eb3a419f18ecbbb45af970b21d4e332f..23ed858b9861f5fb7e9221c4f2251c14ee3b7569 100644 --- a/app/views/learning_objects/build/_file_upload_form.html.erb +++ b/app/views/learning_objects/build/_file_upload_form.html.erb @@ -30,7 +30,7 @@ Visualizar <i style="margin-left:10px;" class="fa fa-eye"></i></button> <% end %> - <button id="uploadFile" type="submit" class="btn-submit btn btn-success btn-outline-rounded green"> + <button id="uploadFiles" type="submit" class="btn-submit btn btn-success btn-outline-rounded green"> Enviar arquivos <i style="margin-left:10px;" class="fa fa-book"></i></button> <%= link_to next_wizard_path, id: 'uploadThumbnail' do %> diff --git a/app/views/learning_objects/build/select_thumbnail.html.erb b/app/views/learning_objects/build/select_thumbnail.html.erb index 411af1f71f1a9bd24bad82d7c8cce735906e4196..c304fea72f66c608fde24ae6ce4d01d0dfc43993 100644 --- a/app/views/learning_objects/build/select_thumbnail.html.erb +++ b/app/views/learning_objects/build/select_thumbnail.html.erb @@ -26,8 +26,7 @@ <% end %> <% content_for :learning_object_studio_content do %> - <h3 class="head text-center">Welcome to Bootsnipp<sup>™</sup> <span style="color:#f48260;">♥</span></h3> - <p class="lead">Envie uma foto de destaque para <strong><%= @learning_object.name %></strong></p> + <h3 class="head text-center">Envie uma foto de destaque para <strong><%= @learning_object.name %></strong></h3> <%= form_for @learning_object, url: wizard_path, method: :put, html: { multipart: true } do |f| %> <%= f.file_field :thumbnail %>