Description:
uses 2 columns on login page
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r286:e63dca91c04d - - 1 file changed: 10 inserted, 40 deleted
| @@ -1,42 +1,12 | |||
|
|
1 | 1 | %h1= Configuration['ui.front.title'] |
|
|
2 | 2 | |
|
|
3 | - - if @announcements.length!=0 | |
|
|
4 | - .announcementbox | |
|
|
5 | - %span{:class => 'title'} | |
|
|
6 |
- |
|
|
|
7 | - = render :partial => 'announcement', :collection => @announcements | |
|
|
8 | - | |
|
|
9 | - %b= Configuration['ui.front.welcome_message'] | |
|
|
10 | - %br/ | |
|
|
11 | - | |
|
|
12 | - - if !@hidelogin | |
|
|
13 | - =t 'login.message' | |
|
|
14 | - %br/ | |
|
|
15 | - %br/ | |
|
|
16 | - | |
|
|
17 | - - if flash[:notice] | |
|
|
18 | - %hr/ | |
|
|
19 | - %b= flash[:notice] | |
|
|
20 | - %hr/ | |
|
|
21 | - | |
|
|
22 | - %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"} | |
|
|
23 | - - form_tag :controller => 'login', :action => 'login' do | |
|
|
24 | - %table | |
|
|
25 | - %tr | |
|
|
26 | - %td{:align => "right"} | |
|
|
27 | - ="#{t 'login_label'}:" | |
|
|
28 | - %td= text_field_tag 'login' | |
|
|
29 | - %tr | |
|
|
30 | - %td{:align => "right"} | |
|
|
31 | - ="#{t 'password_label'}:" | |
|
|
32 | - %td= password_field_tag | |
|
|
33 | - = submit_tag t('login.login_submit') | |
|
|
34 | - %br/ | |
|
|
35 | - | |
|
|
36 | - - if Configuration['system.online_registration'] | |
|
|
37 | - =t 'login.participation' | |
|
|
38 | - %b | |
|
|
39 | - = "#{t 'login.please'} " | |
|
|
40 | - = link_to "#{t 'login.register'}", :controller => :users, :action => :new | |
|
|
41 | - %br/ | |
|
|
42 | - = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget | |
|
|
3 | + %table | |
|
|
4 | + %tr | |
|
|
5 | + %td | |
|
|
6 | + - if @announcements.length!=0 | |
|
|
7 | + .announcementbox{:style => 'margin-top: 0px'} | |
|
|
8 | + %span{:class => 'title'} | |
|
|
9 | + Announcements | |
|
|
10 | + = render :partial => 'announcement', :collection => @announcements | |
|
|
11 | + %td{:style => 'vertical-align: top; width: 40%; padding-left: 20px;'} | |
|
|
12 | + = render :partial => 'login_box' | |
You need to be logged in to leave comments.
Login now