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

app/views/layouts/base_projects.html.erb

@@ -182,12 +182,12 @@
                   <div class="project_intro">
                     <div id="course_description" class="course_description">
                         <h4 ><%= l(:label_project_overview)%>：</h4>
-                        <div id="course_description_content  break_word">
+                        <div id="course_description_content" class="break_word">
                             <%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
                         </div>
                     </div>
                     <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
-                        <label id="expend_more_information"  value="<%= l(:label_expend_information)%>"><%= l(:label_expend_information)%></label>
+                        <label id="expend_more_information"  value="show_more"><%= l(:label_expend_information)%></label>
                         <span class="g-arr-down">
                             <img id="arrow" src="/images/jiantou.jpg" width="12" height="6" />
                         </span>

app/views/projects/show.html.erb

@@ -11,7 +11,7 @@
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user),  :width => "42", :height => "42") %></a>
                 <div class="problem_txt fl mt5 break_word">
                     <%= link_to e.user,  user_path(e.user), :class => "problem_name c_orange fl" %> <span class="fl"> <%= l(:label_project_create) %> ：</span>
-                    <%= link_to (e.project.name),"", :class => "problem_tit fl fb" %></a><br />
+                    <%= link_to e.project.name,{} ,:class => "problem_tit fl fb" %></a><br />
                     <p class="mt5"><br /> <%= l :label_create_time %> ：<%= format_time(e.project.created_on) %></p>
                 </div>
                 <div class="cl"></div>

app/views/repositories/_revisions.html.erb

@@ -33,7 +33,7 @@ end %>
 <% line_num = 1 %>
 <% revisions.each do |changeset| %>
 <tr class="changeset <%= cycle 'odd', 'even' %>">
-<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %>
+<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 12}px" : nil) %>
 <%= content_tag(:td, :class => 'id', :style => id_style) do %>
   <%= link_to_revision(changeset, @repository) %>
 <% end %>
@@ -47,5 +47,8 @@ end %>
 <% end %>
 </tbody>
 </table>
-<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
+<p style="padding-top: 10px;">
+      <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"orange_u_btn ") if show_diff %>
+</p>
+
 <% end %>

public/javascripts/project.js

@@ -47,14 +47,14 @@ function show_more_msg() {
     var information = $("#expend_more_information");
     var arrow = $("#arrow");
     var val = information.attr("value");
-    if (val == "展开更多信息") {
+    if (val == "show_more") {
         $("#expend_more_information").text("收起描述信息");
-        information.attr("value", "收起描述信息");
+        information.attr("value", "hide_more");
         arrow.attr("src", "/images/jiantouup.jpg")
     }
     else {
         $("#expend_more_information").text("展开更多信息");
-        information.attr("value", "展开更多信息");
+        information.attr("value", "show_more");
         arrow.attr("src", "/images/jiantou.jpg")
     }
 }

public/stylesheets/pleft.css

@@ -50,7 +50,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
-.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
+.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
 /****标签(和资源库的tag样式一致)***/
 .project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px;  padding-top:5px; margin-bottom:10px;}

public/stylesheets/project.css

@@ -590,3 +590,92 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
 #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
 #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
 
+
+/*****项目版本库修订 Tables *****/
+table.list{  border:none; border-collapse: collapse; width: 100%; margin-bottom: 4px; }
+table.list th {  background-color:#EEEEEE; padding: 4px; white-space:pre-line; }
+table.list td { vertical-align: top; padding-right:10px; }
+table.list td.id { width: 2%; text-align: center;}
+table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
+table.list td.checkbox input {padding:0px;}
+table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
+table.list td.buttons a { padding-right: 0.6em; }
+table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
+
+table.list tbody td, table.list tbody tr td, table.list tbody tr td.checkbox {
+    border-bottom: solid 1px #ddd;
+    font-size: 11px;
+    padding: 4px 10px 4px 3px;
+}
+
+
+table.list thead th
+{
+    border:none;
+    border-bottom:1px solid #999;
+    font-size:12px;/*by young*/
+    font-weight:400;
+    padding:0 3px 3px;
+    text-transform:uppercase
+}
+
+table.list th
+{
+    background-color:#fff}
+
+table.list thead th
+{
+    border:none;
+    border-bottom:1px solid #999;
+    font-size:12px;/*by young*/
+    font-weight:400;
+    padding:0 3px 3px;
+    text-transform:uppercase
+}
+
+tr.changeset { height: 20px }
+tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; }
+tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; }
+tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;}
+tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;}
+
+div.changeset { padding: 4px;}
+div.changeset { border-bottom: 1px solid #ddd; }
+
+.odd {background-color:#f6f7f8;}
+.even {background-color: #fff;}
+
+
+/*****项目版本库文件 Tables *****/
+.autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
+tr.entry { border: 1px solid #f8f8f8; }
+tr.entry td { white-space: nowrap; }
+tr.entry td.filename { width: 30%; }
+tr.entry td.filename_no_report { width: 70%; }
+tr.entry td.size { text-align: right; font-size: 90%; }
+tr.entry td.revision, tr.entry td.author { text-align: center; }
+tr.entry td.age { text-align: right; }
+tr.entry.file td.filename a { margin-center: 16px; }
+tr.entry.file td.filename_no_report a { margin-left: 16px; }
+
+tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
+tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
+.open .icon-folder { background-image: url(../images/folder_open.png); }
+.icon-file { background-image: url(../images/files/default.png); }
+.icon-file.text-plain { background-image: url(../images/files/text.png); }
+.icon-file.text-x-c { background-image: url(../images/files/c.png); }
+.icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
+.icon-file.text-x-java { background-image: url(../images/files/java.png); }
+.icon-file.text-x-javascript { background-image: url(../images/files/js.png); }
+.icon-file.text-x-php { background-image: url(../images/files/php.png); }
+.icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
+.icon-file.text-xml { background-image: url(../images/files/xml.png); }
+.icon-file.text-css { background-image: url(../images/files/css.png); }
+.icon-file.text-html { background-image: url(../images/files/html.png); }
+.icon-file.image-gif { background-image: url(../images/files/image.png); }
+.icon-file.image-jpeg { background-image: url(../images/files/image.png); }
+.icon-file.image-png { background-image: url(../images/files/image.png); }
+.icon-file.image-tiff { background-image: url(../images/files/image.png); }
+.icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
+.icon-file.application-zip { background-image: url(../images/files/zip.png); }
+.icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }