diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 91584d42c..48a67b400 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -70,10 +70,10 @@ <%= h @bid.name %> - <%= watcher_link(@bid, User.current) %> + <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %> - <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %> + <%= watcher_link(@bid, User.current) %> diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index a261d0633..5736f0821 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -65,8 +65,9 @@ - <%= join_in_contest(@bid, User.current)%> - <%= watcher_link(@bid, User.current) %> + <%= join_in_contest(@bid, User.current)%> + <%= watcher_link(@bid, User.current) %> + diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 403c74878..ba98775e4 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -62,7 +62,8 @@
<%= @project.name %>
-
+
+ <% unless User.current.member_of? @project %> <%= watcher_link(@project, User.current) %> <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 99cbed970..a23459149 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,5 +1,5 @@ -
+
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index e23c66b26..c8870221c 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1869,7 +1869,7 @@ input[type='text'].noline { font-size: 12px; color: #818283; # modified by bai padding: 9px 5px; - width: 85%; + width: 98%; cursor: text; border-radius: 4px; /*# added by bai (边框变圆润)*/ }
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>