<%= l(:label_contact_us) %>
@@ -30,85 +30,25 @@
\ No newline at end of file
diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb
index 9d5ad1155..8ce6be3fe 100644
--- a/app/views/courses/_homework_form.html.erb
+++ b/app/views/courses/_homework_form.html.erb
@@ -49,6 +49,10 @@
<%= f.select :proportion, proportion_option %>
+ <%= f.check_box :open_anonymous_evaluation, :style => "margin-left:10px;" %>
+ 未开启匿评作业将直接进入众评点赞阶段
+
+
<%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onblur => "regexEvaluationNum();" , :maxlength => 4%>
匿评分配数量不宜太大，否则会影响开启匿评速度
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index 95e26abd0..68ec0dc2e 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -5,11 +5,12 @@
<%= javascript_include_tag 'attachments' %>
-
- <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%>
- <%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %>
- <% end %>
+ <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%>
+ <%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %>
+ <% else %>
+ <%= l(:label_coursejoin_tip) %>
+ <% end %>
<%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb
index 753aa20c8..7b6784243 100644
--- a/app/views/courses/new_homework.html.erb
+++ b/app/views/courses/new_homework.html.erb
@@ -43,35 +43,55 @@
{
var evaluation_num = $.trim($("#bid_evaluation_num").val());
var regex = /^\d+$/;
- if(evaluation_num=="")
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
{
- $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
- $("#bid_evaluation_num_span").css('color','#ff0000');
- return false;
- }
- else if(regex.test(evaluation_num))
- {
- if(evaluation_num > 0)
+ if(evaluation_num=="")
{
- $("#bid_evaluation_num_span").text("填写正确");
- $("#bid_evaluation_num_span").css('color','#008000');
- return true;
+ $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
+ $("#bid_evaluation_num_span").css('color','#ff0000');
+ return false;
+ }
+ else if(regex.test(evaluation_num))
+ {
+ if(evaluation_num > 0)
+ {
+ $("#bid_evaluation_num_span").text("填写正确");
+ $("#bid_evaluation_num_span").css('color','#008000');
+ return true;
+ }
+ else
+ {
+ $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
+ $("#bid_evaluation_num_span").css('color','#ff0000');
+ return false;
+ }
}
else
{
- $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
+ $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
$("#bid_evaluation_num_span").css('color','#ff0000');
return false;
}
}
else
{
- $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
- $("#bid_evaluation_num_span").css('color','#ff0000');
- return false;
+ return true;
}
}
+ $(function(){
+ $("#bid_open_anonymous_evaluation").click(function(){
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
+ {
+ $("#evaluation_num_p").slideDown();
+ }
+ else
+ {
+ $("#evaluation_num_p").slideUp();
+ }
+ });
+ });
+
function submitHomework()
{
if(regexDeadLine()&®exName()&®exEvaluationNum())
diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb
index ab0f20257..e73e9cf7b 100644
--- a/app/views/courses/settings/_members.html.erb
+++ b/app/views/courses/settings/_members.html.erb
@@ -20,8 +20,8 @@
<% members.each do |member| %>
<% next if member.new_record? %>
- <%= link_to_user member.principal %>
-
+ <%= link_to_user member.principal %>
+
<%= h member.roles.sort.collect(&:to_s).join(', ') %>
diff --git a/app/views/forums/_form.html.erb b/app/views/forums/_form.html.erb
index 9b3519b05..ac9c298ff 100644
--- a/app/views/forums/_form.html.erb
+++ b/app/views/forums/_form.html.erb
@@ -15,7 +15,7 @@
<% end %>
- <%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share' %>
+ <%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share', :maxlength => 50%>
<% if User.current.logged? && User.current.admin? %>
@@ -36,7 +36,9 @@
-
(<%= l(:label_forums_max_length) %>)
+
+ (<%= l(:label_forums_max_length) %>)
+
<%= submit_tag l(:button_submit) %>
diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index 874dc355f..fe2f757c3 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -4,23 +4,54 @@
<% forums.each do |forum| %>
- <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
-
+ <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
+
-
-
- <%= link_to h(forum.name), forum_path(forum) %>
<%= textAreailizable forum.description%>
<%= authoring forum.created_at, forum.creator %>
+
+
+
+ <%= link_to h(forum.name), forum_path(forum) %>
+
+
+
+
+
+
+ <%= textAreailizable forum.description%>
+
+
+
+
+
+
+ <%= authoring forum.created_at, forum.creator %>
+
+
+
-
<%= link_to (forum.memo_count), forum_path(forum) %> <%= link_to (forum.topic_count), forum_path(forum) %> 回答 帖子
+
+
+ <%= link_to (forum.memo_count), forum_path(forum) %>
+
+
+ <%= link_to (forum.topic_count), forum_path(forum) %>
+
+
+
+ 回答
+ 帖子
+
+
+
<% end %>
-
+
<% else %>
<% end %>
\ No newline at end of file
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 31d00891e..18ac7f752 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -7,12 +7,15 @@
公共贴吧
- <%= l(:label_user_location) %> :
+
+ <%= l(:label_user_location) %> :
+
+
- <% if User.current.logged? %>
- <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
- <% end %>
-
+ <% if User.current.logged? %>
+ <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
+ <% end %>
@@ -24,8 +27,15 @@
- <%= link_to request.host()+"/forums", forums_path %> <%= link_to l(:field_homepage), home_path %> > <%= link_to "公共贴吧", forums_path %>
+
+
+ <%= link_to request.host()+"/forums", forums_path %>
+
+
+
+ <%= link_to l(:field_homepage), home_path %> >
+ <%= link_to "公共贴吧", forums_path %>
+
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 642cf5b15..85fa8093a 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,16 +1,25 @@
-
<%=l(:label_memo_new)%>
+
+ <%=l(:label_memo_new)%>
+
<% if User.current.logged? %>
<%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f| %>
-
<%= f.text_field :subject, :required => true%>
-
<%= f.text_area :content, :required => true, :id => 'editor02' %>
-
-
(<%= l(:label_memos_max_length) %>)
- <%= l(:label_attachment_plural) %>
+
+ <%= f.text_area :content, :required => true, :id => 'editor02' %>
+
+
+
+ (<%= l(:label_memos_max_length) %>)
+
+
+ <%= l(:label_attachment_plural) %>
+
<%= f.submit :value => l(:label_memo_create) %>
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index c778588f7..c40004d02 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -35,13 +35,13 @@
您还没交作业，请创建作业！
- <% if @bid.comment_status == 0 %>
+ <% if @bid.comment_status == 0 || @bid.comment_status == 1%>
<%= link_to "提交作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
<% else %>
-
+
提交作业
<% end %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 4b0140b1c..efa3adc2e 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -41,9 +41,9 @@
<% end %>
- <%= submit_tag l(:button_create) %>
- <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
- <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %>
+ <%= submit_tag l(:button_create), :class => "ButtonAddTags"%>
+ <%= submit_tag l(:button_create_and_continue), :class => 'ButtonAddTags' %>
+ <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "ButtonColor"}%>
<%= javascript_tag "$('#issue_subject').focus();" %>
<% end %>
diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb
index d3da499dc..250ab1d5f 100644
--- a/app/views/layouts/_user_courses_list.html.erb
+++ b/app/views/layouts/_user_courses_list.html.erb
@@ -1,6 +1,6 @@
<% if hasCourse %>
- <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
+ <%=link_to l(:label_my_course), user_courses_user_path(User.current.id) %>
- <%= render_main_menu(@project) %>
+ <%= render_main_menu(@project) %>
<%= render_flash_messages %>
<%= yield %>
diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb
index e3346ee32..938952c32 100644
--- a/app/views/memos/_reply_box.html.erb
+++ b/app/views/memos/_reply_box.html.erb
@@ -1,5 +1,5 @@
<%= form_for(@memo_new, url: forum_memos_path, :html => {:multipart => true}) do |f| %>
- <%= f.hidden_field :subject, :required => true, value: "RE: "+@memo.subject %>
+ <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
<%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
<%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
@@ -7,11 +7,12 @@
<%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
<%= label_tag(l(:label_reply_plural)) %>:
- <%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'editor01', :value => @content %>
-
+ <%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'editor01', :value => @content %>
-
<%= l(:label_attachment_plural) %>
+ <%= l(:label_attachment_plural) %>
+
<%= f.submit value: l(:label_reply_plural), class: "replies" %>
<% end %>
\ No newline at end of file
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index ded3a1b12..09e4262fe 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -4,30 +4,43 @@
<%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f| %>
<% if @memo.errors.any? %>
-
<%= pluralize(@memo.errors.count, "error") %> prohibited this memo from being saved:
+
+ <%= pluralize(@memo.errors.count, "error") %>
+ prohibited this memo from being saved:
+
<% @memo.errors.full_messages.each do |msg| %>
- <%= msg %>
+
+ <%= msg %>
+
<% end %>
<% end %>
-
<%= f.text_field :subject, :required => true, :size => 96 ,:readonly => @replying%>
- <% unless @replying %>
- <% if @memo.safe_attribute? 'sticky' %>
- <%= f.check_box :sticky %> <%= label_tag 'memo_sticky', l(:label_board_sticky) %>
- <% end %>
- <% if @memo.safe_attribute? 'lock' %>
- <%= f.check_box :lock %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
- <% end %>
- <% end %>
+ <%= f.text_field :subject, :required => true, :size => 96 ,:readonly => @replying, :maxlength => 50%>
+
+ <% if User.current.admin?%>
+
+ <% unless @replying %>
+ <% if @memo.safe_attribute? 'sticky' %>
+ <%= f.check_box :sticky %>
+ <%= label_tag 'memo_sticky', l(:label_board_sticky) %>
+ <% end %>
+ <% if @memo.safe_attribute? 'lock' %>
+ <%= f.check_box :lock %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
+ <% end %>
+ <% end %>
+
+ <% end %>
+
+ <%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>
-
<%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>
- <%= l(:label_attachment_plural) %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index b7e5e2749..5222b466f 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -117,28 +117,34 @@
-
+
<%= link_to image_tag(url_to_avatar(reply.author), :class => "avatar"), user_path(reply.author) %>
-
- <%= authoring reply.created_at, reply.author %>
+
+ <%= authoring reply.created_at, reply.author %>
+
<% end %>
-
+
<% if User.current.login? %>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 4ffcc63fc..04793a02e 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -9,6 +9,47 @@
function () {
$("#province").attr("href", "#WOpenWindow")
$("#province").leanModal({top: 100, closeButton: ".modal_close"});
+ var $lastname = $('#user_lastname')
+ var $firstname = $('#user_firstname')
+ var $enterprise = $('#enterprise_name')
+ $lastname.blur(function () {
+ var pas1 = document.getElementById("user_lastname").value;
+
+ if (pas1 == "") {
+ $('#valid_lastname').html('' + "<%= l(:lastname_empty) %>"+ " ");
+ $('#lastname_limit').hide();
+ }
+ else {
+ $('#valid_lastname').html('' + " ");
+ $('#lastname_limit').show();
+ }
+
+ });
+ $firstname.blur(function () {
+ var pas1 = document.getElementById("user_firstname").value;
+
+ if (pas1 == "") {
+ $('#valid_firstname').html('' + "<%= l(:firstname_empty) %>"+ " ");
+ $('#firstname_limit').hide();
+ }
+ else {
+ $('#valid_firstname').html('' + " ");
+ $('#firstname_limit').show();
+ }
+ });
+ $enterprise.blur(function () {
+ var pas1 = document.getElementById("enterprise_name").value;
+
+ if (pas1 == "") {
+ $('#valid_companyname').html('' + "<%= l(:enterprise_empty) %>"+ " ");
+
+ }
+ else {
+ $('#valid_lastname').html('' + " ");
+
+ }
+
+ });
}
);
@@ -61,16 +102,19 @@
<%= l(:label_information_plural) %>
+
+
- <%= f.text_field :login, :required => true, :size => 25, :name => "login"%>
+ <%= f.text_field :login, :required => true, :size => 25, :name => "login", :readonly => true %>
<%= l(:label_max_number) %>
-
- <%= l(:label_identity) %> *
-
+
+
+ <%= l(:label_identity) %> *
+
<%= l(:label_account_identity_choose) %>
@@ -93,34 +137,38 @@
- <% unless User.current.user_extensions.student_id.nil? %>
+
+ <% if !User.current.user_extensions.nil? && !User.current.user_extensions.student_id.nil? %>
<%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
<% else %>
<%= text_field_tag :no, nil, :placeholder => "请输入学号" %>
<% end %>
+
-
-
+
<%= f.text_field :lastname, :size => 25, :required => true %>
-
+
<%= l(:field_lastname_eg) %>
+
-
+
<%= f.text_field :firstname, :size => 25, :required => true %>
-
+
<%= l(:field_firstname_eg) %>
+
-
- <%= l(:label_company_name)%> *
+
+ <%= l(:label_company_name)%> *
<%= text_field_tag :enterprise_name, @user.firstname %>
+
@@ -152,11 +200,16 @@
-
+
<%= l(:field_occupation) %>
- <% if User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
+ <% if User.current.user_extensions.nil? %>
+
@@ -213,7 +266,7 @@
-
+
<%= f.text_field :mail, :required => true %>
@@ -222,14 +275,22 @@
-
- <% province = User.current.user_extensions.location %>
- <% city = User.current.user_extensions.location_city %>
- <% identity = User.current.user_extensions.identity %>
- <% occupation1 = User.current.user_extensions.occupation %>
- <% occupation = User.current.user_extensions.occupation %>
- <% title = User.current.user_extensions.technical_title %>
- <% language = User.current.language %>
+ <% if !User.current.user_extensions.nil? %>
+ <% province = User.current.user_extensions.location %>
+ <% city = User.current.user_extensions.location_city %>
+ <% identity = User.current.user_extensions.identity %>
+ <% occupation1 = User.current.user_extensions.occupation %>
+ <% occupation = User.current.user_extensions.occupation %>
+ <% title = User.current.user_extensions.technical_title %>
+ <% language = User.current.language %>
+ <% else %>
+ <% province = "湖南省" %>
+ <% city = "长沙"%>
+ <% identity = ""%>
+ <% occupation1 = ""%>
+ <% title = "" %>
+ <% language = ""%>
+ <% end %>
-
<%= l(:label_location) %>
+
<%= l(:label_location) %>
--请选择省份--
北京
@@ -648,7 +709,7 @@
$('#name').show()
$('#enterprise').hide()
$('#gender').show()
- $('#occupation_detail').show()
+ $('#occupation_detail').hide()
var technical_titleOptions = new Array(
"<%= l(:label_technicl_title_professor) %>", "<%= l(:label_technicl_title_associate_professor) %>", "<%= l(:label_technicl_title_lecturer) %>", "<%= l(:label_technicl_title_teaching_assistant) %>");
diff --git a/app/views/my/blocks/_assiagn_issue.html.erb b/app/views/my/blocks/_assiagn_issue.html.erb
index 6e7df84fd..1cd940eb9 100644
--- a/app/views/my/blocks/_assiagn_issue.html.erb
+++ b/app/views/my/blocks/_assiagn_issue.html.erb
@@ -11,11 +11,13 @@
-->
-
<%= link_to l(:label_issue_view_all), :controller => 'issues',
- :action => 'index',
- :set_filter => 1,
- :assigned_to_id => 'me',
- :sort => 'priority:desc,updated_on:desc' %>
+
+ <%#= link_to l(:label_issue_view_all), :controller => 'issues',
+ :action => 'index',
+ :set_filter => 1,
+ :assigned_to_id => 'me',
+ :sort => 'priority:desc,updated_on:desc' %>
+
<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,
diff --git a/app/views/my/blocks/_issuesreportedbyme.html.erb b/app/views/my/blocks/_issuesreportedbyme.html.erb
index 06bbda7f8..de5e20229 100644
--- a/app/views/my/blocks/_issuesreportedbyme.html.erb
+++ b/app/views/my/blocks/_issuesreportedbyme.html.erb
@@ -3,7 +3,7 @@
<% reported_issues = issuesreportedbyme_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
<% if reported_issues.length > 0 %>
-
<%= link_to l(:label_issue_view_all), :controller => 'issues',
+
<%#= link_to l(:label_issue_view_all), :controller => 'issues',
:action => 'index',
:set_filter => 1,
:status_id => '*',
diff --git a/app/views/my/blocks/_issueswatched.html.erb b/app/views/my/blocks/_issueswatched.html.erb
index 510920a08..906a47b12 100644
--- a/app/views/my/blocks/_issueswatched.html.erb
+++ b/app/views/my/blocks/_issueswatched.html.erb
@@ -3,7 +3,7 @@
<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
<% if watched_issues.length > 0 %>
-
<%= link_to l(:label_issue_view_all), :controller => 'issues',
+
<%#= link_to l(:label_issue_view_all), :controller => 'issues',
:action => 'index',
:set_filter => 1,
:watcher_id => 'me',
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index f66def486..346fff8b4 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -74,10 +74,10 @@
<%= labelled_form_for @news, :url => course_news_index_path(@course),
:html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
- <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>
+ <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
<%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
- <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
+ <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
<% end if @course %>
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 4ec01995a..ebb3904da 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -1,36 +1,36 @@
<%= form_tag({:action => 'edit'}) do %>
-
<%= setting_text_field :app_title, :size => 30 %>
+
<%= setting_text_field :app_title, :size => 30 %>
-
<%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %>
+
<%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %>
<%= wikitoolbar_for 'settings_welcome_text' %>
-
<%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>
+
<%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>
-
<%= setting_text_field :per_page_options, :size => 20 %>
+
<%= setting_text_field :per_page_options, :size => 20 %>
<%= l(:text_comma_separated) %>
-
<%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %>
+
<%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %>
-
<%= setting_text_field :host_name, :size => 60 %>
+
<%= setting_text_field :host_name, :size => 60 %>
<%= l(:label_example) %>: <%= @guessed_host_and_path %>
-
<%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %>
+
<%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %>
-
<%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %>
+
<%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %>
-
<%= setting_check_box :cache_formatted_text %>
+
<%= setting_check_box :cache_formatted_text %>
-
<%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %>
+
<%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %>
-
<%= setting_text_field :feeds_limit, :size => 6 %>
+
<%= setting_text_field :feeds_limit, :size => 6 %>
-
<%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>
+
<%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>
-
<%= setting_text_field :diff_max_lines_displayed, :size => 6 %>
+
<%= setting_text_field :diff_max_lines_displayed, :size => 6 %>
-
<%= setting_text_field :repositories_encodings, :size => 60 %>
+
<%= setting_text_field :repositories_encodings, :size => 60 %>
<%= l(:text_comma_separated) %>
<%= call_hook(:view_settings_general_form) %>
diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb
index f746f7ced..588880fe2 100644
--- a/app/views/settings/_notifications.html.erb
+++ b/app/views/settings/_notifications.html.erb
@@ -2,7 +2,7 @@
<%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
-
<%= setting_text_field :mail_from, :size => 60 %>
+
<%= setting_text_field :mail_from, :size => 50 %>
<%= setting_check_box :bcc_recipients %>
diff --git a/app/views/stores/search.html.erb b/app/views/stores/search.html.erb
index b75656f18..7b257ee86 100644
--- a/app/views/stores/search.html.erb
+++ b/app/views/stores/search.html.erb
@@ -15,7 +15,7 @@
<%= result.filename %>
- <%= link_to_attachment result, {:download => true, :text => image_tag("/images/button/dl.png", width: "70px", alt: l(:button_download), :class => 'download_icon')}%>
+ <%= link_to_attachment result, { :text => image_tag("/images/button/dl.png", width: "70px", alt: l(:button_download), :class => 'download_icon')}%>
<%= result.description %>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 4d3414a1f..63592d91a 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -76,8 +76,9 @@
<%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
- <%= f.submit l(:button_project_tags_add),:class => "small" %>
- <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
+ <%= f.submit l(:button_project_tags_add),:class => "ButtonAddTags" %>
+ <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%>
+
<% end %>
<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 7d13e404e..28994fe29 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -107,7 +107,7 @@
<%= l(:label_i_new_activity) %>
- <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+ <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
<% else %>
@@ -117,7 +117,7 @@
<%= l(:label_new_activity) %>
- <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+ <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
<% end %>
<% else %>
diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb
index 72c95ad7f..b9759dd4d 100644
--- a/app/views/versions/_form.html.erb
+++ b/app/views/versions/_form.html.erb
@@ -6,7 +6,7 @@
<%= f.text_field :name, :maxlength => 60, :required => true %>
- <%= f.text_field :description, :maxlength => 100, :style => "margin-left:10px;" %>
+ <%= f.text_field :description, :maxlength => 60, :style => "margin-left:10px;" %>
@@ -15,7 +15,7 @@
- <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :disabled => @project.wiki.nil? %>
+ <%= f.text_field :wiki_page_title, :size =>60, :label => :label_wiki_page, :disabled => @project.wiki.nil? %>
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index c33cc841e..8d0d6c40d 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -1,5 +1,5 @@
<% course_list.map do |course| %>
-
/,"") %>>
+
<%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
@@ -9,11 +9,11 @@
<% unless course.is_public == 1 %>
<%= l(:label_private) %>
<% end %>
- <%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
+ <%= link_to(course.name.truncate(25, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
- <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
+ <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
<%#=course.try(:teacher).try(:name)%>