p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改了主页面，用户界面

This commit is contained in:
huangjingquan 2013-08-04 10:56:56 +08:00
parent 8c80e56019
commit 23fc4b8589
6 changed files with 74 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/layouts/base_users.html.erb
View File

@ -33,12 +33,12 @@
<td>
<table>
<tr>
<td class="info_font"><%= h @user.name%></td>
<td class="info_font"><%= h @user.name%> <img src="/images/sidebar/male.png" width="11" height="11"/> </td>
</tr>
<tr>
<td align="center"><% unless User.current == @user %>
<%= watcher_link(@user, User.current) %>
<% else %><img src="/images/sidebar/male.png" width="11" height="11"/> <%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %></td>
<% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %></td>
</tr>
</table></td>
</tr>
@ -61,7 +61,7 @@
<td class="font_lighter_sidebar">邮件地址：</td><td><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
</tr>
</table>
<div class="user_underline"></div>
</div>
<div class="user_underline"></div>
<!--关注-->

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

@ -119,25 +119,44 @@
<% end %>
</td></tr>
<tr><td>
<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>
</table></div>
<!--model-->
<div>
<table width="600" align="center" style="padding-top: 100px" cellspacing="0" cellpadding="0" >
<tr><td width="200" bgcolor="#00adee"><a href="/projects/show"><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="#93c5d8"><img src="/images/welcome/3.png" width="200" height="200"/></td>
</tr>
<tr height="50"><td align="center">
<p><%=link_to "项目管理",:controller => 'projects', :action => 'new' %></p>
<tr class="font_welcome" height="70"><td align="center">
<p class="font_welcome2">项目管理</p>
<p class="font_lighter">添加描述添加描述添加描述添加描述...</p>
</td><td align="center">
<p><%=link_to "项目需求",:controller => 'bids', :action => 'index' %></p>
<p class="font_welcome2">项目需求</p>
<p class="font_lighter">添加描述添加描述添加描述添加描述...</p>
</td><td align="center">
<p><%=link_to "发现开源",:controller=>'projects',:action=>'index' %></p>
<p class="font_welcome2">发现开源</p>
<p class="font_lighter">添加描述添加描述添加描述添加描述...</p>
</td></tr>
</table></td>
</tr>
</table>
<!--feature-->
<div align="center" padding-top="50px">特性</div>
<div>
<table><tr><td></td><td></td><td</td><td></td></tr></table></div>
</table>
</div>
<!--feature-->
<div class="font_welcome_feature">
<div align="center">特性
<div class="user_underline3"></div></div>
</div>
<div style="padding-top: 30px">
<table width="600" align="center" cellspacing="0" cellpadding="0">
<tr class="font_welcome" align="center">
<td width="200" valign="middle"><table><td><img src="/images/welcome/discuss.png" width="30" height="27" /></td><td valign="middle" align="left">讨论区</td></table>
<td width="200" valign="middle"><table><td><img src="/images/welcome/news.png" width="30" height="27" /></td><td>新闻</td></table>
<td width="200" valign="middle"><table><td><img src="/images/welcome/boards.png" width="30" height="27" /></td><td>里程碑</td></table>
</tr>
<tr class="font_lighter">
<td style="padding-left: 25px">互信、分享互信、分享互信、分享互信、分享互信、分享互信、分享互信、分享互信、分享...</td>
<td style="padding-left: 25px">最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,最新动态,...</td>
<td style="padding-left: 25px">我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,我们的历程,...</td>
</tr>
</table>
</div></div>
<div style="padding-top: 40px">
</div>

BIN
public/images/welcome/boards.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
public/images/welcome/discuss.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
public/images/welcome/news.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

45
public/stylesheets/application.css
View File

@ -82,6 +82,25 @@ ul.tool li{list-style-type:none;
.main_context{
padding-bottom: 5px;
}
.font_welcome{
font-family:微软雅黑;
font-weight: bold;
font-size: 16px;
color:#6d6e6e;
}
.font_welcome2{
font-family:微软雅黑;
font-weight: bold;
font-size: 16px;
color:#6d6e6e;
}
.font_welcome_feature{
font-family:微软雅黑;
font-weight: bold;
font-size: 16px;
color:#09b2c8;
padding-top: 50px;
}
.info_font{
font-family:微软雅黑;
font-weight:bold;
@ -93,12 +112,16 @@ ul.tool li{list-style-type:none;
color:#acaeb1;
font-size:12px;
}
.font_lighter_welcome{
color:#acaeb1;
font-size:12px;
font-family:宋体;
}
.font_lighter_sidebar{
font-family:微软雅黑;
color:#919294;
font-size:13px;
padding-left: 8px;
padding-left: 8px;
}
.font_description{
font-size:14px;
@ -198,6 +221,15 @@ ul.tool li{list-style-type:none;
background-color:#c6e9fe;
overflow:hidden
}
.user_underline3{
margin:1;
padding:1;
width:120px;
height:1px;
background-color:#c6e9fe;
overflow:hidden;
margin-top: 10px;
}
.line_under{
border-bottom: 1px dashed rgb(204, 204, 204);
}
@ -794,17 +826,14 @@ margin-left:-10px;
#header a {font-family: Verdana, sans-serif; font-size: 12px; color:#808080;}
#login-form_new table
{
padding:25px 28px;
padding:20px 25px;
background:#fff;
text-align:left;
width:380px;
margin:10px auto;
margin-top:100px;
margin-top: 50px;
width:310px;
margin:10px auto;
font-family:微软雅黑,lucida grande,verdana;
font-size:12px;
-webkit-border-radius:10px;