From 4cb22f2437f198fd2d8b6b8273fcfff04f485bac Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 22 Apr 2015 15:49:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E4=B8=AA=E4=BA=BA=E5=A4=B4=E5=83=8F=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/avatar/_avatar_form.html.erb | 3 ++- app/views/avatar/_new_avatar_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index fef9f7bdb..f5ecfeadd 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -47,7 +47,6 @@ <%= l(:button_upload_photo) %> - (个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像) <%= file_field_tag 'avatar[image]', @@ -69,6 +68,8 @@ :source_id => source.id.to_s } %> +(个人头像建议90*90大小，或者等比图像) + <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb index 8b81ebf66..627de34be 100644 --- a/app/views/avatar/_new_avatar_form.html.erb +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -3,7 +3,6 @@ <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> <%= l(:button_upload_photo) %> -(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像) <%= file_field_tag 'avatar[image]', :id => nil, :class => 'upload_file ', @@ -22,6 +21,7 @@ :source_id => source.id.to_s } %> +(课程和项目logo建议60*60大小，或者等比图像) <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> <% end %> From 36f2643ad8dbd41ddd31ed0fa263b94b2d9e43dc Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 22 Apr 2015 16:33:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/avatar/_new_avatar_form.html.erb | 2 +- public/stylesheets/courses.css | 1 + public/stylesheets/project.css | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb index 627de34be..c94f9f87a 100644 --- a/app/views/avatar/_new_avatar_form.html.erb +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -5,7 +5,7 @@ <%= l(:button_upload_photo) %> <%= file_field_tag 'avatar[image]', :id => nil, - :class => 'upload_file ', + :class => 'upload_avatar ', :size => "1", :multiple => false, :onchange => 'addInputAvatar(this);', diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1fed23fc1..904f6a3a8 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -331,6 +331,7 @@ a:hover.st_add{ color:#ff8e15;} .upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;} .upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;cursor: pointer;} .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer} +.upload_avatar{margin-left: -350px;margin-top: 40px;width: 60px;position: absolute;height: 24px;opacity: 0;cursor: pointer} /* 功能倒计时*/ .w_img{ float:left; margin:10px 10px 15px 0px;} .w_p{ float:left; color:#15bccf; font-size:16px; font-weight:bold; margin-top:70px; } diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 2f6a4babe..abd748dce 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -368,6 +368,7 @@ blockquote { } /*上传项目图片*/ .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer} +.upload_avatar{margin-left: -350px;margin-top: 40px;width: 60px;position: absolute;height: 24px;opacity: 0;cursor: pointer} /*配置*/ .pro_st_ttl{ height:24px;} .pro_st_ctt{height:auto; clear:both;} From 681546b860c2e1924221954a1b391e8517771c93 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 22 Apr 2015 16:49:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 7 +++++-- app/models/mailer.rb | 3 ++- app/services/users_service.rb | 8 +++++--- app/views/attachments/_project_file_links.html.erb | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5e67e0a2c..845f32dab 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -243,8 +243,10 @@ class ProjectsController < ApplicationController # Author lizanle # Description 项目动态展示方法，删除了不必要的代码 def show - - # 试图跳转到请求的按钮 + # params[:login]为邮箱邀请用户加入，主要功能： + # 1、自动注册 + # 2、加入项目、创建角色 + # 3、用户得分 if params[:login] login = params[:login] login = login.sub(/%40/,'@') @@ -252,6 +254,7 @@ class ProjectsController < ApplicationController password = params[:password] us = UsersService.new user = us.register_auto(login,mail, password) + Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id) UserGrade.create(:user_id => user.id, :project_id => @project.id) User.current = user unless User.current.nil? diff --git a/app/models/mailer.rb b/app/models/mailer.rb index ce3924119..acc268275 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -53,7 +53,8 @@ class Mailer < ActionMailer::Base @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} " @password = newpass(6) @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, - :password => @password, :login => email) + :password => @password, + :login => email) mail :to => email, :subject => @subject end diff --git a/app/services/users_service.rb b/app/services/users_service.rb index c1f716fd1..75dd316c0 100644 --- a/app/services/users_service.rb +++ b/app/services/users_service.rb @@ -44,13 +44,16 @@ class UsersService #location = get_user_location @user #{:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction} end + + # 自动注册功能 FOR：邮件邀请 def register_auto(login,mail,password) @user = User.new @user.admin = false @user.register @user.login = login - @user.mail =mail + @user.mail = mail password_confirmation = password + # 自动注册，跳过代码验证 should_confirmation_password = true if !password.blank? && !password_confirmation.blank? && should_confirmation_password @user.password, @user.password_confirmation = password, password_confirmation @@ -59,9 +62,7 @@ class UsersService else @user.password = "" end - @user = automatically_register(@user) - if @user.id != nil ue = @user.user_extensions ||= UserExtensions.new ue.user_id = @user.id @@ -69,6 +70,7 @@ class UsersService end @user end + #显示用户 #id用户id def show_user(params) diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index 9a65556d8..0135ee239 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -64,7 +64,7 @@ <% images = attachments.select(&:thumbnailable?) %> <% if images.any? %> <% images.each do |attachment| %> -
<%= thumbnail_issue_tag(attachment) %>
+
<%= thumbnail_issue_tag(attachment) %>
<% end %> <% end %> <% end %> From 0484692b47f450e15c535565e3cadfaa010f6d17 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 22 Apr 2015 17:57:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=99=9A=E7=BA=BF=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/users_service.rb | 1 - app/views/issues/_edit.html.erb | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/users_service.rb b/app/services/users_service.rb index 75dd316c0..3a92bf8f1 100644 --- a/app/services/users_service.rb +++ b/app/services/users_service.rb @@ -53,7 +53,6 @@ class UsersService @user.login = login @user.mail = mail password_confirmation = password - # 自动注册，跳过代码验证 should_confirmation_password = true if !password.blank? && !password_confirmation.blank? && should_confirmation_password @user.password, @user.password_confirmation = password, password_confirmation diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 1266f4611..e4c1290aa 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -5,12 +5,14 @@ <% if @edit_allowed || !@allowed_statuses.empty? %> + <% end %> -
+ <% if @journals.present? %> From d66af824788a701ae1f5e86a6393dfcaa66e233c Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 23 Apr 2015 01:00:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=A5=E5=8E=86=E6=8F=92=E4=BB=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/_form_contest.html.erb | 2 +- public/stylesheets/application.css | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/views/contests/_form_contest.html.erb b/app/views/contests/_form_contest.html.erb index ec993fae8..344d69571 100644 --- a/app/views/contests/_form_contest.html.erb +++ b/app/views/contests/_form_contest.html.erb @@ -67,7 +67,7 @@ <%= f.text_field :deadline, :required => true, :size => 60, - :style => "width:150px;", + :style => "width:150px;float:left;", :readonly => true, :placeholder => "#{l(:label_deadline)}" %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3e88bb30a..d00ad37e7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -3152,6 +3152,18 @@ input[class~='m3p10'], .m3p10 { .break_word{word-break: break-all;word-wrap: break-word;} .break_word_firefox{white-space: pre-wrap;word-break: break-all;} +/*日历选择图*/ +img.ui-datepicker-trigger { + display:block; + background:url(/images/public_icon.png) -31px 0 no-repeat; + cursor: pointer; + vertical-align: middle; + margin-left: 5px; + margin-top: 5px; + width:16px; + height:15px; + float:left; +} /*lizanle 日誌搜索結果樣式*/ .search_results { From 348eae5c45d5c2879c98d13b36b676b3269eb909 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 23 Apr 2015 10:19:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 6 +++--- app/views/projects/settings/_new_repositories.html.erb | 6 +++--- app/views/projects/settings/_versions.html.erb | 6 +++--- public/stylesheets/public.css | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8890e88a4..096dadf8b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -228,9 +228,9 @@

请选择项目类型：

    -
  • id="development_group"/>
    • -
  • id="research_group"/>
    • -
  • id="friend_organization"/>
    • +
  • id="development_group"/>
    • +
  • id="research_group"/>
    • +
  • id="friend_organization"/>
确定 diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index a5f476079..7eda0e473 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -25,7 +25,7 @@ <%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> - <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%> <%else %> <%=h truncate(repository.url,:length=>10) %> @@ -33,8 +33,8 @@ <% if repository.scm_name=="Git"%> <%if User.current.allowed_to?(:manage_repository, @project) %> - <%= link_to(l(:label_user_plural), committers_repository_path(repository), - :class => 'c_blue') %> + <%= link_to(l(:label_user_plural), committers_repository_path(repository) + ) %> <% end %> <% end %> diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 2ca875681..5b0f27953 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -42,9 +42,9 @@ <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', - :action => 'show', - :project_id => version.project, - :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> + :action => 'show', + :project_id => version.project, + :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 2f45bbd69..125a36064 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -131,6 +131,7 @@ a.c_green{ color:#28be6c;} .c_blue{ color:#15bccf;} .c_red{ color:#F00;} .c_green{ color:#28be6c;} +.c_grey{color:#999;} .c_dblue{ color:#09658c;} .b_blue{background:#64bdd9;} .b_green{background:#28be6c;} @@ -404,7 +405,7 @@ div.flash.warning, .conflict { /*弹出框*/ .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);} .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} -.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} +.white_content02{display:none;position:fixed;top:15%;left:30%;width:310px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} .floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} From de23c3c2a8dd8477c34d87ff0e415dd9c656b9c9 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 23 Apr 2015 14:04:22 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=20=E9=9A=94=E8=A1=8C?= =?UTF-8?q?=E6=8D=A2=E8=89=B2=E6=98=BE=E7=A4=BA=20=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=A6=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- app/views/projects/settings/_new_members.html.erb | 12 ++++++------ .../projects/settings/_new_repositories.html.erb | 2 +- app/views/projects/settings/_new_versions.html.erb | 8 ++++---- public/stylesheets/project.css | 7 +++++-- public/stylesheets/public.css | 2 ++ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 20175dc57..484a3189c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -633,7 +633,7 @@ module ApplicationHelper def principals_check_box_tags_li(name, principals) s = '' principals.each do |principal| - s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id), :class => "c_blue" }
    • \n" + s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id) }
    • \n" end s.html_safe end diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index faccfbeeb..0aa558014 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -12,19 +12,19 @@
    <% if members.any? %>
      -
    • <%= l(:label_user) %><%= l(:label_role_plural) %>
      • +
    • <%= l(:label_user) %><%= l(:label_role_plural) %>
      • <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> <% members.each do |member| %>
    • - <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %> - + <%= link_to_user_header member.principal,false,:class => "w140_h c_orange fl" %> + <%= h member.roles.sort.collect(&:to_s).join(', ') %> <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), :method => :put, :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} ) do |f| %> <% roles.each do |role| %> -
        +
          <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> @@ -32,7 +32,7 @@ <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %> -
          +
          <%= l(:button_change)%> @@ -46,7 +46,7 @@ 编辑 <%= delete_link membership_path(member), :remote => true, - :class => "c_dblue ml30 fl", + :class => "c_dblue ml15 fl", :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> <% end%> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 7eda0e473..13daa2c2b 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -19,7 +19,7 @@ <% @project.repositories.sort.each do |repository| %> - + <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %> <%= checked_image repository.is_default? %> diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index e52984d15..feb08bac5 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -18,15 +18,15 @@ <% for version in @project.shared_versions.sort %> - - + + <%= 'shared' if version.project != @project %> <%= link_to_version version %> <%= format_date(version.effective_date) %> - <%=h version.description %> + <%=h version.description %> <%= l("version_status_#{version.status}") %> <%=h format_version_sharing(version.sharing) %> - + <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', :action => 'show', :project_id => version.project, diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index abd748dce..ea0114441 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -55,6 +55,9 @@ a:hover.btn_free{ background:#d63502;} a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;} .rolebox{ margin:10px 0;} +.w180_h{ width:180px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; text-align:left;} +.w140_h{ width:135px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;} + /*问题跟踪*/ .problem_top{ margin:10px 0 ;} .problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:5px;} @@ -392,8 +395,8 @@ blockquote { .members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{} .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } -.members_left ul li a{ float:left; text-align:center;} -.members_left ul li span{ float:left; text-align:center; color:#484747;} +.members_left ul li a{ float:left; text-align:left;} +.members_left ul li span{ float:left; text-align:center; color:#484747;text-align:left;} .w150{ text-align:center; width:150px;} .f_b{ font-weight: bold;} .members_right{ float:left; width:240px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 125a36064..1ab286c0d 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -410,3 +410,5 @@ div.flash.warning, .conflict { a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} +/*文本左对齐*/ +.tl{text-align: left;} \ No newline at end of file