From 7de07db812a4e0a85f0743e55c1d8af182cf028e Mon Sep 17 00:00:00 2001 From: Wojciech Todryk Date: Sat, 10 Mar 2012 21:03:56 +0100 Subject: [PATCH] cont --- app/controllers/user_controller.rb | 18 ++++++++++----- app/views/common/_form_button.html.haml | 4 ++++ .../common/_input_form_desc_field.html.haml | 8 +++++++ app/views/common/_input_form_field.html.haml | 5 +++++ app/views/layouts/simple.html.haml | 1 - app/views/user/login.html.haml | 22 +++++++------------ app/views/user/setup.html.erb | 20 ----------------- app/views/user/setup.html.haml | 9 ++++++++ 8 files changed, 46 insertions(+), 41 deletions(-) create mode 100755 app/views/common/_form_button.html.haml create mode 100755 app/views/common/_input_form_desc_field.html.haml create mode 100755 app/views/common/_input_form_field.html.haml delete mode 100755 app/views/user/setup.html.erb create mode 100755 app/views/user/setup.html.haml diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 762a687..d8de62c 100755 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -13,13 +13,19 @@ class UserController < ApplicationController end def authenticate + + users = User.all + if users.count.zero? + redirect_to :controller => 'user', :action => 'setup' + return false + end - if not $defaults["only_can_logins"].nil? - if not $defaults["only_can_logins"].include?(params[:user][:login]) - redirect_to :controller => 'internal', :action => 'onlycanlogins' - return false - end - end + if not $defaults["only_can_logins"].nil? + if not $defaults["only_can_logins"].include?(params[:user][:login]) + redirect_to :controller => 'internal', :action => 'onlycanlogins' + return false + end + end user = User.find_by_login(params[:user][:login]) if user.nil? diff --git a/app/views/common/_form_button.html.haml b/app/views/common/_form_button.html.haml new file mode 100755 index 0000000..3543b03 --- /dev/null +++ b/app/views/common/_form_button.html.haml @@ -0,0 +1,4 @@ +.control-group + .controls + %button{:class=>"btn btn-primary",:type=>"submit"} + = text diff --git a/app/views/common/_input_form_desc_field.html.haml b/app/views/common/_input_form_desc_field.html.haml new file mode 100755 index 0000000..91cbd26 --- /dev/null +++ b/app/views/common/_input_form_desc_field.html.haml @@ -0,0 +1,8 @@ +- model = eval(object.class.model_name) +- label.nil? ? model_label = model.human_attribute_name(attr) : model_label = t(label.to_sym) +.control-group + %label{:class=>"control-label",:for=>"#{attr}"} + = model_label + .controls + %input{:id=>"#{model}_#{attr}",:name=>"#{model}[#{attr}]"} + diff --git a/app/views/common/_input_form_field.html.haml b/app/views/common/_input_form_field.html.haml new file mode 100755 index 0000000..8c40206 --- /dev/null +++ b/app/views/common/_input_form_field.html.haml @@ -0,0 +1,5 @@ +.control-group + %label{:class=>"control-label",:for=>"#{attr}"} + = model.capitalize.constantize.human_attribute_name(attr) + .controls + %input{:id=>"#{model}_#{attr}",:name=>"#{model}[#{attr}]"} diff --git a/app/views/layouts/simple.html.haml b/app/views/layouts/simple.html.haml index 6c0182d..d0686a5 100755 --- a/app/views/layouts/simple.html.haml +++ b/app/views/layouts/simple.html.haml @@ -15,7 +15,6 @@ %a{:href=>"/"} = image_tag "logo.png" .row - %hr/ - if flash[:error] .alert.alert-error = flash[:error] diff --git a/app/views/user/login.html.haml b/app/views/user/login.html.haml index 60b07cb..cd4ae34 100644 --- a/app/views/user/login.html.haml +++ b/app/views/user/login.html.haml @@ -1,18 +1,12 @@ +- content_for :title do + \- + = t(:login,:scope=>:user) + %form{:class=>"form-horizontal top-pix18",:action=>"#{url_for(:controller => 'user', :action => 'authenticate')}",:method=>"post"} %fieldset - .control-group - %label{:class=>"control-label",:for=>"login"} - = User.human_attribute_name('login') - .controls - %input{:id=>"user_login",:name=>"user[login]"} - .control-group - %label{:class=>"control-label",:for=>"password"} - = User.human_attribute_name('password') - .controls - %input{:id=>"user_password",:name=>"user[password]"} - .control-group - .controls - %button{:class=>"btn btn-primary",:type=>"submit"} - = t(:please_login,:scope=>:user) + = render :partial => "common/input_form_field",:locals => { :model => 'user',:attr => 'login'} + = render :partial => "common/input_form_field",:locals => { :model => 'user',:attr => 'password'} + = render :partial => "common/form_button",:locals => { :text => t(:please_login,:scope=>:user)} + diff --git a/app/views/user/setup.html.erb b/app/views/user/setup.html.erb deleted file mode 100755 index d3a6c35..0000000 --- a/app/views/user/setup.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<% content_for :title do %> - <%= t(:setup,:scope=>:user) %> -<% end %> - -
-
- -

<%= t(:setup,:scope=>:user) %>

-
-
- <%= raw form_field(@user,"login",nil,"joe.doe",params[:user].nil? ? params[:login] : params[:user][:login]) %> - <%= raw form_field(@user,"first_name",nil,"Joe","") %> - <%= raw form_field(@user,"last_name",nil,"Doe","") %> - <%= raw form_field(@server,"name",nil,"server.domain","") %> - <%= raw single_action('send','compose',"up.png") %> -
-
-
-
diff --git a/app/views/user/setup.html.haml b/app/views/user/setup.html.haml new file mode 100755 index 0000000..d354d65 --- /dev/null +++ b/app/views/user/setup.html.haml @@ -0,0 +1,9 @@ +- content_for :title do + \- + = t(:setup,:scope=>:user) + +%form{:class=>"form-horizontal top-pix18",:action=>"#{url_for(:controller => 'user', :action => 'create')}",:method=>"post"} + %legend + = t(:setup,:scope=>:user) + %fieldset + = render :partial => "common/input_form_desc_field",:locals => {:object => @user,:attr => 'login',:label => nil,:example => 'joe doe',:value => params[:user].nil? ? params[:login] : params[:user][:login]}