Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Remove use_directory_url: false
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Jun 3, 2015
1 parent 475ab90 commit 946ddee
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 63 deletions.
5 changes: 3 additions & 2 deletions docs/user-guide/account/account-activate.md
Expand Up @@ -8,7 +8,8 @@ To activate your account:
1. If you didn't receive an email from Zanata, see [Resend activation email](user-guide/account/account-resend-activation).
1. Click the `Account activation link` in your email or copy and paste the URL provided into your browser.
1. You will be redirected to Zanata with your account activated. You can now log in with your details.

<img alt="Account activated" src="images/account-activated.png" />
<figure>
![Account activated](/images/account-activated.png)
</figure>

*Note: The activation URL will expire after 24 hours.*
5 changes: 3 additions & 2 deletions docs/user-guide/account/account-resend-activation.md
Expand Up @@ -6,5 +6,6 @@ If you didn't receive an email after signing up, or entered wrong email address
1. You will be redirected to `account inactive` page.
1. To resend activation email to the same email address, click on `Resend activation email` button.
1. To update email address and send activation email, enter the new email address in the input field and click `Update email`.

<img alt="Resend activation or update email address" src="images/account-resend-activation.png" />
<figure>
![Resend activation or update email address](/images/account-resend-activation.png)
</figure>
19 changes: 10 additions & 9 deletions docs/user-guide/account/account-settings.md
@@ -1,27 +1,27 @@
# Account Settings

To access your user settings:

1. Login to Zanata
1. Click on `User menu` on top right corner, click on `Settings` on the drop down menu.
1. Alternatively, you can click on the `Settings` tab on your dashboard page.

## Account Settings
## Settings

### Update email

1. Enter the new email address in input field and click `Update email`.

<img alt="Email input field" src="images/account-settings-email.png" />
<figure>
![Email input field](/images/account-settings-email.png)
</figure>

1. A confirmation email will be sent to the new email address. Click on the link or the URL to confirm email address change.

### Change password

1. Fill in the `Old Password` and `New Password` fields.
<figure>
![Password input field](/images/account-settings-password.png)
</figure>

<img alt="Password input field" src="images/account-settings-password.png" />

1. Click `Update password` to change your password.

### Merge with other account
Expand All @@ -38,8 +38,9 @@ Use this to merge additional Zanata accounts you may have created when signing u
## Languages

This page shows all the language teams you have joined in Zanata.

<img alt="Languages" src="images/account-settings-languages.png" />
<figure>
![Languages](/images/account-settings-languages.png)
</figure>

To join more language teams,

Expand Down
5 changes: 3 additions & 2 deletions docs/user-guide/account/account-sign-up.md
Expand Up @@ -16,8 +16,9 @@ To create an account using OpenID:
1. Complete the `Name`, `Username`, and `Email` fields. Ensure your email address is entered correctly.
1. Click `Save`. This sends a validation email to the address you entered in the previous step.
1. Open the validation email and click the validation link.

<img alt="Account signup openid" src="images/account-signup-openid-details.png" />
<figure>
![Account signup openid](/images/account-signup-openid-details.png)
</figure>

You can now sign in to Zanata using your OpenID credentials.

Expand Down
15 changes: 9 additions & 6 deletions docs/user-guide/account/user-dashboard.md
Expand Up @@ -7,8 +7,9 @@ The dashboard aims to help you quickly see and navigate to content that is relev
## Opening the Dashboard

If you sign in from the Zanata homepage, the first screen you see will be the user dashboard. To get to the dashboard from another page, expand the user menu on the right and click `Dashboard`.

<img alt="User dashboard menu" src="images/user-dashboard.png" />
<figure>
![User dashboard menu](/images/user-dashboard.png)
</figure>

## Dashboard Information

Expand All @@ -20,8 +21,9 @@ Dashboard has
- an activity stream
- list of maintained projects
- [Profile settings](user-guide/account/account-settings)

<img alt="User dashboard" src="images/user-dashboard-view.png" />
<figure>
![User dashboard](/images/user-dashboard-view.png)
</figure>

### User Information

Expand All @@ -44,5 +46,6 @@ If you have more recent activity than is shown in the activity stream, you can s
### Projects

