Merge branch 'master' into 12.0

frontend/package.json

@@ -9,7 +9,7 @@
     "@gatsbyjs/reach-router": "1.3.9",
     "@seafile/react-image-lightbox": "2.0.2",
     "@seafile/resumablejs": "1.1.16",
-    "@seafile/sdoc-editor": "0.5.52",
+    "@seafile/sdoc-editor": "0.5.55",
     "@seafile/seafile-calendar": "0.0.12",
     "@seafile/seafile-editor": "1.0.82",
     "@uiw/codemirror-extensions-langs": "^4.19.4",

media/bootstrap/bootstrap.popover.min.css

@@ -0,0 +1,27 @@
+/* register user page*/
+.btn-primary {
+  color: #fff;
+  background-color: #ff9800;
+  border-color: #ff9800;
+}
+
+.btn-primary:hover {
+  color: #fff;
+  background-color: #d98100;
+  border-color: #cc7a00;
+}
+
+a {
+  color: #eb8205;
+  text-decoration: none;
+  font-weight: bold;
+}
+
+.popover-inner {
+  padding: 9px 14px
+}
+
+/* change password page*/
+#id_new_password1 {
+  margin-bottom: 5px;
+}

media/css/seahub.css

@@ -2048,7 +2048,7 @@ a.sf-popover-item {
 
 /* pwd strength */
 #pwd_strength {
-    margin:-15px 0 20px;
+    margin: 0px;
 }
 #pwd_strength span {
     display:inline-block;

media/sdoc-editor/locales/cs/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Print",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/de/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Drucken",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/en/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Print",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/es/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Print",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/fr/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Imprimer",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/it/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Print",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/ru/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "Печать",
   "Enter_more_character_start_search": "Введите больше символов, чтобы начать поиск",
   "Create_file_name_sdoc": "Создать {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Исходный документ имеет параллельные изменения. Хотите объединить эти изменения в ревизию?"
+  "Source_document_changed_tip": "Исходный документ имеет параллельные изменения. Хотите объединить эти изменения в ревизию?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

media/sdoc-editor/locales/zh-CN/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "打印",
   "Enter_more_character_start_search": "输入更多字符开始搜索",
   "Create_file_name_sdoc": "新建 {{file_name_sdoc}}",
-  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?"
+  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?",
+  "Fit_table_to_page_width": "自动适应页面宽度"
 }

media/sdoc-editor/locales/zh_CN/sdoc-editor.json

@@ -456,5 +456,6 @@
   "Print": "打印",
   "Enter_more_character_start_search": "输入更多字符开始搜索",
   "Create_file_name_sdoc": "新建 {{file_name_sdoc}}",
-  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?"
+  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?",
+  "Fit_table_to_page_width": "自动适应页面宽度"
 }

seahub/templates/base.html

@@ -18,7 +18,7 @@
 <link rel="icon" href="{{ MEDIA_URL }}{{ favicon_path }}" type="image/x-icon">
 <link rel="apple-touch-icon" href="{{ MEDIA_URL }}{{ apple_touch_icon_path }}">
 {% block extra_base_style %}
-<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/seafile-ui.css" />
 {% endblock %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/sf_font3/iconfont.css" />

seahub/templates/client_login_confirm.html

@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block extra_style %}
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/bootstrap.popover.min.css" />
-{% endblock %}
-
 {% block main_content %}
 <div class="new-narrow-panel">
     <h2 class="hd">{% trans "Desktop Client Login Confirm" %}</h2>
@@ -15,6 +11,3 @@ <h2 class="hd">{% trans "Desktop Client Login Confirm" %}</h2>
 </div>
 {% endblock %}
 
-{% block extra_script %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/bootstrap.min.js"></script>
-{% endblock %}

seahub/templates/registration/password_change_form.html

@@ -3,7 +3,8 @@
 {% block title %}{% trans "Password Modification" %}{% endblock %}
 
 {% block extra_style %}
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/bootstrap.popover.min.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}bootstrap/bootstrap.min.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}bootstrap/bootstrap.popover.min.css" />
 {% endblock %}
 
 {% block main_content %}
@@ -27,30 +28,32 @@ <h2 class="hd">{% trans "Password Modification" %}</h2>
 {% endblock %}
 
 {% block extra_script %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/bootstrap.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}bootstrap/bootstrap.popover.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript">
 $('[type="password"]').addClass('input');
 $('.new-narrow-panel').removeClass('vh');
 
 {% if strong_pwd_required %}
 {% include "snippets/password_strength_js.html" %}
 var passwd_tip = "{% blocktrans %}Passwords must have at least {{min_len}} characters and contain {{level}} of the following: uppercase letters, lowercase letters, numbers, and symbols.{% endblocktrans%}";
