[history/snapshot/shared/trash file view] modified 'view-hd'

wendixiang · Feb 22, 2017 · e228271 · e228271
1 parent 0599546
commit e228271
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 51 deletions.
diff --git a/media/css/seahub.css b/media/css/seahub.css
@@ -2636,6 +2636,9 @@ button.sf-dropdown-toggle:focus {
 .file-view-op {
     margin-top:10px;
 }
+.file-view-meta-info {
+    margin:0;
+}
 #shared-link,
 #shared-upload-link,
 #shared-link-text,
@@ -3476,7 +3479,7 @@ button.sf-dropdown-toggle:focus {
 }
 .shared-file-op-btn {
     padding:7px;
-    margin-top:11px;
+    margin-top:9px;
 }
 /*random password */
 #share-popup .passwd-wrapper,

diff --git a/seahub/templates/shared_file_view.html b/seahub/templates/shared_file_view.html
@@ -13,7 +13,7 @@
     {% endif %}
     <div id="shared-file-view-hd" class="ovhd">
         <div class="fleft js-file-info">
-            <h2 class="ellipsis no-bold" title="{{ file_name }}">{{ file_name }}</h2>
+            <h2 class="file-view-hd ellipsis no-bold" title="{{ file_name }}">{{ file_name }}</h2>
             {% if zipped %}
             <p class="cur-path ellipsis">
               {% trans "Current path: "%}
@@ -42,10 +42,7 @@ <h2 class="ellipsis no-bold" title="{{ file_name }}">{{ file_name }}</h2>
         </div>
     </div>
 
-    <div id="file">
-        {% include 'snippets/file_content_html.html' %}
-    </div>
-
+    {% include 'snippets/file_content_html.html' %}
 
     <form id="file-save-form" action="{{save_to_link}}" method="post" class="file-choose-form hide">{% csrf_token %}
         <h3>{% trans "Save To:" %}</h3>

diff --git a/seahub/templates/snippets/file_content_html.html b/seahub/templates/snippets/file_content_html.html
@@ -4,7 +4,7 @@
 content of files that can be viewed online shows here.
 For details please refer to 'snippets/file_content_js.html'.
 {% endcomment %}
-<div id="file-view" {% if filetype == 'Image' %}class="image-file-view"{% endif %}>
+<div id="file-view" {% if filetype == 'Image' and not err %}class="image-file-view"{% endif %}>
     {% include 'snippets/file_encoding.html' %}
     {% if not err %}
         {% if filetype == 'Text' or filetype == 'Markdown' %}

diff --git a/seahub/templates/view_file_base.html b/seahub/templates/view_file_base.html
@@ -285,7 +285,7 @@ <h3 class="right-side-panel-title">{% trans "Comments" %}</h3>
 $(window).load(function() {
     if (highlight_kw) {
         // hl kw in file title
-        highlight_kw($('#view-hd')[0]);
+        highlight_kw($('.file-view-hd span')[0]);
 
         // hl kw in file content
         if ('{{filetype}}' == 'Markdown') {

diff --git a/seahub/templates/view_history_file.html b/seahub/templates/view_history_file.html
@@ -12,30 +12,18 @@
 {% block main_css_class %}{% endblock %} {# remove the padding-top css #}
 
 {% block main_content %}
-    <div id="view-hd">
-      {% block view_hd %}
-        <h2>
-          {{file_name}}
-          <span class="commit-time">({{ current_commit.props.ctime|tsstr_sec }})</span>
-        </h2>
-      {% endblock %}
-    </div>
-
-    <div id="file">
-        <div id="file-op" class="ovhd">
-            <p class="history-file-path fleft">
-              {% block file_path %}
-                {% trans "Current Path: "%}
-                {% for name, link in zipped %}
-                    {% if not forloop.last %} {{ name }} / {% else %} {{ name }} {% endif %}
-                {% endfor %}
-              {% endblock %}
-            </p>
-
-            <a class="sf-btn-link fright" href="{% url 'download_file' repo.id obj_id%}?file_name={{ file_name|urlencode }}&p={{path|urlencode}}" id="download">{% trans "Download"%}</a>
+    <div id="view-hd" class="ovhd">
+        <div class="fleft">
+            <h2 class="file-view-hd">{{file_name}}</h2>
+            {% block file_path %}
+            <p class="file-view-meta-info">{{ current_commit.props.ctime|tsstr_sec }}</p>
+            {% endblock %}
         </div>
-        {% include 'snippets/file_content_html.html' %}
+
+        <a class="file-view-op sf-btn-link fright" href="{% url 'download_file' repo.id obj_id%}?file_name={{ file_name|urlencode }}&p={{path|urlencode}}" id="download">{% trans "Download"%}</a>
     </div>
+
+    {% include 'snippets/file_content_html.html' %}
 {% endblock %}
 
 {% block extra_script %}

diff --git a/seahub/templates/view_snapshot_file.html b/seahub/templates/view_snapshot_file.html
@@ -1,17 +1 @@
 {% extends 'view_history_file.html' %}
-{% load seahub_tags i18n %}
-{% load url from future %}
-
-{% block view_hd %}
-<h2>
-    {{file_name}}
-    <span class="commit-time">({{ current_commit.props.ctime|tsstr_sec }})</span>
-</h2>
-{% endblock %}
-
-{% block file_path %}
-  {% trans "Current Path: "%}
-  {% for name, link in zipped %}
-    {% if not forloop.last %} <a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ link|urlencode }}">{{ name }}</a> / {% else %} {{ name }} {% endif %}
-  {% endfor %}
-{% endblock %}
diff --git a/seahub/templates/view_trash_file.html b/seahub/templates/view_trash_file.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load url from future %}
 
-{% block view_hd %}
-    <h2>{{file_name}}</h2>
-{% endblock %}
-
 {% block file_path %}
-  {% trans "Current Path: "%}{% trans "Trash" %}
+<p class="file-view-meta-info">{% trans "Current Path: "%}{% trans "Trash" %}</p>
 {% endblock %}