Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
cc32bee0f7
|
@ -136,7 +136,7 @@ class AccountController < ApplicationController
|
||||||
session[:auth_source_registration] = nil
|
session[:auth_source_registration] = nil
|
||||||
self.logged_user = @user
|
self.logged_user = @user
|
||||||
flash[:notice] = l(:notice_account_activated)
|
flash[:notice] = l(:notice_account_activated)
|
||||||
render :action => 'email_valid'
|
redirect_to my_account_path
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@user.login = params[:user][:login]
|
@user.login = params[:user][:login]
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
|
|
||||||
<% if @user.auth_source_id.nil? %>
|
<% if @user.auth_source_id.nil? %>
|
||||||
<p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
|
<p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
|
||||||
<em class="info"><%= l(:label_max_number) %></em>
|
<em class="info" style="color: #acaeb1"><%= l(:label_max_number) %></em>
|
||||||
</p>
|
</p>
|
||||||
<p><%= f.password_field :password, :size => 25, :required => true %>
|
<p><%= f.password_field :password, :size => 25, :required => true %>
|
||||||
<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
|
<em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
|
||||||
</p>
|
</p>
|
||||||
<p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password"></span></p>
|
<p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password"></span></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -30,7 +30,10 @@
|
||||||
<span id="valid_user_mail"></span>
|
<span id="valid_user_mail"></span>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<em class="info"><%= "#{l(:label_mail_attention)} " %></em>
|
<em class="info" style="color: #acaeb1">
|
||||||
|
<p><%= "#{l(:label_mail_attention)} " %></p>
|
||||||
|
<p><%= "#{l(:label_mail_attention1)} " %></p>
|
||||||
|
</em>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
<% members.each do |member| %>
|
<% members.each do |member| %>
|
||||||
<% next if member.new_record? %>
|
<% next if member.new_record? %>
|
||||||
<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
|
<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
|
||||||
<td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
|
<td class="<%= member.principal.class.name.downcase %>" style="text-align: center"><%= link_to_user member.principal %></td>
|
||||||
<td class="roles">
|
<td class="roles" style="text-align: center">
|
||||||
<span id="member-<%= member.id %>-roles">
|
<span id="member-<%= member.id %>-roles">
|
||||||
<%= h member.roles.sort.collect(&:to_s).join(', ') %>
|
<%= h member.roles.sort.collect(&:to_s).join(', ') %>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -9,6 +9,47 @@
|
||||||
function () {
|
function () {
|
||||||
$("#province").attr("href", "#WOpenWindow")
|
$("#province").attr("href", "#WOpenWindow")
|
||||||
$("#province").leanModal({top: 100, closeButton: ".modal_close"});
|
$("#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('<span class="red">' + "<%= l(:lastname_empty) %>"+ "</span>");
|
||||||
|
$('#lastname_limit').hide();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$('#valid_lastname').html('<span class="red">' + "</span>");
|
||||||
|
$('#lastname_limit').show();
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
$firstname.blur(function () {
|
||||||
|
var pas1 = document.getElementById("user_firstname").value;
|
||||||
|
|
||||||
|
if (pas1 == "") {
|
||||||
|
$('#valid_firstname').html('<span class="red">' + "<%= l(:firstname_empty) %>"+ "</span>");
|
||||||
|
$('#firstname_limit').hide();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$('#valid_firstname').html('<span class="red">' + "</span>");
|
||||||
|
$('#firstname_limit').show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
$enterprise.blur(function () {
|
||||||
|
var pas1 = document.getElementById("enterprise_name").value;
|
||||||
|
|
||||||
|
if (pas1 == "") {
|
||||||
|
$('#valid_companyname').html('<span class="red">' + "<%= l(:enterprise_empty) %>"+ "</span>");
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$('#valid_lastname').html('<span class="red">' + "</span>");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
@ -61,16 +102,19 @@
|
||||||
<%= l(:label_information_plural) %>
|
<%= l(:label_information_plural) %>
|
||||||
</legend>
|
</legend>
|
||||||
|
|
||||||
|
|
||||||
|
<div>
|
||||||
<!-- 昵称 -->
|
<!-- 昵称 -->
|
||||||
<p style="width:630px;padding-left: 40px;">
|
<p style="width:630px;padding-left: 40px;">
|
||||||
<%= f.text_field :login, :required => true, :size => 25, :name => "login"%>
|
<%= f.text_field :login, :required => true, :size => 25, :name => "login", :readonly => true %>
|
||||||
<span class='font_lighter'><%= l(:label_max_number) %></span>
|
<span class='font_lighter'><%= l(:label_max_number) %></span>
|
||||||
<br/>
|
<br/>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p style="width:400px;padding-left: 54px;">
|
<p style="width:400px;padding-left: 52px;">
|
||||||
<%= l(:label_identity) %><span style="color: #ff0000"> *</span>
|
<label style="margin-right: 1px;">
|
||||||
<select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location">
|
<%= l(:label_identity) %><span style="color: #bb0000;"> *</span></label>
|
||||||
|
<select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: 0px;">
|
||||||
<option value="">
|
<option value="">
|
||||||
<%= l(:label_account_identity_choose) %>
|
<%= l(:label_account_identity_choose) %>
|
||||||
</option>
|
</option>
|
||||||
|
@ -93,34 +137,38 @@
|
||||||
</span>
|
</span>
|
||||||
<span id='no' style='display:none'>
|
<span id='no' style='display:none'>
|
||||||
<!-- modified by fq -->
|
<!-- modified by fq -->
|
||||||
<% 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 => "请输入学号" %>
|
<%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
|
<%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<!-- end -->
|
<!-- end -->
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
|
||||||
<span id='name' style='display:none'>
|
<span id='name' style='display:none'>
|
||||||
<p style="width:530px;padding-left: 54px;">
|
<p style="width:530px;padding-left: 53px;">
|
||||||
<%= f.text_field :lastname, :size => 25, :required => true %>
|
<%= f.text_field :lastname, :size => 25, :required => true %>
|
||||||
<span class='font_lighter'>
|
<span class='font_lighter' id="lastname_limit">
|
||||||
<%= l(:field_lastname_eg) %>
|
<%= l(:field_lastname_eg) %>
|
||||||
</span>
|
</span>
|
||||||
|
<span id="valid_lastname"></span>
|
||||||
</p>
|
</p>
|
||||||
<p style="width:530px;padding-left: 54px;">
|
<p style="width:530px;padding-left: 53px;">
|
||||||
<%= f.text_field :firstname, :size => 25, :required => true %>
|
<%= f.text_field :firstname, :size => 25, :required => true %>
|
||||||
<span class='font_lighter'>
|
<span class='font_lighter' id="firstname_limit">
|
||||||
<%= l(:field_firstname_eg) %>
|
<%= l(:field_firstname_eg) %>
|
||||||
</span>
|
</span>
|
||||||
|
<span id="valid_firstname"></span>
|
||||||
</p>
|
</p>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span id='enterprise' style='display:none'>
|
<span id='enterprise' style='display:none'>
|
||||||
<p style="width:400px;padding-left: 40px;">
|
<p style="width:400px;padding-left: 39px;">
|
||||||
<%= l(:label_company_name)%><span style="color: red"> *</span>
|
<%= l(:label_company_name)%><span style="color: #bb0000"> *</span>
|
||||||
<%= text_field_tag :enterprise_name, @user.firstname %>
|
<%= text_field_tag :enterprise_name, @user.firstname %>
|
||||||
|
<span id="valid_companyname"></span>
|
||||||
</p>
|
</p>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
|
@ -152,11 +200,16 @@
|
||||||
|
|
||||||
|
|
||||||
<!-- added by Wen -->
|
<!-- added by Wen -->
|
||||||
<p id="occupation_detail" style="padding-left: 26px; display: none">
|
<p id="occupation_detail" style="padding-left: 24px; display: none">
|
||||||
|
|
||||||
<%= l(:field_occupation) %>
|
<%= l(:field_occupation) %>
|
||||||
<span class="required"> </span>
|
<span class="required"> </span>
|
||||||
<% if User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
|
<% if User.current.user_extensions.nil? %>
|
||||||
|
<input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
|
||||||
|
<input id="occupation" name="occupation" style="display: none" type="text" value="" />
|
||||||
|
<input id="occupation_name" type="text" style="display: none" readonly/>
|
||||||
|
<% else %>
|
||||||
|
<% if User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
|
||||||
|
|
||||||
<input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
|
<input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
|
||||||
<input id="occupation" name="occupation" style="display: none" type="text" value="<%= @user.user_extensions.occupation %>" />
|
<input id="occupation" name="occupation" style="display: none" type="text" value="<%= @user.user_extensions.occupation %>" />
|
||||||
|
@ -172,7 +225,7 @@
|
||||||
<input id="occupation" name="occupation" type="text" style="display: none" value="<%= User.current.user_extensions.school.id %>"/>
|
<input id="occupation" name="occupation" type="text" style="display: none" value="<%= User.current.user_extensions.school.id %>"/>
|
||||||
<input id="occupation_name" type="text" style="display: none" value="<%= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>
|
<input id="occupation_name" type="text" style="display: none" value="<%= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% end %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div id="WOpenWindow">
|
<div id="WOpenWindow">
|
||||||
|
@ -213,7 +266,7 @@
|
||||||
|
|
||||||
<!-- end -->
|
<!-- end -->
|
||||||
|
|
||||||
<p style="width:357px;padding-left: 26px;">
|
<p style="width:357px;padding-left: 27px;">
|
||||||
<%= f.text_field :mail, :required => true %>
|
<%= f.text_field :mail, :required => true %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
@ -222,14 +275,22 @@
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
<% if !User.current.user_extensions.nil? %>
|
||||||
<% province = User.current.user_extensions.location %>
|
<% province = User.current.user_extensions.location %>
|
||||||
<% city = User.current.user_extensions.location_city %>
|
<% city = User.current.user_extensions.location_city %>
|
||||||
<% identity = User.current.user_extensions.identity %>
|
<% identity = User.current.user_extensions.identity %>
|
||||||
<% occupation1 = User.current.user_extensions.occupation %>
|
<% occupation1 = User.current.user_extensions.occupation %>
|
||||||
<% occupation = User.current.user_extensions.occupation %>
|
<% occupation = User.current.user_extensions.occupation %>
|
||||||
<% title = User.current.user_extensions.technical_title %>
|
<% title = User.current.user_extensions.technical_title %>
|
||||||
<% language = User.current.language %>
|
<% language = User.current.language %>
|
||||||
|
<% else %>
|
||||||
|
<% province = "湖南省" %>
|
||||||
|
<% city = "长沙"%>
|
||||||
|
<% identity = ""%>
|
||||||
|
<% occupation1 = ""%>
|
||||||
|
<% title = "" %>
|
||||||
|
<% language = ""%>
|
||||||
|
<% end %>
|
||||||
<script type="text/javascript" language="javascript">
|
<script type="text/javascript" language="javascript">
|
||||||
$().ready(function () {
|
$().ready(function () {
|
||||||
var province = "<%= "#{province}" %>"
|
var province = "<%= "#{province}" %>"
|
||||||
|
@ -245,7 +306,7 @@
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<p style="width:400px;padding-left: 58px;"><%= l(:label_location) %>
|
<p style="width:400px;padding-left: 57px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
|
||||||
<select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
|
<select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
|
||||||
<option value="">--请选择省份--</option>
|
<option value="">--请选择省份--</option>
|
||||||
<option value="北京">北京</option>
|
<option value="北京">北京</option>
|
||||||
|
@ -648,7 +709,7 @@
|
||||||
$('#name').show()
|
$('#name').show()
|
||||||
$('#enterprise').hide()
|
$('#enterprise').hide()
|
||||||
$('#gender').show()
|
$('#gender').show()
|
||||||
$('#occupation_detail').show()
|
$('#occupation_detail').hide()
|
||||||
var technical_titleOptions = new Array(
|
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) %>");
|
"<%= l(:label_technicl_title_professor) %>", "<%= l(:label_technicl_title_associate_professor) %>", "<%= l(:label_technicl_title_lecturer) %>", "<%= l(:label_technicl_title_teaching_assistant) %>");
|
||||||
|
|
||||||
|
|
|
@ -1,36 +1,36 @@
|
||||||
<%= form_tag({:action => 'edit'}) do %>
|
<%= form_tag({:action => 'edit'}) do %>
|
||||||
|
|
||||||
<div class="box tabular settings">
|
<div class="box tabular settings">
|
||||||
<p><%= setting_text_field :app_title, :size => 30 %></p>
|
<p style="padding-left: 180px;"><%= setting_text_field :app_title, :size => 30 %></p>
|
||||||
|
|
||||||
<p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
|
<p style="padding-left: 180px;"><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
|
||||||
<%= wikitoolbar_for 'settings_welcome_text' %>
|
<%= wikitoolbar_for 'settings_welcome_text' %>
|
||||||
|
|
||||||
<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
|
<p style="padding-left: 180px;"><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :per_page_options, :size => 20 %>
|
<p style="padding-left: 180px;"><%= setting_text_field :per_page_options, :size => 20 %>
|
||||||
<em class="info"><%= l(:text_comma_separated) %></em></p>
|
<em class="info"><%= l(:text_comma_separated) %></em></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
|
<p style="padding-left: 180px;"><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :host_name, :size => 60 %>
|
<p style="padding-left: 180px;"><%= setting_text_field :host_name, :size => 60 %>
|
||||||
<em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
|
<em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
|
||||||
|
|
||||||
<p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
|
<p style="padding-left: 180px;"><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
|
||||||
|
|
||||||
<p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
|
<p style="padding-left: 180px;"><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
|
||||||
|
|
||||||
<p><%= setting_check_box :cache_formatted_text %></p>
|
<p style="padding-left: 180px;"><%= setting_check_box :cache_formatted_text %></p>
|
||||||
|
|
||||||
<p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
|
<p style="padding-left: 180px;"><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :feeds_limit, :size => 6 %></p>
|
<p style="padding-left: 180px;"><%= setting_text_field :feeds_limit, :size => 6 %></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
|
<p style="padding-left: 180px;"><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
|
<p style="padding-left: 180px;"><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
|
||||||
|
|
||||||
<p><%= setting_text_field :repositories_encodings, :size => 60 %>
|
<p style="padding-left: 180px;"><%= setting_text_field :repositories_encodings, :size => 60 %>
|
||||||
<em class="info"><%= l(:text_comma_separated) %></em></p>
|
<em class="info"><%= l(:text_comma_separated) %></em></p>
|
||||||
|
|
||||||
<%= call_hook(:view_settings_general_form) %>
|
<%= call_hook(:view_settings_general_form) %>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
|
<%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
|
||||||
|
|
||||||
<div class="box tabular settings">
|
<div class="box tabular settings">
|
||||||
<p><%= setting_text_field :mail_from, :size => 60 %></p>
|
<p><%= setting_text_field :mail_from, :size => 50 %></p>
|
||||||
|
|
||||||
<p><%= setting_check_box :bcc_recipients %></p>
|
<p><%= setting_check_box :bcc_recipients %></p>
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<div class="cb">
|
<div class="cb">
|
||||||
<span style=""><%= result.filename %></span>
|
<span style=""><%= result.filename %></span>
|
||||||
<span style="margin-left: 4px;">
|
<span style="margin-left: 4px;">
|
||||||
<%= 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')}%>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<%= result.description %>
|
<%= result.description %>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<%= f.text_field :name, :maxlength => 60, :required => true %>
|
<%= f.text_field :name, :maxlength => 60, :required => true %>
|
||||||
</p>
|
</p>
|
||||||
<p style="margin-left:-20px;">
|
<p style="margin-left:-20px;">
|
||||||
<%= f.text_field :description, :maxlength => 100, :style => "margin-left:10px;" %>
|
<%= f.text_field :description, :maxlength => 60, :style => "margin-left:10px;" %>
|
||||||
</p>
|
</p>
|
||||||
<p style="margin-left:-20px;">
|
<p style="margin-left:-20px;">
|
||||||
<span style="margin-left:10px;">
|
<span style="margin-left:10px;">
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
</p>
|
</p>
|
||||||
<p style="margin-left:-20px;">
|
<p style="margin-left:-20px;">
|
||||||
<span style="margin-left:10px;">
|
<span style="margin-left:10px;">
|
||||||
<%= 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? %>
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
<p style="margin-left:-20px;">
|
<p style="margin-left:-20px;">
|
||||||
|
|
|
@ -246,8 +246,11 @@ zh:
|
||||||
field_summary: 摘要
|
field_summary: 摘要
|
||||||
field_is_required: 必填
|
field_is_required: 必填
|
||||||
field_firstname: 名字
|
field_firstname: 名字
|
||||||
|
firstname_empty: 名字不能为空
|
||||||
field_firstname_eg: '(例:张三丰,请填写[三丰])'
|
field_firstname_eg: '(例:张三丰,请填写[三丰])'
|
||||||
field_lastname: 姓氏
|
field_lastname: 姓氏
|
||||||
|
lastname_empty: 姓氏不能为空
|
||||||
|
enterprise_empty: 企业名不能为空
|
||||||
field_lastname_eg: '(例:张三丰,请填写[张])'
|
field_lastname_eg: '(例:张三丰,请填写[张])'
|
||||||
field_mail: 邮件地址
|
field_mail: 邮件地址
|
||||||
field_filename: 文件
|
field_filename: 文件
|
||||||
|
@ -299,7 +302,7 @@ zh:
|
||||||
field_effective_date: 日期
|
field_effective_date: 日期
|
||||||
field_password: 密码
|
field_password: 密码
|
||||||
field_new_password: 新密码
|
field_new_password: 新密码
|
||||||
field_password_confirmation: 确认
|
field_password_confirmation: 密码确认
|
||||||
field_version: 版本
|
field_version: 版本
|
||||||
field_type: 类型
|
field_type: 类型
|
||||||
field_host: 主机
|
field_host: 主机
|
||||||
|
@ -1595,8 +1598,9 @@ zh:
|
||||||
label_tags_user_mail: 用户邮箱:
|
label_tags_user_mail: 用户邮箱:
|
||||||
label_tags_user_name: 用户名:
|
label_tags_user_name: 用户名:
|
||||||
label_tags_numbers: Tag统计:
|
label_tags_numbers: Tag统计:
|
||||||
label_max_number: 登录名是在网站中显示的您的公开标识,至多25个字符。
|
label_max_number: 登录名是在网站中显示的您的公开标识,只能为英文。
|
||||||
label_mail_attention: qq邮箱可能收不到此邮件,其他邮箱如果没有收到可能在垃圾邮件中,其中gmail与教育网邮箱的激活邮件有时比较慢,请耐心等待。
|
label_mail_attention: qq邮箱可能收不到此邮件,其他邮箱如果没有收到可能在垃圾邮件中,
|
||||||
|
label_mail_attention1: 其中gmail与教育网邮箱的激活邮件有时比较慢,请耐心等待。
|
||||||
label_your_course: 您的课程《
|
label_your_course: 您的课程《
|
||||||
label_have_message : 》有新的留言
|
label_have_message : 》有新的留言
|
||||||
label_all_revisions: 所有版本:
|
label_all_revisions: 所有版本:
|
||||||
|
@ -1872,7 +1876,7 @@ zh:
|
||||||
label_account_identity_teacher: 教师
|
label_account_identity_teacher: 教师
|
||||||
label_account_identity_student: 学生
|
label_account_identity_student: 学生
|
||||||
label_account_identity_developer: 开发者
|
label_account_identity_developer: 开发者
|
||||||
label_account_identity_enterprise: 企业
|
label_account_identity_enterprise: 组织
|
||||||
label_account_identity_choose: --请选择身份--
|
label_account_identity_choose: --请选择身份--
|
||||||
label_teaching_course: 我执教的课程
|
label_teaching_course: 我执教的课程
|
||||||
label_release_homework: 我发布的作业
|
label_release_homework: 我发布的作业
|
||||||
|
@ -2056,7 +2060,7 @@ zh:
|
||||||
label_contest_work_list: 参赛作品列表
|
label_contest_work_list: 参赛作品列表
|
||||||
label_attending_contest: 我要参赛
|
label_attending_contest: 我要参赛
|
||||||
label_contest_notification: 竞赛通知
|
label_contest_notification: 竞赛通知
|
||||||
label_company_name: 企业名
|
label_company_name: 组织名
|
||||||
|
|
||||||
label_coursefile_sharingarea: 课程资源共享区
|
label_coursefile_sharingarea: 课程资源共享区
|
||||||
label_sort_by_activity: 按动态数排序
|
label_sort_by_activity: 按动态数排序
|
||||||
|
|
|
@ -1678,8 +1678,8 @@ div.issue table.attributes td {width:28%;}
|
||||||
#relations td.buttons {padding:0;}
|
#relations td.buttons {padding:0;}
|
||||||
|
|
||||||
fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
|
fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
|
||||||
fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
|
fieldset.collapsible>legend { padding-left: 16px; background:url(../images/arrow_collapsed.png) no-repeat 0% 40%; cursor:pointer; }
|
||||||
fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_collapsed.png); }
|
fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_expanded.png); }
|
||||||
|
|
||||||
fieldset#date-range p { margin: 2px 0 2px 0; }
|
fieldset#date-range p { margin: 2px 0 2px 0; }
|
||||||
fieldset#filters table { border-collapse: collapse; }
|
fieldset#filters table { border-collapse: collapse; }
|
||||||
|
@ -1913,7 +1913,7 @@ input#time_entry_comments { width: 90%;}
|
||||||
|
|
||||||
.tabular.settings p{ padding-left: 300px; }
|
.tabular.settings p{ padding-left: 300px; }
|
||||||
.tabular.settings label{ margin-left: -300px; width: 295px; }
|
.tabular.settings label{ margin-left: -300px; width: 295px; }
|
||||||
.tabular.settings textarea { width: 99%; }
|
.tabular.settings textarea { width: 85%; }
|
||||||
|
|
||||||
.settings.enabled_scm table {width:100%}
|
.settings.enabled_scm table {width:100%}
|
||||||
.settings.enabled_scm td.scm_name{ font-weight: bold; }
|
.settings.enabled_scm td.scm_name{ font-weight: bold; }
|
||||||
|
@ -1921,7 +1921,8 @@ input#time_entry_comments { width: 90%;}
|
||||||
fieldset.settings label { display: block; }
|
fieldset.settings label { display: block; }
|
||||||
fieldset#notified_events .parent { padding-left: 20px; }
|
fieldset#notified_events .parent { padding-left: 20px; }
|
||||||
|
|
||||||
span.required {color: #bb0000;margin-right: 4px;}
|
span.required {color: #bb0000; margin-right: 2px;}
|
||||||
|
|
||||||
.summary {font-style: italic;}
|
.summary {font-style: italic;}
|
||||||
|
|
||||||
#attachments_fields input.description {margin-left:4px; width:100px; }
|
#attachments_fields input.description {margin-left:4px; width:100px; }
|
||||||
|
|
Loading…
Reference in New Issue