cafe-grader-web Commit - r555:964258440467

cafe-grader-web

Commit `r555:964258440467` public

parent | child

Description:

## Bootstrapify * submit error message * bootstrap switch for announcement

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

r555:964258440467 - Sun, 28 Feb 2016 04:19:40 - 8 files changed: 73 inserted, 10 deleted

Gemfile ¶ +1

               #syntax highlighter
               gem 'rouge'
               #add bootstrap
               gem 'bootstrap-sass', '~> 3.2.0'
+            + gem 'bootstrap-switch-rails'
               gem 'autoprefixer-rails'
               gem 'haml'
               gem 'mail'
               gem 'rdiscount'

Gemfile.lock ¶ +2

                     json
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
+            +     bootstrap-switch-rails (3.3.3)
                   builder (3.0.4)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                     railties (~> 3.2.0)
                   coffee-script (2.3.0)
                     coffee-script-source
                 ruby
               DEPENDENCIES
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
+            +   bootstrap-switch-rails
                 coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
                 in_place_editing
                 jquery-rails
                 jquery-tablesorter

app/assets/javascripts/application.js ¶ +2 -1

               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require bootstrap-sprockets
+            + //= require bootstrap-switch
+            + //= require select2
               //= require custom
-            - //= require select2
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects

app/assets/javascripts/custom.js.coffee ¶ +24

@@ -1,2 +1,26
		1	+ $(document).on 'change', '.btn-file :file', ->
		2	+ input = $(this)
		3	+ numFiles = if input.get(0).files then input.get(0).files.length else 1
		4	+ label = input.val().replace(/\\/g, '/').replace(/.*\//, '')
		5	+ input.trigger 'fileselect', [
		6	+ numFiles
		7	+ label
		8	+ ]
		9	+ return
		10	+
		11	+
		12	+ # document ready
		13	+
1	$ ->	14	$ ->
2	$(".select2").select2()	15	$(".select2").select2()
		16	+ $(".bootstrap-switch").bootstrapSwitch()
		17	+ $('.btn-file :file').on 'fileselect', (event, numFiles, label) ->
		18	+ input = $(this).parents('.input-group').find(':text')
		19	+ log = if numFiles > 1 then numFiles + ' files selected' else label
		20	+ if input.length
		21	+ input.val log
		22	+ else
		23	+ if log
		24	+ alert log
		25	+ return
		26	+ return

app/assets/stylesheets/application.css.sass ¶ +21

               @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
               .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

app/views/announcements/index.html.erb ¶ +2 -1

                     <% if !announcement.notes.blank? %>
                       <b>Notes: <%=h announcement.notes %></b><br/>
                     <% end %>
                     <%=h announcement.body %>
                   </td>
                   <td><%=h announcement.author %></td>
-            -     <td><%= in_place_editor_field :announcement, :published, {}, :rows => 1 %></td>
+            +     <td><%= check_box_tag :published, 1, announcement.published, class: 'bootstrap-switch', data: {size: 'small'} %></td>
+            +     <!-- <td><%= in_place_editor_field :announcement, :published, {}, :rows => 1 %></td> -->
                   <td><%= link_to 'Show', announcement %></td>
                   <td><%= link_to 'Edit', edit_announcement_path(announcement) %></td>
                   <td><%= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete %></td>
                 </tr>
               <% end %>
               </table>

app/views/main/_submission_box.html.haml ¶ +20 -6

@@ -1,6 +1,20
1	- = form_tag({:action => 'submit'}, :multipart => true) do	1	+ = form_tag({:action => 'submit'}, :multipart => true, class: 'form-inline') do
2	- %b Problem:	2	+ - if @submission and @submission.errors.any?
3	- = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {\|p\| [p.full_name, p.id]}, {:selected => '-1'}, { class: 'select2' }	3	+ #error_explanation
4	- %b File:	4	+ .alert.alert-danger
5	- = file_field_tag 'file'	5	+ %h3= "#{pluralize(@submission.errors.count, "error")} prohibited this user from being saved:"
6	- = submit_tag 'Submit'	6	+ %ul
		7	+ - @submission.errors.full_messages.each do \|msg\|
		8	+ %li= msg
		9	+ .form-group
		10	+ = label_tag :submission, 'Problem:'
		11	+ = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {\|p\| [p.full_name, p.id]}, {:selected => '-1'}, { class: 'select2 form-control' }
		12	+ .form-group
		13	+ = label_tag :file, 'File:'
		14	+ .input-group
		15	+ %span.input-group-btn
		16	+ %span.btn.btn-default.btn-file
		17	+ Browse
		18	+ = file_field_tag 'file'
		19	+ = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
		20	+ = submit_tag 'Submit', class: 'btn btn-default'

app/views/main/list.html.haml ¶ +1 -2

                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               - if GraderConfiguration.show_submitbox_to?(@user)
                 .submitbox
-            -     = error_messages_for 'submission'
                   = 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.table.table-striped.table-condensed
                     %thead
                       %tr.info-head
                         %th #
                         %th Tasks name
                         %th Full name
                         %th # of sub(s)

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

r555:964258440467 - Sun, 28 Feb 2016 04:19:40 - 8 files changed: 73 inserted, 10 deleted

Sign in to your account

Commit r555:964258440467 public

Author

r555:964258440467 - Sun, 28 Feb 2016 04:19:40 - 8 files changed: 73 inserted, 10 deleted

Commit `r555:964258440467` public