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

               /* This is a manifest file that'll be compiled into application.css, which will include all the files
                * listed below.
                *
                * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
                * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
                *
                * You're free to add application-wide styles to this file and they'll appear at the bottom of the
                * compiled file so the styles you add here take precedence over styles defined in any styles
                * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
                * file per style scope.
                *
                * // bootstrap says that we should not do this, but @import each file instead
                * #   *= require_tree .
                * #   *= require_self
                */
               //@import "jquery-ui";
               //@import "jquery.ui.core";
               //@import "jquery.ui.theme";
               //@import "jquery.ui.datepicker";
               //@import "jquery.ui.slider";
               //@import "jquery-ui-timepicker-addon";
               //@import "jquery-tablesorter/theme.metro-dark";
               //@import "jquery.countdown";
               //@import "tablesorter-theme.cafe";
               //bootstrap
               //@import "bootstrap-sprockets";
               @import "bootstrap";
               @import "select2/select2.min";
               @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'),
                     font-path('bootstrap/glyphicons-halflings-regular.woff') format('woff'),
                     font-path('bootstrap/glyphicons-halflings-regular.ttf') format('truetype'),
                     font-path('bootstrap/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
               }
               /*
               .navbar-default {
                 background-color: $bgDefault;
                 border-color: $bgHighlight;
                 .navbar-brand {
                   color: $colDefault;
                   &:hover, &:focus {
                     color: $colHighlight;
                   }
                 }
                 .navbar-text {
                   color: $colDefault;
                 }
                 .navbar-nav {
                   > li {
                     > a {
                       color: $colDefault;
                       &:hover, &:focus {
                         color: $colHighlight;
                       }
                     }
                     @if $dropDown {
                       > .dropdown-menu {
                         background-color: $bgDefault;
                         > li {
                           > a {
                             color: $colDefault;
                             &:hover, &:focus {
                               color: $colHighlight;
                               background-color: $bgHighlight;
                             }
                           }
                           > .divider {
                             background-color: $bgHighlight;
                           }
                         }
                       }
                     }
                   }
                   @if $dropDown {
                     .open .dropdown-menu > .active {
                       > a, > a:hover, > a:focus {
                         color: $colHighlight;
                         background-color: $bgHighlight;
                       }
                     }
                   }
                   > .active {
                     > a, > a:hover, > a:focus {
                       color: $colHighlight;
                       background-color: $bgHighlight;
                     }
                   }
                   > .open {
                     > a, > a:hover, > a:focus {
                       color: $colHighlight;
                       background-color: $bgHighlight;
                     }
                   }
                 }
                 .navbar-toggle {
                   border-color: $bgHighlight;
                   &:hover, &:focus {
                     background-color: $bgHighlight;
                   }
                   .icon-bar {
                     background-color: $colDefault;
                   }
                 }
                 .navbar-collapse,
                 .navbar-form {
                   border-color: $colDefault;
                 }
                 .navbar-link {
                   color: $colDefault;
                   &:hover {
                     color: $colHighlight;
                   }
                 }
               }
               @media (max-width: 767px) {
                 .navbar-default .navbar-nav .open .dropdown-menu {
                   > li > a {
                     color: $colDefault;
                     &:hover, &:focus {
                       color: $colHighlight;
                     }
                   }
                   > .active {
                     > a, > a:hover, > a:focus {
                       color: $colHighlight;
                       background-color: $bgHighlight;
                     }
                   }
                 }
               }
               */
               .secondnavbar {
                 top: 50px;
               }
               // --------------- bootstrap file upload ----------------------
               .btn-file {
                 position: relative;
                 overflow: hidden;
               }
               .btn-file input[type=file] {
                 position: absolute;
                 top: 0;
                 right: 0;
                 min-width: 100%;
                 min-height: 100%;
                 font-size: 100px;
                 text-align: right;
                 filter: alpha(opacity = 0);
                 opacity: 0;
                 outline: none;
                 background: white;
                 cursor: inherit;
                 display: block;
               }
               body {
                 background: white image-url("topbg.jpg") repeat-x top center;
                 //font-size: 13px
                 //font-family: Tahoma, "sans-serif"
                 margin: 10px;
                 padding: 10px;
                 padding-top: 60px;
               }
               // ------------------ bootstrap sortable --------------------
               table.sortable th {
                 padding-right: 20px !important;
                 span.sign {
                   right: (-15px) !important;
                 }
                 &.text-right {
                   padding-left: 20px !important;
                   padding-right: 8px !important;
                   &:after, span.sign {
                     left: (-15px) !important;
                   }
                 }
               }
               input {
                 font-family: Tahoma, "sans-serif";
               }
               h1 {
                 font-size: 24px;
                 color: #334488;
                 line-height: 2em;
               }
               h2 {
                 font-size: 18px;
                 color: #5566bb;
                 line-height: 1.5em;
               }
               hr {
                 border-top: 1px solid #dddddd;
                 border-bottom: 1px solid #eeeeee;
               }
               //#a
               //  color: #6666cc
               //  text-decoration: none
               //
               //  &:link, &:visited
               //    color: #6666cc
               //    text-decoration: none
               //
               //  &:hover, &:focus
               //    color: #111166
               //    text-decoration: none
               div {
                 &.userbar {
                   line-height: 1.5em;
                   text-align: right;
                   font-size: 12px;
                 }
                 &.title {
                   padding: 10px 0px;
                   line-height: 1.5em;
                   font-size: 13px;
                   span.contest-over-msg {
                     font-size: 15px;
                     color: red;
                   }
                   table {
                     width: 100%;
                     font-weight: bold;
                   }
                   td {
                     &.left-col {
                       text-align: left;
                       vertical-align: top;
                       color: #444444;
                     }
                     &.right-col {
                       text-align: right;
                       vertical-align: top;
                       font-size: 18px;
                       color: #116699;
                     }
                   }
                 }
               }
               table.info {
                 margin: 10px 0;
                 border: 1px solid #666666;
                 border-collapse: collapse;
                 font-size: 12px;
                 th {
                   border: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
                 }
                 td {
                   border-left: 1px solid #666666;
                   border-right: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
                 }
               }
               tr {
                 &.info-head {
                   background: #777777;
                   color: white;
                 }
                 &.info-odd {
                   background: #eeeeee;
                 }
                 &.info-even {
                   background: #fcfcfc;
                 }
               }
               @mixin basicbox {
                 background: #eeeeff;
                 border: 1px dotted #99aaee;
                 padding: 5px;
                 margin: 10px 0px;
                 color: black;
                 font-size: 13px;
               }
               .infobox {
                 @include basicbox;
               }
               .submitbox {
                 @include basicbox;
               }
               .errorExplanation {
                 border: 1px dotted gray;
                 color: #bb2222;
                 padding: 5px 15px 5px 15px;
                 margin-bottom: 5px;
                 background-color: white;
                 font-weight: normal;
                 h2 {
                   color: #cc1111;
                   font-weight: bold;
                 }
               }
               table.uinfo {
                 border-collapse: collapse;
                 border: 1px solid black;
                 font-size: 13px;
               }
               td.uinfo {
                 vertical-align: top;
                 border: 1px solid black;
                 padding: 5px;
               }
               th.uinfo {
                 background: lightgreen;
                 vertical-align: top;
                 text-align: right;
                 border: 1px solid black;
                 padding: 5px;
               }
               div {
                 &.compilermsgbody {
                   font-family: monospace;
                 }
                 &.task-menu {
                   text-align: center;
                   font-size: 13px;
                   line-height: 1.75em;
                   font-weight: bold;
                   border-top: 1px dashed gray;
                   border-bottom: 1px dashed gray;
                   margin-top: 2px;
                   margin-bottom: 4px;
                 }
               }
               table.taskdesc {
                 border: 2px solid #dddddd;
                 border-collapse: collapse;
                 margin: 10px auto;
                 width: 90%;
                 font-size: 13px;
                 p {
                   font-size: 13px;
                 }
                 tr.name {
                   border: 2px solid #dddddd;
                   background: #dddddd;
                   color: #333333;
                   font-weight: bold;
                   font-size: 14px;
                   line-height: 1.5em;

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

               class AnnouncementsController < ApplicationController
                 before_action :admin_authorization
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
                   @announcements = Announcement.order(created_at: :desc)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 # GET /announcements/1.xml
                 def show
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/new
                 # GET /announcements/new.xml
                 def new
                   @announcement = Announcement.new
                   respond_to do |format|
                     format.html # new.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/1/edit
                 def edit
                   @announcement = Announcement.find(params[:id])
                 end
                 # POST /announcements
                 # POST /announcements.xml
                 def create
                   @announcement = Announcement.new(announcement_params)
                   respond_to do |format|
                     if @announcement.save
                       flash[:notice] = 'Announcement was successfully created.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { render :xml => @announcement, :status => :created, :location => @announcement }
                     else
                       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? } }
                   end
                 end
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy
                   respond_to do |format|
                     format.html { redirect_to(announcements_url) }
                     format.xml  { head :ok }
                   end
                 end
                 private
                   def announcement_params
                     params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title, :on_nav_bar)
                   end
               end

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

               %header
                 %nav.navbar.fixed-top.navbar-dark.bg-primary.navbar-expand-lg
                   .container-fluid
                     %a.navbar-brand{href: list_main_path}
                       %span.glyphicon.glyphicon-home
                       MAIN
                     %button.navbar-toggler.collapsed{ type: :button, 'data-bs': {toggle: 'collapse', target: '#navbar-collapse'} }
                       %span.navbar-toggler-icon
                     .collapse.navbar-collapse#navbar-collapse
                       %ul.navbar-nav.me-auto.mb-2.mb-lg-0
                         / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           %li.nav-item.dropdown
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                             %ul.dropdown-menu
                               %li= link_to 'View', submissions_path, class:'dropdown-item'
                               %li= link_to 'Self Test', test_index_path, class:'dropdown-item'
                         / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof', class: 'nav-item')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.nav-item.dropdown
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                             %ul.dropdown-menu
                               %li= link_to 'Announcements', announcements_path, class: 'dropdown-item'
                               %li= link_to 'Problems', problems_path, class: 'dropdown-item'
                               %li= link_to 'Tags', tags_path, class: 'dropdown-item'
                               %li= link_to 'Users', user_admin_index_path, class: 'dropdown-item'
                               %li= link_to 'User Groups', groups_path, class: 'dropdown-item'
                               %li= link_to 'Graders', graders_list_path, class: 'dropdown-item'
                               %li= link_to 'Message ', console_messages_path, class: 'dropdown-item'
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'System config', grader_configuration_index_path, class: 'dropdown-item'
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'Sites', sites_path, class: 'dropdown-item'
                               %li= link_to 'Contests', contest_management_index_path, class: 'dropdown-item'
                               -#
                           / report
                           %li.nav-item.dropdown
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                             %ul.dropdown-menu
                               %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

               - content_for :head do
                 = javascript_include_tag "announcement_refresh"
               = user_title_bar(@user)
               - if @user.section
                 passcode for CP Unofficial Logo voting is
                 %strong= @user.section
                 %br
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               .row
                 .col-md-7
                   - if GraderConfiguration.show_submitbox_to?(@user)
                     .panel.panel-primary
                       .panel-heading
                         Submission
                       .panel-body
                         = render :partial => 'submission_box'
                   - if GraderConfiguration.show_tasks_to?(@user)
                     - if not GraderConfiguration.multicontests?
                       %table.table.table-striped.table-condensed
                         %thead
                           %tr
                             %th Task name
                             %th Full name
                             %th # of sub(s)
                             %th Results
                             %th
                         %tbody
                           = render :partial => 'problem', :collection => @problems
                     - else
                       - @contest_problems.each do |cp|
                         - 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;
                       %h4 Compiler message
                     .modal-body
                       %pre#compiler_msg
                     .modal-footer
                       %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

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