qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

用户主页 门户

This commit is contained in:
huangjingquan 2013-08-12 10:25:23 +08:00
parent 7a0db3b3f1
commit 4bc217b52c
4 changed files with 239 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/_base_header.html.erb
View File

@ -1,6 +1,6 @@
<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;"> <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">
<div style="float: left "> <div class="welcome_logo">
<%=link_to image_tag("/images/logo.png",weight:"39px", height: "39px"), home_path %> <%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px"), home_path %>
</div> </div>
<div id="account"> <div id="account">
<%= render_menu :account_menu -%> <%= render_menu :account_menu -%>

453
app/views/welcome/index.html.erb
View File

@ -1,44 +1,44 @@
<!-- <div class="table_"> <!-- <div class="table_">
<table background="/images/welcome/backgroundnew.png" height="600" width="928"> <table background="/images/welcome/backgroundnew.png" height="600" width="928">
<tr><td align="left"> <tr><td align="left">
<%= call_hook :view_account_login_top %> <%= call_hook :view_account_login_top %>
<div id="login-form_new"> <div id="login-form_new">
<%= form_tag(signin_path) do %> <%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag %> <%= back_url_hidden_field_tag %>
<table> <table>
<tr> <tr>
<td align="right"><label for="username"><%=l(:field_login)%>:</label></td> <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td> <td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
</tr> </tr>
<tr> <tr>
<td align="right"><label for="password"><%=l(:field_password)%>:</label></td> <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td> <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
</tr> </tr>
<% if Setting.openid? %> <% if Setting.openid? %>
<tr> <tr>
<td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td> <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
<td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td> <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
</tr> </tr>
<% end %> <% end %>
<tr> <tr>
<td></td> <td></td>
<td align="left"> <td align="left">
<% if Setting.autologin? %> <% if Setting.autologin? %>
<label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
<% end %> <% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left"> <td align="left">
<% if Setting.lost_password? %> <% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), lost_password_path %> <%= link_to l(:label_password_lost), lost_password_path %>
<% end %> <% end %>
</td> </td>
<td align="right"> <td align="right">
<input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/> <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
</td> </td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
</div> </div>
<%= call_hook :view_account_login_bottom %> <%= call_hook :view_account_login_bottom %>
@ -50,76 +50,76 @@
<% end %> <% end %>
</td></tr> </td></tr>
<tr><td> <tr><td>
<table width="600" align="center" style="padding-top: 120px" cellspacing="0" cellpadding="0" > <table width="600" align="center" style="padding-top: 120px" cellspacing="0" cellpadding="0" >
<tr><td width="200" bgcolor="#00adee"><img src="/images/welcome/1.png" width="200" height="200"/></td> <tr><td width="200" bgcolor="#00adee"><img src="/images/welcome/1.png" width="200" height="200"/></td>
<td width="200" bgcolor="#54c8f3"><img src="/images/welcome/2.png" width="200" height="200"/></td> <td width="200" bgcolor="#54c8f3"><img src="/images/welcome/2.png" width="200" height="200"/></td>
<td width="200" bgcolor="#93c5d8"><img src="/images/welcome/3.png" width="200" height="200"/></td> <td width="200" bgcolor="#93c5d8"><img src="/images/welcome/3.png" width="200" height="200"/></td>
</tr> </tr>
<tr height="50"><td align="center"> <tr height="50"><td align="center">
<p><%=link_to "发布需求",home_path %></p> <p><%=link_to "发布需求",home_path %></p>
</td><td align="center"> </td><td align="center">
<p><%=link_to "发现开源",home_path %></p> <p><%=link_to "发现开源",home_path %></p>
</td><td align="center"> </td><td align="center">
<p><%=link_to "创建项目",:controller=>'projects',:action=>'index' %></p> <p><%=link_to "创建项目",:controller=>'projects',:action=>'index' %></p>
</td></tr> </td></tr>
</table></td> </table></td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="table_" style="height:230px;"> <div class="table_" style="height:230px;">
<div class="welcone_left"> <div class="welcone_left">
<table width="240px"> <table width="240px">
<tr><td><span class="font_welcome_trustie">Trustieforge</span><span class="">是一个社交化的项目管理、软件开发和众包平台。</span></td></tr> <tr><td><span class="font_welcome_trustie">Trustieforge</span><span class="">是一个社交化的项目管理、软件开发和众包平台。</span></td></tr>
<tr><td class="font_lighter_trustie">Trustieforge is a socialized collaboration platform for project management, <tr><td class="font_lighter_trustie">Trustieforge is a socialized collaboration platform for project management,
software development and software crowdsourcing.</td></tr> software development and software crowdsourcing.</td></tr>
</table> </table>
</div> </div>
<div > <div >
<table> <table>
<tr><td align="left"> <tr><td align="left">
<%= call_hook :view_account_login_top %> <%= call_hook :view_account_login_top %>
<div id="login-form_new"> <div id="login-form_new">
<%= form_tag(signin_path) do %> <%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag %> <%= back_url_hidden_field_tag %>
<% unless User.current.logged? %> <% unless User.current.logged? %>
<table class="welcone_right"> <table class="welcone_right">
<tr> <tr>
<td align="right"><label for="username">用户:</label></td> <td align="right"><label for="username">用户:</label></td>
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td> <td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
</tr> </tr>
<tr> <tr>
<td align="right"><label for="password">密码:</label></td> <td align="right"><label for="password">密码:</label></td>
<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td> <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
</tr> </tr>
<% if Setting.openid? %> <% if Setting.openid? %>
<tr> <tr>
<td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td> <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
<td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td> <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
</tr> </tr>
<% end %> <% end %>
<tr> <tr>
<td></td> <td></td>
<td align="left"> <td align="left">
<% if Setting.autologin? %> <% if Setting.autologin? %>
<label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
<% end %> <% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left"> <td align="left">
<% if Setting.lost_password? %> <% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), lost_password_path %> <%= link_to l(:label_password_lost), lost_password_path %>
<% end %> <% end %>
</td> </td>
<td align="right"> <td align="right">
<input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/> <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
</td> </td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<%= call_hook :view_account_login_bottom %> <%= call_hook :view_account_login_bottom %>
@ -136,142 +136,135 @@
--> -->
<!--add by huang--> <!--add by huang-->
<!--add by huang--> <!--add by huang-->
<div style="height:220px;"> <div style="height:190px;">
<div class="welcone_left"> <div class="welcone_left">
<table width="350px"> <table width="350px">
<tr><td><span class="font_welcome_trustie">Trustie</span> <tr>
<span class="font_welcome_Cdescription">是一个社交化的项目管理、软件开发和众包平台。</span></td></tr> <td><span class="font_welcome_trustie">Trustie</span><span class="font_welcome_Cdescription">是一个社交化的项目管理、软件开发和众包平台。</span></td>
<tr><td class="font_welcome_Edescription">Trustieforge is a socialized collaboration platform for project management, </tr>
software development and software crowdsourcing.</td></tr> <tr>
</table> <td class="font_welcome_Edescription">Trustieforge is a socialized collaboration platform for project management,
</div> software development and software crowdsourcing.</td>
</tr>
</table>
</div>
<table> <table>
<tr><td>
<%= call_hook :view_account_login_top %>
<div id="login-form_new">
<%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag %>
<% unless User.current.logged? %> <!--modified by young-->
<table>
<tr> <tr>
<td align="right"><label for="username"><%= l(:label_username) %></label></td> <td> <%= call_hook :view_account_login_top %>
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td> <div id="login-form_new">
<%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag %>
<% unless User.current.logged? %> <!--modified by young-->
<table>
<tr>
<td align="right"><label for="username"><%= l(:label_username) %></label></td>
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
</tr>
<tr>
<td align="right"><label for="password"><%= l(:label_password) %></label></td>
<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
</tr>
<% if Setting.openid? %>
<tr>
<td align="right"><label for="openid_url"><%= l(:field_identity_url)%></label></td>
<td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
</tr>
<% end %>
<tr>
<td></td>
<td align="left"> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <% end %> </td>
</tr>
<tr>
<td align="left"> <% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), lost_password_path %>
<% end %> </td>
<td align="right">
<input type="submit" name="login" value="<%= l(:button_login)%> &#187;" tabindex="5"/>
</td>
</tr>
</table>
<% else %>
<div>
<!--info-->
<table width="200" border="0">
<tr>
<td colspan="2" class="font_welcome_Cdescription"><%= l(:label_welcome) %> <strong class="font_small_watch"><%= User.current.name%></strong> <%= l(:label_join) %></td>
</tr>
<tr>
<td rowspan="2" align="left"><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></td>
<td><%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%= link_to User.watched_by(User.current).count %></strong>)&nbsp
<%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(User.current) }%></td>
</tr>
<tr>
<td><% 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 %></td>
</tr>
</table>
</div>
<% end %>
<% end %>
</div> <%= call_hook :view_account_login_bottom %>
<% if params[:username].present? %>
<%= javascript_tag "$('#password').focus();" %>
<% else %>
<%= javascript_tag "$('#username').focus();" %>
<% end %> </td>
</tr> </tr>
<tr> </table>
<td align="right"><label for="password"><%= l(:label_password) %></label></td>
<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
</tr>
<% if Setting.openid? %>
<tr>
<td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
<td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
</tr>
<% end %>
<tr>
<td></td>
<td align="left">
<% if Setting.autologin? %>
<label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
<% end %>
</td>
</tr>
<tr>
<td align="left">
<% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), lost_password_path %>
<% end %>
</td>
<td align="right">
<input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
</td>
</tr>
</table>
<% else %>
<div>
<table>
<tr><td class="font_welcome_Cdescription"><%= l(:label_welcome) %> <strong class="font_small_watch"><%=User.current.name%></strong> <%= l(:label_join) %></td></tr>
<tr><td align="center"><span><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></span></td></tr>
<tr><td><%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%= User.watched_by(User.current).count %></strong>)
<%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(User.current) }%></td></tr>
<tr><td><% 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 %></td></tr>
</table>
</div>
<% end %>
<% end %>
</div> </div>
<%= call_hook :view_account_login_bottom %>
<% if params[:username].present? %>
<%= javascript_tag "$('#password').focus();" %>
<% else %>
<%= javascript_tag "$('#username').focus();" %>
<% end %>
</td></tr>
</table></div>
<!--model--> <!--model-->
<div> <div>
<table width="700" border="0" align="center" style="padding-top: 100px"> <table width="700" border="0" align="center" style="padding-top: 100px">
<tr align="center"> <tr align="center">
<td><%= link_to image_tag("/images/welcome/1.png", weight:"200px", height:"200px"), :controller => 'projects', :action => 'index' %></td> <td><%= link_to image_tag("/images/welcome/1.png", weight:"190px", height:"190px"), :controller => 'projects', :action => 'index' %></td>
<td width="50">&nbsp;</td> <td width="65"></td>
<td><%= link_to image_tag("/images/welcome/2.png", weight:"200px", height:"200px"), :controller => 'bids', :action => 'index' %></td> <td><%= link_to image_tag("/images/welcome/2.png", weight:"190px", height:"190px"), :controller => 'bids', :action => 'index' %></td>
<td width="50">&nbsp;</td> <td width="65"></td>
<td><%= link_to image_tag("/images/welcome/3.png", weight:"200px", height:"200px") %></td> <td><%= link_to image_tag("/images/welcome/3.png", weight:"190px", height:"190px") %></td>
</tr>
<!-- <tr align="center">
<td><p class="font_welcome"><%= l(:label_create_new_projects) %></p></td>
<td>&nbsp;</td>
<td><p class="font_welcome"><%= l(:label_call_for_bids) %></p></td>
<td>&nbsp;</td>
<td><p class="font_welcome"><%= l(:label_create_course) %></p></td>
</tr> -->
<tr align="center" class="font_lighter2" >
<td><%= l(:label_create_new_projects_description) %></td>
<td>&nbsp;</td>
<td><%= l(:label_call_for_bids_description) %></td>
<td>&nbsp;</td>
<td><%= l(:label_create_course_description) %></td>
</tr>
</table>
</div>
<!--feature--> </tr>
<div class="font_welcome_feature"> <!-- <tr align="center">
<div align="center"><%= l(:label_features) %> <td><p class="font_welcome"><%= l(:label_create_new_projects) %></p></td>
<div class="user_underline3"></div></div> <td>&nbsp;</td>
</div> <td><p class="font_welcome"><%= l(:label_call_for_bids) %></p></td>
<div style="padding-top: 30px"> <td>&nbsp;</td>
<table width="700" border="0" align="center" > <td><p class="font_welcome"><%= l(:label_create_course) %></p></td>
<tr class="font_welcome" align="center" > </tr> -->
<td><%= image_tag("/images/welcome/discuss.png", weight:"30px", height: "26px") %><span style="vertical-align: top"><%= l(:label_board) %></span></td> <tr align="center" class="font_lighter2" >
<td width="50">&nbsp;</td> <td width="190"><%= l(:label_create_new_projects_description) %></td>
<td><%= image_tag("/images/welcome/news.png", weight:"30px", height: "26px") %><span style="vertical-align: top"><%= l(:label_news) %></span></td> <td width="65"></td>
<td width="50">&nbsp;</td> <td width="190"><%= l(:label_call_for_bids_description) %></td>
<td><%= image_tag("/images/welcome/boards.png", weight:"30px", height: "26px") %><span style="vertical-align: top"><%= l(:label_milestone) %></span></td> <td width="65"></td>
<td width="190"><%= l(:label_create_course_description) %></td>
</tr>
<tr>
<td colspan="5"><div class="font_welcome_feature">
<div align="center">
<%= l(:label_features) %> <div class="user_underline3"></div>
</div>
</div></td>
</tr> </tr>
<tr class="font_welcome" align="center">
<td width="190"><%= image_tag("/images/welcome/discuss.png", weight:"30px", height: "26px") %><span style="vertical-align: top"><%= l(:label_board) %></span></td>
<td width="65">&nbsp;</td>
<td width="190"><%= image_tag("/images/welcome/news.png", weight:"30px", height: "26px") %><span style="vertical-align: top"><%= l(:label_news) %></span></td>
<td width="65">&nbsp;</td>
<td width="190"><%= image_tag("/images/welcome/boards.png", weight:"30px", height: "26px") %><span style="vertical-align: top"><%= l(:label_milestone) %></span></td>
</tr>
<tr align="center" class="font_lighter2"> <tr align="center" class="font_lighter2">
<td><%= l(:label_board_description) %></td> <td width="190"><%= l(:label_board_description) %></td>
<td>&nbsp;</td> <td width="65"></td>
<td><%= l(:label_news_description) %></td> <td width="190"><%= l(:label_news_description) %></td>
<td>&nbsp;</td> <td width="65"></td>
<td><%= l(:label_milestone_description) %></td> <td width="190"><%= l(:label_milestone_description) %></td>
</tr> </tr>
</table> </table>
</div>
<div style="padding-top: 40px">
</div> </div>
<div style="padding-top: 40px"></div>

