cafe-grader-web Commit - r557:47db9776ed2e

cafe-grader-web

Commit `r557:47db9776ed2e` public

parent | child

Description:

change announcement toggle into bootstrap button with processing state

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

r557:47db9776ed2e - Sat, 18 Jun 2016 03:59:39 - 8 files changed: 75 inserted, 56 deleted

app/assets/javascripts/announcements.js.coffee created 644 ¶ +15

@@ -0,0 +1,15
	1	+ #js for announcement
	2	+ $ ->
	3	+ $('.ajax-toggle').on 'click', (event) ->
	4	+ console.log event.target.id
	5	+ target = $(event.target)
	6	+ target.removeClass 'btn-default'
	7	+ target.removeClass 'btn-success'
	8	+ target.addClass 'btn-warning'
	9	+ target.text '...'
	10	+ return
	11	+
	12	+ $(document).ajaxError (event, jqxhr, settings, exception) ->
	13	+ if jqxhr.status
	14	+ alert 'We\'re sorry, but something went wrong (' + jqxhr.status + ')'
	15	+ return

app/views/announcements/index.html.haml created 644 ¶ +37

@@ -0,0 +1,37
	1	+ %h1 Listing announcements
	2	+
	3	+ = link_to '+ Add announcement', new_announcement_path, class: 'btn btn-success'
	4	+ %br
	5	+ %br
	6	+
	7	+ %table.table.table-striped
	8	+ %tr
	9	+ %th Updated
	10	+ %th Announcement
	11	+ %th Author
	12	+ %th Published
	13	+ %th
	14	+ %th
	15	+ - for announcement in @announcements
	16	+ %tr
	17	+ - @announcement = announcement
	18	+ %td= time_ago_in_words announcement.updated_at
	19	+ %td
	20	+ - if !announcement.title.blank?
	21	+ %b Title:
	22	+ = h announcement.title
	23	+ %br/
	24	+ - if !announcement.notes.blank?
	25	+ %b
	26	+ Notes: #{h announcement.notes}
	27	+ %br/
	28	+ = h announcement.body
	29	+ %td= h announcement.author
	30	+ // %td= check_box_tag :published, 1, announcement.published, { class: 'bootstrap-toggle', id: "published-#{announcement.id}", data: {remote: true, method: 'PUT', url: url_for(controller: :announcements, action: :toggle, id: announcement), size: 'small', toggle: 'toggle' } }
	31	+ // <td><haml_loud> in_place_editor_field :announcement, :published, {}, :rows => 1 </haml_loud></td>
	32	+ %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' } }
	33	+ %td= link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-block btn-sm btn-info'
	34	+ %td= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete, class: "btn btn-block btn-sm btn-danger"
	35	+ %br
	36	+
	37	+ = link_to '+ Add announcement', new_announcement_path, class: 'btn btn-success'

app/views/announcements/toggle.js.haml created 644 ¶ +8

@@ -0,0 +1,8
	1	+ :plain
	2	+ var t = $("#published-#{@announcement.id}");
	3	+ t.removeClass('btn-default');
	4	+ t.removeClass('btn-success');
	5	+ t.removeClass('btn-warning');
	6	+ t.addClass("btn-#{@announcement.published? ? 'success' : 'default'}");
	7	+ t.attr("data-params","published=#{!@announcement.published?}");
	8	+ t.text("#{@announcement.published? ? "Yes" : "No"}");

