diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index cc76e8ea7..6c8b14cfa 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -29,7 +29,7 @@ - +
高校课程实践社区<%= l(:label_user_location) %> : <%= l(:label_user_location) %> : + diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index ca055f1b5..acf205d71 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -1,11 +1,11 @@

温馨提示:项目可以是一次作业,也可以是别人或者自己创建的一项小工程~

-
+
<% if @user == User.current %> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> <% end %>
-

<%= watch_projects @state%> +<%= watch_projects @state %> <% unless @memberships.empty? %>

    diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1cb938ea1..21fc6719e 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1427,6 +1427,7 @@ zh: label_password_not_null: 密码不能设置为空。 label_exist_repository_path: 定义已有版本库URL路径,定义格式file:///, http://, https://, svn:// label_project_no_activity: 该项目暂无动态! + label_course_homework_un: 暂未发布任何作业 label_follow_no_requirement: 暂未关注任何需求! label_no_user_respond_you: 暂无任何用户对您进行反馈! label_tags_issue: 问题名称: diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 470568e11..78007094c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -23,6 +23,10 @@ h4 {border-bottom: 1px dotted #bbb;} padding-top: 5px; } +.content-title-top-project{ + padding-left: 5px; +} + .content-title-top{ padding-bottom: 20px; padding-left: 5px; diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 0b7a8454f..c76e9a1b5 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1408,7 +1408,7 @@ div.nomargin { div.pagination { margin: 25px 0px; - height: 36px; + height: 25px; text-align: left; font-size: 13px; }