In the Project tab, a list of your maintained projects is shown. The down arrow to the left of the version can be clicked to show all the versions for the project. The project name, version name link directly to the project page, version page respectively.

<img alt="User dashboard" src="images/user-dashboard-versions.png" />
<figure>
![User dashboard version](/images/user-dashboard-versions.png)
</figure>
10 changes: 6 additions & 4 deletions docs/user-guide/account/user-profile.md
@@ -1,8 +1,10 @@
You can view a user's profile page by typing the username in the top search field and click on the search result.

<img alt="Project user search" src="images/project-user-search.png" />
<figure>
![Project user search](/images/project-user-search.png)
</figure>

On the user profile page, you can view this user's recent contribution statistics according to the selected date range option.
By default it will show this week's contribution categorized by language and project.

<img alt="User profile" src="images/user-profile.png" />
<figure>
![User profile](/images/user-profile.png)
</figure>
5 changes: 2 additions & 3 deletions docs/user-guide/admin/admin-overview.md
Expand Up @@ -2,14 +2,13 @@ Zanata admin has full access to all functionality in Zanata.

To access to admin menu, login to Zanata with admin role user, select `Administrator`.
<figure>
<img alt="admin menu access" src="images/admin-menu-access.png" />
![admin menu access](/images/admin-menu-access.png)
</figure>
<br/>

## Admin sections

<figure>
<img alt="admin sections" src="images/admin-sections.png" />
![admin sections](/images/admin-sections.png)
</figure>
<br/>

Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/admin/contact-admin.md
@@ -1,11 +1,11 @@
1. Login to Zanata.
1. At the bottom of the page, click on `Contact admin`.
<figure>
<img alt="Contact admin link" src="images/admin-contact-link.png" />
![Contact admin link](/images/admin-contact-link.png)
</figure>
<br/>
1. In the dialog, fill in the message in the input file and click `Send`.
<figure>
<img alt="Contact admin" src="images/admin-contact.png" />
![Contact admin](/images/admin-contact.png)
</figure>
<br/>
4 changes: 1 addition & 3 deletions docs/user-guide/admin/manage-search.md
@@ -1,6 +1,4 @@
<figure>
<img alt="Process manager" src="images/admin-manage-search.png" />
</figure>
![Manage search](/images/admin-manage-search.png)
<br/>

Zanata uses lucene index for fast searching and perform various tasks such as translation memory search.
Expand Down
4 changes: 1 addition & 3 deletions docs/user-guide/admin/monitoring.md
@@ -1,6 +1,4 @@
<figure>
<img alt="Monitoring" src="images/admin-monitoring.png" />
</figure>
![Monitoring](/images/admin-monitoring.png)
<br/>

