cafe-grader-web

Commit r737:d8bb239a84f8 public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge algo
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

r737:d8bb239a84f8 - - 3 files changed: 13 inserted, 24 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -51,9 +51,7
51 51
52 52 === 3. Install necessary package
53 53
54 - cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php7.2-cli apache2 dirmngr gnupg apache2-dev
55 -
56 - curl build-essential
54 + cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php-cli apache2 dirmngr gnupg apache2-dev
57 55
58 56 === 4. Install cafe-grader
59 57
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -5,13 +5,13
5 5 -#%p
6 6 -#You can edit your alias and e-mails. Just click on the text and edit it.
7 7
8 - %table.uinfo
8 + %table.table.table-bordered{:style => "width:30%"}
9 9 %tr
10 - %th.uinfo Login
11 - %td.uinfo= @user.login
10 + %th Login
11 + %td= @user.login
12 12 %tr
13 - %th.uinfo Full name
14 - %td.uinfo= @user.full_name
13 + %th Full name
14 + %td= @user.full_name
15 15 -#%tr
16 16 -#%th.uinfo Alias
17 17 -#%td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
@@ -19,17 +19,18
19 19 -#%th.uinfo E-mail
20 20 -#%td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
21 21 %tr
22 - %th.uinfo Password
23 - %td.uinfo
22 + %th Password
23 + %td
24 24 = form_tag :action => 'chg_passwd', :method => 'post' do
25 25 %table
26 26 %tr
27 - %td= password_field_tag 'passwd'
27 + %td
28 + %input{:type => "password", :class => "form-control", :name => "passwd", :id => "passwd"}
28 29 %td (new)
29 30 %tr
30 - %td= password_field_tag 'passwd_verify'
31 + %td
32 + %input{:type => "password", :class => "form-control", :name => "passwd_verify", :id => "passwd_verify"}
31 33 %td (verify)
32 34 %tr
33 35 %td{:colspan => "2"}
34 - = submit_tag 'change password'
35 -
36 + %input{:type => "button", :class => "btn btn-default", :name => "commit", :value => "Change Password"}
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now