2
0
Эх сурвалжийг харах

Merge pull request #29 from Len-PGH/master

edits and image linking for PDF
FusionPBX 9 жил өмнө
parent
commit
4783021641

BIN
source/_static/images/fusionpbx_accounts.jpg


BIN
source/_static/images/fusionpbx_apps.jpg


BIN
source/_static/images/fusionpbx_dialplan_menu.jpg


BIN
source/_static/images/logo_right.png


+ 7 - 2
source/accounts.rst

@@ -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

+ 6 - 6
source/contributing.rst

@@ -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  

+ 1 - 1
source/contributing/coding-standards.rst → source/contributing/coding_standards.rst

@@ -4,4 +4,4 @@ Coding Standards
 
 - **FusionPBX Best practice coding practices**
 
-    Command (example):
+    Command (example):

+ 0 - 5
source/contributing/contributing-code.rst

@@ -1,5 +0,0 @@
-*****************
-Contributing Code
-*****************
-
-Lorem Ipsum

+ 65 - 0
source/contributing/contributing_code.rst

@@ -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.
+

+ 1 - 1
source/contributing/contributing-documentation.rst → source/contributing/contributing_documentation.rst

@@ -2,4 +2,4 @@
 Contributing Documentation
 **************************
 
-Lorem Ipsum
+Lorem Ipsum

+ 1 - 1
source/contributing/contributing-translations.rst → source/contributing/contributing_translations.rst

@@ -2,4 +2,4 @@
 Contributing Translations
 *************************
 
-Lorem Ipsum
+Lorem Ipsum

+ 0 - 0
source/contributing/directory-structure.rst → source/contributing/directory_structure.rst


+ 1 - 1
source/contributing/qa-testing.rst → source/contributing/qa_testing.rst

@@ -2,4 +2,4 @@
 Quality Assurance Testing
 *************************
 
-Lorem Ipsum
+Lorem Ipsum

+ 5 - 1
source/dialplan.rst

@@ -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

+ 1 - 1
source/doc-guide.rst → source/doc_guide.rst

@@ -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

+ 35 - 18
source/Extensions-IVR/Extensions.rst → source/extensions_ivr/extensions.rst

@@ -13,7 +13,8 @@ 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% 
 
 |
 |
@@ -21,14 +22,16 @@ Goto **Accounts** then click **Extensions**
 
 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%
 
 |
 |
@@ -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%
 
 |
 |
@@ -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. 
 
@@ -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%
 
 |
 |
@@ -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%
 
 |
 |
@@ -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%
 
 |
 
@@ -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%
 
 |
 
@@ -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%
 
 |
 
@@ -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%
 
 |
 
@@ -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%
 
 |
 
@@ -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

+ 20 - 9
source/Gateway-Inbound-Outbound/Gateway.rst → source/gateway_inbound_outbound/gateway.rst

@@ -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%
 
 ::
 
@@ -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%
 
 |
 |

+ 12 - 6
source/Gateway-Inbound-Outbound/Gateway1.rst → source/gateway_inbound_outbound/gateway1.rst

@@ -3,7 +3,8 @@ Gateway setup
 
 
 
-.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+.. image:: ../_static/images/logo_right.png
+        :scale: 85%
   
 |
 Gateways provide access into other voice networks. These can be voice providers or other systems that require SIP registration.
@@ -17,7 +18,8 @@ Gateways provide access into other voice networks. These can be voice providers
 
 
 
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12149664/e05ebd40-b472-11e5-83c3-5931c7c409d3.jpg 
+.. image:: ../_static/images/fusionpbx_voicetel.jpg
+        :scale: 85% 
 
 `Click to visit <http://tiny.cc/voicetel>`_  
     
@@ -28,17 +30,20 @@ Gateways provide access into other voice networks. These can be voice providers
 
 Select **Accounts** from the drop-down list and click on **Gateways**. 
 
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12148465/999cf76a-b46c-11e5-85ae-e42c0d3dc97b.jpg
+.. image:: ../_static/images/fusionpbx_gateway.jpg
+        :scale: 85%
 
 |
 |
 
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12148464/999caf08-b46c-11e5-832e-b13240e01bc5.jpg
+.. image:: ../_static/images/fusionpbx_gateway1.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 gateway information below and Click on **Save** once complete.
 
@@ -56,5 +61,6 @@ button on the right. Enter the gateway information below and Click on **Save** o
 |
 |
 
-.. image:: https://cloud.githubusercontent.com/assets/13131198/12148466/99a8a5ba-b46c-11e5-80d2-4aca54114640.jpg
+.. image:: ../_static/images/fusionpbx_gateway2.jpg
+        :scale: 85%
 

+ 0 - 21
source/getting-started.rst