16
public/stylesheets/application.css
View File

@ -11,6 +11,11 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/ /*new by huang*/
/**/ /**/
.welcome_logo{
float: left;
padding-left: 5px;
padding-top: 2px;
}
.welcome_images{ .welcome_images{
width: 200px; width: 200px;
height: 200px; height: 200px;
@ -154,7 +159,7 @@ ul.tool li{list-style-type:none;
.font_lighter2{ .font_lighter2{
font-family:微软雅黑; font-family:微软雅黑;
color:#9a9a9a; color:#9a9a9a;
font-size:12px; font-size:14px;
} }
.font_lighter_welcome{ .font_lighter_welcome{
@ -191,7 +196,7 @@ ul.tool li{list-style-type:none;
.spaceright{float:left; width:620px;} .spaceright{float:left; width:620px;}
.welcone_left{ .welcone_left{
margin-top: 70px; margin-top: 50px;
margin-left: 90px; margin-left: 90px;
float:left; float:left;
width: 49%; width: 49%;
@ -224,6 +229,11 @@ ul.tool li{list-style-type:none;
padding-bottom: 8px; padding-bottom: 8px;
} }
.inf_user_image img.avatar2{ .inf_user_image img.avatar2{
background: rgb(245, 245, 245);
padding: 4px;
border: 1px solid #e5dfc7;
float: left;
display: block;
height：80px; height：80px;
width: 80px; width: 80px;
@ -545,7 +555,7 @@ ul.newprojects2 li{
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
white-space:nowrap; 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; } #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
#account {float:right;} #account {float:right;}

2
public/themes/redpenny-master/stylesheets/application.css
View File

@ -376,7 +376,7 @@ ul.projects li.root
#top-menu ul #top-menu ul
{ {
margin-left: 60px; /*add by huang*/ margin-left: 0px; /*add by huang*/
padding-right: 1px; padding-right: 1px;
} }