From 9c16da4f46a793477a0702957d1648b838d34feb Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Mon, 15 Oct 2012 14:07:53 +0800
Subject: [PATCH] fixed html for add link. form html

---
 .../admin/users_new_interface/_user_basic.html.erb   | 12 +++++++++---
 app/views/layouts/_side_bar.html.erb                 |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/users_new_interface/_user_basic.html.erb b/app/views/admin/users_new_interface/_user_basic.html.erb
index 3ce900b7..52fd5f9b 100644
--- a/app/views/admin/users_new_interface/_user_basic.html.erb
+++ b/app/views/admin/users_new_interface/_user_basic.html.erb
@@ -2,25 +2,31 @@
 
   <div class="map-block back">
                 <h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4>
-                <form class="form-horizontal">
+
+                <div class="form-horizontal">
                     <div class="control-group">
                         <%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br />
                         <div class="controls">
                             <%= f.email_field :email %>
                         </div>
                     </div>
+                </div>
+
+                <div class="form-horizontal">
                     <div class="control-group">
                         <%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %>
                         <div class="controls">
                             <%= f.password_field :password %>
                         </div>
                     </div>
+                  </div>
+
+                  <div class="form-horizontal">
                     <div class="control-group">
                       <%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %>
-                        <div class="controls">                      
                           <div class="controls">
                               <%= f.password_field :password_confirmation %>
-                          </div>
                         </div>
                     </div>
+                </div>
             </div>
\ No newline at end of file
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 545c5fbb..5d771119 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -41,6 +41,7 @@
 		<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
 
 		  <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
+		  <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
 		  <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
 		  <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
 		  <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>