<%= f.text_field :lastname, :required => true %> - <%= l(:field_lastname_eg) %> + + <%= l(:field_lastname_eg) %> +
<%= f.text_field :firstname, :required => true %> - <%= l(:field_firstname_eg) %> + + <%= l(:field_firstname_eg) %> +
- <%= l(:label_company_name)%><%= text_field_tag :enterprise_name, @user.firstname %> + <%= l(:label_company_name)%> + <%= text_field_tag :enterprise_name, @user.firstname %>
<%= l(:label_identity) %> - - <%= l(:label_account_identity_choose) %> - <%= l(:label_account_identity_teacher) %> - <%= l(:label_account_identity_student) %> - <%= l(:label_account_identity_developer) %> + + + <%= l(:label_account_identity_choose) %> + + + <%= l(:label_account_identity_teacher) %> + + + <%= l(:label_account_identity_student) %> + + + <%= l(:label_account_identity_developer) %> + @@ -243,9 +258,9 @@ <% unless User.current.user_extensions.student_id.nil? %> - <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %> + <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %> <% else %> - <%= text_field_tag :no, nil, :placeholder => "请输入学号" %> + <%= text_field_tag :no, nil, :placeholder => "请输入学号" %> <% end %> @@ -254,11 +269,21 @@ - <%= l(:label_account_identity_choose) %> - <%= l(:label_account_identity_teacher) %> - <%= l(:label_account_identity_student) %> - <%= l(:label_account_identity_enterprise) %> - <%= l(:label_account_identity_developer) %> + + <%= l(:label_account_identity_choose) %> + + + <%= l(:label_account_identity_teacher) %> + + + <%= l(:label_account_identity_student) %> + + + <%= l(:label_account_identity_enterprise) %> + + + <%= l(:label_account_identity_developer) %> + @@ -267,7 +292,9 @@ <% if Setting.openid? %> - <%= f.text_field :identity_url %> + + <%= f.text_field :identity_url %> + <% end %> <% @user.custom_field_values.select(&:editable?).each do |value| %> From 29e6158fa414b9dc94b1551f8ea56be5e98a993d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 27 Oct 2014 09:55:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_versions.html.erb | 2 +- public/stylesheets/application.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 98d7c5563..2ca875681 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -25,7 +25,7 @@ <% for version in @project.shared_versions.sort %> - + <%= link_to_version version %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1410b2781..8f0ed1ca7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1356,7 +1356,7 @@ tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; } tr.version.closed, tr.version.closed a { color: #999; } -tr.version td.name { padding-left: 20px;word-break: break-all; } +tr.version td.name { padding-left: 20px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; } tr.version td.description{word-break: break-all} tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; } tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; } From 4090834c2e43408db4dc268ede1052de2385d6e5 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 27 Oct 2014 09:59:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?#1247=E4=BF=AE=E6=94=B9=E9=99=90=E5=88=B6?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/versions/_form.html.erb | 6 +++--- app/views/versions/new.html.erb | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index 286e85188..df3b2ec4b 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -3,10 +3,10 @@ - <%= f.text_field :name, :size => 60, :required => true %> + <%= f.text_field :name, :maxlength => 60, :required => true %> - <%= f.text_field :description, :size => 60, :style => "margin-left:10px;" %> + <%= f.text_field :description, :maxlength => 100, :style => "margin-left:10px;" %> @@ -15,7 +15,7 @@ - <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %> + <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :maxlength => 60, :disabled => @project.wiki.nil? %> diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb index a4b6a1144..e5f9f39f3 100644 --- a/app/views/versions/new.html.erb +++ b/app/views/versions/new.html.erb @@ -1,6 +1,8 @@ -<%=l(:label_version_new)%> + + <%=l(:label_version_new)%> + <%= labelled_form_for @version, :url => project_versions_path(@project) do |f| %> -<%= render :partial => 'versions/form', :locals => { :f => f } %> + <%= render :partial => 'versions/form', :locals => { :f => f } %> <%= submit_tag l(:button_create) %> <% end %> From 5aa68ba9b4e009a90e0c0e03fa64aa0f232e6fa7 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 27 Oct 2014 10:17:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?#1175=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E4=B8=AD=E7=9A=84=E4=B8=AD=E6=96=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/revisions.html.erb | 18 ++++++++++-------- .../app/views/code_review/_show.html.erb | 14 ++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/views/repositories/revisions.html.erb b/app/views/repositories/revisions.html.erb index 4efc4992a..ba875ca84 100644 --- a/app/views/repositories/revisions.html.erb +++ b/app/views/repositories/revisions.html.erb @@ -17,15 +17,17 @@ :revisions => @changesets, :entry => nil } %> -<%= pagination_links_full @changeset_pages,@changeset_count %> + + <%= pagination_links_full @changeset_pages,@changeset_count %> + -<% content_for :header_tags do %> - <%= stylesheet_link_tag "scm" %> - <%= auto_discovery_link_tag( - :atom, - params.merge( - {:format => 'atom', :page => nil, :key => User.current.rss_key})) %> -<% end %> + <% content_for :header_tags do %> + <%= stylesheet_link_tag "scm" %> + <%= auto_discovery_link_tag( + :atom, + params.merge( + {:format => 'atom', :page => nil, :key => User.current.rss_key})) %> + <% end %> <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> diff --git a/plugins/redmine_code_review/app/views/code_review/_show.html.erb b/plugins/redmine_code_review/app/views/code_review/_show.html.erb index a626b6281..509b9d7bb 100644 --- a/plugins/redmine_code_review/app/views/code_review/_show.html.erb +++ b/plugins/redmine_code_review/app/views/code_review/_show.html.erb @@ -24,10 +24,14 @@ <%= error_messages_for 'review' -%> <%= error_messages_for 'reply' -%> <% if @notice -%> - <%= @notice -%> + + <%= @notice -%> + <% end -%> <% if @error -%> - <%= @error -%> + + <%= @error -%> + <% end -%> @@ -77,9 +81,7 @@ - <% - review_form_id = "review_form_#{@review.id}" - -%> + <% review_form_id = "review_form_#{@review.id}" -%> <%= form_for :review, :url => {:controller => 'code_review', :action => 'update', @@ -111,7 +113,7 @@ <% submit_url = url_for(:controller => 'code_review', :action => 'update', :id => @project) -%> - <%= button_to_function l(:button_apply), "$('#show_review_#{@review.id}').load('#{submit_url}', $('##{review_form_id}').serialize())" %> + <%= button_to_function l(:button_submit), "$('#show_review_#{@review.id}').load('#{submit_url}', $('##{review_form_id}').serialize())" %> <%= link_to_function l(:label_preview), "$('#preview_#{@review.id}').load('#{url_for(:controller => 'code_review', :action => 'preview', :id => @project)}', $('##{review_form_id}').serialize())" %> From e220f100d6f5bbc49272fec3397cbcef2c5bc5b3 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 27 Oct 2014 14:20:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?#1163=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=96=B0=E5=BB=BA=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E5=A2=9E=E5=8A=A0js=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 35 ++++-- app/views/boards/_course_show.html.erb | 107 ++++++++++-------- app/views/boards/_form.html.erb | 12 +- app/views/boards/_project_show.html.erb | 70 ++++-------- app/views/boards/index.html.erb | 38 +++++-- app/views/messages/_course_show.html.erb | 40 +++---- app/views/messages/_form.html.erb | 68 ++++++++--- app/views/messages/_project_show.html.erb | 47 ++++---- config/locales/zh.yml | 1 + .../app/views/code_review/_show.html.erb | 43 +++---- 10 files changed, 262 insertions(+), 199 deletions(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 20b0c5c04..1115ca80e 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -26,7 +26,11 @@ <%= back_url_hidden_field_tag %> - <%=l(:lable_user_name)%>: + + + <%=l(:lable_user_name)%>: + + <%= text_field_tag 'username', params[:username], :tabindex => '1' , :value => "#{l(:label_login_prompt)}", :onfocus => "clearInfo('username','#{l(:label_login_prompt)}')", @@ -35,33 +39,48 @@ - <%=l(:field_password)%>: - <%= password_field_tag 'password', nil, :tabindex => '2' %> + + + <%=l(:field_password)%>: + + + + <%= password_field_tag 'password', nil, :tabindex => '2' %> + <% if Setting.openid? %> - <%=l(:field_identity_url)%> - <%= text_field_tag "openid_url", nil, :tabindex => '3' %> + + + <%=l(:field_identity_url)%> + + + + <%= text_field_tag "openid_url", nil, :tabindex => '3' %> + <% end %> <% if Setting.autologin? %> - <%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %> + + <%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> + <%= l(:label_stay_logged_in) %> + <% end %> - <% if Setting.lost_password? %> + + <% if Setting.lost_password? %> <%= link_to l(:label_password_lost), lost_password_path %> <% end %> - diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 26576195d..5a25cf262 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -1,31 +1,36 @@ - - - - - - + <% if User.current.logged? %> - <%= link_to h(@board.name), course_board_path(@course, @board) %> » <%= l(:label_message_new) %> + + <%= link_to h(@board.name), course_board_path(@course, @board) %> » + <%= l(:label_message_new) %> + <%= l(:label_message_new) %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'messages/form', :locals => {:f => f} %> - <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> - <%#= preview_link(preview_board_message_path(@board), 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%> - <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10' %> + + + <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10' %> + <% end %> <% end %> -<%=h @board.name %> + + <%=h @board.name %> + <% if !User.current.logged?%> @@ -35,9 +40,12 @@ <% end %> - - 共有 <%=link_to @topic_count,:controller => 'boards',:action => 'index' %> 个贴子 + + 共有 + <%=link_to @topic_count,:controller => 'boards',:action => 'index' %> + 个贴子 + <%= link_to l(:label_message_new), new_board_message_path(@board), @@ -47,15 +55,6 @@ <% if @topics.any? %> - <% @topics.each do |topic| %> @@ -64,36 +63,44 @@ <%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title: topic.subject.to_s %> + <%= topic.locked? ? 'locked' : '' %>"> + <%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title: topic.subject.to_s %> + + + + + + <%=link_to (topic.replies_count), board_message_path(@board, topic) %> + + + + + 回答 + + + - <%=link_to (topic.replies_count), board_message_path(@board, topic) %> - 回答 - - - <%= authoring topic.created_on, topic.author %> - + + + + <%= authoring topic.created_on, topic.author %> + + + + + + - - <% end %> - - <%= pagination_links_full @topic_pages, @topic_count %> + + <%= pagination_links_full @topic_pages, @topic_count %> + <% else %> - <%= l(:label_no_data) %> + + <%= l(:label_no_data) %> + <% end %> diff --git a/app/views/boards/_form.html.erb b/app/views/boards/_form.html.erb index ffe23fbde..c1ab085cf 100644 --- a/app/views/boards/_form.html.erb +++ b/app/views/boards/_form.html.erb @@ -1,9 +1,15 @@ <%= error_messages_for @board %> -<%= f.text_field :name, :required => true %> -<%= f.text_field :description, :required => true, :size => 30 %> + + <%= f.text_field :name, :required => true %> + + + <%= f.text_field :description, :required => true, :size => 30 %> + <% if @board.valid_parents.any? %> -<%= f.select :parent_id, boards_options_for_select(@board.valid_parents), :include_blank => true, :label => :field_board_parent %> + + <%= f.select :parent_id, boards_options_for_select(@board.valid_parents), :include_blank => true, :label => :field_board_parent %> + <% end %> diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index d615c877c..8128797c0 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -1,25 +1,24 @@ - - - - - - + <% if User.current.logged? %> - <%= link_to h(@board.name), project_board_path(@project, @board) %> » <%= l(:label_message_new) %> - + + <%= link_to h(@board.name), project_board_path(@project, @board) %> » <%= l(:label_message_new) %> + <%= l(:label_message_new) %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'messages/form', :locals => {:f => f} %> - <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> - <%#= preview_link(preview_board_message_path(@board), 'message-form', target='preview', {:class => 'whiteButton m3p10'}) %> - + + <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %> <% end %> @@ -27,7 +26,9 @@ -<%= h @board.name %> + + <%= h @board.name %> + <% if !User.current.logged? %> @@ -40,10 +41,12 @@ <% end %> - - - 共有 <%= link_to @topic_count,:controller => 'boards',:action => 'index' %> 个贴子 + + 共有 + <%= link_to @topic_count,:controller => 'boards',:action => 'index' %> + 个贴子 + <% if @project.enabled_modules.where("name = 'boards'").count > 0 %> <%= link_to l(:label_message_new), @@ -55,15 +58,6 @@ <% if @topics.any? %> - <% @topics.each do |topic| %> @@ -88,7 +82,6 @@ - <%= authoring topic.created_on, topic.author %> @@ -97,23 +90,10 @@ - - <% end %> - - <%= pagination_links_full @topic_pages, @topic_count %> + + <%= pagination_links_full @topic_pages, @topic_count %> + <% else %> <%= l(:label_no_data) %> <% end %> diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb index 614066613..d3671a096 100644 --- a/app/views/boards/index.html.erb +++ b/app/views/boards/index.html.erb @@ -3,14 +3,26 @@ <%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %> <% end %> -<%= l(:label_board_plural) %> + + <%= l(:label_board_plural) %> + - - <%= l(:label_board) %> - <%= l(:label_topic_plural) %> - <%= l(:label_message_plural) %> - <%= l(:label_message_last) %> - + + + + <%= l(:label_board) %> + + + <%= l(:label_topic_plural) %> + + + <%= l(:label_message_plural) %> + + + <%= l(:label_message_last) %> + + + <% Board.board_tree(@boards) do |board, level| %> @@ -18,12 +30,16 @@ <%= link_to h(board.name), project_board_path(board.project, board), :class => "board" %> <%=h board.description %> - <%= board.topics_count %> - <%= board.messages_count %> + + <%= board.topics_count %> + + + <%= board.messages_count %> + <% if board.last_message %> - <%= authoring board.last_message.created_on, board.last_message.author %> - <%= link_to_message board.last_message %> + <%= authoring board.last_message.created_on, board.last_message.author %> + <%= link_to_message board.last_message %> <% end %> diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 6977385d8..5459e1c17 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -1,9 +1,4 @@ - <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> + + <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> + <%= watcher_link(@topic, User.current) %> <%= link_to( @@ -103,12 +100,14 @@ <%= textilizable(@topic, :content) %> <%= link_to_attachments @topic, :author => false %> - <%# options = {:author => true, :deletable => @topic.author.eql?(User.current)} %> - <%#= render :partial => 'attachments/app_link', :locals => {:attachments => @topi.attachments, :options => options} %> - <%= authoring @topic.created_on, @topic.author %> - <%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %> + + <%= authoring @topic.created_on, @topic.author %> + + + <%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %> + @@ -119,15 +118,19 @@ - <%= l(:label_reply_plural) %> (<%= @reply_count %>) + + <%= l(:label_reply_plural) %> + (<%= @reply_count %>) + <% reply_count = 0 %> <% @replies.each do |message| %> "> - - <%= link_to image_tag(url_to_avatar(message.author), :class => "avatar"), user_path(message.author) %> + + <%= link_to image_tag(url_to_avatar(message.author), :class => "avatar"), user_path(message.author) %> + <%= link_to( @@ -157,12 +160,14 @@ <%= textilizable message,:content,:attachments => message.attachments %> - <%#= message.content.html_safe %> - <%= link_to_attachments message, :author => false %> + <%= link_to_attachments message, :author => false %> + - <%= authoring message.created_on, message.author %> + + <%= authoring message.created_on, message.author %> + @@ -174,12 +179,9 @@ <% end %> <% if !@topic.locked? && authorize_for_course('messages', 'reply') %> - <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'form', :locals => {:f => f, :replying => true} %> - <%#= submit_tag l(:button_submit) %> - <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %> <% end %> diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index eb0a7f53e..387e91c26 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -1,48 +1,82 @@ - + <%= error_messages_for 'message' %> <% replying ||= false %> - <% extra_option = replying ? { readonly: true} : { maxlength: 254 } %> + <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %> <%= l(:field_subject) %> * - <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject" }.merge(extra_option) %> + <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject", onblur: "regexSubject();" }.merge(extra_option) %> + <% unless replying %> <% if @message.safe_attribute? 'sticky' %> - <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %> + <%= f.check_box :sticky %> + <%= label_tag 'message_sticky', l(:label_board_sticky) %> <% end %> <% if @message.safe_attribute? 'locked' %> - <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %> + <%= f.check_box :locked %> + <%= label_tag 'message_locked', l(:label_board_locked) %> <% end %> <% end %> - <%= l(:field_description) %> - * - - <%= text_area :quote,:quote,:style => 'display:none' %> + + <%= l(:field_description) %> + * + + + <%= text_area :quote,:quote,:style => 'display:none' %> <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> - <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();" %> + <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();", :maxlength => 5000 %> - - - <%= l(:label_attachment_plural) %> <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %> - - - -<%#= wikitoolbar_for 'message_content' %> \ No newline at end of file + \ No newline at end of file diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 028be4b83..2dc0d89c2 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -1,9 +1,4 @@
- <%= l(:label_account_identity_choose) %> - <%= l(:label_account_identity_teacher) %> - <%= l(:label_account_identity_student) %> - <%= l(:label_account_identity_enterprise) %> - <%= l(:label_account_identity_developer) %> + + <%= l(:label_account_identity_choose) %> + + + <%= l(:label_account_identity_teacher) %> + + + <%= l(:label_account_identity_student) %> + + + <%= l(:label_account_identity_enterprise) %> + + + <%= l(:label_account_identity_developer) %> +
<%= f.text_field :identity_url %>
+ <%= f.text_field :identity_url %> +
- <%= f.text_field :name, :size => 60, :required => true %> + <%= f.text_field :name, :maxlength => 60, :required => true %>
- <%= f.text_field :description, :size => 60, :style => "margin-left:10px;" %> + <%= f.text_field :description, :maxlength => 100, :style => "margin-left:10px;" %>
@@ -15,7 +15,7 @@
- <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %> + <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :maxlength => 60, :disabled => @project.wiki.nil? %>
diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb index a4b6a1144..e5f9f39f3 100644 --- a/app/views/versions/new.html.erb +++ b/app/views/versions/new.html.erb @@ -1,6 +1,8 @@ -
<%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> - <%#= preview_link(preview_board_message_path(@board), 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%> - <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10' %>
+ + <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10' %> +
<%= l(:label_no_data) %>
+ <%= l(:label_no_data) %> +
<%= f.text_field :name, :required => true %>
<%= f.text_field :description, :required => true, :size => 30 %>
+ <%= f.text_field :name, :required => true %> +
+ <%= f.text_field :description, :required => true, :size => 30 %> +
<%= f.select :parent_id, boards_options_for_select(@board.valid_parents), :include_blank => true, :label => :field_board_parent %>
+ <%= f.select :parent_id, boards_options_for_select(@board.valid_parents), :include_blank => true, :label => :field_board_parent %> +
<%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> - <%#= preview_link(preview_board_message_path(@board), 'message-form', target='preview', {:class => 'whiteButton m3p10'}) %> - +
+ <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %>
<%= l(:field_subject) %> * - <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject" }.merge(extra_option) %> + <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject", onblur: "regexSubject();" }.merge(extra_option) %> +
<% unless replying %> <% if @message.safe_attribute? 'sticky' %> - <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %> + <%= f.check_box :sticky %> + <%= label_tag 'message_sticky', l(:label_board_sticky) %> <% end %> <% if @message.safe_attribute? 'locked' %> - <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %> + <%= f.check_box :locked %> + <%= label_tag 'message_locked', l(:label_board_locked) %> <% end %> <% end %>
- <%= l(:field_description) %> - * -
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> - <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();" %> + <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();", :maxlength => 5000 %>
<%= l(:label_attachment_plural) %> <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>