Skip to content

Commit

Permalink
Merge pull request #29 from Len-PGH/master
Browse files Browse the repository at this point in the history
edits and image linking for PDF
  • Loading branch information
markjcrane committed Jan 26, 2016
2 parents dcf84f3 + b6df16a commit 4783021
Show file tree
Hide file tree
Showing 29 changed files with 196 additions and 83 deletions.
Binary file added source/_static/images/fusionpbx_accounts.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/_static/images/fusionpbx_apps.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/_static/images/fusionpbx_dialplan_menu.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/_static/images/logo_right.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions source/accounts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ Accounts
In the **Accounts** menu you have access to devices, extensions, gateways and user manager.

.. image:: _static/images/fusionpbx_accounts.jpg
:scale: 85%



.. toctree::
:maxdepth: 3
:glob:

Extensions-IVR/Extensions.rst
Gateway-Inbound-Outbound/Gateway1.rst
extensions_ivr/extensions.rst
gateway_inbound_outbound/gateway1.rst
12 changes: 6 additions & 6 deletions source/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ How to Get Started:
:maxdepth: 4
:glob:

contributing/contributing-code.rst
contributing/contributing-documentation.rst
contributing/contributing-translations.rst
contributing/qa-testing.rst
#contributing/coding-standards
#contributing/directory-structure
contributing/contributing_code.rst
contributing/contributing_documentation.rst
contributing/contributing_translations.rst
contributing/qa_testing.rst
#contributing/coding_standards
#contributing/directory_structure
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Coding Standards

- **FusionPBX Best practice coding practices**

Command (example):
Command (example):
5 changes: 0 additions & 5 deletions source/contributing/contributing-code.rst

This file was deleted.

65 changes: 65 additions & 0 deletions source/contributing/contributing_code.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
*****************
Contributing Code
*****************

https://github.com/fusionpbx/open-source

Open Source at FusionPBX
==============================================

This repository serves as the umbrella project to represent the
various open source efforts of Mark J. Crane(https://fusionpbx.com).
Come here to get an overview of the various projects, to learn how to
contribute to them, and to sign up as a contributor.

Table Of Contents
-----------------

* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]



Note to External Contributors
-----------------------------

Hello, External Person!

We at FusionPBX are eager to work with you.

In particular, in order for us to accept any patches from you, you will have to
electronically sign a statement that indicates two things:

* You are willingly licensing your contributions under the terms of
the open source license of the project that you’re contributing to.

* You are legally able to license your contributions as stated.

The reason we do this is to ensure, to the extent possible, that we don’t “taint”
the projects we manage with contributions that turn out to be improper. This protects
everyone who wants to use the projects, including *you*! If you want a longer explanation,
then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).

Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
merge your contributions with a clear conscience and with only the friction that results
from the usual technical back-and-forth of a vibrant open source project.

