diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -111,6 +111,6 @@ private def announcement_params - params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title) + params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title, :on_nav_bar) end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,6 +4,7 @@ protect_from_forgery before_action :current_user + before_action :nav_announcement SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode' MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login' @@ -22,6 +23,10 @@ @current_user ||= User.find(session[:user_id]) end + def nav_announcement + @nav_announcement = Announcement.where(on_nav_bar: true) + end + def admin_authorization return false unless check_valid_login user = User.includes(:roles).find(session[:user_id]) diff --git a/app/views/announcements/_form.html.haml b/app/views/announcements/_form.html.haml new file mode 100644 --- /dev/null +++ b/app/views/announcements/_form.html.haml @@ -0,0 +1,25 @@ += simple_form_for(@announcement) do |f| + - if @announcement.errors.any? + .form-row + .col-sm-12 + #error_explanation.alert.alert-dismissable.alert-danger + %button.close{type: "button", data: { dismiss: "alert"}, aria: {hidden: "true"}} × + %h3= "เกิดปัญหาในการบันทึกข้อมูลเนื่องจาก" + %ul + - @announcement.errors.full_messages.each do |message| + %li= message + .form-row + .col-md-6.col-12 + -# = f.input :lock_version, as: :hidden + = f.input :title + = f.input :notes, label: 'Notes (shown internally, used to organize announcements)' + = f.input :body + = f.input :author + = f.input :published + = f.input :frontpage, label: 'Display in the front page only?' + = f.input :on_nav_bar, label: 'Show on menu bar?', wrapper: :custom_boolean + = f.input :contest_only, label: 'Display in contest only?' + = f.submit "Create", class: 'btn btn-primary' + -if content_for?(:form_buttons) + = yield(:form_buttons) + / = link_to 'Back', announcements_path, class: 'btn btn-default' diff --git a/app/views/announcements/edit.html.haml b/app/views/announcements/edit.html.haml --- a/app/views/announcements/edit.html.haml +++ b/app/views/announcements/edit.html.haml @@ -1,34 +1,45 @@ -.container-fluid - %h1 Editing announcement - = error_messages_for :announcement - .row - .col-md-6 - = form_for(@announcement) do |f| - .form-group - %label Title - = f.text_field :title, class: 'form-control' - .form-group - %label Notes - (shown internally, used to organize announcements) - = f.text_field :notes, class: 'form-control' - .form-group - %label Body - = f.text_area :body, class: 'form-control', style: 'height: 200px;' - .form-group - %label Author - = f.text_field :author, class: 'form-control' - .checkbox - %label - = f.check_box :published - Published - .checkbox - %label - = f.check_box :frontpage - Show on front page? - .checkbox - %label - = f.check_box :contest_only - Show only in contest? - = f.submit "Update", class: 'btn btn-primary' - = link_to 'Show', @announcement, class: 'btn btn-default' - = link_to 'Back', announcements_path, class: 'btn btn-default' +%h1 Edit Announcement + +-content_for(:form_buttons) do + = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary' + += render 'form' +-# old style + .container-fluid + %h1 Editing announcement + = error_messages_for :announcement + .row + .col-md-6 + = form_for(@announcement) do |f| + .form-group + %label Title + = f.text_field :title, class: 'form-control' + .form-group + %label Notes + (shown internally, used to organize announcements) + = f.text_field :notes, class: 'form-control' + .form-group + %label Body + = f.text_area :body, class: 'form-control', style: 'height: 200px;' + .form-group + %label Author + = f.text_field :author, class: 'form-control' + .checkbox + %label + = f.check_box :published + Published + .checkbox + %label + = f.check_box :frontpage + Show on front page? + .checkbox + %label + = f.check_box :on_nav_bar + Show on top menu bar? + .checkbox + %label + = f.check_box :contest_only + Show only in contest? + = f.submit "Update", class: 'btn btn-primary' + = link_to 'Show', @announcement, class: 'btn btn-default' + = link_to 'Back', announcements_path, class: 'btn btn-default' diff --git a/app/views/announcements/new.html.haml b/app/views/announcements/new.html.haml --- a/app/views/announcements/new.html.haml +++ b/app/views/announcements/new.html.haml @@ -1,14 +1,22 @@ %h1 New announcement -= error_messages_for :announcement -= simple_form_for(@announcement) do |f| - .row - .col-md-6 - = f.input :title - = f.input :notes, label: 'Notes (shown internally, used to organize announcements)' - = f.input :body - = f.input :author - = f.input :published - = f.input :frontpage, label: 'Display in the front page only?' - = f.input :contest_only, label: 'Display in contest only?' - = f.button :submit, "Create", class: 'btn btn-primary' - = link_to 'Back', announcements_path, class: 'btn btn-default' + +-content_for(:form_buttons) do + = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary' + += render 'form' + +-# old style + = error_messages_for :announcement + = simple_form_for(@announcement) do |f| + .row + .col-md-6 + = f.input :title + = f.input :notes, label: 'Notes (shown internally, used to organize announcements)' + = f.input :body + = f.input :author + = f.input :published + = f.input :frontpage, label: 'Display in the front page only?' + = f.input :contest_only, label: 'Display in contest only?' + = f.button :submit, "Create", class: 'btn btn-primary' + = link_to 'Back', announcements_path, class: 'btn btn-default' + diff --git a/app/views/announcements/show.html.haml b/app/views/announcements/show.html.haml --- a/app/views/announcements/show.html.haml +++ b/app/views/announcements/show.html.haml @@ -17,6 +17,9 @@ %b Show on front page: = h @announcement.frontpage %p + %b Show on top menu bar: + = h @announcement.on_nav_bar +%p %b Show only in contest: = h @announcement.contest_only = link_to 'Edit', edit_announcement_path(@announcement) diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -70,6 +70,12 @@ =link_to "#{ungraded} backlogs!", graders_list_path, class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission' + / announcement + - @nav_announcement.each do |ann| + %p.navbar-text + = ann.body.html_safe + + %ul.nav.navbar-nav.navbar-right = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help') diff --git a/db/migrate/20210124101028_add_on_nav_bar_to_announcement.rb b/db/migrate/20210124101028_add_on_nav_bar_to_announcement.rb new file mode 100644 --- /dev/null +++ b/db/migrate/20210124101028_add_on_nav_bar_to_announcement.rb @@ -0,0 +1,5 @@ +class AddOnNavBarToAnnouncement < ActiveRecord::Migration[5.2] + def change + add_column :announcements, :on_nav_bar, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_08_13_083020) do +ActiveRecord::Schema.define(version: 2021_01_24_101028) do create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t| t.string "author" @@ -22,6 +22,7 @@ t.boolean "contest_only", default: false t.string "title" t.string "notes" + t.boolean "on_nav_bar", default: false end create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|