Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r737:d8bb239a84f8 - - 3 files changed: 13 inserted, 24 deleted
| @@ -42,27 +42,25 | |||
|
|
42 | 42 | Second, we add the custom PPA, update the system and install RVM. |
|
|
43 | 43 | |
|
|
44 | 44 | cafe@grader:~$ sudo apt-add-repository -y ppa:rael-gc/rvm |
|
|
45 | 45 | cafe@grader:~$ sudo apt-get update |
|
|
46 | 46 | cafe@grader:~$ sudo apt-get install rvm |
|
|
47 | 47 | |
|
|
48 | 48 | This is very important. You have to logout and login again since RVM change a lots of system. |
|
|
49 | 49 | |
|
|
50 | 50 | If you are using GUI version of Ubuntu, be sure to have Gnome Terminal (or any other terminal you are using) perform login every time. This can be done by mark the check box "Run command as a login shell" in Gnome terminal or by adding --login to bash. |
|
|
51 | 51 | |
|
|
52 | 52 | === 3. Install necessary package |
|
|
53 | 53 | |
|
|
54 |
- cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php |
|
|
|
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 | |
|
|
60 | 58 | First, ensure that RVM is installed correctly. |
|
|
61 | 59 | |
|
|
62 | 60 | cafe@grader:~$ rvm |
|
|
63 | 61 | |
|
|
64 | 62 | If you get a result similar to this. |
|
|
65 | 63 | |
|
|
66 | 64 | Command 'rvm' not found, but there are 21 similar ones. |
|
|
67 | 65 | |
|
|
68 | 66 | It is very likely that you have not re-login or you are using bash without --login. Please do so and re-read the installation of RVM on Ubuntu https://github.com/rvm/ubuntu_rvm again. |
| @@ -1,35 +1,36 | |||
|
|
1 | 1 | = user_title_bar(@user) |
|
|
2 | 2 | |
|
|
3 | 3 | %h1 Your account settings |
|
|
4 | 4 | |
|
|
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 |
|
|
|
11 |
- %td |
|
|
|
10 | + %th Login | |
|
|
11 | + %td= @user.login | |
|
|
12 | 12 | %tr |
|
|
13 |
- %th |
|
|
|
14 |
- %td |
|
|
|
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 |
|
|
18 | 18 | -#%tr |
|
|
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 |
|
|
|
23 |
- %td |
|
|
|
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"} | |
| deleted file |
You need to be logged in to leave comments.
Login now