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

修改了个人主页项目里面的链接

Browse Source 
user和project界面
以及主页
exceptionHandle
huangjingquan 12 years ago
parent a7871c63b2
commit 408a626ddd
9 changed files with 131 additions and 58 deletions
Show Stats Download Patch File Download Diff File

57
app/views/layouts/base_projects.html.erb
Unescape View File

@ -47,8 +47,7 @@
<!--标签-->
<div class="tags">
<!-- added by william -for tag -->
<div id="tags">
<%= tag('img', {:src => "../images/user.png"}, false, false) %>
<div id="tags">
<%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
</div>
</div>
@ -60,13 +59,13 @@
<tr align="center" width="80px">
<td class="font_index"><%= @project.members.count %></td>
<td class="font_index"><%= session[:project_focus_num] %></td>
<td class="font_index"><%= session[:project_investor_num] %></td>
<td class="font_index"><%= @project.issues.count %></td>
<td class="font_index"><%= @project.attachments.count %></td>
<tr>
<td align="center" width="80px"><strong><%= link_to('成员 ', {:controller => 'projects', :action => 'member'}, :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong><%= link_to('关注 ', {:controller => 'projects', :action => 'focus'}, :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong><%= link_to('投资者 ',{:controller => 'projects', :action =>'investor'},:class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong><%= link_to('缺陷: ',project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong><%= link_to('文件: ', project_files_path(@project), :class => 'project_infor_tag') %></strong></td>
</tr>
</table>
<div class="user_underline"></div>
@ -74,40 +73,42 @@
<!--描述-->
<div class="inf_user_context">
<div class="font_title_left">
概述
<span ><img src="/images/sidebar/tag_title.png" width="18" height="18"/></span>概述
</div>
<div >
<div class="user_underline2"></div>
<div style="padding-bottom: 8px"><div class="font_lighter_sidebar">
<%= textilizable @project.description %>
</div>
<div style="padding-bottom: 5px">
<strong>创建时间：</strong><%= @project.created_on %>
<strong style="color: #31a0d5">创建时间：</strong><%= @project.created_on %>
</div>
</div><div class="user_underline"></div>
</div>
<!--项目推荐-->
<!--工具-->
<div class="tool">
<div class="font_title_left">
工具
<span ><img src="/images/sidebar/tag_title.png" width="18" height="18"/></span>工具
</div>
<div class="user_underline"></div>
<ul>
<li>
<%= link_to l(:project_module_documents),project_documents_path(@project) %>
</li>
<li>
<%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
</li>
<li>
<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
</li>
<li>
<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
</li>
</ul>
<div class="user_underline2"></div>
<table class="font_tool">
<tr>
<td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
<td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_wiki),project_wiki_path(@project) %></td>
</tr>
<tr>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_calendar),project_calendar_path(@project) %></td>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %></td>
</tr>
<tr>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_boards) ,project_boards_path(@project) %></td>
</tr>
<tr><td align="right" width="240px"><img src="/images/sidebar/tag_title_right.png" width="18" height="18"/></td></tr>
</table>
</div>
<div class="user_underline"></div>
</div>
</div>

15
app/views/layouts/base_users.html.erb
Unescape View File

@ -38,13 +38,13 @@
<tr>
<td align="center"><% unless User.current == @user %>
<%= watcher_link(@user, User.current) %>
<% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %></td>
<% 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>
</tr>
</table></td>
</tr>
</table>
<div>
关注 (<%= link_to User.watched_by(@user.id).count, home_path %>) &nbsp;粉丝 (<%= link_to @user.watcher_users.count, home_path %>)
关注 (<strong class="font_small_watch"><%= User.watched_by(@user.id).count %></strong>) &nbsp;粉丝 (<strong class="font_small_watch"><%= @user.watcher_users.count %></strong>)
</div>
</div>
<div class="user_underline"></div>
@ -61,6 +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>
<!--关注-->
@ -75,10 +76,7 @@
<td style="padding-top: 5px">
<%= show_watcher_profile(@user) %>
</td>
</tr>
<tr>
<td align="right">...</td>
</tr>
</tr>
</table>
</div>
</div>
@ -95,10 +93,7 @@
<td style="padding-top: 5px">
<%= show_fans_picture(@user) %>
</td>
</tr>
<tr>
<td align="right">...</td>
</tr>
</tr>
</table>
</div>
</div>

4
app/views/projects/show.html.erb
Unescape View File

@ -26,14 +26,14 @@
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
<td><table width="580px" border="0">
<tr>
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong> <span class="font_lighter">有了最新动态</span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong> <span class="font_lighter"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> 有了最新动态</span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
</tr>
<tr>
<td colspan="2" width="580px" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td>
</tr>
<tr>
<td align="left"><a class="font_lighter"><%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
<td width="200" align="center" class="a"><a class="font_lighter"></a><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></td>
</tr>
</table></td>
</tr>

6
app/views/users/user_projects.html.erb
Unescape View File

@ -9,7 +9,7 @@
<td>
<table width="580" border="0">
<tr>
<td colspan="2" valign="top"><strong> <%= link_to_project(membership.project) %></strong><a class="font_lighter">创建了</a> <%= link_to_project(membership.project) %></td>
<td colspan="2" valign="top"><strong> <%= link_to_user(membership.user) if membership.respond_to?(:user) %></strong><a class="font_lighter"> 创建了</a> <%= link_to_project(membership.project) %></td>
</tr>
<tr>
<td colspan="2" width="580" >
@ -29,10 +29,6 @@
</li>
<% end %>
</ul>
<div class=more>
<%= link_to"更多",:controller=>'projects',:action=>'index'%>
</div>
<% else %>
暂无项目，赶快去<%= link_to"新建",:controller=>'projects',:action=>'new'%>吧
<% end %>

76
app/views/welcome/index.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="table_">
<!-- <div class="table_">
<table background="/images/welcome/backgroundnew.png" height="600" width="928">
<tr><td align="left">
<%= call_hook :view_account_login_top %>
@ -66,4 +66,78 @@
</table></td>
</tr>
</table>
</div> -->
<div class="table_">
<table>
<tr><td align="left">
<%= call_hook :view_account_login_top %>
<div id="login-form_new">
<%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag %>
<table>
<tr>
<td align="right"><label for="username">用户:</label></td>
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
</tr>
<tr>
<td align="right"><label for="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>
<% 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><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>
<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>
</td><td align="center">
<p><%=link_to "项目需求",:controller => 'bids', :action => 'index' %></p>
</td><td align="center">
<p><%=link_to "发现开源",:controller=>'projects',:action=>'index' %></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>
</div>

3
app/views/words/_message.html.erb
Unescape View File

@ -1,6 +1,7 @@
<% if jour.size >0 %>
<% remove_allowed = (User.current.id == jour.first.user_id) %>
<% for journal in jour%>
<% journals = jour.reverse%>
<% for journal in journals%>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><img src="/images/new/news.png" width="40" height="40"/></td>

BIN
public/images/sidebar/add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
public/images/sidebar/minus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

28
public/stylesheets/application.css
Unescape View File

@ -71,6 +71,11 @@ ul.tool li{list-style-type:none;
font-size:16px;
/*color:#00aaf8;*/
}
.font_small_watch{
font-family:微软雅黑;
font-weight:bold;
color:#00aaf8;
}
.left_wf{
padding-left:8px;
}
@ -92,6 +97,7 @@ ul.tool li{list-style-type:none;
font-family:微软雅黑;
color:#919294;
font-size:13px;
padding-left: 8px;
}
.font_description{
@ -116,7 +122,7 @@ ul.tool li{list-style-type:none;
.inf_user_motto{
padding-left:8px;
margin:5px 0px 0px 0px;
padding-top:2px;
padding-top:1px;
background-color:#b8c1c8;
height: auto;
}
@ -128,28 +134,28 @@ ul.tool li{list-style-type:none;
}*/
.inf_user_image{
padding-left:8px;
margin:5px 0px 0px 0px;
margin:0px 0px 0px 0px;
background-color:#fff;
height: auto;
padding-bottom: 8px;
}
.user_fans{
padding-left:0px;
margin:5px 0px 0px 0px;
margin:0px 0px 0px 0px;
height: auto;
background-color:#fff;
}
.inf_user_context{
padding-left:8px;
margin:5px 0px 0px 0px;
padding-top:2px;
padding-left:0px;
margin:0px 0px 0px 0px;
padding-top:1px;
background-color:#fff;
height: auto;
/*color:#fff; */
}
.tool{
padding-left:0px;
margin:5px 0px 0px 0px;
margin:0px 0px 0px 0px;
height: auto;
background-color:#fff;
padding-bottom:5px;
@ -188,8 +194,8 @@ ul.tool li{list-style-type:none;
margin:1;
padding:1;
width:240px;
height:2px;
background-color:#ebebeb;
height:1px;
background-color:#c6e9fe;
overflow:hidden
}
.line_under{
@ -796,10 +802,10 @@ margin-left:-10px;
margin:10px auto;
margin-top:100px;
width:410px;
width:310px;
margin:10px auto;
font-family:lucida grande,verdana;
font-family:微软雅黑,lucida grande,verdana;
font-size:12px;
-webkit-border-radius:10px;
-moz-border-radius:10px;

Write Preview
Loading…
Cancel
Save