diff --git a/media/css/seahub.css b/media/css/seahub.css index 6e820e345e..dc180b4e1a 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -388,7 +388,8 @@ textarea:-moz-placeholder {/* for FF */ color:#000; } /**** side-tabnav ****/ -.side-tabnav .hd { +.side-tabnav .hd, +.side-textnav .hd { padding-bottom:4px; border-bottom:1px solid #ddd; margin-bottom:1em; @@ -435,6 +436,23 @@ textarea:-moz-placeholder {/* for FF */ font-weight:bold; color:#fff; } +.side-textnav .hd { + margin:2em 0 .5em; +} +.side-textnav-tabs .tab a { + display:block; + padding:10px 0; + font-weight:normal; + color:#999; + border-bottom:1px solid #eee; + margin-bottom:3px; +} +.side-textnav-tabs .tab-cur a, +.side-textnav-tabs .tab a:hover { + color:#de3f1c; + text-decoration:none; +} + /**** checkbox ****/ .checkbox-orig { font-size:0; @@ -2606,3 +2624,6 @@ textarea:-moz-placeholder {/* for FF */ font-weight:normal; color:#888; } +.help-con { + padding:0 0 0 60px; +} diff --git a/media/img/help/help-client/new-seafile-client.png b/media/img/help/help-client/new-seafile-client.png new file mode 100644 index 0000000000..762fa51402 Binary files /dev/null and b/media/img/help/help-client/new-seafile-client.png differ diff --git a/media/img/help/help-client/seafile-add-account.png b/media/img/help/help-client/seafile-add-account.png new file mode 100644 index 0000000000..aea42b188a Binary files /dev/null and b/media/img/help/help-client/seafile-add-account.png differ diff --git a/media/img/help/help-client/seafile-create-library-02.png b/media/img/help/help-client/seafile-create-library-02.png new file mode 100644 index 0000000000..9fc58aa3d3 Binary files /dev/null and b/media/img/help/help-client/seafile-create-library-02.png differ diff --git a/media/img/help/help-client/seafile-create-library.png b/media/img/help/help-client/seafile-create-library.png new file mode 100644 index 0000000000..3a85e59602 Binary files /dev/null and b/media/img/help/help-client/seafile-create-library.png differ diff --git a/media/img/help/help-client/seafile-download-library.png b/media/img/help/help-client/seafile-download-library.png new file mode 100644 index 0000000000..becf9e90ee Binary files /dev/null and b/media/img/help/help-client/seafile-download-library.png differ diff --git a/media/img/help/help-client/seafile-init-choose-folder.png b/media/img/help/help-client/seafile-init-choose-folder.png new file mode 100644 index 0000000000..911c90cbd1 Binary files /dev/null and b/media/img/help/help-client/seafile-init-choose-folder.png differ diff --git a/seahub/help/__init__.py b/seahub/help/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/seahub/help/models.py b/seahub/help/models.py new file mode 100644 index 0000000000..71a8362390 --- /dev/null +++ b/seahub/help/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/seahub/help/templates/help/.help_base.html.swp b/seahub/help/templates/help/.help_base.html.swp new file mode 100644 index 0000000000..855b90a980 Binary files /dev/null and b/seahub/help/templates/help/.help_base.html.swp differ diff --git a/seahub/help/templates/help/help_base.html b/seahub/help/templates/help/help_base.html new file mode 100644 index 0000000000..abcc04f251 --- /dev/null +++ b/seahub/help/templates/help/help_base.html @@ -0,0 +1,33 @@ +{% extends "myhome_base.html" %} +{% load i18n %} + +{% block nav_help_class %}class="cur"{% endblock %} +{% block left_panel %} +
+

{% trans "Client Program" %}

+ +

{% trans "Web Site" %}

+ +
+{% endblock %} + +{% block right_panel %} +
{% block help_con %}{% endblock %}
+{% endblock %} + +{% block extra_script %} + +{% endblock %} diff --git a/seahub/help/templates/help/help_colab.html b/seahub/help/templates/help/help_colab.html new file mode 100644 index 0000000000..ac369a5d52 --- /dev/null +++ b/seahub/help/templates/help/help_colab.html @@ -0,0 +1,15 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block colab %}tab-cur{% endblock %} + +{% block help_con %} +

