Merge branch 'master' of https://github.com/JDLabOrg/IUManual-EN

# Conflicts: # 000_00_index.rst
JDLabOrg · Sep 23, 2019 · 22a99a2 · 22a99a2
2 parents ce7a488 + 6ed0507
commit 22a99a2
Show file tree

Hide file tree

Showing 125 changed files with 152 additions and 3,292 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/.idea/*
+/win_venv/*
diff --git a/000_00_index.rst b/000_00_index.rst
@@ -3,7 +3,7 @@
 IUEditor Manual
 ===============
 
-.. image:: resource/index_hero_img.png
+.. image:: resource_new/index_hero_img.png
 
 Welcome to **IUEditor** Manual.
 
@@ -13,81 +13,122 @@ You can download **IUEditor** from website below.
 * IUEditor Facebook Page (Korean): https://www.facebook.com/iueditor
 
 
-.. note:: Anyone can use IUEditor for personal and non-commercial projects (up to 5 pages).
-
 ---------
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Introduction
 
+<<<<<<< HEAD:000_00_index.rst
    001_01_intro_what_is
    001_02_intro_env
+=======
+   intro_what_is_iueditor
+   intro_environment
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Basic Feature
 
+<<<<<<< HEAD:000_00_index.rst
    002_01_basic_menu
    002_02_basic_top_toolbar
    002_03_basic_mid_toolbar
    002_04_basic_widget
    002_05_basic_nav
    002_06_basic_canvas
+=======
+   basic_menu
+   basic_top_toolbar
+   basic_middle_toolbar
+   basic_widget_panel
+   basic_navigation
+   basic_canvas
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Advanced Feature
 
+<<<<<<< HEAD:000_00_index.rst
    003_01_advanced_dev
    003_02_advanced_proto
    advanced_heroku
    advanced_server
 
+=======
+   advanced_developer_mode
+   advanced_prototype_mode
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 .. toctree::
    :maxdepth: 2
    :caption: Panel
 
+<<<<<<< HEAD:000_00_index.rst
    004_01_panel_project_setting
    004_02_panel_resource
    004_03_panel_event
    004_04_panel_memo
    004_05_panel_manage_custom
    004_06_panel_export
+=======
+   project_setting
+   panel_resource
+   panel_event
+   panel_memo
+   panel_management_widget
+   panel_export_widget
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Project Type
 
+<<<<<<< HEAD:000_00_index.rst
    005_00_project_type
    wordpress_basic_use
    wordpress_site_information
    wordpress_article
    wordpress_category
    wordpress_comment
    wordpress_etc
+=======
+   project_type
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Sheet
 
+<<<<<<< HEAD:000_00_index.rst
    006_01_sheet_page
    006_02_sheet_comp
+=======
+   sheet_page
+   sheet_composition
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Widget
 
+<<<<<<< HEAD:000_00_index.rst
    007_01_widget_basic
    007_02_widget_complex
    007_03_widget_programming
+=======
+   widget_basic
+   widget_complex
+   widget_programming
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
    widget_wordpress
 
 
@@ -96,20 +137,35 @@ You can download **IUEditor** from website below.
    :maxdepth: 2
    :caption: Known Bugs
 
+<<<<<<< HEAD:000_00_index.rst
    008_00_known_bug_list
+=======
+   known_bug_list
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 
 .. toctree::
    :maxdepth: 2
    :caption: Preference
 
+<<<<<<< HEAD:000_00_index.rst
    009_00_preference
+=======
+   preference
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
 
 .. toctree::
    :maxdepth: 2
    :caption: Appendix
 
+<<<<<<< HEAD:000_00_index.rst
    010_01_appendix_templates
    010_02_appendix_shortcut
    010_03_appendix_dict
    010_04_appendix_tutorial
+=======
+   appendix_templates
+   appendix_shortcut
+   appendix_dict
+   tutorial
+>>>>>>> 6ed0507248b803d815db4eb26e294c49cadc47f9:index.rst
diff --git a/001_01_intro_what_is.rst b/001_01_intro_what_is.rst
@@ -8,7 +8,7 @@ What is IUEditor?
 Advantages
 ----------
 
-* IUEditor is a GUI-based program which allows users to design a prototype without any coding. 
+* IUEditor is a GUI-based program which allows users to design a prototype without any coding.
 * Also, IUEditor allows users to develop a product or a website that supports multi-screen devices with just one IU project file.
 * IUEditor is integrated via backend layers such as python.
 
@@ -17,7 +17,6 @@ Values
 * IUEditor enables designers to work together with developers without publishers so that your team or company can save cost and time.
 * Furthermore, IUEditor enables your team or company to ship products early, so you can adopt a lean process and iterate to build a better product or website.
 
-Software License Policy
------------------------
-* For Company, we offer a software license of IUEditor to $2,000. (Single License)
-* Anyone can use IUEditor but only for personal and non-commercial project. (IUEditor offers free user license until 30 September, 2015)
+More ...
+------
+* You can check javascript manual on http://cdn.iueditor.org/js/readme.html
diff --git a/001_02_intro_env.rst b/001_02_intro_env.rst
@@ -2,11 +2,6 @@
 Environment
 ===========
 
+**IUEditor** operates only on Mac OS X - Mojave. (10.14 +)
 
-.. image:: resource/os_x_el_capitan.jpg
-
-**IUEditor** operates only on Mac OS X - Yosemite & El Capitan. (10.10.a +) And you have to install **Git** & **Heroku Toolbelt** (Heroku account also required)
-
-
-* Git Download : http://git-scm.com/downloads
-* Heroku Toolbelt : https://toolbelt.heroku.com
+Browser support : Chrome, Safari, Firefox, Opera - current / IE 9+
diff --git a/002_01_basic_menu.rst b/002_01_basic_menu.rst
@@ -1,7 +1,5 @@
 .. _Preference: ./preference.html
 .. _Project Setting: ./project_setting.html
-.. _Upload to Server: ./advanced_server.html
-.. _Heroku Management: ./advanced_heroku.html
 .. _Event Panel: ./panel_event.html
 .. _Resource Panel: ./panel_resource.html
 .. _Memo Panel: ./panel_memo.html
@@ -12,7 +10,7 @@
 Menu
 ==========================
 
-.. image:: resource/iu_manual_basic_menu.png
+.. image:: resource_new/mac_menu_bar.png
 
 Description about IUEditor Menu Bar
 ----------
@@ -25,8 +23,7 @@ IUEditor
 
 
 * ``About IUEditor`` : Show IUEditor's version info.
-* ``License`` : Show IUEditor's license info. You can enter license key and visit license page.
-* ``Preference`` : Open IUeditor `Preference`_ window. 
+* ``Preference`` : Open IUeditor `Preference`_ window.
 
 ----------
 
@@ -55,11 +52,9 @@ Project
 .. image:: resource/iu_manual_basic_menu_project.png
 
 
-* ``Build`` : Generates HTML & CSS & JS files based on IU Project. 
+* ``Build`` : Generates HTML & CSS & JS files based on IU Project.
 * ``Build Clean`` : Clean build data. It can fix program error.
-* ``Project Setting`` : Opens `Project Setting`_ panel. 
-* ``Upload to Server`` : Opens `Upload to Server`_ panel. 
-* ``Upload to Heroku`` : Opens `Heroku Management`_ panel. 
+* ``Project Setting`` : Opens `Project Setting`_ panel.
 * ``Refresh Page`` : Refresh current page. It can fix program error.
 
 ----------
@@ -88,10 +83,10 @@ Window
 .. image:: resource/iu_manual_basic_menu_window.png
 
 
-* ``Event`` : Opens `Event panel`_ . 
-* ``Resource`` : Opens `Resource panel`_ . 
-* ``Memo`` : Opens `Memo panel`_ . 
-* ``Manage Custom Widgets`` : Opens `Manage Custom Widgets Panel`_ . 
+* ``Event`` : Opens `Event panel`_ .
+* ``Resource`` : Opens `Resource panel`_ .
+* ``Memo`` : Opens `Memo panel`_ .
+* ``Manage Custom Widgets`` : Opens `Manage Custom Widgets Panel`_ .
 
 ----------
 
@@ -106,7 +101,3 @@ Help
 * ``Documentation`` : Open IUEditor Manual page in the brower.
 * ``Visit IUEditor`` : Open IUEditor Homepage page in the brower.
 * ``Visit Facebook`` : Open IUEditor Facebook page in the brower.
-
-
-
-
diff --git a/003_01_advanced_dev.rst b/003_01_advanced_dev.rst
@@ -8,7 +8,7 @@ Developer Mode
 =======================
 
 
-.. image:: resource/iu_manual_developer_mode.png
+.. image:: resource_new/advanced_dev.png
 
 From the toolbar at the top, you can switch to **Developer Mode** by clicking ``Mode Switching Button``.
 
@@ -33,5 +33,3 @@ Custom Code
 
 
 You can write back-end, custom css, script code. The tab composition differs between widget and project type.
-
-
diff --git a/003_02_advanced_proto.rst b/003_02_advanced_proto.rst
@@ -4,11 +4,11 @@
 Prototype Mode
 =======================
 
-.. image:: resource/iu_manual_advanced_prototype_mode.png
+.. image:: resource_new/advanced_proto.png
 
 From the toolbar at the top, you can switch to **Prototype Mode** by clicking ``Mode Switch Button``.
 
-Prototype Mode offers `Revision History`_ / `Project Workflow`_ / `Node Description`_ page. 
+Prototype Mode offers `Revision History`_ / `Project Workflow`_ / `Node Description`_ page.
 You can refresh scenario by clicking ``Reset Workflow`` and can build **HTML Scenario** by clicking ``Build Senario``.
 And ``Refresh Thumbnail`` updates the page thumbnails that are included in the workflow and the page list.
 
@@ -17,8 +17,8 @@ And ``Refresh Thumbnail`` updates the page thumbnails that are included in the w
 
 Revision History
 -------------------------------
- 
-.. image:: resource/scenario/ic_SB_revision.png
+
+.. image:: resource_new/advanced_proto_revision.png
 
 
 Displays **the history of revision** made in the current project. You can add or change the history.
@@ -31,7 +31,7 @@ Displays **the history of revision** made in the current project. You can add or
 Project Workflow
 -------------------------------
 
-.. image:: resource/scenario/ic_SB_workflow.png
+.. image:: resource_new/advanced_proto_workflow.png
 
 Displays **Workflow** of the current project. Users can add nodes by drag and drop of page thumbnails. Press delete key to delete the selected node.
 

diff --git a/005_00_project_type.rst b/005_00_project_type.rst
@@ -51,13 +51,3 @@ AngularJS Project is a Dynamic Project which can be connected with AngularJS as
 
 
 .. image:: resource/iu_manual_project_new_angularjs.png
-
--------------
-
-Wordpress Project
------------------------
-
-Wordpress Project is a Dynamic Project which can be connected with Wordpress as back-end. Wordpress project has special widgets for wordpress templates. You can select Wordpress Project in **New Project Popup** (which pops up when you run **File > New Project (⌘N)** menu)
-
-
-.. image:: resource/iu_manual_project_new_wordpress.png
diff --git a/006_01_sheet_page.rst b/006_01_sheet_page.rst
@@ -47,27 +47,61 @@ Page Default Widget
 ----------------------------
 
 
+.. image:: resource/widget/IUPage.png
+**Page**
+
+.. image:: resource/iu_manual_prop_basic_IUPage.png 
+IUPage is same as html document. You can change page structure in property tab.
+
+
+
 .. image:: resource/widget/IUHeader.png
 **Header**
 
+.. image:: resource/iu_manual_prop_basic_IUHeader.png 
 Header is placed top of page. Header can import **Header or another composition** .
 
+
+
 .. image:: resource/widget/IUPageContent.png
 **Page Content** 
 
 Page Content is placed middle of page (Page Content cannot be removed). You can add sections in Page Content.
 
+
+
 .. image:: resource/widget/IUFooter.png
 **Footer** 
 
+.. image:: resource/iu_manual_prop_basic_IUFooter.png 
 Footer is placed bottom of page. Footer can import **Footer of another composition** .
 
+
+
 .. image:: resource/widget/IUSection.png
 **Section** 
 
 Section is placed under Page Content. 
 
+
+
 .. image:: resource/widget/IUCenterBox.png
 **Centered Box** 
- 
+
 Centered Box is placed under Section (Centered Box can be removed). Centered Box used for horizontal-center layout.
+
+
+.. image:: resource/widget/IUPanel.png
+**Panel** 
+
+.. image:: resource/iu_manual_prop_basic_IUPanel.png 
+You can add a panel by press [+] button of panel group. To call panel, create link with any widget and select link target to panel. 
+
+
+
+.. image:: resource/widget/IUPopUp.png
+**Popup** 
+
+.. image:: resource/iu_manual_prop_basic_IUPopup.png 
+You can add a popup by press [+] button of popup group. To call popup, create link with any widget and select link target to popup. 
+