-$("#id_new_password1")
-.popover({ // bootstrap plugin 'popover'
+var element = document.getElementById('id_new_password1')
+var popover = new bootstrap.Popover(element, {
     container: 'body',
+    animation: false,
     content: passwd_tip,
-    template: '<div class="popover" role="tooltip"><div class="arrow"></div><div class="popover-content"></div></div>',
+    template: `<div class="popover" role="popover"><div class="popover-arrow"></div><div class="popover-inner">${passwd_tip}</div></div>`,
     trigger: 'focus'
-})
-.on('keyup', function() {
-    var pwd = $(this).val();
+});
+element.addEventListener('keyup', () => {
+    var pwd = $('#id_new_password1').val();
     if (pwd.trim()) {
         var level = getStrengthLevel(pwd);
         showStrength(level);
     } else {
         $("#pwd_strength").html("");
     }
-});
+})
 {% endif %}
 
 $('form').on('submit', function(){

seahub/templates/registration/password_set_form.html

@@ -4,7 +4,8 @@
 {% block sub_title %}{% trans "Set Password" %} - {% endblock %}
 
 {% block extra_style %}
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/bootstrap.popover.min.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}bootstrap/bootstrap.min.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}bootstrap/bootstrap.popover.min.css" />
 {% endblock %}
 
 {% block main_content %}
@@ -30,30 +31,32 @@ <h2 class="hd">{% trans "Set Password" %}</h2>
 {% endblock %}
 
 {% block extra_script %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/bootstrap.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}bootstrap/bootstrap.popover.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript">
 $('[type="email"], [type="password"]').addClass('input');
 $('.new-narrow-panel').removeClass('vh');
 
 {% if strong_pwd_required %}
 {% include "snippets/password_strength_js.html" %}
 var passwd_tip = "{% blocktrans %}Passwords must have at least {{min_len}} characters and contain {{level}} of the following: uppercase letters, lowercase letters, numbers, and symbols.{% endblocktrans%}";
-$("#id_new_password1")
-.popover({ // bootstrap plugin 'popover'
+var element = document.getElementById('id_new_password1')
+var popover = new bootstrap.Popover(element, {
     container: 'body',
+    animation: false,
     content: passwd_tip,
-    template: '<div class="popover" role="tooltip"><div class="arrow"></div><div class="popover-content"></div></div>',
+    template: `<div class="popover" role="popover"><div class="popover-arrow"></div><div class="popover-inner">${passwd_tip}</div></div>`,
     trigger: 'focus'
-})
-.on('keyup', function() {
-    var pwd = $(this).val();
+});
+element.addEventListener('keyup', () => {
+    var pwd = $('#id_new_password1').val();
     if (pwd.trim()) {
         var level = getStrengthLevel(pwd);
         showStrength(level);
     } else {
         $("#pwd_strength").html("");
     }
-});
+})
 {% endif %}
 
 $('form').on('submit', function(){

seahub/templates/registration/registration_form.html

@@ -3,7 +3,8 @@
 {% block sub_title %}{% trans "Signup" %} - {% endblock %}
 
 {% block extra_style %}{{block.super}}
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/bootstrap.popover.min.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}bootstrap/bootstrap.min.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}bootstrap/bootstrap.popover.min.css" />
 {% endblock %}
 
 {% block main_content %}
@@ -55,27 +56,30 @@ <h1 class="login-panel-hd">{% trans "Signup" %}</h1>
 {% endblock %}
 
 {% block extra_script %}{{ block.super }}
-<script type="text/javascript" src="{{MEDIA_URL}}js/bootstrap.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}bootstrap/bootstrap.popover.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript">
 {% if strong_pwd_required %}
 {% include "snippets/password_strength_js.html" %}
+
 var passwd_tip = "{% blocktrans %}Passwords must have at least {{min_len}} characters and contain {{level}} of the following: uppercase letters, lowercase letters, numbers, and symbols.{% endblocktrans%}";
-$("#id_password1")
-.popover({ // bootstrap plugin 'popover'
+var element = document.getElementById('id_password1')
+var popover = new bootstrap.Popover(element, {
     container: 'body',
+    animation: false,
     content: passwd_tip,
-    template: '<div class="popover" role="tooltip"><div class="arrow"></div><div class="popover-content"></div></div>',
+    template: `<div class="popover" role="popover"><div class="popover-arrow"></div><div class="popover-inner">${passwd_tip}</div></div>`,
     trigger: 'focus'
-})
-.on('keyup', function() {
-    var pwd = $(this).val();
+});
+element.addEventListener('keyup', () => {
+    var pwd = $('#id_password1').val();
     if (pwd.trim()) {
         var level = getStrengthLevel(pwd);
         showStrength(level);
     } else {
         $("#pwd_strength").html("");
     }
-});
+})
 {% endif %}
 
 $('#signup-form').on('submit', function(){

seahub/templates/sdoc_revisions.html

@@ -3,15 +3,12 @@
 {% load seahub_tags avatar_tags i18n static %}
 
 {% block extra_style %}
-<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 {% render_bundle 'sdocRevisions' 'css'%}
 {% endblock %}
 
 {% block extra_script %}
     <script type="text/javascript">
         window.app.config.lang = '{{LANGUAGE_CODE}}';
-        console.log('{{page_next}}')
         window.sdocRevisions = {
             repo: { "id": "{{ repo.id }}", "name": "{{ repo.name }}" },
             revisions: '{{ revisions|escapejs }}',