{% trans "File conflicts" %}

+

{% 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 your + version unchanged, while rename your friends' versions to "conflict files". A conflict file's name ends with it's author's email address, plus the + current time, e.g. test.txt (name@example.com 2011-11-11-11-11-11). + {% endblocktrans %}

+{% endblock %} diff --git a/seahub/help/templates/help/help_delete.html b/seahub/help/templates/help/help_delete.html new file mode 100644 index 0000000000..d172259754 --- /dev/null +++ b/seahub/help/templates/help/help_delete.html @@ -0,0 +1,14 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block del %}tab-cur{% endblock %} + +{% block help_con %} +

{% trans "Deleting a file library" %}

+ +

{% blocktrans %}To maximize your data security, deletion of file libraries on the website and on your computer are not "synced" automatically. {% endblocktrans %}

+ +{% endblock %} diff --git a/seahub/help/templates/help/help_group_share.html b/seahub/help/templates/help/help_group_share.html new file mode 100644 index 0000000000..1d3da3d2c7 --- /dev/null +++ b/seahub/help/templates/help/help_group_share.html @@ -0,0 +1,14 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block grp_share %}tab-cur{% endblock %} + +{% block help_con %} +

{% trans "Sharing a library to a group" %}

+ +

{% trans "You have two ways to share a library to a group" %}

+ +{% endblock %} diff --git a/seahub/help/templates/help/help_ignore.html b/seahub/help/templates/help/help_ignore.html new file mode 100644 index 0000000000..6a2c8b6832 --- /dev/null +++ b/seahub/help/templates/help/help_ignore.html @@ -0,0 +1,48 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block ignore %}tab-cur{% endblock %} + +{% block help_con %} + +

{% trans "Excluding files/folders from syncing" %}

+ +

