Skip to content

Commit 73f55f1

Browse files
LucPrestinma-ro
andauthored
Enhancement/#287 mark course description as optional (#395)
* change "cancel account" button to a danger button * Mark the course description as optional in the course form. * fix a missing closing tag Co-authored-by: Marc <35168157+ma-ro@users.noreply.github.com>
1 parent e15aee7 commit 73f55f1

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

app/views/courses/_form.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</div>
1818

1919
<div class="form-group">
20-
<%= form.label :description %>
20+
<%= form.label :description, "Description (optional)" %>
2121
<%= form.text_field :description, class: "form-control" %>
2222
</div>
2323

app/views/users/registrations/edit.html.erb

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
</div>
2929

3030
<div class="form-group">
31-
<div class="actions d-flex flex-row justify-content-between mt-2">
32-
<div class="forn-group">
33-
<%= link_to (fa_icon 'arrow-left', text: 'Back'), :back, class: "btn btn-outline-primary" %>
34-
</div>
35-
<div class="form-group">
36-
<%= link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete, class: "btn btn-outline-primary" %>
37-
<%= f.submit t('.update'), class: 'btn btn-primary' %>
38-
</div>
31+
<div class="actions d-flex flex-row justify-content-between mt-2">
32+
<div class="forn-group">
33+
<%= link_to (fa_icon 'arrow-left', text: 'Back'), :back, class: "btn btn-outline-primary" %>
34+
</div>
35+
<div class="form-group">
36+
<%= link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete, class: "btn btn-outline-danger" %>
37+
<%= f.submit t('.update'), class: 'btn btn-primary' %>
38+
</div>
39+
</div>
3940
</div>
4041

4142
<% end %>

db/schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
t.datetime "created_at", null: false
148148
t.datetime "updated_at", null: false
149149
t.boolean "is_student", default: false, null: false
150-
t.string "hash_id"
151150
t.integer "feedback_id"
151+
t.string "hash_id"
152152
t.index ["email"], name: "index_users_on_email", unique: true
153153
t.index ["feedback_id"], name: "index_users_on_feedback_id"
154154
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true

0 commit comments

Comments
 (0)