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

Merge remote-tracking branch 'origin/develop' into wordh

This commit is contained in:
yanxd 2013-12-24 16:47:57 +08:00
parent f3ce918699 5e5689d945
commit deaae6998c
10 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/journals_for_message_observer.rb
View File

@ -1,7 +1,7 @@
# Added by young
class JournalsForMessageObserver < ActiveRecord::Observer
def after_create(journals_for_message)
Mailer.journals_for_message_add(User.current, journals_for_message).deliver
# Mailer.journals_for_message_add(User.current, journals_for_message).deliver
end
end

2
app/views/bids/index.html.erb
View File

@ -4,7 +4,7 @@
<%= form_tag(calls_path, :method => :get) do %>
<table width="940px">
<tr>
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_requirement_enterprise ) %></td>
<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_requirement_enterprise ) %></td>
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
<td rowspan="2">
<% if User.current.logged? %>

1
app/views/boards/show.html.erb
View File

@ -47,6 +47,7 @@
<tbody> -->
<% @topics.each do |topic| %>
<table class="content-text-list">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %></td>
<td>
<table width="640px" border="0">

74
app/views/layouts/base_projects.html.erb
View File

@ -22,90 +22,82 @@
<div id="wrapper3">
<%=render :partial => 'layouts/base_header'%>
<div id="main">
<!-- added by bai -->
<div class="top-content">
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"">软件项目托管社区</td>
<td style="width: 430px; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
<td class="info_font" style="width: 240px; color: #15bccf">软件项目托管社区</td>
<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
<td rowspan="2" width="250px">
<div class="top-content-search">
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
</div>
</td>
</tr>
<tr>
<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %></a></td>
<td style="padding-left: 8px"><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %></td>
<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index', :project_type => 0 %> > <%=link_to @project, project_path(@project) %></p></td>
</tr>
</table>
</div>
<!-- end -->
<!--project page-->
<div id="sidebar">
<div class="spaceleft">
<!--informations-->
<div class="inf_user_image">
<% @project = Project.find_by_id(@project.id)%>
<table>
<tr>
<td><%= image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
<td>
<div class="info-course">
<%= @project.name %>
</div>
<div style="margin-left: 20px;">
<% unless User.current.member_of? @project %>
<span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %>
<% end %>
</div></td>
<div class="info-course">
<%= @project.name %>
</div>
<div style="margin-left: 20px;">
<% unless User.current.member_of? @project %>
<span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %>
<% end %>
</div>
</td>
</tr>
</table>
</div>
<!--parameter -->
<div class="user_fans">
<table width="240" border="0">
<tr align="center" width="80px">
<% files_count = @project.attachments.count %>
<% @project.versions.each do |version| %>
<% files_count += version.attachments.count %>
<% @project.versions.each do |version| %>
<% files_count += version.attachments.count %>
<% end %>
<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td>
<td class="font_index"><%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist" %></td>
<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
<!-- <td class="font_index"><%=link_to files_count, project_files_path(@project) %></td> -->
</tr>
<tr class="font_aram">
<td align="center" width="70px"> <%= l(:label_member) %></td>
<td align="center" width="100px"><%= l(:label_user_watchered) %></td>
<td align="center" width="70px"> <%= l(:label_project_issues) %></td>
<!-- <td align="center" width="58px"><%= l(:label_attachment) %></td> -->
</tr>
</table>
<div class="user_underline"></div>
</div>
<!--description-->
<div class="inf_user_context">
<div class="font_title_left">
<%= l(:label_project_overview) %>
</div>
<div style="padding-bottom: 8px">
<div class="font_lighter_sidebar">
<%= textilizable @project.description %>
</div>
<div class="created_on_project">
@ -114,21 +106,21 @@
</div>
<div class="user_underline"></div>
</div>
<!--tags-->
<div class="user_fans">
<!-- added by william -for tag -->
<div class="user_tags">
<!--tags-->
<div class="user_fans">
<!-- added by william -for tag -->
<div class="user_tags">
<div id="tags">
<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
</div></div>
</div>
</div>
</div>
<!--tool-->
<div class="user_underline"></div>
<div class="tool">
<%= render 'projects/tools_expand' %>
<%= render 'projects/tools_expand' %>
</div>
<div class="user_underline"></div>
</div>
@ -141,10 +133,9 @@
<%= yield %>
<%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div>
</div>
<%= render :partial => 'layouts/base_footer'%>
<%= debug(params) if Rails.env.development? %>
<%= debug(params) if Rails.env.development? %>
</div>
<div id="ajax-indicator" style="display:none;">
@ -154,6 +145,7 @@
</div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</div>
</body>
</html>

1
app/views/news/index.html.erb
View File

@ -38,6 +38,7 @@
<% @newss.each do |news| %>
<table class="content-text-list">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
<td>
<table width="580px" border="0">

5
app/views/projects/_new_respond.html.erb
View File

@ -1,8 +1,7 @@
<%= form_tag({:controller => 'projects',
:action => 'project_respond'}) do %>
<%= form_tag({:controller => 'projects', :action => 'project_respond'}) do %>
<%= text_area_tag 'project_respond', "", :class => 'noline', :required => true, :style => "resize: none;", :rows => 6, :placeholder => l(:label_projects_feedback_respond_content) %>
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> </td>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%>
<%end%>

12
app/views/projects/feedback.html.erb
View File

@ -11,10 +11,12 @@
</table>
<table border="0" width="525px" align="center">
<tr>
<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %></td>
<td align="right">
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %>
</td>
</tr>
</table>
<% end %>
<% end %>
<% if @jour.size >0 %>
@ -29,9 +31,9 @@
</tr>
<tr>
<td colspan="2" width="580px" >
<p class="font_description">
<div class="font_description">
<%= textilizable journal.notes%>
</p></td>
</div></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>: <%= format_time journal.created_on %></span></td>
@ -55,5 +57,5 @@
<div class="pagination" style="float:left;">
<ul>
<%= pagination_links_full @feedback_pages %>
<ul>
</ul>
</div>

2
app/views/users/user_newfeedback.html.erb
View File

@ -12,7 +12,7 @@
<div class="pagination" style="float:left;">
<ul>
<%= pagination_links_full @feedback_pages %>
<ul>
</ul>
</div>
</div>

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

@ -1,12 +1,12 @@
<div style="height:200px; margin:0 auto;">
<div class="welcome_left" style="max-width: 380px; float: left; margin: 20px 0px 0px 50px;">
<div class="welcome_left" style="max-width: 380px; float: left; margin: 20px 0px 0px 60px;">
<p>
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
</p>
</div>
<div style="display:inline;">
<%= call_hook :view_account_login_top %>
<div id="login-form_new" style="margin-left: 520px;">
<div id="login-form_new" style="margin-left: 510px;">
<%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag if is_logout? %>
<% unless User.current.logged? %>

7
app/views/words/_message.html.erb
View File

@ -18,9 +18,9 @@
</tr>
<tr>
<td colspan="2" width="580px" >
<p class="info-break">
<div class="info-break">
<%= textilizable journal.notes%>
</p></td>
</div></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= l :label_comment_time %>：&nbsp; <%= format_time journal.created_on %></span></td>
@ -32,7 +32,8 @@
<% end %>
</td>
</tr>
</table></td>
</table>
</td>
</tr>
</table>
<div id=<%= ids %> style="display: none;width: 80%; margin: auto;">