{% 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." %}

+ +
    +
  1. {% trans "A blank line matches no files." %}
    2. +
  2. {% trans "A line starting with # serves as a comment." %}
    3. +
  3. {% blocktrans %}Seafile supports wildcards in the pattern. For example, "foo/*" matches "foo/1" and "foo/hello". "foo/?" matches "foo/1" but not "foo/hello". Note that the wildcard character * recursively matches all the paths under a folder. For instance, "foo/*.html" matches "foo/a.html" and "foo/templates/b.html".{% endblocktrans %}
    4. +
  4. {% blocktrans %}If the pattern ends with a slash, it would only match a folder. In other words, foo/ will match a folder "foo" and paths underneath it, but will not match a regular file or a symbolic link "foo".{% endblocktrans %}
    5. +
  5. {% blocktrans %}If a pattern doesn't end with a slash or a wildcard, it would not match a folder. For example, "foo" can only match regular file "foo" or a symbolic link; while "foo/" and "foo*" match a folder and paths under it.{% endblocktrans %}
    6. +
+ +

{% trans "Example" %}

+ +
+# a regular file
+test-file
+
+# a dir
+test-dir/
+
+# wildcard *
+test-star1/*
+test-star2/*.html
+
+# wildcard ?
+test-qu1/?.html
+test-qu2/?/
+
+ +

{% trans "Notes" %}

+ +

{% 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/help_install_v2.html b/seahub/help/templates/help/help_install_v2.html new file mode 100644 index 0000000000..40dced3aef --- /dev/null +++ b/seahub/help/templates/help/help_install_v2.html @@ -0,0 +1,40 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block install %}tab-cur{% endblock %} + +{% block help_con %} + +

{% trans "Installing Seafile Client Program Version 2.0+" %}

+ +

{% trans "After downloading Seafile client program, you have 3 steps left to get it up and running." %}

+ +

{% trans "1. Select a disk partition to store local Seafile data" %}

+Selecting a folder to store Seafile data + + +

{% trans "2. Add an account" %}

+

{% trans "Add an account on your private Seafile server or our public server." %}

+ + + + +

{% trans "3. Download a library and syncing files" %}

+ + + + + + +

{% trans "4. (Optional) Create a library" %}

+ +

{% trans "You can also create a library from a local folder." %}

+ + + + + +{% endblock %} diff --git a/seahub/help/templates/help/help_quota.html b/seahub/help/templates/help/help_quota.html new file mode 100644 index 0000000000..f13c3fca95 --- /dev/null +++ b/seahub/help/templates/help/help_quota.html @@ -0,0 +1,13 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block quota %}tab-cur{% endblock %} + +{% block help_con %} +

{% trans "On the official server for Seafile (seacloud.cc), the storage space used by a user is divided into two parts:" %} {% trans "space used by the user + space the user shared to others." %}

+ +

{% trans "The space used by the user himself/herself is simply the total size of the libraries that this user owns." %}

+ +

{% trans "Whenever a user shares a library to others, it takes up a portion of his/her space, but not the space of the other users. Sharing a library consumes:" %} {% trans "size of the library * the number of people you share to." %} {% trans "Sharing to a group is the same as sharing to all the group members. If you share to two groups, and some members in these groups are the same, those members will only be counted once." %}

+ +{% endblock %} diff --git a/seahub/help/templates/help/help_security.html b/seahub/help/templates/help/help_security.html new file mode 100644 index 0000000000..c27eca17bb --- /dev/null +++ b/seahub/help/templates/help/help_security.html @@ -0,0 +1,15 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block security %}tab-cur{% endblock %} + +{% block help_con %} +

{% trans "Encrypting a file library" %}

+

{% 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 "The password can only be set when you create the library."%} {% trans "It cannot be changed since then." %}

+

{% 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 new file mode 100644 index 0000000000..202bc1ddf1 --- /dev/null +++ b/seahub/help/templates/help/help_view_encrypted.html @@ -0,0 +1,14 @@ +{% extends "help/help_base.html" %} +{% load i18n %} + +{% block view_enc %}tab-cur{% endblock %} + +{% block help_con %} + +

{% trans "Viewing an encrypted library" %}

+ +

{% trans "Seafile servers don't store the password for an encrypted library. To view an encrypted library online, you need to temporarily provide the password to the server." %}

+ +

{% trans "Your password is only recorded 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/tests.py b/seahub/help/tests.py new file mode 100644 index 0000000000..501deb776c --- /dev/null +++ b/seahub/help/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/seahub/help/urls.py b/seahub/help/urls.py new file mode 100644 index 0000000000..3eabb081b2 --- /dev/null +++ b/seahub/help/urls.py @@ -0,0 +1,19 @@ +from django.conf.urls.defaults import * +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") ), + (r'^quota/$', TemplateView.as_view(template_name="help/help_quota.html") ), + (r'^traffic/$', TemplateView.as_view(template_name="help/help_traffic.html") ), + + (r'^seaf/$', TemplateView.as_view(template_name="help/help_seaf.html") ), + (r'^markdown/$', TemplateView.as_view(template_name="help/help_markdown.html") ), +) diff --git a/seahub/help/views.py b/seahub/help/views.py new file mode 100644 index 0000000000..60f00ef0ef --- /dev/null +++ b/seahub/help/views.py @@ -0,0 +1 @@ +# Create your views here. diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html index cfadbede62..c37a8f6591 100644 --- a/seahub/profile/templates/profile/set_profile.html +++ b/seahub/profile/templates/profile/set_profile.html @@ -4,24 +4,9 @@ {% block sub_title %}{% trans "Profile Setting" %} - {% endblock %} -{% block extra_style %} - -{% endblock %} - {% block left_panel %} -
-