cafe-grader-web

Commit r577:41b47d07f81f public

parent | child
Description:
- panel the main page - bootstrapize user_admin
Commit status:
[Not Reviewed]
References:
bootstrap
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r577:41b47d07f81f - - 2 files changed: 33 inserted, 47 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,25 +1,28
1 1 - content_for :head do
2 2 = javascript_include_tag "announcement_refresh"
3 3
4 4 = user_title_bar(@user)
5 5
6 6 - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
7 7 %p=t 'main.start_soon'
8 8
9 9 .row
10 10 .col-md-7
11 11 - if GraderConfiguration.show_submitbox_to?(@user)
12 - .submitbox
13 - = render :partial => 'submission_box'
12 + .panel.panel-primary
13 + .panel-heading
14 + Submission
15 + .panel-body
16 + = render :partial => 'submission_box'
14 17 - if GraderConfiguration.show_tasks_to?(@user)
15 18 - if not GraderConfiguration.multicontests?
16 19 %table.table.table-striped.table-condensed
17 20 %thead
18 21 %tr
19 22 %th Task name
20 23 %th Full name
21 24 %th # of sub(s)
22 25 %th Results
23 26 %th
24 27 %tbody
25 28 = render :partial => 'problem', :collection => @problems
@@ -34,24 +37,16
34 37 %th Full name
35 38 %th # of sub(s)
36 39 %th Results
37 40 %th
38 41 = render :partial => 'problem', :collection => cp[:problems]
39 42 .col-md-5
40 43 .panel.panel-info
41 44 .panel-heading
42 45 Announcement
43 46 %ul.list-group
44 47 = render :partial => 'announcement', :collection => @announcements
45 48
46 -
47 -
48 - %hr/
49 -
50 -
51 -
52 - %hr/
53 -
54 49 %script{:type => 'text/javascript'}
55 50 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
56 51 Announcement.registerRefreshEventTimer();
57 52
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -17,62 +17,53
17 17 .form-group
18 18 = label_tag 'user_password_confirmation', 'Confirm'
19 19 = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
20 20 .form-group
21 21 = label_tag 'user_email', 'email'
22 22 = text_field 'user', 'email', :size => 10,class: 'form-control'
23 23 =submit_tag "Create", class: 'btn btn-primary'
24 24
25 25 .panel.panel-primary
26 26 .panel-title.panel-heading
27 27 Import from site management
28 28 .panel-body
29 - = form_tag( {method: 'post',multipart: true, action: 'import'}, {class: 'form-inline'}) do
30 - .form-group
31 - = label_tag 'user_login', 'Login'
32 - = text_field 'user', 'login', :size => 10,class: 'form-control'
33 - .form-group
34 - = label_tag 'user_full_name', 'Full Name'
35 - = text_field 'user', 'full_name', :size => 10,class: 'form-control'
29 + = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do
36 30 .form-group
37 - = label_tag 'user_password', 'Password'
38 - = text_field 'user', 'password', :size => 10,class: 'form-control'
39 - .form-group
40 - = label_tag 'user_password_confirmation', 'Confirm'
41 - = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
42 - .form-group
43 - = label_tag 'user_email', 'email'
44 - = text_field 'user', 'email', :size => 10,class: 'form-control'
45 - =submit_tag "Create", class: 'btn btn-primary'
31 + = label_tag :file, 'File:'
32 + .input-group
33 + %span.input-group-btn
34 + %span.btn.btn-default.btn-file
35 + Browse
36 + = file_field_tag 'file'
37 + = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
38 + = submit_tag 'Submit', class: 'btn btn-default'
39 +
46 40
47 - .submitbox
48 - %b Import from site management
49 - = form_tag({:action => 'import'}, :multipart => true) do
50 - File: #{file_field_tag 'file'} #{submit_tag 'Import'}
41 + %p
42 + = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
43 + = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
44 + = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
45 + = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
46 + = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
47 + = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
48 +
49 + - if GraderConfiguration.multicontests?
51 50 %br/
52 - %b What else:
53 - = link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}
54 - = link_to 'New list of users',{ :action => 'new_list'}, { class: 'btn btn-default btn-sm'}
55 - = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default btn-sm'}
56 - = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default btn-sm'}
57 - = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default btn-sm'}
58 - = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default btn-sm'}
59 - - if GraderConfiguration.multicontests?
60 - %br/
61 - %b Multi-contest:
62 - = link_to '[Manage bulk users in contests]', :action => 'contest_management'
63 - View users in:
64 - - @contests.each do |contest|
65 - = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
66 - = link_to "[no contest]", :action => 'contests', :id => 'none'
51 + %b Multi-contest:
52 + = link_to '[Manage bulk users in contests]', :action => 'contest_management'
53 + View users in:
54 + - @contests.each do |contest|
55 + = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
56 + = link_to "[no contest]", :action => 'contests', :id => 'none'
57 +
67 58 Total #{@user_count} users |
68 59 - if !@paginated
69 60 Display all users.
70 61 \#{link_to '[show in pages]', :action => 'index', :page => '1'}
71 62 - else
72 63 Display in pages.
73 64 \#{link_to '[display all]', :action => 'index', :page => 'all'} |
74 65 \#{will_paginate @users, :container => false}
75 66
76 67
77 68 %table.table.table-hover.table-condense
78 69 %thead
@@ -96,14 +87,14
96 87 %td= link_to user.login, controller: :users, :action => 'profile', :id => user
97 88 %td= user.full_name
98 89 %td= user.email
99 90 %td= user.remark
100 91 %td= toggle_button(user.activated?, toggle_activate_user_url(user),"toggle_activate_user_#{user.id}")
101 92 %td= toggle_button(user.enabled?, toggle_enable_user_url(user),"toggle_enable_user_#{user.id}")
102 93 %td= user.last_ip
103 94 %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
104 95 %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
105 96 %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
106 97 %td= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-xs btn-block'
107 98 %br/
108 - = link_to '[New user]', :action => 'new'
109 - = link_to '[New list of users]', :action => 'new_list'
99 + = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
100 + = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
You need to be logged in to leave comments. Login now