{% trans "Once you and your friends sync a shared file library onto your computers, you may add, delete or edit files in the library together. Every change you make to the library would be automatically synced to others' computers." %}
+ +{% blocktrans %}Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep the first version synced to the cloud unchanged, while rename the other version to a "conflict file". A conflict file's name ends with it's author's email address, plus the current time, e.g. test.txt (SFConflict name@example.com 2015-03-07-11-30-28).{% endblocktrans %}
+{% endblock %} diff --git a/seahub/help/templates/help/desktop_proxy.html b/seahub/help/templates/help/desktop_proxy.html new file mode 100644 index 0000000000..5734167bc3 --- /dev/null +++ b/seahub/help/templates/help/desktop_proxy.html @@ -0,0 +1,14 @@ +{% extends "help/base.html" %} +{% load i18n %} + +{% block help_con %} + +{% trans "Seafile client supports 3 types of proxy servers: HTTP proxy, SOCKS5 proxy and system proxy settings." %}
+ +{% trans "HTTP proxy and SOCKS5 proxy requires you to enter the proxy server's address and port. If you use system proxy settings, Seafile client reads proxy settings from the operating system. The operating system has some mechanisms to auto-detect proxy server information. So you don't have to manually enter proxy server address." %}
+ +{% blocktrans %}To change proxy settings, click the Seafile icon in the system notification area. Choose "Settings" in the menu. In the pop-up settings dialog, you can change proxy settings in the "Network" tab.{% endblocktrans %}
+ +{% endblock %} diff --git a/seahub/help/templates/help/encrypted_libraries.html b/seahub/help/templates/help/encrypted_libraries.html new file mode 100644 index 0000000000..1aa1b498bf --- /dev/null +++ b/seahub/help/templates/help/encrypted_libraries.html @@ -0,0 +1,29 @@ +{% extends "help/base.html" %} +{% load i18n %} + +{% block help_con %} + +{% trans "Seafile provides client-side end-to-end data encryption. You can create encrypted libraries to use this feature. File contents in encrypted libraries are encrypted on client side. The encryption password is not stored on the server. So even the server administrator can't access your file contents." %}
+ +{% trans "When creating an encrypted library:" %} +
{% trans "When you access the encrypted library:" %} +
{% trans "Note that encrypted library only encrypt the contents of the files, but not the folder and file names." %}
+ +{% blocktrans %}More technical details of encrypted library can be found at Seafile Manual.{% endblocktrans %}
+ +{% endblock %} diff --git a/seahub/help/templates/help/help_base.html b/seahub/help/templates/help/help_base.html deleted file mode 100644 index 278fab3dd3..0000000000 --- a/seahub/help/templates/help/help_base.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block main_content %} -{% trans "Once you and your friends sync a shared library onto your computers, you may add, delete or edit files in the library together. Every change you make to the library will be automatically synced to others' computers." %}
- -{% blocktrans %} - Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep your version unchanged, while save your friends' versions as "conflict files". A conflict file's name ends with its author's email address, plus the current time, e.g. test.txt (name@example.com 2013-10-01-00-12-24). - {% endblocktrans %}
-{% endblock %} diff --git a/seahub/help/templates/help/help_delete.html b/seahub/help/templates/help/help_delete.html deleted file mode 100644 index d172259754..0000000000 --- a/seahub/help/templates/help/help_delete.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "help/help_base.html" %} -{% load i18n %} - -{% block del %}tab-cur{% endblock %} - -{% block help_con %} -{% blocktrans %}To maximize your data security, deletion of file libraries on the website and on your computer are not "synced" automatically. {% endblocktrans %}
-{% trans "You have two ways to share a library to a group" %}
-{% trans "After downloading Seafile client program, you have 3 steps left to get it up and running." %}
- -
-
-
-{% trans "Add an account on your private Seafile server or our public server." %}
- -
-
-
-
-
-{% trans "You can also create a library from a local folder." %}
- -
-
-
-
-{% endblock %}
diff --git a/seahub/help/templates/help/help_security.html b/seahub/help/templates/help/help_security.html
deleted file mode 100644
index 59eec96212..0000000000
--- a/seahub/help/templates/help/help_security.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "help/help_base.html" %}
-{% load i18n %}
-
-{% block security %}tab-cur{% endblock %}
-
-{% block help_con %}
-{% trans "Seafile supports encryption of file libraries to strengthen your data security. To encrypt a file library, you need to set a password when you create a library." %}
- -{% trans "The password won't be stored on Seafile cloud platform." %} {% trans "So even the adminastrator of the servers cannot view your encrypted data without the password." %}
- -{% trans "To download and sync an encrypted library to your computer, you need to provide the password. Seafile client program will download the encrypted data and decrypt it on your computer." %}
-{% trans "To share an encrypted library with your friends, you also need to tell them the password." %}
-{% endblock %} diff --git a/seahub/help/templates/help/help_view_encrypted.html b/seahub/help/templates/help/help_view_encrypted.html deleted file mode 100644 index 9ab087ed12..0000000000 --- a/seahub/help/templates/help/help_view_encrypted.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "help/help_base.html" %} -{% load i18n %} - -{% block view_enc %}tab-cur{% endblock %} - -{% block help_con %} - -{% trans "Seafile servers don't store the password for an encrypted library. To view an encrypted library online, you need to provide the password for the library. Your password is only stored in the server's encrypted memory. It would be cleared from the memory in an hour. After that, if you want to view the library, you'll have to enter password again." %}
- -{% endblock %} diff --git a/seahub/help/templates/help/help_ignore.html b/seahub/help/templates/help/ignore.html similarity index 51% rename from seahub/help/templates/help/help_ignore.html rename to seahub/help/templates/help/ignore.html index 3c5ed611bc..18bb3e1e7e 100644 --- a/seahub/help/templates/help/help_ignore.html +++ b/seahub/help/templates/help/ignore.html @@ -1,21 +1,19 @@ -{% extends "help/help_base.html" %} +{% extends "help/base.html" %} {% load i18n %} -{% block ignore %}tab-cur{% endblock %} - {% block help_con %}{% trans "Sometimes you don't want to sync some files or folders inside a library. To achieve this, you can create a file named seafile-ignore.txt in the root folder of this library. In this special file, you specify the files and folders that Seafile should not sync. Each line in this file specifies a pattern. The following pattern format are supported." %}
- +{% trans "Sometimes you don't want to sync some files or folders inside a library. To achieve this, create a seafile-ignore.txt file in the root folder of a library. This special file specifies the files and folders that Seafile should not sync. Each line in a ignore.txt file specifies a pattern. The following pattern format are supported." %}
{% trans "The seafile-ignore.txt file only controls which files to exclude on the client side. You can still create a file from seahub web interface that's excluded on the client. In this case," %}
- +{% trans "The seafile-ignore.txt file only controls which files to exclude on the client side. You can still create a file from seahub web interface that's excluded on the client. In this case," %}
{% trans "seafile-ignore.txt only ignores files that are not synced yet. If a file is already synced, and some time later you add it to the ignore list, its existing versions won't be removed." %}
{% endblock %} diff --git a/seahub/help/templates/help/install.html b/seahub/help/templates/help/install.html new file mode 100644 index 0000000000..f3dfc5f952 --- /dev/null +++ b/seahub/help/templates/help/install.html @@ -0,0 +1,39 @@ +{% extends "help/base.html" %} +{% load i18n %} + +{% block help_con %} + +{% trans "After downloading Seafile client program, you have 3 steps left to get it up and running." %}
+ +
+
+{% trans "Add an account on your private Seafile server or our public server." %}
+ +
+
+
+
+{% trans "You can also create a library from a local folder." %}
+ +
+
+
+
+{% trans 'In some occasions, you want to modify files on the cloud directly without syncing them. Seafile client comes with a "cloud file browser" to meet this need. Click an unsynced library will open the cloud file browser.' %}
+ +
+
+{% endblock %}
diff --git a/seahub/help/templates/help/selective_sync.html b/seahub/help/templates/help/selective_sync.html
new file mode 100644
index 0000000000..e70bc8105f
--- /dev/null
+++ b/seahub/help/templates/help/selective_sync.html
@@ -0,0 +1,16 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+{% trans "You may have some very large libraries on the Seafile server. And you're currently only interested in a sub-folder inside one library. If your Seafile server is Pro edition, you can selectively sync a sub-folder in a library, instead of syncing the entire library." %}
+ +{% blocktrans %}To sync a sub-folder, open cloud file browser by double clicking a library which hasn't been synced. Navigate into the parent folder of that sub-folder. Right click on the sub-folder. Choose "Sync this folder" in the pop-up menu.{% endblocktrans %}
+ +
+
+{% blocktrans %}After syncing the sub-folder, you can see its syncing status in the "Synced Libraries" group in the client's main window.{% endblocktrans %}
+ +{% endblock %} diff --git a/seahub/help/templates/help/sync_existing.html b/seahub/help/templates/help/sync_existing.html new file mode 100644 index 0000000000..392e53df42 --- /dev/null +++ b/seahub/help/templates/help/sync_existing.html @@ -0,0 +1,22 @@ +{% extends "help/base.html" %} +{% load i18n %} + +{% block help_con %} + +{% blocktrans %}Sometimes you already have a library on the Seafile server (shared by others, or uploaded from another computer). You can sync this library with an existing folder on your computer. The local folder must have the same name as the library. The files in the local folder will be merged with the files in the library. No file in the local folder or the library will be overwritten or lost. The merge will produce some conflict files if file contents are different in the local folder and the library. {% endblocktrans %}
+ +{% blocktrans %}To sync a library with an existing folder, right click on the library in Seafile client's main window and click "Sync this library".{% endblocktrans %}
+ +
+
+{% trans 'In the pop-up dialog, click the "Sync with an existing folder" link.' %}
+ +
+
+{% trans "Then choose an existing folder to sync with this library." %}
+ +
+
+{% endblock %}
diff --git a/seahub/help/templates/help/sync_interval.html b/seahub/help/templates/help/sync_interval.html
new file mode 100644
index 0000000000..6b336b869a
--- /dev/null
+++ b/seahub/help/templates/help/sync_interval.html
@@ -0,0 +1,12 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+{% trans "Usually Seafile client automatically detects changes on local folder and upload the changes to server. However, if the local folder is in a Windows network share drive, Seafile client cannot detect changes reliably. In this case, you can ask Seafile client to periodically checks for changes in the local folder. You can set the interval of this periodic sync. The interval is set in the unit of seconds." %}
+ +
+
+{% endblock %}
diff --git a/seahub/help/templates/help/unsync_resync.html b/seahub/help/templates/help/unsync_resync.html
new file mode 100644
index 0000000000..053216e3f7
--- /dev/null
+++ b/seahub/help/templates/help/unsync_resync.html
@@ -0,0 +1,14 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+{% blocktrans %}When you no longer want to sync a local folder with a library, you can unsync it. After you unsync a library, changes to the local folder and files will not be uploaded, and changes in the library will not be downloaded. If you want to sync the library with the local folder again, you can use sync with existing folder feature.{% endblocktrans %}
+ +{% blocktrans %}Sometimes there are internal errors in the client which blocks syncing. In these cases, it's usually helpful to "resync" the library. Resync means unsync and then immediately sync the library with the same folder. You can find this action in the pop-up menu of the client's main window.{% endblocktrans %}
+ +
+
+{% endblock %}
diff --git a/seahub/help/urls.py b/seahub/help/urls.py
index 3cfcdfff6c..649d776674 100644
--- a/seahub/help/urls.py
+++ b/seahub/help/urls.py
@@ -1,15 +1,15 @@
from django.conf.urls import patterns, url, include
from django.views.generic import TemplateView
-urlpatterns = patterns(
- '',
- (r'^$', TemplateView.as_view(template_name="help/help_install_v2.html") ),
- (r'^install/$', TemplateView.as_view(template_name="help/help_install_v2.html") ),
- (r'^delete/$', TemplateView.as_view(template_name="help/help_delete.html") ),
- (r'^security/$', TemplateView.as_view(template_name="help/help_security.html") ),
- (r'^colab/$', TemplateView.as_view(template_name="help/help_colab.html") ),
- (r'^ignore/$', TemplateView.as_view(template_name="help/help_ignore.html") ),
-
- (r'^group_share/$', TemplateView.as_view(template_name="help/help_group_share.html") ),
- (r'^view_encrypted/$', TemplateView.as_view(template_name="help/help_view_encrypted.html") ),
+urlpatterns = patterns('',
+ (r'^$', TemplateView.as_view(template_name="help/install.html") ),
+ (r'^install/$', TemplateView.as_view(template_name="help/install.html") ),
+ (r'^sync_existing/$', TemplateView.as_view(template_name="help/sync_existing.html") ),
+ (r'^selective_sync/$', TemplateView.as_view(template_name="help/selective_sync.html") ),
+ (r'^unsync_resync/$', TemplateView.as_view(template_name="help/unsync_resync.html") ),
+ (r'^sync_interval/$', TemplateView.as_view(template_name="help/sync_interval.html") ),
+ (r'^desktop_proxy/$', TemplateView.as_view(template_name="help/desktop_proxy.html") ),
+ (r'^conflicts/$', TemplateView.as_view(template_name="help/conflicts.html") ),
+ (r'^ignore/$', TemplateView.as_view(template_name="help/ignore.html") ),
+ (r'^encrypted_libraries/$', TemplateView.as_view(template_name="help/encrypted_libraries.html") ),
)