Merge branch 'gh-pages' of https://github.com/ENGYS/HELYX-OS into

gh-pages

Conflicts:
	pages/installation.md
	pages/pages-root-folder/index.md
This commit is contained in:
HELYX-OS Development Team 2016-11-22 17:16:32 +01:00
commit 0a0bdb5b25
7 changed files with 35 additions and 27 deletions

11
.project Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>HELYX-OS</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>

View file

@ -25,7 +25,7 @@ author: dcombest
# This URL is the main address for absolute links. Don't include a slash at the end.
#
url: 'http://engys.github.io/HELYX-OS'
baseurl: ''
baseurl: '/'
# This is for the editing function in _/includes/improve_content
# Leave it empty if your site is not on GitHub/GitHub Pages

View file

@ -2,7 +2,7 @@
# Navigation to the left side: left
#
- title: "Home"
url: "/"
url: "http://engys.github.io/HELYX-OS/"
side: left
- title: "Quick Links"
@ -12,7 +12,7 @@
- title: "About HELYX-OS"
url: "http://engys.com/products/helyx-os"
- title: "Installation"
url: "/installation/"
url: "http://engys.github.io/HELYX-OS/installation/"
- title: "Training and Support"
url: "http://engys.com/services/support"
- title: "HELYX-OS on Github"

View file

@ -35,14 +35,14 @@
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
{% if link.dropdown == nil %}
<li class="divider"></li>
<li{% if link.url == page.url %} class="active"{% endif %}><a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
<li{% if link.url == page.url %} class="active"{% endif %}><a href="{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
{% comment %} If right side WITH dropdown menu do {% endcomment %}
{% else %}
<li class="divider"></li>
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
<a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
<a href="{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
<ul class="dropdown">
{% for dropdown_link in link.dropdown %}
@ -53,7 +53,7 @@
{% assign domain = site.url %}
{% endif %}
<li><a href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
<li><a href="{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
{% endfor %}
</ul>
@ -89,14 +89,14 @@
{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}
{% if link.dropdown == nil %}
<li{% if link.url == page.url %} class="active"{% endif %}><a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
<li{% if link.url == page.url %} class="active"{% endif %}><a href="{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
<li class="divider"></li>
{% comment %} If left side WITH dropdown menu do {% endcomment %}
{% else %}
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
<a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
<a href="{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
<ul class="dropdown">
{% for dropdown_link in link.dropdown %}
@ -107,7 +107,7 @@
{% assign domain = site.url %}
{% endif %}
<li><a href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
<li><a href="{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
{% endfor %}
</ul>

View file

@ -22,7 +22,7 @@ format: blog-index
{% if page.callforaction %}
<div class="row t60 b60">
<div class="small-12 text-center columns">
<a class="button large radius {{ page.callforaction.style }}" href="{{ url }}{{ site.baseurl }}{{ page.callforaction.url }}"{% if page.callforaction.url contains 'http' %} target="_blank" {% endif %}>{{ page.callforaction.text }}</a>
<a class="button large radius {{ page.callforaction.style }}" href="{{ page.callforaction.url }}"{% if page.callforaction.url contains 'http' %} target="_blank" {% endif %}>{{ page.callforaction.text }}</a>
</div><!-- /.small-12.columns -->
</div><!-- /.row -->
{% endif %}

View file

@ -116,7 +116,7 @@ $subfooter-link-color: $grey-8;
$code-background-color: scale-color($secondary-color, $lightness: 70%);
$highlight-background: #ffffff;
$highlight-background: #9b9b9b;
$highlight-comment: #999988;
$highlight-error: #a61717;
$highlight-comment-special: #999999;

View file

