diff --git a/examples/demo/install_modules.bat b/examples/demo/install_modules.bat index 5d5241e..1880e20 100644 --- a/examples/demo/install_modules.bat +++ b/examples/demo/install_modules.bat @@ -1,9 +1,12 @@ setlocal -set ROC_CMD=%~dp0..\..\tools\roc.exe +set ROC_CMD=call %~dp0..\..\tools\roc.bat set ROC_CMS_DIR=%~dp0 +%ROC_CMD% install --module ..\..\modules\admin --dir %ROC_CMS_DIR% %ROC_CMD% install --module ..\..\modules\auth --dir %ROC_CMS_DIR% %ROC_CMD% install --module ..\..\modules\basic_auth --dir %ROC_CMS_DIR% -%ROC_CMD% install --module ..\..\modules\node --dir %ROC_CMS_DIR% %ROC_CMD% install --module ..\..\modules\blog --dir %ROC_CMS_DIR% +%ROC_CMD% install --module ..\..\modules\node --dir %ROC_CMS_DIR% %ROC_CMD% install --module ..\..\modules\oauth20 --dir %ROC_CMS_DIR% +%ROC_CMD% install --module ..\..\modules\openid --dir %ROC_CMS_DIR% +%ROC_CMD% install --module ..\..\modules\recent_changes --dir %ROC_CMS_DIR% diff --git a/examples/demo/site/modules/auth/mail_templates/account_new_password.html b/examples/demo/site/modules/auth/mail_templates/account_new_password.html index dfcd355..ad2792d 100644 --- a/examples/demo/site/modules/auth/mail_templates/account_new_password.html +++ b/examples/demo/site/modules/auth/mail_templates/account_new_password.html @@ -8,10 +8,10 @@ -

You have required a new password at ROC CMS

+

You have required a new password at ROC CMS

To complete your request, please click on this link to genereate a new password:

$link

- \ No newline at end of file + diff --git a/examples/demo/site/modules/auth/mail_templates/account_re_activation.html b/examples/demo/site/modules/auth/mail_templates/account_re_activation.html index 95aebb2..3590804 100644 --- a/examples/demo/site/modules/auth/mail_templates/account_re_activation.html +++ b/examples/demo/site/modules/auth/mail_templates/account_re_activation.html @@ -8,11 +8,11 @@ -

You have request a new activation token atROC CMS

+

You have request a new activation token at ROC CMS

To complete your registration, please click on this link to activate your account:

$link

Thank you for joining us.

- \ No newline at end of file + diff --git a/examples/demo/site/modules/auth/mail_templates/account_welcome.html b/examples/demo/site/modules/auth/mail_templates/account_welcome.html index 0ea987c..facecee 100644 --- a/examples/demo/site/modules/auth/mail_templates/account_welcome.html +++ b/examples/demo/site/modules/auth/mail_templates/account_welcome.html @@ -7,7 +7,7 @@ -

Welcome toROC CMS

+

Welcome toROC CMS

Thank you for joining us.

- \ No newline at end of file + diff --git a/examples/demo/site/modules/auth/templates/block_login.tpl b/examples/demo/site/modules/auth/templates/block_login.tpl index 891cb15..fd24464 100644 --- a/examples/demo/site/modules/auth/templates/block_login.tpl +++ b/examples/demo/site/modules/auth/templates/block_login.tpl @@ -25,5 +25,5 @@

- {/unless} - + {/unless} + diff --git a/tools/roc.bat b/tools/roc.bat new file mode 100644 index 0000000..8d8f501 --- /dev/null +++ b/tools/roc.bat @@ -0,0 +1,39 @@ +@echo off +setlocal + +if "%ROC_TOOL_PATH%" == "" goto LOCAL_ROC_TOOL +goto start + +:LOCAL_ROC_TOOL +if exist "%~dp0roc.exe" set ROC_TOOL_PATH=%~dp0 + +if "%ROC_TOOL_PATH%" == "" goto SEARCH_ROC_TOOL +goto START + +:SEARCH_ROC_TOOL +for %%f in (roc.exe) do ( + if exist "%%~dp$PATH:f" set ROC_TOOL_PATH="%%~dp$PATH:f" + ) +if "%ROC_TOOL_PATH%" == "" goto BUILD_ROC_TOOL +echo Using roc.exe from %ROC_TOOL_PATH% +goto START + +:BUILD_ROC_TOOL +set ROC_SRCDIR=%~dp0roc +set ROC_COMPDIR=%~dp0.roc-comp +mkdir %ROC_COMPDIR% +call ecb -config %ROC_SRCDIR%\roc.ecf -finalize -c_compile -project_path %ROC_COMPDIR% +copy %ROC_COMPDIR%\EIFGENs\roc\F_code\roc.exe %~dp0roc.exe +rd /q/s %ROC_COMPDIR% + +set ROC_TOOL_PATH=%~dp0 +goto START + +:START +echo Calling %ROC_TOOL_PATH%roc.exe %* +call %ROC_TOOL_PATH%roc.exe %* +goto END + +:END +endlocal +exit /B 0