# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2018-07-11 10:35:06
# Node ID d8bb239a84f89515f1b148f7c74b50fa8b55278f
# Parent  06d038074b56a880a2b4194a3dac49cc3b2fb8db
# Parent  63d47ef59bac683d910a3622920bd28e9e297fae

merge

diff --git a/README b/README
deleted file mode 100644
--- a/README
+++ /dev/null
@@ -1,10 +0,0 @@
-== cafe grader
-
-cafe grader is a programming contest platform used in Thailand IOI training.
-The package includes 2 repositories, jittat/cafe-grader-web and jittat/cafe-grader-judge-scripts.
-
-=== Installation
-
-The system is tested on ubuntu 14.04 LTS. Use the installation script in 
-cafe-grader-judge-scripts/installer/install.sh . See http://theory.cpe.ku.ac.th/wiki/index.php/%E0%B8%81%E0%B8%B2%E0%B8%A3%E0%B8%95%E0%B8%B4%E0%B8%94%E0%B8%95%E0%B8%B1%E0%B9%89%E0%B8%87_Cafe_grader for the detail.
-
diff --git a/README.rdoc b/README.rdoc
--- a/README.rdoc
+++ b/README.rdoc
@@ -51,9 +51,7 @@
 
 === 3. Install necessary package
 
-    cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php7.2-cli apache2 dirmngr gnupg apache2-dev
-
-curl build-essential
+    cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php-cli apache2 dirmngr gnupg apache2-dev
 
 === 4. Install cafe-grader
 
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -5,13 +5,13 @@
 -#%p
   -#You can edit your alias and e-mails.  Just click on the text and edit it.
 
-%table.uinfo
+%table.table.table-bordered{:style => "width:30%"}
   %tr
-    %th.uinfo Login
-    %td.uinfo= @user.login
+    %th Login
+    %td= @user.login
   %tr
-    %th.uinfo Full name
-    %td.uinfo= @user.full_name
+    %th Full name
+    %td= @user.full_name
   -#%tr
     -#%th.uinfo Alias
     -#%td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
@@ -19,17 +19,18 @@
     -#%th.uinfo E-mail
     -#%td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
   %tr
-    %th.uinfo Password
-    %td.uinfo
+    %th Password
+    %td
       = form_tag :action => 'chg_passwd', :method => 'post' do
         %table
           %tr
-            %td= password_field_tag 'passwd'
+            %td
+              %input{:type => "password", :class => "form-control", :name => "passwd", :id => "passwd"}
             %td (new)
           %tr
-            %td= password_field_tag 'passwd_verify'
+            %td
+              %input{:type => "password", :class => "form-control", :name => "passwd_verify", :id => "passwd_verify"}
             %td (verify)
           %tr
             %td{:colspan => "2"}
-              = submit_tag 'change password'
-
+              %input{:type => "button", :class => "btn btn-default", :name => "commit", :value => "Change Password"}