From aa9ce1520db28789a5a14dbae2e110c6fa8fbeec Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 31 May 2012 17:50:46 +0800
Subject: [PATCH] modified 'commit-time' in repo & repo_history; added
 'commit-time' to repo_history_dir

---
 media/css/seahub.css            |  5 +++--
 templates/repo.html             | 13 ++++---------
 templates/repo_history.html     |  6 +++---
 templates/repo_history_dir.html |  4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 542c44c3ba..d0c6efb47b 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -220,7 +220,7 @@ table img {
     font-weight:normal;
 }
 #simplemodal-container h3 {
-    margin-top:0;
+    margin:0 0 4px;
 }
 .simplemodal-close {
     margin-left:5px;
@@ -267,7 +267,8 @@ table img {
 }
 .latest-commit-time-author {
     color:#333;
-    margin-bottom:4px;
+    font-size:13px;
+    font-weight:normal;
 }
 .latest-commit {
     word-wrap:break-word;
diff --git a/templates/repo.html b/templates/repo.html
index 301b2c60ea..41c1b74808 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -4,7 +4,10 @@
 {% block main_panel %}
 <div id="repo-page" class="ovhd">
 
-    <h2>{{repo.props.name}}</h2>
+    <h2>
+        {{repo.props.name}}
+        <span class="latest-commit-time-author">({{ latest_commit.props.ctime|tsstr_sec }})</span>
+    </h2>
 
     <div class="side fright">
         <h3>基本信息</h3>
@@ -60,14 +63,6 @@
             {% if not is_owner and repo_ap == 'own' and not share_to_me %}
         <p>该同步目录web匿名访问未开启，不能在线查看。</p>
             {% else %}
-        <p class="latest-commit-time-author">
-            {{ latest_commit.props.ctime|tsstr_sec }} by 
-                {% if latest_commit.props.creator_name %}
-            {{ latest_commit.props.creator_name }}
-                {% else %}
-            未知
-                {% endif %}
-        </p>
         <p class="path">
             当前路径：
                 {% for name, link in zipped %}
diff --git a/templates/repo_history.html b/templates/repo_history.html
index 1a5b09dcd4..c9fd63443f 100644
--- a/templates/repo_history.html
+++ b/templates/repo_history.html
@@ -81,14 +81,14 @@
     //list modification made by a commit
     $('.lsch').each(function() {
         $(this).click(function() {
-            var str_time_author = '<p class="latest-commit-time-author">' + $(this).attr('data') + ' by ' + $(this).parent().prev().html() + '</p>';
+            var str_time_author = '<span class="latest-commit-time-author">(' + $(this).attr('data') + ')</span>';
             $.ajax({
                 url: $(this).attr('href'),
                 dataType: 'json',
                 cache: false,
                 contentType: 'application/json; charset=utf-8',
                 success: function(data) {
-                    var str_title = '<h3>修改详情</h3>';
+                    var str_title = '<h3>修改详情' + str_time_author + '</h3>';
                     var str_con = ''; 
                     var show = function(data_) {
                             str_con += '<ul>';
@@ -116,7 +116,7 @@
                     if (!str_con) {
                         str_con = '<p>没有文件被改动</p>';
                     }
-                    $('#ls-ch').html(str_title + str_time_author + str_con);
+                    $('#ls-ch').html(str_title + str_con);
                     $('#ls-ch').modal({appendTo:'#main'});
                 }
             });
diff --git a/templates/repo_history_dir.html b/templates/repo_history_dir.html
index 6bec21c6e3..fac70e49af 100644
--- a/templates/repo_history_dir.html
+++ b/templates/repo_history_dir.html
@@ -5,7 +5,7 @@
 {% if not repo.props.encrypted %}
     {% if is_owner or repo_ap == 'public' or share_to_me %}
 <div class="latest-commit">
-    <h3>最新修改</h3>
+    <h3>修改信息</h3>
     <p>{{ current_commit.props.desc|translate_commit_desc }}</p>
     <p class="al-rt">
         <span class="author">by
@@ -27,7 +27,7 @@
 {% endblock%}
 
 {% block right_panel %}
-<h2 class="repo-history-hd">{{repo.props.name}} 历史浏览</h2>
+<h2 class="repo-history-hd">{{repo.props.name}} 历史浏览<span class="latest-commit-time-author">({{ current_commit.props.ctime|tsstr_sec }})</span></h2>
 {% if repo.props.encrypted %}
 <p>该同步目录已加密，不能在线查看。</p>
 {% else %}