diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index a64767f98..892be7e42 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -1,6 +1,6 @@
-
- <%=link_to image_tag("/images/logo.png",weight:"39px", height: "39px"), home_path %> +
<%= render_menu :account_menu -%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 34e1be806..f61eb01f5 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,44 +1,44 @@ - - -
-
- - - -
Trustie - 是一个社交化的项目管理、软件开发和众包平台。
Trustieforge is a socialized collaboration platform for project management, - software development and software crowdsourcing.
-
+
+
+ + + + + + + +
Trustie是一个社交化的项目管理、软件开发和众包平台。
Trustieforge is a socialized collaboration platform for project management, + software development and software crowdsourcing.
+
-
- <%= call_hook :view_account_login_top %> -
- <%= form_tag(signin_path) do %> - <%= back_url_hidden_field_tag %> - <% unless User.current.logged? %> - - - + - - - - - <% if Setting.openid? %> - - - - - <% end %> - - - - - - - - -
<%= text_field_tag 'username', params[:username], :tabindex => '1' %> <%= call_hook :view_account_login_top %> +
+ <%= form_tag(signin_path) do %> + <%= back_url_hidden_field_tag %> + <% unless User.current.logged? %> + + + + + + + + + + <% if Setting.openid? %> + + + + + <% end %> + + + + + + + + +
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= text_field_tag "openid_url", nil, :tabindex => '3' %>
<% if Setting.autologin? %> <% end %>
<% if Setting.lost_password? %> + <%= link_to l(:label_password_lost), lost_password_path %> + <% end %> + +
+ <% else %> +
+ + + + + + + + + + + + +
<%= l(:label_welcome) %> <%= User.current.name%> <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %><%= l(:label_user_watcher) %> (<%= link_to User.watched_by(User.current).count %>)  + <%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(User.current) }%>
<% unless User.current.memberships.empty? %> + <%= l(:label_contribute_to, :project_count => "#{User.current.memberships.count}") %> <% end %>
+ +
+ <% end %> + <% end %> +
<%= call_hook :view_account_login_bottom %> + + <% if params[:username].present? %> + <%= javascript_tag "$('#password').focus();" %> + <% else %> + <%= javascript_tag "$('#username').focus();" %> + <% end %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= text_field_tag "openid_url", nil, :tabindex => '3' %>
- <% if Setting.autologin? %> - - <% end %> -
- <% if Setting.lost_password? %> - <%= link_to l(:label_password_lost), lost_password_path %> - <% end %> - - -
- <% else %> -
- - - - - - - -
<%= l(:label_welcome) %> <%=User.current.name%> <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %>
<%= l(:label_user_watcher) %> (<%= User.watched_by(User.current).count %>) - <%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(User.current) }%>
<% unless User.current.memberships.empty? %> - <%= l(:label_contribute_to, :project_count => "#{User.current.memberships.count}") %> - <% for member in User.current.memberships %> - <%= link_to_project(member.project) %><%= (User.current.memberships.last == member) ? '' : '，' %> - <% end %> - <% end %>
-
- <% end %> -<% end %> +
-<%= call_hook :view_account_login_bottom %> - -<% if params[:username].present? %> -<%= javascript_tag "$('#password').focus();" %> -<% else %> -<%= javascript_tag "$('#username').focus();" %> -<% end %> - - -
- - - - - - - - - - - - - - - - - -
<%= link_to image_tag("/images/welcome/1.png", weight:"200px", height:"200px"), :controller => 'projects', :action => 'index' %> <%= link_to image_tag("/images/welcome/2.png", weight:"200px", height:"200px"), :controller => 'bids', :action => 'index' %> <%= link_to image_tag("/images/welcome/3.png", weight:"200px", height:"200px") %>
<%= l(:label_create_new_projects_description) %> <%= l(:label_call_for_bids_description) %> <%= l(:label_create_course_description) %>
-
+ + + + + + + - -
-
<%= l(:label_features) %> -
-
-
-
<%= link_to image_tag("/images/welcome/1.png", weight:"190px", height:"190px"), :controller => 'projects', :action => 'index' %><%= link_to image_tag("/images/welcome/2.png", weight:"190px", height:"190px"), :controller => 'bids', :action => 'index' %><%= link_to image_tag("/images/welcome/3.png", weight:"190px", height:"190px") %>
- - - - - - + + + + + + + + + + + + + + + + + + - - - - - - -
<%= image_tag("/images/welcome/discuss.png", weight:"30px", height: "26px") %><%= l(:label_board) %> <%= image_tag("/images/welcome/news.png", weight:"30px", height: "26px") %><%= l(:label_news) %> <%= image_tag("/images/welcome/boards.png", weight:"30px", height: "26px") %><%= l(:label_milestone) %>
<%= l(:label_create_new_projects_description) %><%= l(:label_call_for_bids_description) %><%= l(:label_create_course_description) %>
+
+ <%= l(:label_features) %>
+
+
<%= image_tag("/images/welcome/discuss.png", weight:"30px", height: "26px") %><%= l(:label_board) %> <%= image_tag("/images/welcome/news.png", weight:"30px", height: "26px") %><%= l(:label_news) %> <%= image_tag("/images/welcome/boards.png", weight:"30px", height: "26px") %><%= l(:label_milestone) %>
<%= l(:label_board_description) %> <%= l(:label_news_description) %> <%= l(:label_milestone_description) %>
-
-
+ <%= l(:label_board_description) %> + + <%= l(:label_news_description) %> + + <%= l(:label_milestone_description) %> + +
- +
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fe008c51c..5ff2458c5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -11,6 +11,11 @@ h4 {border-bottom: 1px dotted #bbb;} /*new by huang*/ /**/ +.welcome_logo{ + float: left; + padding-left: 5px; + padding-top: 2px; +} .welcome_images{ width: 200px; height: 200px; @@ -154,7 +159,7 @@ ul.tool li{list-style-type:none; .font_lighter2{ font-family:微软雅黑; color:#9a9a9a; - font-size:12px; + font-size:14px; } .font_lighter_welcome{ @@ -191,7 +196,7 @@ ul.tool li{list-style-type:none; .spaceright{float:left; width:620px;} .welcone_left{ - margin-top: 70px; + margin-top: 50px; margin-left: 90px; float:left; width: 49%; @@ -224,6 +229,11 @@ ul.tool li{list-style-type:none; padding-bottom: 8px; } .inf_user_image img.avatar2{ + background: rgb(245, 245, 245); + padding: 4px; + border: 1px solid #e5dfc7; + float: left; + display: block; height：80px; width: 80px; @@ -545,7 +555,7 @@ ul.newprojects2 li{ padding: 0px 0px 0px 0px; white-space:nowrap; } -#top-menu a {color: #000000; margin-right: 8px; font-weight: bold;} +#top-menu a {color: #fff; margin-right: 8px; font-weight: bold;} #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; } #account {float:right;} diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 125c25076..032ba732a 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -376,7 +376,7 @@ ul.projects li.root #top-menu ul { - margin-left: 60px; /*add by huang*/ + margin-left: 0px; /*add by huang*/ padding-right: 1px; }