@@ -1,21 +0,0 @@
-***************
-Getting Started
-***************
-
-Welcome! Let's install FusionPBX.
-Follow the menu to the left and you will have a working PBX in no time.
-
-.. note::
-
-  There are many ways to install FusionPBX depending on how you want to architect your solution.
-  What is presented here represents the quickest, easiest, best supported way to a FusionPBX system.
-  For advanced topics consider attending the training. Details for the training can be found at http://fusionpbx.com.
-
-
-.. toctree::
-  :maxdepth: 3
-  :glob:
-
-  getting-started/installation-recommended.rst
-  getting-started/post-installation.rst
-  iptables.rst

+ 22 - 0
source/getting_started.rst

@@ -0,0 +1,22 @@
+***************
+Getting Started
+***************
+
+Welcome! 
+Let's install FusionPBX.
+Follow the menu to the left and you will have a working PBX in no time. For PDF and Epub formats of this documentation click the bottom left on **v:latest** and a menu will pop-up.  
+
+.. note::
+
+  There are many ways to install FusionPBX depending on how you want to build your solution.
+  What is presented here represents the quickest, easiest, best supported way to a FusionPBX system.
+  For advanced topics consider attending the in person or online training at http://fusionpbx.com.
+
+
+.. toctree::
+  :maxdepth: 3
+  :glob:
+
+  getting_started/installation_recommended.rst
+  getting_started/post_installation.rst
+  iptables.rst

+ 12 - 6
source/getting-started/installation-recommended.rst → source/getting_started/installation_recommended.rst

@@ -1,7 +1,8 @@
 *****************
 New Install
 *****************
-.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+.. image:: ../_static/images/logo_right.png
+        :scale: 85% 
 *************
 
 
@@ -57,12 +58,14 @@ New Install
      
     **4.** Web browser Installation part
      :Select Language: **Pick your language. Click next**
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797615/3b84a6aa-a292-11e5-92be-9130fe480f9b.jpg
+     .. image:: ../_static/images/install_lang.jpg
+        :scale: 85%
 
 |
 
      :Freeswitch Detect: **Detecting folder paths used** 
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11802026/c5a78c04-a2b9-11e5-9a79-e77ef3298c49.jpg 
+     .. image:: ../_static/images/install_detect_freeswitch.jpg
+        :scale: 85% 
 
      
      **Don't change anything here**
@@ -70,14 +73,16 @@ New Install
 |
 
      :Database Configuration: **Click Execute**
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797607/2bfe2fb2-a292-11e5-9d58-e344678f3fdb.jpg 
+     .. image:: ../_static/images/install_database_config.jpg
+        :scale: 85% 
      
      **Don't change anything here** 
      
 |
 
      :Admin Login Configuration: **Click Next**
-     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797659/99b6c424-a292-11e5-81a2-1bfae36ce197.jpg 
+     .. image:: ../_static/images/install_admin_username.jpg
+        :scale: 85% 
      
      This will create the superadmin login that will be used in your web browser.
 
@@ -115,7 +120,8 @@ New Install
      :Install Finished:  **Login with the username and password you choose during the install**
      
      
-      .. image:: https://cloud.githubusercontent.com/assets/13131198/11797604/25935530-a292-11e5-8612-7dba48d65bde.jpg
+      .. image:: ../_static/images/ilogin.jpg
+        :scale: 50%
       
     
     

+ 0 - 0
source/getting-started/iptables.rst → source/getting_started/iptables.rst


+ 0 - 0
source/getting-started/post-installation.rst → source/getting_started/post_installation.rst


+ 0 - 0
source/getting-started/pre-installation.rst → source/getting_started/pre_installation.rst


+ 2 - 2
source/index.rst

@@ -80,14 +80,14 @@ Getting Started
 .. toctree::
     :maxdepth: 2
 
-    getting-started.rst
+    getting_started.rst
     accounts.rst
     dialplan.rst
     phones.rst
     domains.rst
     manual.rst
     contributing.rst
-    doc-guide.rst
+    doc_guide.rst
 
 
 

+ 0 - 0
source/iptables.rst → source/iptables1.rst


+ 1 - 1
source/manual.rst

@@ -14,4 +14,4 @@ User Manual
   manual/apps
   manual/status
   manual/advanced
-  manual/multi-tenant
+  manual/multi_tenant

+ 0 - 0
source/manual/multi-tenant.rst → source/manual/multi_tenant.rst


+ 4 - 1
source/phones.rst

@@ -6,8 +6,11 @@ Applications
 |
 In the **Applications** menu (Apps) section you will find Call Block, Call Broadcast, Call Center, Call Detail Records, Call Flows, Conference Center, Contacts, Fax Server, Follow Me, IVR Menu, Music on Hold, Operator Panel, Phrases, Queues, Recordings, Ring Groups, Time Conditions and Voicemail.
 
+.. image:: _static/images/fusionpbx_apps.jpg
+        :scale: 85%
+
 |
-|
+