Body: - <%=h @announcement.body %> + <%=h markdown(@announcement.body) %>
diff --git a/app/views/main/_login_box.html.haml b/app/views/main/_login_box.html.haml --- a/app/views/main/_login_box.html.haml +++ b/app/views/main/_login_box.html.haml @@ -12,22 +12,26 @@ %hr/ %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"} - = form_tag login_login_path do - %table - %tr - %td{:align => "right"} - ="#{t 'login_label'}:" - %td= text_field_tag 'login' - %tr - %td{:align => "right"} - ="#{t 'password_label'}:" - %td= password_field_tag - - unless GraderConfiguration['right.bypass_agreement'] - %tr - %td{:align => "right"}= check_box_tag 'accept_agree' - %td ยอมรับข้อตกลงการใช้งาน - - = submit_tag t('login.login_submit') + = form_tag login_login_path, {class: 'form-horizontal'} do + .form-group + =label_tag :login, "Login",class: 'col-sm-3 control-label' + .col-sm-9 + =text_field_tag :login, nil, class: 'form-control' + .form-group + =label_tag :password, "Password", class: 'col-sm-3 control-label' + .col-sm-9 + =password_field_tag :password, nil, class: 'form-control' + - unless GraderConfiguration['right.bypass_agreement'] + .form-group + .col-sm-offset-3.col-sm-9 + .checkbox + %label + = check_box_tag 'accept_agree' + ยอมรับข้อตกลงการใช้งาน + + .form-group + .col-sm-offset-3.col-sm-9 + = submit_tag t('login.login_submit'), class: 'btn btn-primary' %br/ - if GraderConfiguration['system.online_registration'] diff --git a/app/views/main/_problem.html.haml b/app/views/main/_problem.html.haml --- a/app/views/main/_problem.html.haml +++ b/app/views/main/_problem.html.haml @@ -11,7 +11,7 @@ = link_to_description_if_any "[#{t 'main.problem_desc'}] ".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 } diff --git a/app/views/main/_submission_short.html.haml b/app/views/main/_submission_short.html.haml --- a/app/views/main/_submission_short.html.haml +++ b/app/views/main/_submission_short.html.haml @@ -13,7 +13,7 @@ %strong=t 'main.score' = "#{(submission.points*100/submission.problem.full_score).to_i} " = " [" - %tt + %tt.grader-comment = submission.grader_comment = "]" %br diff --git a/app/views/main/login.html.haml b/app/views/main/login.html.haml --- a/app/views/main/login.html.haml +++ b/app/views/main/login.html.haml @@ -1,12 +1,11 @@ %h1= GraderConfiguration['ui.front.title'] -%table - %tr - %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;'} - = render :partial => 'login_box' +.row + .col-md-6 + - if @announcements.length!=0 + .announcementbox{:style => 'margin-top: 0px'} + %span{:class => 'title'} + Announcements + = render :partial => 'announcement', :collection => @announcements + .col-md-4{style: "padding-left: 20px;"} + = render :partial => 'login_box' diff --git a/app/views/user_admin/_form.html.haml b/app/views/user_admin/_form.html.haml --- a/app/views/user_admin/_form.html.haml +++ b/app/views/user_admin/_form.html.haml @@ -4,28 +4,35 @@ %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] diff --git a/app/views/user_admin/index.html.haml b/app/views/user_admin/index.html.haml --- a/app/views/user_admin/index.html.haml +++ b/app/views/user_admin/index.html.haml @@ -95,7 +95,7 @@ %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 '} diff --git a/app/views/user_admin/new.html.erb b/app/views/user_admin/new.html.erb deleted file mode 100644 --- a/app/views/user_admin/new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -