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

app/views/files/_show_all_attachment.html.erb

@@ -4,7 +4,7 @@
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <div class="autoscroll">
-<table class="list files" id="ver-zebra"  style="width: 100%; table-layout: fixed">
+<table class="list files" id="ver-zebra"  style=" table-layout: fixed">
   <colgroup>
     <col class="vzebra-odd"/>
     <col class="vzebra-even"/>

app/views/my/account.html.erb

@@ -128,7 +128,7 @@
         <a class="modal_close" href="#"></a>
 
         <h2>学校列表</h2>
-
+        &nbsp;&nbsp;
         <div class="pcontent">
           <ul id="provincelist" class="school_list">
             <% @ss = School.find_by_sql("select distinct province from schools") %>
@@ -140,7 +140,7 @@
             <% end %>
           </ul>
         </div>
-        <hr/>
+
         <div class="content" style="font-size: 13px">
           <ul id="schoollist" class="school_list">