diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index a2f0cde18..df0a3c052 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -9,5 +9,3 @@ <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -
- diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index a0249918b..315c39c76 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,12 +1,11 @@ -
-
-

+

+ <%= image_tag '/images/qrweixin.jpg', size: '200x200', alt: 'trustie', class: "weixin" %> +
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> -

-
+
<%= call_hook :view_account_login_top %> -
+
<%= form_tag(signin_path) do %> <%= back_url_hidden_field_tag if is_logout? %> <% unless User.current.logged? %> @@ -67,6 +66,7 @@
+