* Zanata uses [Java Melody](https://code.google.com/p/javamelody/) for performance and statistic monitoring.
Expand Down
3 changes: 1 addition & 2 deletions docs/user-guide/admin/process-manager.md
@@ -1,7 +1,6 @@
All asynchronous tasks that are running in the background are shown in this page.

<figure>
<img alt="Process manager" src="images/admin-process-manager.png" />
![Process manager](/images/admin-process-manager.png)
</figure>
<br/>

Expand Down
14 changes: 6 additions & 8 deletions docs/user-guide/admin/role-assignment-rules.md
@@ -1,16 +1,14 @@
'Role assignment rules' are Zanata's way of dynamically assigning security roles and even Project access to users.
To configure Role Assignment Rules, admin users must go to the Administration section and click 'Role assignment rules' button.

<figure>
<img alt="Role Assignment Rules Location" src="images/role-assignment-access.png" />
![Role Assignment Rules Location](/images/role-assignment-access.png)
</figure>
<br/>


### Overview

<figure>
<img alt="Role Assignment Rules overview" src="images/role-assignment-view.png" />
![Role Assignment Rules overview](/images/role-assignment-view.png)
</figure>
<br/>

Expand All @@ -33,12 +31,12 @@ To configure Role Assignment Rules, admin users must go to the Administration se
1. Navigate to 'Role assignment rules' page.
1. Click on `More Action` menu on the top right panel.
<figure>
<img alt="Role Assignment Rules new" src="images/role-assignment-new-access.png" />
![Role Assignment Rules new](/images/role-assignment-new-access.png)
</figure>
<br/>
1. Select `New Rule`.
<figure>
<img alt="Role Assignment Rules new form" src="images/role-assignment-new-form.png" />
![Role Assignment Rules new form](/images/role-assignment-new-form.png)
</figure>
<br/>
1. Fill in the fields and click `Save`.
Expand All @@ -49,7 +47,7 @@ To configure Role Assignment Rules, admin users must go to the Administration se
1. Locate the rule you wish to delete, click on `Options` menu in front of the row.
1. Click `Delete` to remove the rule.
<figure>
<img alt="Role Assignment delete" src="images/role-assignment-delete.png" />
![Role Assignment delete](/images/role-assignment-delete.png)
</figure>
<br/>

Expand All @@ -63,7 +61,7 @@ To restrict project access,
1. Click on `Permission` tab.
1. Check `Restrict access to certain user roles` and select roles that you wish to allow access to your project.
<figure>
<img alt="Role Assignment project" src="images/role-assignment-project.png" />
![Role Assignment project](/images/role-assignment-project.png)
</figure>
<br/>
1. Any role restrictions will now be seen on the project's page and only users belonging to that role will be able to work on the project.
12 changes: 4 additions & 8 deletions docs/user-guide/admin/server-config.md
@@ -1,9 +1,8 @@
## General

General configuration for Zanata server.

<figure>
<img alt="Admin settings general" src="images/admin-settings-general.png" />
![Admin settings general](/images/admin-settings-general.png)
</figure>
<br/>

Expand All @@ -22,9 +21,8 @@ General configuration for Zanata server.
## Email log

This enables or disables the sending of Zanata diagnostics log information via email.

<figure>
<img alt="Admin settings email log" src="images/admin-settings-email-log.png" />
![Admin settings email log](/images/admin-settings-email-log.png)
</figure>
<br/>

Expand All @@ -39,9 +37,8 @@ This enables or disables the sending of Zanata diagnostics log information via e
## Piwik

[Piwik](http://piwik.org/) is a web analytics tools application. It tracks online visits to one or more websites and displays reports on these visits for analysis.

<figure>
<img alt="Admin settings piwik" src="images/admin-settings-piwik.png" />
![Admin settings piwik](/images/admin-settings-piwik.png)
</figure>
<br/>

Expand All @@ -53,9 +50,8 @@ This enables or disables the sending of Zanata diagnostics log information via e
## Client

Admin can control the limit of client communication towards server via Client or REST API.

<figure>
<img alt="Admin settings client" src="images/admin-settings-client.png" />
![Admin settings client](/images/admin-settings-client.png)
</figure>
<br/>

Expand Down
4 changes: 1 addition & 3 deletions docs/user-guide/admin/statistic.md
@@ -1,6 +1,4 @@
<figure>
<img alt="Statistic" src="images/admin-statistics.png" />
</figure>
![Statistic](/images/admin-statistics.png)
<br/>

This page shows the number of
Expand Down
5 changes: 2 additions & 3 deletions docs/user-guide/translator-guide.md
Expand Up @@ -10,7 +10,7 @@ Any translator who has joined a language team can participate in the document tr
1. In project page, locate the version you wish to translate.
1. Click on `Options` and select `Translate in {your language}`.
<figure>
![Start translate](images/webtrans-access.png)
![Start translate](/images/webtrans-access.png)
</figure>
<br/>

Expand All @@ -22,8 +22,7 @@ Any translator who has joined a language team can participate in the document tr
1. In project page, click on the version you wish to translate.
3. In version page, open up the language page (default page) and select a language.
4. Click on the document name to open up the [editor](user-guide/editor/editor-view).

<figure>
![Select document](images/editor-open-menu.png)
![Select document](/images/editor-open-menu.png)
</figure>
<br/>
3 changes: 0 additions & 3 deletions mkdocs.yml
Expand Up @@ -5,9 +5,6 @@ repo_url: http://www.github.com/zanata/zanata-server
theme: readthedocs
# theme_dir: For custom themes

# workaround for issue: https://github.com/rtfd/readthedocs.org/issues/1260
use_directory_urls: false

pages:
- ['index.md', 'Home']
- ['release-notes.md', 'Release notes', 'Release notes']
Expand Down

0 comments on commit 946ddee

Please sign in to comment.