Skip to content

Commit

Permalink
Merge pull request #3592 from dodona-edu/change/submit-button
Browse files Browse the repository at this point in the history
Use send instead of play as hand in icon
  • Loading branch information
bmesuere authored May 3, 2022
2 parents 796d104 + 4e6a652 commit 71d68b4
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/exercise.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,13 @@ function initExerciseShow(exerciseId, programmingLanguage, loggedIn, editorShown
$("#editor-process-btn")
.prop("disabled", false)
.removeClass("busy mdi-timer-sand-empty mdi-spin")
.addClass("mdi-play");
.addClass("mdi-send");
}

function disableSubmitButton() {
$("#editor-process-btn")
.prop("disabled", true)
.removeClass("mdi-play")
.removeClass("mdi-send")
.addClass("busy mdi-timer-sand-empty mdi-spin");
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/card.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ a.card-title-link:hover {
.card-title-fab {
position: absolute;
right: 24px;
top: 33px;
top: 31px;
z-index: 4;

form {
Expand Down
3 changes: 3 additions & 0 deletions app/assets/stylesheets/material_icons.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ a.btn-fab .mdi::before {
margin-top: 5px;
}

.btn-fab.mdi-send {
padding-left: 12px;
}
.btn-sm .mdi::before {
font-size: 18px;
margin-top: 3px;
Expand Down
2 changes: 1 addition & 1 deletion app/views/activities/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ end %>
<div class="card-title card-title-colored">
<% if policy(@activity).submit? %>
<div class="card-title-fab">
<button class="btn btn-primary btn-fab mdi mdi-play mdi-36" id="editor-process-btn" data-user_id="<%= current_user.id %>">
<button class="btn btn-primary btn-fab mdi mdi-send mdi-36" id="editor-process-btn" data-user_id="<%= current_user.id %>">
</button>
<a class="btn btn-primary btn-fab hidden-fab" id="submission-copy-btn">
<i class="mdi mdi-pencil mdi-36"></i>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/views/activities/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ en:
hide_correct: hide correct
correct: correct
wrong: wrong
hand_in_tooltip: Click the play button to hand in and test your solution.
hand_in_tooltip: Click the send button to hand in and test your solution.
not_found: Sorry, we can't find this exercise.
not_accessible: This exercise isn't accessible to students.
not_visible: This exercise isn't visible for students without the correct link.
Expand Down
2 changes: 1 addition & 1 deletion config/locales/views/activities/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ nl:
hide_correct: verberg correct
correct: correct
wrong: verkeerd
hand_in_tooltip: Klik op de play-knop om je oplossing te testen en in te dienen.
hand_in_tooltip: Klik op de verzend-knop om je oplossing te testen en in te dienen.
not_found: Sorry, we kunnen deze oefening niet vinden.
not_accessible: Deze oefening is niet toegankelijk voor studenten.
not_visible: Deze oefening is niet zichtbaar voor studenten zonder de correcte link.
Expand Down
3 changes: 0 additions & 3 deletions public/javascripts/translations.js

This file was deleted.

0 comments on commit 71d68b4

Please sign in to comment.