cafe-grader-web Commit - r567:cc292daee78f

cafe-grader-web

Commit `r567:cc292daee78f` public

parent | child

Description:

- add front page toggle to announcement - cosmetic change in some pages / main

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r567:cc292daee78f - Sat, 09 Jul 2016 04:37:05 - 9 files changed: 37 inserted, 32 deleted

app/assets/stylesheets/sources.css.scss ¶ -8

@@ -1,12 +1,4
1	// Place all the styles related to the sources controller here.	1	// Place all the styles related to the sources controller here.
2	// They will automatically be included in application.css.	2	// They will automatically be included in application.css.
3	// You can use Sass (SCSS) here: http://sass-lang.com/	3	// You can use Sass (SCSS) here: http://sass-lang.com/
4		4
5	- #editor {
6	- position: absolute;
7	- top: 0;
8	- right: 0;
9	- bottom: 0;
10	- left: 0;
11	- }
12	-

app/controllers/announcements_controller.rb ¶ +9

                   end
                 end
                 def toggle
                   @announcement = Announcement.find(params[:id])
                   @announcement.update_attributes( 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
               end

app/views/announcements/index.html.haml ¶ +4 -3

               %h1 Listing announcements
               = link_to '+ Add announcement', new_announcement_path, class: 'btn btn-success'
               %br
               %br
               %table.table.table-striped
-            -   %tr
+            +   %thead
                   %th Updated
                   %th Announcement
                   %th Author
-            -     %th Published
+            +     %th{style: 'width: 100px'} Published?
+            +     %th{style: 'width: 100px'}Front?
                   %th
                   %th
                 - for announcement in @announcements
                   %tr
                     - @announcement = announcement
                     %td= time_ago_in_words announcement.updated_at
                     %td
                       - if !announcement.title.blank?
                         %b Title:
                         = h announcement.title
                         %br/
                       - if !announcement.notes.blank?
                         %b
                           Notes: #{h announcement.notes}
                         %br/
                       = h announcement.body
                     %td= h announcement.author
                     %td= toggle_button(announcement.published?, toggle_announcement_url(@announcement), "announcement_toggle_#{@announcement.id}", {size: 'btn-sm'})
-            -       //%td= link_to (announcement.published? ? "Yes" : "No"), url_for(controller: :announcements, action: :toggle, id: announcement), { class: "btn btn-block btn-sm btn-#{(announcement.published? ? 'success' : 'default')} ajax-toggle", id: "published-#{announcement.id}", data: {remote: true, method: 'post' } }
+            +       %td= toggle_button(announcement.frontpage?, toggle_front_announcement_url(@announcement), "announcement_toggle_front_#{@announcement.id}", {size: 'btn-sm'})
                     %td= link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-block btn-sm btn-info'
                     %td= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete, class: "btn btn-block btn-sm btn-danger"
               %br
               = link_to '+ Add announcement', new_announcement_path, class: 'btn btn-success'

app/views/main/_announcement.html.haml ¶ +5 -11

@@ -1,19 +1,13
1	- .announcement{:id => "announcement-#{announcement.id}", :style => "#{'display: none; opacity: 0' if (defined? announcement_effect) and announcement_effect }"}	1	+ %li.list-group-item
2	- %div	2	+ %strong
3	- .announcement-title
4	- -# .toggles
5	- -# %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").blindUp({duration: 0.2}); return false;"}
6	- -# [hide]
7	- -# %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").blindDown({duration: 0.2}); return false;"}
8	- -# [show]
9	= announcement.title	3	= announcement.title
10	- .announcement-body{:id => "announcement-body-#{announcement.id}"}	4	+ %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
		5	+
		6	+ %br
11	= markdown(announcement.body)	7	= markdown(announcement.body)
12	- -#.pub-info
13	- -# %p= "#{announcement.author}, #{announcement.created_at}"
14	:javascript	8	:javascript
15	Announcement.updateRecentId(#{announcement.id});	9	Announcement.updateRecentId(#{announcement.id});
16	- if (defined? announcement_effect) and announcement_effect	10	- if (defined? announcement_effect) and announcement_effect
17	:javascript	11	:javascript
18	$("announcement-#{announcement.id}").blindDown({duration: 0.2});	12	$("announcement-#{announcement.id}").blindDown({duration: 0.2});
19	$("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});	13	$("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});

app/views/main/_problem.html.haml ¶ +4 -1

               %tr
                 %td
                   = "#{problem.name}"
                 %td
                   = "#{problem.full_name}"
                   = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
-            -   %td{:align => "center"}
+            +   %td
                   = @prob_submissions[problem.id][:count]
+            +     = link_to "[#{t 'main.submissions_link'}]", main_submission_path(problem.id)
                 %td
                   = render :partial => 'submission_short',
                     :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name }
+            +   %td
+            +     = link_to 'Edit', direct_edit_path(problem.id), class: 'btn btn-success'

app/views/main/_submission_short.html.haml ¶ +2 -2

                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   - if GraderConfiguration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
                   = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
-            -   = " | "
+            +   //= " | "
-            -   = link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)
+            +   //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)

app/views/main/list.html.haml ¶ +8 -6

               - content_for :head do
                 = javascript_include_tag "announcement_refresh"
               = user_title_bar(@user)
-            - .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
+            + .panel.panel-info
-            -   %span{:class => 'title'}
+            +   .panel-heading
-            -     Announcements
+            +     Announcement
-            -   #announcementbox-body
+            +   %ul.list-group
                   = render :partial => 'announcement', :collection => @announcements
+            +
               - if GraderConfiguration.show_submitbox_to?(@user)
                 .submitbox
                   = render :partial => 'submission_box'
               %hr/
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if GraderConfiguration.show_tasks_to?(@user)
                 - if not GraderConfiguration.multicontests?
                   %table.table.table-striped.table-condensed
                     %thead
-            -         %tr.info-head
+            +         %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]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();

app/views/sources/direct_edit.html.haml ¶ +4

               %h2 Live submit
               %br
               %textarea#text_haha{style: "display:none"}~ @source
               .container
                 .row
+            +     .col-md-12
+            +       .alert.alert-info
+            +         Write your code in the following box, choose language, and click submit button when finished
+            +   .row
                   .col-md-7
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-5
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group

config/routes.rb ¶ +1 -1

               CafeGrader::Application.routes.draw do
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
-            -       get 'toggle'
+            +       get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'

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

Commit r567:cc292daee78f public

Author

r567:cc292daee78f - Sat, 09 Jul 2016 04:37:05 - 9 files changed: 37 inserted, 32 deleted

Commit `r567:cc292daee78f` public