diff --git a/composants/categories.html b/composants/categories.html index 4df8ab0..8f930ca 100644 --- a/composants/categories.html +++ b/composants/categories.html @@ -1,4 +1,4 @@ - +

${CATEG_TITLE}

${CATEG_DESC}

diff --git a/composants/index.html b/composants/index.html index 8881867..414a0bb 100644 --- a/composants/index.html +++ b/composants/index.html @@ -9,12 +9,12 @@ - +

${PORTEAIL_TITLE}

- +
${INTRODUCTION} ${CONTENT} @@ -22,10 +22,10 @@ ${MENU} - + diff --git a/composants/introduction.html b/composants/introduction.html index ffcca9e..8885dba 100644 --- a/composants/introduction.html +++ b/composants/introduction.html @@ -1,11 +1,11 @@ - +

- Ce message permet d'introduire le sujet de notre page et expliquer rapidement l'existence du site, la présence des éléments, les catégories, etc.
- Il est modifiable dans le fichier introduction.html situé dans le dossier composants du répertoire principal de PorteAil. + This message permit to introduce our webpage subject and quickly explain why this website exists, why all these categories, elements, etc.
+ This one is editable in introduction.html file located in composants directory from main PorteAil directory.

- Pour de plus amples renseignements sur PorteAil, veuillez vous référer au fichier README.md contenu dans le répertoire principal du projet PorteAil. + For more information about PorteAil, please refer to README.md file situated in PorteAil main directory.

- Les catégories sont renseignées dans le dossier categ dans lequel des fichiers d'exemples, normalement assez parlants, devraient vous permettre de construire votre première page PorteAil. + Categories are filled in categ directory in which some example file should be talkative for you. This will allow you to generate your first PorteAil homepage.

diff --git a/composants/menu.html b/composants/menu.html index 38e5ac1..5f8a6ea 100644 --- a/composants/menu.html +++ b/composants/menu.html @@ -1,11 +1,11 @@ - + diff --git a/configrc.exemple b/configrc.exemple index 888d7c4..1be6b0c 100644 --- a/configrc.exemple +++ b/configrc.exemple @@ -3,7 +3,7 @@ ########################### # Homepage title -TITLE = Default title +TITLE = My portal # CSS color file STYLE = black.css # Menu (if needed) diff --git a/create_homepage.lua b/create_homepage.lua index c287e6d..77b0406 100755 --- a/create_homepage.lua +++ b/create_homepage.lua @@ -30,9 +30,9 @@ local default_css_menu_with = 'with_menu.css' -- Other defaults values local default_categ_extension = 'txt' local DIR_SEP = '/' -local default_css_name = 'Défaut' -local default_title = 'Titre par défaut' -local default_homepage_title = 'Accueil - ' .. default_title +local default_css_name = 'Default' +local default_title = 'My portal' +local default_homepage_title = ' - Homepage' --[[ Functions ]]-- @@ -265,7 +265,7 @@ end result = assert(io.open(destination .. '/' .. main_template, 'wb')) -- create substitution table substitutions = { - TITLE=config['HOMEPAGE'] or default_homepage_title, + TITLE=config['HOMEPAGE'] or (config['TITLE'] and config['TITLE'] .. default_homepage_title) or (default_title .. default_homepage_title), PORTEAIL_TITLE=config['TITLE'] or default_title, CONTENT=content, INTRODUCTION=introduction_content, diff --git a/paconfigrc b/paconfigrc index a506b41..8bbef82 100644 --- a/paconfigrc +++ b/paconfigrc @@ -3,7 +3,7 @@ ########################### # Homepage title -TITLE = Default title +TITLE = My portal # CSS color file STYLE = black.css # Menu (if needed)