@ -7,7 +7,7 @@ teaser: ""
permalink: /installation/
---
1. These instructions assume you have a working version of [OpenFOAM v4.1](http://www.openfoam.org/archive/4.1/download/source.php) or [OpenFOAM v1606+](http://openfoam.com/download/install-binary.php). If you are using Ubuntu 14.04 or greater, the installer will download and install the proper version of OpenFOAM in steps 8-10.
1. Before you proceed, please make sure you have a working version of [OpenFOAM v4.1](http://www.openfoam.org/archive/4.1/download/source.php) or [OpenFOAM v1606+](http://openfoam.com/download/install-binary.php) installed in your system. HELYX-OS v2.4.0 is designed to work only with this particular version of OpenFOAM. If you are using Ubuntu 14.04 or greater, the installer provided can download and install the proper version of OpenFOAM, as explained below during steps 8 to 10.
2. Download the [latest 64 Bit binary of HELYX-OS](https://github.com/ENGYS/HELYX-OS/releases/download/v2.4.0/HELYX-OS-2.4.0-linux-x86_64.bin) from the [project releases](https://github.com/ENGYS/HELYX-OS/releases) or the [project front page](http://engys.github.io/HELYX-OS/). The installer name will have the form:
@ -17,22 +17,20 @@ permalink: /installation/
4. Change the permissions of the installer by executing ```chmod 755 <installer name>``` in the terminal, similar to:
:~$ chmod 755 HELYX-OS-2.4.0-linux-x86_64.bin
:~$ chmod 755 HELYX-OS-2.4.0-linux-x86_64.bin
5. Start the installer by typing ```./<installer name>``` while in the terminal, similar to:
:~$ ./HELYX-OS-2.4.0-linux-x86_64.bin
:~$ ./HELYX-OS-2.4.0-linux-x86_64.bin
6. At this point, the installer will begin and the user will be guided through the installation process:
Waiting for HELYX-OS installer to start...
This program will install HELYX-OS on your system. Do you want to continue?
1) Yes
2) No
#?
#?
In order to continue with the installation, you must type **1** in the terminal and press enter.<br>
7. The user will be presented with a copy of the Gnu Public License (press enter or space to read through the GPL):
@ -51,7 +49,7 @@ permalink: /installation/
2) HELYX-OS-GUI and Kernel
#?
For users with existing installations of OpenFOAM (see compatability table above), select to install only the GUI by typing **1** and hitting enter. To install the HELYX-OS GUI and the compatable version of OpenFOAM (for Ubuntu 14.04 or later only), type **2** and press enter.
For users with an existing installations of OpenFOAM (refer to step 1 for compatability), select to install only the GUI by typing **1** and hitting enter. Otherwise, to install the HELYX-OS GUI with the compatible version of OpenFOAM (for Ubuntu 14.04 or later only), type **2** and press enter.
9. The user will be prompted to enter **the full path** to where HELYX-OS will be installed:
@ -69,17 +67,16 @@ permalink: /installation/
10. If you previously selected option **2** in step 8, you will now be prompted to select your linux distribution:
Please select your linux distribution:
1) Ubuntu (14.04 or later)
2) Other
#?
Please select your linux distribution:
1) Ubuntu (14.04 or later)
2) Other
#?
Selecting **1** will install the compatable OpenFOAM deb package for 64 bit Ubuntu on 14.04 or later. For other linux distributions, the compatable version of OpenFOAM must be installed manually by the user.
Selecting **1** will install the compatible OpenFOAM deb package for 64 bit Ubuntu on 14.04 or later. For other linux distributions, the compatible version of OpenFOAM must be installed manually by the user.
11. To start HELYX-OS in the terminal, execute the ```HELYX-OS.sh``` file located in ```engys/HELYX-OS/v2.4.0``` directory similar to:
:~$ ~/Engys/HELYX-OS/v2.4.0/HELYX-OS.sh
:~$ ~/Engys/HELYX-OS/v2.4.0/HELYX-OS.sh
Please report all bugs encountered with HELYX-OS on the [project issue tracker](https://github.com/ENGYS/HELYX-OS/issues).