From ec73bb144e55a6bc74694ef1536390b814e298c7 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 23 Dec 2013 19:54:43 +0800 Subject: [PATCH 1/4] zz --- app/views/welcome/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 0ff079978..32cb43167 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,12 +1,12 @@
-
+

<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>

<%= call_hook :view_account_login_top %> -
+
<%= form_tag(signin_path) do %> <%= back_url_hidden_field_tag if is_logout? %> <% unless User.current.logged? %> From fe2dc180ba64762b46195415db7fc8789e71b04b Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 24 Dec 2013 10:27:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_newfeedback.html.erb | 2 +- app/views/words/_message.html.erb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index 643ccfe96..22ff5a280 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -12,7 +12,7 @@
\ No newline at end of file diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index f76ffc94c..1201bae22 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -18,9 +18,9 @@ -

+

<%= textilizable journal.notes%> -

+
<%= l :label_comment_time %>：  <%= format_time journal.created_on %> @@ -35,7 +35,8 @@ :method => 'post', :title => l(:button_quote))%> <% end %> - + +
From 2636d6b1e6b4598921ebb9c4dfdc18f7561b922b Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 24 Dec 2013 10:57:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 74 +++++++++++------------- app/views/projects/_new_respond.html.erb | 5 +- app/views/projects/feedback.html.erb | 12 ++-- 3 files changed, 42 insertions(+), 49 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 3a524157a..6e184fa25 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -22,90 +22,82 @@
<%=render :partial => 'layouts/base_header'%>
- - -
+
- - + + - +
软件项目托管社区<%= l(:label_user_location) %> : 软件项目托管社区<%= l(:label_user_location) %> :
<%= 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 %>
<%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %>

<%=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) %>
- - + + - -
<%= call_hook :view_layouts_base_body_bottom %> +
diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index 9daa48e14..e6b072399 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -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"%> +<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> <%end%> diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index be7827e9d..b5588ee0f 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -11,10 +11,12 @@ - +
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %> + <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %> +
- <% end %> +<% end %> <% if @jour.size >0 %> @@ -29,9 +31,9 @@ -

+

<%= textilizable journal.notes%> -

+
<%= l :label_update_time %>: <%= format_time journal.created_on %> @@ -55,5 +57,5 @@ \ No newline at end of file From 5e5689d945075eed373906693d1df4f84397372b Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 24 Dec 2013 11:19:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=97=AD=E5=90=88=E7=B4=A0=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message_observer.rb | 2 +- app/views/bids/index.html.erb | 2 +- app/views/boards/show.html.erb | 1 + app/views/news/index.html.erb | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/journals_for_message_observer.rb b/app/models/journals_for_message_observer.rb index f0dce08c2..e5023f251 100644 --- a/app/models/journals_for_message_observer.rb +++ b/app/models/journals_for_message_observer.rb @@ -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 diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index bf405e6b5..ac724b1a1 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -4,7 +4,7 @@ <%= form_tag(calls_path, :method => :get) do %> - + --> <% @topics.each do |topic| %>
<%= l(:label_requirement_enterprise ) %><%= l(:label_requirement_enterprise ) %> <%= l(:label_user_location) %> : <% if User.current.logged? %> diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 1a0a7af45..8c270eea7 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -47,6 +47,7 @@
+
<%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %> diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index a43565cfc..80576e434 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -38,6 +38,7 @@ <% @newss.each do |news| %>
+
<%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %>