cafe-grader-web Commit - r679:043258f318f9

r679:043258f318f9 - Thu, 14 Sep 2017 08:44:51 - 11 files changed: 47 inserted, 30 deleted

app/views/user_admin/new.html.haml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ %h1 New user
	2	+ = form_tag( {action: 'create'}, { class: 'form-horizontal'}) do
	3	+ = render :partial => 'form'
	4	+ .form-group
	5	+ .col-md-offset-2.col-md-10
	6	+ = submit_tag "Create", class: 'btn btn-primary'
	7	+ = link_to 'Back', :action => 'index'

app/assets/stylesheets/application.css.scss ¶ +6

@@ -546,3 +546,9
546	margin-top: 5px;	546	margin-top: 5px;
547	margin-bottom: 5px;	547	margin-bottom: 5px;
548	}	548	}
		549	+
		550	+
		551	+
		552	+ .grader-comment {
		553	+ word-wrap: break-word;
		554	+ }

app/views/announcements/show.html.erb ¶ +1 -1

               <p>
                 <b>Body:</b>
-            -   <%=h @announcement.body %>
+            +   <%=h markdown(@announcement.body) %>
               </p>
               <p>

app/views/main/_login_box.html.haml ¶ +18 -14

@@ -12,22 +12,26
12	%hr/	12	%hr/
13		13
14	%div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}	14	%div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
15	- = form_tag login_login_path do	15	+ = form_tag login_login_path, {class: 'form-horizontal'} do
16	- %table	16	+ .form-group
17	- %tr	17	+ =label_tag :login, "Login",class: 'col-sm-3 control-label'
18	- %td{:align => "right"}	18	+ .col-sm-9
19	- ="#{t 'login_label'}:"	19	+ =text_field_tag :login, nil, class: 'form-control'
20	- %td= text_field_tag 'login'	20	+ .form-group
21	- %tr	21	+ =label_tag :password, "Password", class: 'col-sm-3 control-label'
22	- %td{:align => "right"}	22	+ .col-sm-9
23	- ="#{t 'password_label'}:"	23	+ =password_field_tag :password, nil, class: 'form-control'
24	- %td= password_field_tag
25	- unless GraderConfiguration['right.bypass_agreement']	24	- unless GraderConfiguration['right.bypass_agreement']
26	- %tr	25	+ .form-group
27	- %td{:align => "right"}= check_box_tag 'accept_agree'	26	+ .col-sm-offset-3.col-sm-9
28	- %td ยอมรับข้อตกลงการใช้งาน	27	+ .checkbox
		28	+ %label
		29	+ = check_box_tag 'accept_agree'
		30	+ ยอมรับข้อตกลงการใช้งาน
29		31
30	- = submit_tag t('login.login_submit')	32	+ .form-group
		33	+ .col-sm-offset-3.col-sm-9
		34	+ = submit_tag t('login.login_submit'), class: 'btn btn-primary'
31	%br/	35	%br/
32		36
33	- if GraderConfiguration['system.online_registration']	37	- if GraderConfiguration['system.online_registration']

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

                   = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                 %td
                   = @prob_submissions[problem.id][:count]
-            -     = link_to "[subs]", main_submission_path(problem.id)
+            +     -#= link_to "[subs]", main_submission_path(problem.id)
                 %td
                   = render :partial => 'submission_short',
                     :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name, :problem_id => problem.id }

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

                     %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
-            -     %tt
+            +     %tt.grader-comment
                     = submission.grader_comment
                   = "]"
                   %br

app/views/main/login.html.haml ¶ +3 -4

               %h1= GraderConfiguration['ui.front.title']
-            - %table
+            + .row
-            -   %tr
+            +   .col-md-6
-            -     %td
                   - if @announcements.length!=0
                     .announcementbox{:style => 'margin-top: 0px'}
                       %span{:class => 'title'}
                         Announcements
                       = render :partial => 'announcement', :collection => @announcements
-            -     %td{:style => 'vertical-align: top; width: 40%; padding-left: 20px;'}
+            +   .col-md-4{style: "padding-left: 20px;"}
                   = render :partial => 'login_box'

app/views/user_admin/_form.html.haml ¶ +7

                 %label.col-md-2.control-label{for: :login} Login
                 .col-md-4
                   = text_field 'user', 'login', class: 'form-control'
+            +   .col-md-6
               .form-group
                 %label.col-md-2.control-label{for: :full_name} Full name
                 .col-md-4
                   = text_field 'user', 'full_name', class: 'form-control'
+            +   .col-md-6
               .form-group
                 %label.col-md-2.control-label{for: :password} Password
                 .col-md-4
                   = password_field 'user', 'password', class: 'form-control'
+            +   .col-md-6
               .form-group
                 %label.col-md-2.control-label{for: :password_confirmation} Password (confirm)
                 .col-md-4
                   = password_field 'user', 'password_confirmation', class: 'form-control'
+            +   .col-md-6
               .form-group
                 %label.col-md-2.control-label{for: :email} E-mail
                 .col-md-4
                   = email_field 'user', 'email', class: 'form-control'
+            +   .col-md-6
               .form-group
                 %label.col-md-2.control-label{for: :alias} Alias
                 .col-md-4
                   = text_field 'user', 'alias', class: 'form-control'
+            +   .col-md-6
               .form-group
                 %label.col-md-2.control-label{for: :remark} Remark
                 .col-md-4
                   = text_field 'user', 'remark', class: 'form-control'
+            +   .col-md-6
               / [eoform:user]

app/views/user_admin/index.html.haml ¶ +1 -1

                     %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'
                     %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
-            -       %td= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
+            +       %td= link_to 'Destroy', user_admin_destroy_path(user), data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}

config/routes.rb ¶ +2

                 #user admin
                 get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+            +   post 'user_admin', to: 'user_admin#create'
+            +   delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #report
                 get 'report/current_score', to: 'report#current_score', as: 'report_current_score'

app/views/user_admin/new.html.erb removed ¶ -8

deleted file

	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

r679:043258f318f9 - Thu, 14 Sep 2017 08:44:51 - 11 files changed: 47 inserted, 30 deleted

Sign in to your account

Commit r679:043258f318f9 public

Author

r679:043258f318f9 - Thu, 14 Sep 2017 08:44:51 - 11 files changed: 47 inserted, 30 deleted

Commit `r679:043258f318f9` public