To get started with this process, visit the
[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
page.


Thanks, FusionPBX!



List of Projects
----------------

* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) — The Official FusionPBX Repo.
* [FusionPBX Apps](https://github.com/Fusionpbx/opensource) — Applications for FusionPBX.
* [FusionPBX Scripts](https://github.com/Fusionpbx/opensource) — Install and Upgrade Scripts for FusionPBX.
* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) — This site.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Contributing Documentation
**************************

Lorem Ipsum
Lorem Ipsum
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Contributing Translations
*************************

Lorem Ipsum
Lorem Ipsum
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Quality Assurance Testing
*************************

Lorem Ipsum
Lorem Ipsum
6 changes: 5 additions & 1 deletion source/dialplan.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ Dialplan
In the **Dialplan** menu you have access to Destinations, Dialplan Manager, Inbound Routes and Outbound Routes.

.. image:: _static/images/fusionpbx_dialplan_menu.jpg
:scale: 85%


.. toctree::
:maxdepth: 2
:glob:

Gateway-Inbound-Outbound/Gateway.rst
gateway_inbound_outbound/gateway.rst
2 changes: 1 addition & 1 deletion source/doc-guide.rst → source/doc_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -961,4 +961,4 @@ Similarly to the note directive, one can include todo boxes but it requires the
.. _Git Tutorial: https://try.github.io/levels/1/challenges/1
.. _Git Install: http://git-scm.com/book/en/Getting-Started-Installing-Git
.. _Atlassian Git site: https://www.atlassian.com/git/tutorials
.. _Atlassian Git site: https://www.atlassian.com/git/tutorials
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,25 @@ Welcome to the adding Extensions section. Here you will find how to add Extensi

Goto **Accounts** then click **Extensions**

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153364/86f061b8-b487-11e5-8667-5a753994a3b9.jpg
.. image:: ../_static/images/fusionpbx_ext.jpg
:scale: 85%

|
|

Then click the

.. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
.. image:: ../_static/images/plus.png
:scale: 85%

on the right.

|

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153359/86e7c814-b487-11e5-91ef-c1a1d89198c5.jpg
.. image:: ../_static/images/fusionpbx_ext1.jpg
:scale: 85%

|
|
Expand All @@ -38,7 +41,8 @@ Enter the desired *extension* starting number. From the dropdown *Range* box yo
|
|
.. image:: https://cloud.githubusercontent.com/assets/13131198/12153358/86e71cd4-b487-11e5-8e46-4d78dd358db1.jpg
.. image:: ../_static/images/fusionpbx_ext2.jpg
:scale: 85%

|
|
Expand All @@ -51,7 +55,8 @@ We now have extensions. Each extension has and edit icon beside it. Click the e
|
|
.. image:: https://cloud.githubusercontent.com/assets/13131198/12153361/86eba8b2-b487-11e5-9e81-c6bac7fa355b.jpg
.. image:: ../_static/images/fusionpbx_edit.jpg
:scale: 85%

to customize internal, external, emergency caller id and other fine tuned options. You can also access **Call Control** from here.

Expand All @@ -61,7 +66,8 @@ to customize internal, external, emergency caller id and other fine tuned option
|

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153360/86ea9db4-b487-11e5-8b6a-2c6bf8768e74.jpg
.. image:: ../_static/images/fusionpbx_ext3.jpg
:scale: 85%

|
|
Expand All @@ -87,7 +93,8 @@ Enter information as needed.
- **Emergency Caller ID Name:** Can be set to a national standard or local emergency entity
- **Emergency Caller ID Number:** Can be set to a national standard or local emergency entity

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153357/86e5a980-b487-11e5-81ad-2944bff0f0bf.jpg
.. image:: ../_static/images/fusionpbx_ext4.jpg
:scale: 85%

|
|
Expand All @@ -112,7 +119,8 @@ Use this to configure your SIP extensions.
Grandstream
============

.. image:: https://cloud.githubusercontent.com/assets/13131198/12453792/d9aa7b2e-bf62-11e5-9ddd-30ad751e9ce8.jpg
.. image:: ../_static/images/fusionpbx_grandstream4.jpg
:scale: 85%

|
Expand All @@ -130,7 +138,8 @@ In our example we will register an analog telephone adapter (ata) model HT701.
1. Goto the device ip address. The default password should be admin. Enter admin and click login

.. image:: https://cloud.githubusercontent.com/assets/13131198/12453076/8dc6fbcc-bf5f-11e5-89bc-56bcb1bc2d00.jpg
.. image:: ../_static/images/fusionpbx_grandstream.jpg
:scale: 85%

|
Expand All @@ -147,13 +156,15 @@ Click **Update** then click **Apply** at the bottom

|
.. image:: https://cloud.githubusercontent.com/assets/13131198/12453075/8dc38cf8-bf5f-11e5-9e41-606241e41379.jpg
.. image:: ../_static/images/fusionpbx_grandstream2.jpg
:scale: 85%

|
3. Click the **Status** tab on the top left. You should see the *Registration* as **Registered** and the *User ID* **1000**

.. image:: https://cloud.githubusercontent.com/assets/13131198/12453074/8dc0ce6e-bf5f-11e5-8f78-95473e500900.jpg
.. image:: ../_static/images/fusionpbx_grandstream1.jpg
:scale: 85%

|
Expand Down Expand Up @@ -188,25 +199,29 @@ In the ever changing world of voip businesses are moving away from hardware phon
3. If the software isn't open click the Zoiper icon to open from the desktop or start menu.


.. image:: https://cloud.githubusercontent.com/assets/13131198/12450587/b9878e46-bf52-11e5-99bb-8744091d62c8.jpg
.. image:: ../_static/images/fusionpbx_zoiper.jpg
:scale: 85%

|
4. Click on **Settings**

.. image:: https://cloud.githubusercontent.com/assets/13131198/12450588/b98939da-bf52-11e5-807d-bd29b612671b.jpg
.. image:: ../_static/images/fusionpbx_zoiper1.jpg
:scale: 85%

|
5. Click on **Preferences**

.. image:: https://cloud.githubusercontent.com/assets/13131198/12450591/b98e0366-bf52-11e5-8633-b4079385940b.jpg
.. image:: ../_static/images/fusionpbx_zoiper2.jpg
:scale: 85%

|
6. Click on **Create account**

.. image:: https://cloud.githubusercontent.com/assets/13131198/12450589/b98abf76-bf52-11e5-9f57-e77adabd3ea8.jpg
.. image:: ../_static/images/fusionpbx_zoiper3.jpg
:scale: 85%

|
Expand All @@ -218,13 +233,15 @@ In the ever changing world of voip businesses are moving away from hardware phon
|
.. image:: https://cloud.githubusercontent.com/assets/13131198/12450590/b98d9552-bf52-11e5-9e46-650e8bc846b1.jpg
.. image:: ../_static/images/fusionpbx_zoiper4.jpg
:scale: 85%

|
8. Click ok. You should have **Registered** at the top right

.. image:: https://cloud.githubusercontent.com/assets/13131198/12450586/b986d690-bf52-11e5-892d-7eb5e96d44a3.jpg
.. image:: ../_static/images/fusionpbx_zoiper5.jpg
:scale: 85%

|
Expand All @@ -249,4 +266,4 @@ In the ever changing world of voip businesses are moving away from hardware phon
:maxdepth: 3
:glob:

Extensions-IVR/Extensions.rst
extensions_ivr/extensions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@ Configure Inbound Destinations: (This will auto-configure an Inbound Route also)

*Select* **Dialplan** from the drop-down list and then *click* **Destinations**.

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153363/86efa890-b487-11e5-8628-0b7358797493.jpg
.. image:: ../_static/images/fusionpbx_inboundd.jpg
:scale: 85%

Click on the

.. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
.. image:: ../_static/images/plus.png
:scale: 85%

button on the right.

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153365/86f0df3a-b487-11e5-967d-4820f7c77f77.jpg
.. image:: ../_static/images/fusionpbx_inboundd1.jpg
:scale: 85%

*Enter* the route information below and *Click* **Save** once complete.

.. image:: https://cloud.githubusercontent.com/assets/13131198/12153362/86ef406c-b487-11e5-9b63-af8d485cb4e1.jpg
.. image:: ../_static/images/fusionpbx_inboundd2.jpg
:scale: 85%

::

Expand Down Expand Up @@ -55,25 +59,32 @@ Configure Outbound Route.

Select **Dialplan** from the drop-down list and then click **Outbound Routes** .

.. image:: https://cloud.githubusercontent.com/assets/13131198/12156744/e8fd860c-b49a-11e5-9136-2025ed9b9cd2.jpg
.. image:: ../_static/images/fusionpbx_outbound.jpg
:scale: 85%

Click the

.. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
.. image:: ../_static/images/plus.png
:scale: 85%



button on the right. Enter the route information below and Click **Save** once complete.
button on the right. Enter the route information below and Click **Save** once entry is complete.

|
|
.. image:: https://cloud.githubusercontent.com/assets/13131198/12156743/e8f91c0c-b49a-11e5-88c5-f2475fc1bfad.jpg
.. image:: ../_static/images/fusionpbx_outbound1.jpg
:scale: 85%

|


|
.. image:: https://cloud.githubusercontent.com/assets/13131198/12157521/633bfb4c-b4a0-11e5-9019-8217560076cc.jpg
.. image:: ../_static/images/fusionpbx_outbound2.jpg
:scale: 85%

|
|
Expand Down

0 comments on commit 4783021

Please sign in to comment.