Merge branch 'develop'

MITSustainableDesignLab · Nov 27, 2017 · cc9bb99 · cc9bb99
2 parents 31fa122 + a8b966e
commit cc9bb99
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 
 _build
+
+\.idea/
diff --git a/docs/examples/Data.umi b/docs/examples/Data.umi
diff --git a/docs/examples/Embodiedenergy.umi b/docs/examples/Embodiedenergy.umi
diff --git a/docs/examples/Far.umi b/docs/examples/Far.umi
diff --git a/docs/examples/Mobility.umi b/docs/examples/Mobility.umi
diff --git a/docs/examples/Newproject.umi b/docs/examples/Newproject.umi
diff --git a/docs/examples/Operationalenergy.umi b/docs/examples/Operationalenergy.umi
diff --git a/docs/examples/_examples.rst b/docs/examples/_examples.rst
diff --git a/docs/examples/_tutorials.rst b/docs/examples/_tutorials.rst
@@ -0,0 +1,67 @@
+.. |br| raw:: html
+
+   <br />
+
+Tutorials
+=========
+
+If you are interested in following the video tutorials below, you also need to download the corresponding tutorial files.
+
+
+.. only:: html
+
+   :download:`Tutorial 01 \| Installation <./Newproject.umi>` |br|
+   :download:`Tutorial 02 \| Model and FAR <./Far.umi>` |br|
+   :download:`Tutorial 03 \| Operational Energy <./Operationalenergy.umi>` |br|
+   :download:`Tutorial 04 \| Embodied Energy <./Embodiedenergy.umi>` |br|
+   :download:`Tutorial 05 \| Mobility <./Mobility.umi>` |br|
+   :download:`Tutorial 06 \| Results Viewer <./Data.umi>` |br|
+
+
+
+Video Tutorials
+---------------
+
+.. only:: epub
+
+   Online video tutorials are available at `umidocs/tutorials <http://umidocs.readthedocs.io/en/develop/docs/examples/_tutorials.html>`__
+
+.. only:: html
+
+   |1| |br|
+   |2| |br|
+   |3| |br|
+   |4| |br|
+   |5| |br|
+   |6| |br|
+
+
+
+.. |1| raw:: html
+
+       <iframe width="100%" max-height="360" height="360 px" src="https://www.youtube-nocookie.com/embed/QBJAhmKvf2s?rel=0" frameborder="0" allowfullscreen></iframe>
+
+
+.. |2| raw:: html
+
+       <iframe width="100%" max-height="360" height="360 px" src="https://www.youtube-nocookie.com/embed/X26KjwTy4pc?rel=0" frameborder="0" allowfullscreen></iframe>
+
+
+.. |3| raw:: html
+
+       <iframe width="100%" max-height="360" height="360 px" src="https://www.youtube-nocookie.com/embed/rohkQb-zg7I?rel=0" frameborder="0" allowfullscreen></iframe>
+
+
+.. |4| raw:: html
+
+       <iframe width="100%" max-height="360" height="360 px" src="https://www.youtube-nocookie.com/embed/b5-L3sgW8lA?rel=0" frameborder="0" allowfullscreen></iframe>
+
+
+.. |5| raw:: html
+
+       <iframe width="100%" max-height="360" height="360 px" src="https://www.youtube-nocookie.com/embed/qgw62iRkbEU?rel=0" frameborder="0" allowfullscreen></iframe>
+
+
+.. |6| raw:: html
+
+       <iframe width="100%" max-height="360" height="360 px" src="https://www.youtube-nocookie.com/embed/HVpfoIKz1CQ?rel=0" frameborder="0" allowfullscreen></iframe>
diff --git a/docs/examples/example01.md b/docs/examples/example01.md
diff --git a/docs/examples/example02.md b/docs/examples/example02.md
diff --git a/index.rst b/index.rst
@@ -12,7 +12,7 @@ A first public version of Umi was released during a public symposium on Sustaina
    :caption: Getting Started
 
    Getting Started <docs/first.md>
-   docs/examples/_examples
+   docs/examples/_tutorials
    Create a new project <docs/newproject.md>
    docs/site-config.rst
    docs/saving-project.rst