Show More
Commit Description:
Merge pull request #19 from nattee/master...
Commit Description:
Merge pull request #19 from nattee/master upstream merge from nattee/cafe-grader-web
References:
File last commit:
Show/Diff file:
Action:
app/views/main/_login_box.html.haml | 39 lines | 1.1 KiB | text/x-haml | HamlLexer |
Jittat Fakcharoenphol
renamed model Configuration to GraderConfiguration, renamed rhtml views to erb, fixed other small errors
r320 %b= GraderConfiguration['ui.front.welcome_message']
Jittat Fakcharoenphol
added view file
r287 %br/
- if !@hidelogin
=t 'login.message'
%br/
%br/
- if flash[:notice]
%hr/
%b= flash[:notice]
%hr/
%div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
login test
r626 = form_tag login_login_path do
Jittat Fakcharoenphol
added view file
r287 %table
%tr
%td{:align => "right"}
="#{t 'login_label'}:"
%td= text_field_tag 'login'
%tr
%td{:align => "right"}
="#{t 'password_label'}:"
%td= password_field_tag
add license agreement checkbox
r535 - unless GraderConfiguration['right.bypass_agreement']
%tr
%td{:align => "right"}= check_box_tag 'accept_agree'
%td ยอมรับข้อตกลงการใช้งาน
Jittat Fakcharoenphol
added view file
r287 = submit_tag t('login.login_submit')
%br/
Jittat Fakcharoenphol
renamed model Configuration to GraderConfiguration, renamed rhtml views to erb, fixed other small errors
r320 - if GraderConfiguration['system.online_registration']
Jittat Fakcharoenphol
added view file
r287 =t 'login.participation'
%b
= "#{t 'login.please'} "
= link_to "#{t 'login.register'}", :controller => :users, :action => :new
%br/
= link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget