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: 33 inserted, 16 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;

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

                 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 ¶ +14 -9

                         - 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}
+            +             %span.mi.md-18 chat
                       - if GraderConfiguration['system.user_setting_enabled']
-            -             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
+            +           %li.nav-item
-            -           = 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'}})
+            +             %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 ¶ +12 -1

+            + .card-body
+            +   .card-title
+            +     = announcement.title
+            +     - if @current_user and @current_user.admin?
+            +       = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'
+            +   .card-subtitle
+            +     = "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
+            +   .card-text
+            +     = markdown(announcement.body)
+            +
+            +
+            + -#
                 %li.list-group-item
                   %strong
-            -     = announcement.title
                   - if @current_user and @current_user.admin?
                     = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'
                   %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
                   %br
                     = markdown(announcement.body)
                   :javascript
                     Announcement.updateRecentId(#{announcement.id});
                   - if (defined? announcement_effect) and announcement_effect
                     :javascript
                       $("announcement-#{announcement.id}").blindDown({duration: 0.2});
                       $("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: 33 inserted, 16 deleted

Sign in to your account

Commit r868:826ade30ee35 public

Author

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

Commit `r868:826ade30ee35` public