app/assets/stylesheets/application.css.sass ¶ +11 -11

               /*
                * 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.all
               @import jquery.ui.core
               @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 tablesorter-theme.cafe
               //bootstrap
               @import bootstrap-sprockets
               @import bootstrap
               @import select2
               @import select2-bootstrap
               //@import bootstrap3-switch
               @import bootstrap-toggle
               .secondnavbar
                 top: 50px
               .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: 100px
               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
+            + //#a
-            -   color: #6666cc
+            + //  color: #6666cc
-            -   text-decoration: none
+            + //  text-decoration: none
+            + //
-            -   &:link, &:visited
+            + //  &:link, &:visited
-            -     color: #6666cc
+            + //    color: #6666cc
-            -     text-decoration: none
+            + //    text-decoration: none
+            + //
-            -   &:hover, &:focus
+            + //  &:hover, &:focus
-            -     color: #111166
+            + //    color: #111166
-            -     text-decoration: none
+            + //    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
               =basicbox
                 background: #eeeeff
                 border: 1px dotted #99aaee
                 padding: 5px
                 margin: 10px 0px
                 color: black
                 font-size: 13px
               .infobox
                 +basicbox
               .submitbox
                 +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
                   text-align: center
                 td
                   &.desc-odd
                     padding: 5px
                     padding-left: 20px
                     background: #fefeee
                   &.desc-even
                     padding: 5px
                     padding-left: 20px
                     background: #feeefe
               .announcementbox
                 margin: 10px 0px
                 background: #bbddee
                 padding: 1px
                 span.title
                   font-weight: bold
                   color: #224455
                   padding-left: 10px
                   line-height: 1.6em
               .announcement
                 margin: 2px
                 background: white
                 padding: 1px
                 padding-left: 10px
                 padding-right: 10px
                 padding-top: 5px
                 padding-bottom: 5px
               .announcement p
                 font-size: 12px
                 margin: 2px
               .pub-info
                 text-align: right
                 font-style: italic
                 font-size: 9px
                 p
                   text-align: right
                   font-style: italic
                   font-size: 9px
               .announcement
                 .toggles
                   font-weight: normal
                   float: right
                   font-size: 80%
                 .announcement-title
                   font-weight: bold
               div
                 &.message
                   margin: 10px 0 0
                   div
                     &.message
                       margin: 0 0 0 30px
                     &.body
                       border: 2px solid #dddddd
                       background: #fff8f8
                       padding-left: 5px
                     &.reply-body
                       border: 2px solid #bbbbbb
                       background: #fffff8
                       padding-left: 5px
                     &.stat
                       font-size: 10px
                       line-height: 1.75em
                       padding: 0 5px
                       color: #333333
                       background: #dddddd
                       font-weight: bold
                     &.message div.stat
                       font-size: 10px
                       line-height: 1.75em
                       padding: 0 5px
                       color: #444444
                       background: #bbbbbb
                       font-weight: bold
                 &.contest-title
                   color: white
                   text-align: center
                   line-height: 2em
                 &.registration-desc, &.test-desc
                   border: 1px dotted gray
                   background: #f5f5f5
                   padding: 5px
                   margin: 10px 0
                   font-size: 12px
                   line-height: 1.5em
               h2.contest-title
                 margin-top: 5px
                 margin-bottom: 5px

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

               class AnnouncementsController < ApplicationController
                 before_filter :admin_authorization
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
                   @announcements = Announcement.find(:all,
                                                      :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(params[:announcement])
                   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(params[:announcement])
                       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: params[:published] == 1)
+            +     @announcement.update_attributes( published:  !@announcement.published? )
                   respond_to do |format|
                     format.js {}
                   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/layouts/application.html.haml ¶ +2 -2

               <!DOCTYPE html>
               %html
               %head
                 %title= GraderConfiguration['contest.name']
-            -   = stylesheet_link_tag "application", :media => "all"
+            +   = stylesheet_link_tag "application", params[:controller], :media => "all"
-            -   = javascript_include_tag "application"
+            +   = javascript_include_tag "application", params[:controller]
                 = csrf_meta_tags
                 = content_for :header
                 = yield :head
               %body
                 = render 'layouts/header'
                 = content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil
                 = yield

config/routes.rb ¶ +1 -1

               CafeGrader::Application.routes.draw do
                 root :to => 'main#login'
                 get "report/login"
                 resources :contests
                 resources :announcements
-            -   match 'announcements/toggle/:id' => 'announcements#toggle', via: :put
+            +   match 'announcements/toggle/:id' => 'announcements#toggle'
                 resources :sites
                 resources :grader_configuration, controller: 'configurations'
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)'
               end

app/views/announcements/index.html.erb removed ¶ -41

deleted file

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 r557:47db9776ed2e public

Author

r557:47db9776ed2e - Sat, 18 Jun 2016 03:59:39 - 8 files changed: 75 inserted, 56 deleted

Commit `r557:47db9776ed2e` public