Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/admin/search.html.erb

@@ -26,7 +26,7 @@
      
 
     <div class="autoscroll">
-      <table class="list">
+      <table class="list" style="width: 100%;table-layout: fixed">
         <thead>
         <tr>
           <%= sort_header_tag('login', :caption => l(:field_login)) %>
@@ -37,20 +37,20 @@
           <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
           <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
           <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-          <th></th>
+          <th style="width: 100px;"></th>
         </tr>
         </thead>
         <tbody>
         <% for user in @users -%>
             <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
-              <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-              <td class="firstname"><%= h(user.firstname) %></td>
-              <td class="lastname"><%= h(user.lastname) %></td>
-              <td class="email"><%= mail_to(h(user.mail)) %></td>
-              <td align="center"><%= checked_image user.admin? %></td>
-              <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-              <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td class="buttons"> <%= change_status_link(user) %>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="username" title='<%=user.login%>'> <%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="firstname" align="center" title='<%=user.firstname%>'><%= h(user.firstname) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="lastname" align="center" title='<%=user.lastname%>'><%= h(user.lastname) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="email" align="center" title='<%=user.mail%>'><%= mail_to(h(user.mail)) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+              <td  class="buttons"> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>

app/views/admin/users.html.erb

@@ -37,18 +37,9 @@
           <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
           <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
           <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-          <th></th>
+          <th style="width: 100px;"></th>
         </tr>
         </thead>
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 5%" />
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 5%" />
         <tbody>
         <% for user in @users -%>
             <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
@@ -59,7 +50,7 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td class="buttons"> <%= change_status_link(user) %>
+              <td  class="buttons"> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>

app/views/issues/show.html.erb

@@ -4,7 +4,9 @@
 
 <%= render :partial => 'action_menu' %>
 
-<h3><%= issue_heading(@issue) %></h3>
+<h3>
+  <%= issue_heading(@issue) %>
+</h3>
 
 <style type="text/css"></style>
 
@@ -25,9 +27,9 @@
     </div>
   <% end %>
 
-  <!-- <%= avatar(@issue.author, :size => "50") %> -->
+  <!-- <%#= avatar(@issue.author, :size => "50") %> -->
 
-<div class="subject">
+<div class="subject"  style="word-wrap: break-word;">
 <%= render_issue_subject_with_tree(@issue) %>
 </div> 
 

app/views/projects/show.html.erb

@@ -1,7 +1,8 @@
 <% if @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <p class="subtitle">
-        <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
+        <% # 暂时隐藏时间的显示%>
+        <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
       </p>
 
       <% @events_by_day.keys.sort.reverse.each do |day| %>

app/views/stores/_search_bar.html.erb

@@ -4,5 +4,5 @@
 	  
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
-	<div class='font_lighter' style="display: inline-block; margin-top:3px;">全站文件搜索。不会搜索私有项目中的内容、学生已经提交的作业。</div>
+	<div class='font_lighter' style="display: inline-block; margin-top:3px;">全站文件搜索。不会搜索私有项目中的内容。</div>
 </div>

app/views/users/_memberships.html.erb

@@ -1,4 +1,4 @@
-<% roles = Role.find_all_givable %>
+<% roles = Role.find_all_givable[0..2] %>
 <% projects = Project.active.all %>
 
 <div class="splitcontentleft">
@@ -50,12 +50,19 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 </div>
+<script type="text/javascript">
+  window.onready = function()
+  {
+      $("#membership_project_id").css("width","150px");
+      $("#membership_project_id").css("overflow ","hidden");
 
+  }
+</script>
 <div class="splitcontentright">
 <% if projects.any? %>
-<fieldset><legend><%=l(:label_project_new)%></legend>
+<fieldset style="width: 170px;"><legend><%=l(:label_project_new)%></legend>
 <%= form_for(:membership, :remote => true, :url => user_memberships_path(@user)) do %>
-<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
+<div style="width:100px;"><%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects)%></div>
 <p><%= l(:label_role_plural) %>:
 <% roles.each do |role| %>
   <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>

app/views/welcome/_search_bar.html.erb

@@ -4,5 +4,5 @@
 	  
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
-	<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;">全站文件搜索。不会搜索私有项目中的内容和学生已经提交的作业。</div>
+	<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;">全站文件搜索。不会搜索私有项目中的内容。</div>
 </div>