cafe-grader-web Commit - r868:826ade30ee35

cafe-grader-web

Commit `r868:826ade30ee35` public

parent | child

Description:

announcement

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r868:826ade30ee35 - Sun, 18 Sep 2022 10:35:32 - 5 files changed: 45 inserted, 28 deleted

app/assets/stylesheets/application.css.scss ¶ +1

               @import "select2/select2-bootstrap-5-theme.min";
               //@import bootstrap3-switch
               //@import "bootstrap-toggle";
               //@import "bootstrap-sortable";
               //@import "bootstrap-datepicker3";
               //@import "bootstrap-datetimepicker";
               //@import "datatables.net-bs/css/dataTables.bootstrap.min";
               //@import "datatables.net-buttons-bs/css/buttons.bootstrap.min";
               //new import
               @import 'datatables/datatables.min';
+            + @import 'material_icons';
               //bootstrap navbar color (from)
               $bgDefault: #19197b;
               $bgHighlight: #06064b;
               $colDefault: #8e8eb4;
               $colHighlight: #ffffff;
               $dropDown: false;
               @font-face {
                   font-family: 'Glyphicons Halflings';
                   src: font-path('bootstrap/glyphicons-halflings-regular.eot');
                   src: font-path('bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),

app/controllers/announcements_controller.rb ¶ +2 -2

                       format.html { render :action => "new" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /announcements/1
                 # PUT /announcements/1.xml
                 def update
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
-            -       if @announcement.update_attributes(announcement_params)
+            +       if @announcement.update(announcement_params)
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
                       format.js   {}
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.js   {}
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 def toggle
                   @announcement = Announcement.find(params[:id])
-            -     @announcement.update_attributes( published:  !@announcement.published? )
+            +     @announcement.update( published:  !@announcement.published? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_#{@announcement.id}",button_on: @announcement.published? } }
                   end
                 end
                 def toggle_front
                   @announcement = Announcement.find(params[:id])
                   @announcement.update_attributes( frontpage:  !@announcement.frontpage? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_front_#{@announcement.id}",button_on: @announcement.frontpage? } }

app/views/layouts/_header.html.haml ¶ +15 -10

                               %li= link_to 'Current Score', current_score_report_path, class: 'dropdown-item'
                               %li= link_to 'Score Report', max_score_report_path, class: 'dropdown-item'
                               %li= link_to 'Submission Report', submission_report_path, class: 'dropdown-item'
                               %li= link_to 'Login Report', login_report_path, class: 'dropdown-item'
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =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.navbar-nav
+            +         %li.nav-item
+            +           %a.nav-link{href: help_main_path}
-            -         %ul.nav.navbar-nav.navbar-right
+            +             %span.mi.md-18 help
-            -           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
+            +         %li.nav-item
-            -           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
+            +           %a.nav-link{href: messages_path}
-            -           - if GraderConfiguration['system.user_setting_enabled']
+            +             %span.mi.md-18 chat
-            -             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
+            +         - if GraderConfiguration['system.user_setting_enabled']
-            -           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
+            +           %li.nav-item
+            +             %a.nav-link{href: profile_users_path}
+            +               %span.mi.md-18 settings
+            +         %li.nav-item
+            +           %a.nav-link{href: login_main_path}
+            +             %span.mi.md-18 exit_to_app
+            +             = @current_user.full_name

app/views/main/_announcement.html.haml ¶ +23 -12

@@ -1,15 +1,26
1	- %li.list-group-item	1	+ .card-body
2	- %strong	2	+ .card-title
3	= announcement.title	3	= announcement.title
4	- - if @current_user and @current_user.admin?	4	+ - if @current_user and @current_user.admin?
5	- = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'	5	+ = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'
6	- %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"	6	+ .card-subtitle
		7	+ = "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
		8	+ .card-text
		9	+ = markdown(announcement.body)
		10	+
7		11
8	- %br	12	+ -#
9	- = markdown(announcement.body)	13	+ %li.list-group-item
10	- :javascript	14	+ %strong
11	- Announcement.updateRecentId(#{announcement.id});	15	+ - if @current_user and @current_user.admin?
12	- - if (defined? announcement_effect) and announcement_effect	16	+ = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'
		17	+ %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
		18	+
		19	+ %br
		20	+ = markdown(announcement.body)
13	:javascript	21	:javascript
14	- $("announcement-#{announcement.id}").blindDown({duration: 0.2});	22	+ Announcement.updateRecentId(#{announcement.id});
15	- $("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});	23	+ - if (defined? announcement_effect) and announcement_effect
		24	+ :javascript
		25	+ $("announcement-#{announcement.id}").blindDown({duration: 0.2});
		26	+ $("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});

app/views/main/list.html.haml ¶ +4 -4

                         - if cp[:problems].length > 0
                           %h2{:class =>'contest-title'}
                             = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                           %table.info
                             %tr.info-head
                               %th Task name
                               %th Full name
                               %th # of sub(s)
                               %th Results
                               %th
                             = render :partial => 'problem', :collection => cp[:problems]
                 .col-md-5
-            -     .panel.panel-info
+            +     .card
-            -       .panel-heading
+            +       .card-header
                       Announcement
-            -         = link_to 'Manage', announcements_path, class: 'btn btn-xs btn-default'
+            +         = link_to 'Manage', announcements_path, class: 'btn btn-small'
-            -       %ul.list-group
+            +       .card-body
                       = render :partial => 'announcement', :collection => @announcements
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();
               .modal.fade#compiler{tabindex: -1,role: 'dialog'}
                 .modal-dialog.modal-lg{role:'document'}
                   .modal-content
                     .modal-header
                       %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
                         %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r868:826ade30ee35 - Sun, 18 Sep 2022 10:35:32 - 5 files changed: 45 inserted, 28 deleted

Sign in to your account

Commit r868:826ade30ee35 public

Author

r868:826ade30ee35 - Sun, 18 Sep 2022 10:35:32 - 5 files changed: 45 inserted, 28 deleted

Commit `r868:826ade30ee35` public