Fixes installer

1.10.x
Julio Montoya 10 years ago
parent 60255ad5ab
commit f2edbd959c
  1. 1
      app/AppKernel.php
  2. 22
      app/ChamiloRequirements.php
  3. 29
      app/Resources/translations/install.en.yml
  4. 14
      app/config/assetic.yml
  5. 2
      app/config/config.yml
  6. 4
      app/config/routing_dev.yml
  7. 0
      data/temp/twig/.gitkeep
  8. 4
      src/Chamilo/CoreBundle/ChamiloCoreBundle.php
  9. 6
      src/Chamilo/CoreBundle/Controller/NavbarController.php
  10. 6
      src/Chamilo/CoreBundle/Resources/views/Navbar/user.html.twig
  11. 2
      src/Chamilo/CoreBundle/Resources/views/User/create.html.twig
  12. 2
      src/Chamilo/CoreBundle/Resources/views/layout.html.twig
  13. 1
      src/Chamilo/InstallerBundle/Process/Step/SetupStep.php
  14. 10
      src/Chamilo/InstallerBundle/Resources/public/css/install.css
  15. 18
      src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml
  16. 9
      src/Chamilo/InstallerBundle/Resources/views/Process/Step/configure.html.twig
  17. 4
      src/Chamilo/InstallerBundle/Resources/views/Process/Step/final.html.twig
  18. 10
      src/Chamilo/InstallerBundle/Resources/views/Process/Step/installation.html.twig
  19. 6
      src/Chamilo/InstallerBundle/Resources/views/Process/Step/schema.html.twig
  20. 4
      src/Chamilo/InstallerBundle/Resources/views/Process/Step/setup.html.twig
  21. 2
      src/Chamilo/InstallerBundle/Resources/views/Process/Step/welcome.html.twig
  22. 35
      src/Chamilo/InstallerBundle/Resources/views/layout.html.twig
  23. 2
      src/Chamilo/ThemeBundle/DependencyInjection/ChamiloAdminThemeExtension.php
  24. 2
      src/Chamilo/ThemeBundle/Resources/views/Breadcrumb/breadcrumb.html.twig
  25. 2
      src/Chamilo/ThemeBundle/Resources/views/Default/form.html.twig
  26. 5
      src/Chamilo/ThemeBundle/Resources/views/Default/index.html.twig
  27. 2
      src/Chamilo/ThemeBundle/Resources/views/Exception/exception_full.html.twig
  28. 2
      src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig
  29. 4
      src/Chamilo/ThemeBundle/Resources/views/Navbar/messages.html.twig
  30. 4
      src/Chamilo/ThemeBundle/Resources/views/Navbar/notifications.html.twig
  31. 6
      src/Chamilo/ThemeBundle/Resources/views/Navbar/tasks.html.twig
  32. 6
      src/Chamilo/ThemeBundle/Resources/views/Navbar/user.html.twig
  33. 2
      src/Chamilo/ThemeBundle/Resources/views/Sidebar/user-panel.html.twig
  34. 101
      web/install.php

@ -143,7 +143,6 @@ class AppKernel extends Kernel
new Chamilo\MessageBundle\ChamiloMessageBundle(),
new Chamilo\SettingsBundle\ChamiloSettingsBundle(),
new Chamilo\ThemeBundle\ChamiloThemeBundle(),
//new Chamilo\ThemeBundle\ChamiloThemeBundle(),
// Chamilo course tool
new Chamilo\NotebookBundle\ChamiloNotebookBundle(),

@ -82,6 +82,7 @@ class ChamiloRequirements extends SymfonyRequirements
);
$extensions = $this->getExtensions();
foreach ($extensions as $type) {
$isOptional = $type == 'optional' ? true : false;
foreach ($type as $extension => $url) {
@ -143,7 +144,7 @@ class ChamiloRequirements extends SymfonyRequirements
}
$baseDir = realpath(__DIR__ . '/..');
$mem = $this->getBytes(ini_get('memory_limit'));
$mem = $this->getBytes(ini_get('memory_limit'));
$this->addPhpIniRequirement(
'memory_limit',
@ -252,6 +253,7 @@ class ChamiloRequirements extends SymfonyRequirements
* @param string $testMessage The message for testing the requirement
* @param string $helpHtml The help text formatted in HTML for resolving the problem
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
* @param bool $optional
*/
public function addChamiloRequirement(
$fulfilled,
@ -260,7 +262,15 @@ class ChamiloRequirements extends SymfonyRequirements
$helpText = null,
$optional = false
) {
$this->add(new ChamiloRequirement($fulfilled, $testMessage, $helpHtml, $helpText, $optional));
$this->add(
new ChamiloRequirement(
$fulfilled,
$testMessage,
$helpHtml,
$helpText,
$optional
)
);
}
/**
@ -366,14 +376,18 @@ class ChamiloRequirements extends SymfonyRequirements
foreach ($requirements as $key => $requirement) {
$testMessage = $requirement->getTestMessage();
if (preg_match_all(self::EXCLUDE_REQUIREMENTS_MASK, $testMessage, $matches)) {
if (preg_match_all(
self::EXCLUDE_REQUIREMENTS_MASK,
$testMessage,
$matches
)) {
unset($requirements[$key]);
}
}
return $requirements;
}
/**
* {@inheritdoc}
*/

@ -1,29 +0,0 @@
title: Chamilo installation
welcome:
header: Welcome to the Installer
content: This wizard will guide you through the setup process.
button: Begin Installation
process:
step:
check:
header: System requirements
invalid: Some of the requirements are not met and the installation process cannot continue. Please check below for the minimum requirements to Install.
phpchanges: Changes to the <strong>php.ini</strong> file must be done in "<strong>%path%</strong>".
phpcreate: To change settings, create a "<strong>php.ini</strong>".
table:
mandatory: Mandatory requirements
php: PHP settings
chamilo: Chamilo Specific requirements
optional: Optional recommendations
check: Check
cli: PHP CLI
configure: Configuration
schema: Database initialization
setup: Administration setup
final: Finish
button:
next: Next
refresh: Refresh

@ -13,17 +13,17 @@ assetic:
assets:
chamilo_bootstrap_css:
inputs:
- "bundles/chamiloadmintheme/components/bootstrap/dist/css/bootstrap.min.css"
- @ChamiloThemeBundle/Resources/public/components/bootstrap/dist/css/bootstrap.min.css
filters:
- cssrewrite
chamilo_font_awesome_css:
inputs:
- "bundles/chamiloadmintheme/components/fontawesome/css/font-awesome.min.css"
- @ChamiloThemeBundle/Resources/public/components/fontawesome/css/font-awesome.min.css
filters:
- cssrewrite
chamilo_ionicons_css:
inputs:
- "bundles/chamiloadmintheme/components/adminlte/css/ionicons.css"
- @ChamiloThemeBundle/Resources/public/components/ionicons/css/ionicons.css
filters:
- cssrewrite
@ -50,7 +50,7 @@ assetic:
- @ChamiloThemeBundle/Resources/public/components/adminlte/css/timepicker/bootstrap-timepicker.css
- @ChamiloThemeBundle/Resources/public/components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css
- @ChamiloThemeBundle/Resources/public/components/adminlte/css/AdminLTE.css
output: web/js/chamilo.css
output: js/chamilo.css
chamilo_js:
inputs:
@ -66,7 +66,7 @@ assetic:
- @ChamiloThemeBundle/Resources/public/components/adminlte/js/plugins/daterangepicker/daterangepicker.js
- @ChamiloCoreBundle/Resources/public/js/app.js
output: web/js/chamilo.js
output: js/chamilo.js
# see http://sonata-project.org/blog/2012/5/15/assetic-package-configuration
sonata_jqueryui_js:
@ -165,8 +165,8 @@ assetic:
sonata_admin_css:
inputs:
- @ChamiloThemeBundle/Resources/public/components/bootstrap/dist/css/bootstrap.css
- "bundles/chamiloadmintheme/components/fontawesome/css/font-awesome.min.css"
- "bundles/chamiloadmintheme/components/adminlte/css/ionicons.css"
- @ChamiloThemeBundle/Resources/public/components/fontawesome/css/font-awesome.min.css
- @ChamiloThemeBundle/Resources/public/components/ionicons/css/ionicons.css
- %kernel.root_dir%/../web/bundles/sonataadmin/vendor/AdminLTE/css/AdminLTE.css
- %kernel.root_dir%/../web/bundles/sonataadmin/vendor/jqueryui/themes/flick/jquery-ui.min.css
- @ChamiloThemeBundle/Resources/public/components/select2/select2.css

@ -275,7 +275,7 @@ sp_bower:
bundles:
ChamiloThemeBundle:
cache:
directory: %kernel.root_dir%/../cache/public/components/cache
directory: %kernel.root_dir%/cache/public/components/cache
# Run to update js dependencies: app/console sp:bower:install

@ -12,3 +12,7 @@ _wdt:
_profiler:
resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
prefix: /_profiler
_errors:
resource: "@TwigBundle/Resources/config/routing/errors.xml"
prefix: /_error

@ -7,6 +7,10 @@ use Chamilo\CoreBundle\DependencyInjection\Compiler\DoctrineEntityListenerPass;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
/**
* Class ChamiloCoreBundle
* @package Chamilo\CoreBundle
*/
class ChamiloCoreBundle extends Bundle
{
public function boot()

@ -44,7 +44,7 @@ class NavbarController extends Controller
$listEvent = $this->getDispatcher()->dispatch(ThemeEvents::THEME_NOTIFICATIONS, new NotificationListEvent());
return $this->render(
'ChamiloAdminTheme:Navbar:notifications.html.twig',
'ChamiloThemeBundle:Navbar:notifications.html.twig',
array(
'notifications' => $listEvent->getNotifications(),
'total' => $listEvent->getTotal()
@ -63,7 +63,7 @@ class NavbarController extends Controller
$listEvent = $this->getDispatcher()->dispatch(ThemeEvents::THEME_MESSAGES, new MessageListEvent());
return $this->render(
'ChamiloAdminTheme:Navbar:messages.html.twig',
'ChamiloThemeBundle:Navbar:messages.html.twig',
array(
'messages' => $listEvent->getMessages(),
'total' => $listEvent->getTotal()
@ -80,7 +80,7 @@ class NavbarController extends Controller
$listEvent = $this->getDispatcher()->dispatch(ThemeEvents::THEME_TASKS, new TaskListEvent());
return $this->render(
'ChamiloAdminTheme:Navbar:tasks.html.twig',
'ChamiloThemeBundle:Navbar:tasks.html.twig',
array(
'tasks' => $listEvent->getTasks(),
'total' => $listEvent->getTotal()

@ -13,7 +13,7 @@
<p>
{{user.username}}
<small>
{{ 'Member since %date%'|trans({'%date%': user.memberSince|date('m.Y') }, 'ChamiloAdminTheme') }}
{{ 'Member since %date%'|trans({'%date%': user.memberSince|date('m.Y') }, 'ChamiloThemeBundle') }}
</small>
</p>
</li>
@ -21,12 +21,12 @@
<li class="user-footer">
<div class="pull-left">
<a href="{{ path('fos_user_profile_show') }}" class="btn btn-default btn-flat">
{{'Profile'|trans({}, 'ChamiloAdminTheme')}}
{{'Profile'|trans({}, 'ChamiloThemeBundle')}}
</a>
</div>
<div class="pull-right">
<a href="{{ path('logout') }}" class="btn btn-default btn-flat">
{{ 'Sign out'|trans({}, 'ChamiloAdminTheme') }}
{{ 'Sign out'|trans({}, 'ChamiloThemeBundle') }}
</a>
</div>
</li>

@ -1,4 +1,4 @@
{% from '@ChamiloAdminTheme/Macros/actions.html.twig' import create %}
{% from '@ChamiloTheme/Macros/actions.html.twig' import create %}
{{ form_errors(form) }}

@ -1,4 +1,4 @@
{% extends "@ChamiloAdminTheme/Layout/base-layout.html.twig" %}
{% extends "@ChamiloTheme/Layout/base-layout.html.twig" %}
{% block title %}
{{- chamilo_settings_get('platform.site_name') -}}

@ -70,7 +70,6 @@ class SetupStep extends AbstractStep
'loadFixtures',
$form->has('loadFixtures') && $form->get('loadFixtures')->getData()
);*/
$this->get('fos_user.user_manager')->updateUser($adminUser);
// Setting portal parameters

@ -165,3 +165,13 @@ ul.nav-wizard.nav-wizard-backnav .active ~ li a:focus {
color: #999999;
background: #ededed;
}
td pre.output {
background-color: #232125;
overflow: auto;
line-height: 1.3em;
color: #fff;
font-size: 14px;
padding: .7em;
margin-top: 10px;
}

@ -1,4 +1,4 @@
title: Chamilo Application installation
title: Chamilo installation
flashes:
installed: Chamilo has been successfully installed.
@ -71,6 +71,22 @@ process:
content: <p>Welcome to the installer.</p>
check:
header: System requirements
invalid: Some of the requirements are not met and the installation process cannot continue. Please check below for the minimum requirements to Install.
phpchanges: Changes to the <strong>php.ini</strong> file must be done in "<strong>%path%</strong>".
phpcreate: To change settings, create a "<strong>php.ini</strong>".
table:
mandatory: Mandatory requirements
php: PHP settings
chamilo: Chamilo Specific requirements
optional: Optional recommendations
check: Check
cli: PHP CLI
status: Status
requirement_status:
ok: Ok
warning: Warning
danger: Danger
configure:
header: Configuration
schema:

@ -32,8 +32,13 @@
</div>
<div class="install-form-actions">
<a href="{{ app.request.basePath }}/install.php" class="btn btn-default back">{{ 'process.button.back'|trans }}</a>
<button class="btn btn-primary button next" type="submit">{{ 'process.button.next'|trans }}</button>
<a href="{{ app.request.basePath }}/install.php" class="btn btn-lg btn-default back">
{{ 'process.button.back'|trans }}
</a>
<button class="btn btn-lg btn-primary button next" type="submit">
<i class="fa fa-chevron-right"></i>
{{ 'process.button.next'|trans }}
</button>
</div>
</form>
</div>

@ -18,7 +18,9 @@
</div>
<div class="install-form-actions">
<a href="{{ path('home') }}" class="btn btn-success btn-lg" target="_blank">{{ 'process.button.finish'|trans }}</a>
<a href="{{ path('home') }}" class="btn btn-success btn-lg" target="_blank">
{{ 'process.button.finish'|trans }}
</a>
</div>
{% endblock %}

@ -61,11 +61,11 @@
</table>
<div class="install-form-actions">
<a href="{{ path('sylius_flow_display', { scenarioAlias: 'chamilo_installer', stepName: 'configure' }) }}" class="btn btn-default back disabled">
<a href="{{ path('sylius_flow_display', { scenarioAlias: 'chamilo_installer', stepName: 'configure' }) }}" class="btn btn-lg btn-default back disabled">
<span>{{ 'process.button.back'|trans }}</span>
</a>
<a href="javascript: void(0)" class="btn btn-primary next primary disabled">
<span>{{ 'process.button.next'|trans }}</span>
<a href="javascript: void(0)" class="btn btn-lg btn-primary next primary disabled">
<i class="fa fa-chevron-right"></i> <span>{{ 'process.button.next'|trans }}</span>
</a>
</div>
</div>
@ -77,8 +77,8 @@
<script type="text/javascript">
$(function() {
ajaxQueue(
[{% for step in steps %}'{{ step }}'{{ loop.last ? '' : ', ' }}{% endfor %}],
'{{ path('sylius_flow_forward', { scenarioAlias: 'chamilo_installer', stepName: 'installation' }) }}'
[{% for step in steps %}'{{ step }}'{{ loop.last ? '' : ', ' }}{% endfor %}],
'{{ path('sylius_flow_forward', { scenarioAlias: 'chamilo_installer', stepName: 'installation' }) }}'
);
});
</script>

@ -34,11 +34,11 @@
</table>
<div class="install-form-actions">
<a href="{{ path('sylius_flow_display', { scenarioAlias: 'chamilo_installer', stepName: 'configure' }) }}" class="btn btn-default back disabled">
<a href="{{ path('sylius_flow_display', { scenarioAlias: 'chamilo_installer', stepName: 'configure' }) }}" class="btn btn-lg btn-default back disabled">
{{ 'process.button.back'|trans }}
</a>
<a href="javascript: void(0)" class="btn btn-primary next primary disabled">
{{ 'process.button.next'|trans }}
<a href="javascript: void(0)" class="btn btn-lg btn-primary next primary disabled">
<i class="fa fa-chevron-right"></i> {{ 'process.button.next'|trans }}
</a>
</div>
</div>

@ -31,8 +31,8 @@
</div>
{{ form_rest(form) }}
<div class="install-form-actions">
<a href="{{ path('sylius_flow_display', {'scenarioAlias': 'chamilo_installer', 'stepName': 'configure'}) }}" class="btn btn-default btn-lg">
<i class="fa fa-chevron-right"></i>
<a href="{{ path('sylius_flow_display', {'scenarioAlias': 'chamilo_installer', 'stepName': 'configure'}) }}" class="btn btn-lg btn-default">
<i class="fa fa-chevron-left"></i>
{{ 'process.button.back'|trans }}
</a> &nbsp;
<button class="btn btn-lg btn-primary" type="submit">

@ -15,7 +15,7 @@
<div class="install-form-actions">
<a href="{{ path('sylius_flow_forward', {'scenarioAlias': 'chamilo_installer', 'stepName': 'welcome'}) }}" class="btn btn-lg btn-primary">
{{ 'process.button.continue'|trans }} <i class="fa fa-chevron-right"></i>
<i class="fa fa-chevron-right"></i> {{ 'process.button.continue'|trans }}
</a>
</div>
{% endblock %}

@ -12,14 +12,13 @@
{% block stylesheets %}
{% endblock %}
<link rel="stylesheet" href="{{ asset('bundles/chamiloadmintheme/components/bootstrap/dist/css/bootstrap.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/chamiloadmintheme/components/fontawesome/css/font-awesome.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/chamilotheme/components/bootstrap/dist/css/bootstrap.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/chamilotheme/components/fontawesome/css/font-awesome.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/chamiloinstaller/css/install.css') }}" />
<script type="text/javascript" src="{{ asset('bundles/chamiloadmintheme/components/jquery/dist/jquery.js') }}"></script>
<script type="text/javascript" src="{{ asset('bundles/chamiloadmintheme/components/bootstrap/dist/js/bootstrap.js') }}"></script>
<script type="text/javascript" src="{{ asset('bundles/chamiloadmintheme/components/ajaxQueue/dist/jquery.ajaxQueue.js') }}"></script>
<script type="text/javascript" src="{{ asset('bundles/chamilotheme/components/jquery/dist/jquery.js') }}"></script>
<script type="text/javascript" src="{{ asset('bundles/chamilotheme/components/bootstrap/dist/js/bootstrap.js') }}"></script>
<script type="text/javascript" src="{{ asset('bundles/chamilotheme/components/ajaxQueue/dist/jquery.ajaxQueue.js') }}"></script>
{% block javascript %}
<script type="text/javascript">
@ -36,6 +35,12 @@
$('input[type="checkbox"]').removeClass('form-control');
});
var wait = '<i class="fa fa-clock-o"></i> {{ 'wait'|trans }}';
var progress = '<i class="fa fa-circle-o-notch fa-spin"></i> {{ 'progress'|trans }}';
var skipped = '<i class="fa fa-circle-thin"></i> {{ 'skipped'|trans }}';
var passed = '<i class="fa fa-check-circle-o"></i> {{ 'passed'|trans }}';
var failed = '<i class="fa fa-exclamation-triangle"></i> {{ 'failed'|trans }}';
function ajaxQueue(actions, url) {
var finRes = true,
aborted = false;
@ -43,12 +48,12 @@
$.each(actions, function(i) {
var stepCon = $('#step-' + this);
stepCon.closest('tr').find('td:last').text('{{ 'wait'|trans }}');
stepCon.closest('tr').find('td:last').html(wait);
if (i == 0) {
stepCon
.addClass('icon-wait')
.closest('tr').find('td:last').text('{{ 'progress'|trans }}');
.closest('tr').find('td:last').html(progress);
}
$.ajaxQueue({
@ -68,13 +73,13 @@
.removeClass('icon-wait')
.addClass('icon-' + (curRes ? (exitCode == 0 ? 'yes' : 'warning') : 'no'))
.closest('tr')
.find('td:last').text(
.find('td:last').html(
curRes
? (exitCode == 0 ? '{{ 'passed'|trans }}' : '{{ 'skipped'|trans }}')
: '{{ 'failed'|trans }}'
? (exitCode == 0 ? passed : skipped)
: failed
).end()
.closest('tr').next()
.find('td:last').text('{{ 'progress'|trans }}').end()
.find('td:last').html(progress).end()
.find('span').addClass('icon-wait');
if (i == actions.length - 1 && finRes) {
@ -86,13 +91,13 @@
stepCon
.removeClass('icon-wait')
.addClass('icon-warning')
.closest('tr').find('td:last').text('{{ 'skipped'|trans }}');
.closest('tr').find('td:last').html(skipped);
} else {
finRes = false;
stepCon
.removeClass('icon-wait')
.addClass('icon-no')
.closest('tr').find('td:last').text('{{ 'failed'|trans }}');
.closest('tr').find('td:last').html(failed);
}
if (i == actions.length - 1) {
$('a.back').removeClass('disabled');
@ -107,7 +112,7 @@
<body>
<div class="container">
<div class="page-header">
<h1 class="logo">Chamilo installation</h1>
<h1 class="logo">{{ 'title'|trans }}</h1>
</div>
{% block progress %}{% endblock %}
{% block content %}{% endblock %}

@ -13,7 +13,7 @@ use Symfony\Component\DependencyInjection\Loader;
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
*/
class ChamiloAdminThemeExtension extends Extension implements PrependExtensionInterface
class ChamiloThemeExtension extends Extension implements PrependExtensionInterface
{
/**
* {@inheritDoc}

@ -2,7 +2,7 @@
<li>
<a href="{{ path('home') }}">
<i class="fa fa-dashboard"></i>
{{ 'Home'|trans({}, 'ChamiloAdminTheme') }}
{{ 'Home'|trans({}, 'ChamiloThemeBundle') }}
</a>
</li>
{% if active %}

@ -1,4 +1,4 @@
{% extends '@ChamiloAdminTheme/Layout/base-layout.html.twig' %}
{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %}
{% block page_content %}

@ -1,4 +1 @@
{% extends '@ChamiloAdminTheme/Layout/base-layout.html.twig' %}
{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %}

@ -1,4 +1,4 @@
{% extends '@ChamiloAdminTheme/Layout/base-layout.html.twig' %}
{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %}
{% block page_title %} Error {% endblock %}
{% block page_subtitle %} {{ status_code }} {% endblock %}

@ -31,7 +31,7 @@
<link rel="stylesheet" href="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/scormfs.css') }}"/>
<link rel="stylesheet" href="{{ asset('bundles/chamilocore/js/tag/style.css') }}"/>
<script src="{{ asset('bundles/chamiloadmintheme/components/modernizr/modernizr.js') }}"></script>
<script src="{{ asset('bundles/chamilotheme/components/modernizr/modernizr.js') }}"></script>
{% block javascripts %}
{%- javascripts '@chamilo_js' -%}
<script src="{{ asset_url }}"></script>

@ -7,7 +7,7 @@
</a>
<ul class="dropdown-menu">
<li class="header">
{{ 'You have %total% messages'|trans({'%total%':total}, 'ChamiloAdminTheme') }}
{{ 'You have %total% messages'|trans({'%total%':total}, 'ChamiloThemeBundle') }}
</li>
<li>
<!-- inner menu: contains the actual data -->
@ -30,7 +30,7 @@
</li>
<li class="footer">
<a href="{{ path('fos_message_inbox') }}">
{{'See All Messages'|trans({}, 'ChamiloAdminTheme')}}
{{'See All Messages'|trans({}, 'ChamiloThemeBundle')}}
</a>
</li>
</ul>

@ -5,7 +5,7 @@
<span class="label label-warning">{{ total }}</span>
</a>
<ul class="dropdown-menu">
<li class="header">{{ 'You have %total% notifications'|trans({'%total%': total}, 'ChamiloAdminTheme') }}</li>
<li class="header">{{ 'You have %total% notifications'|trans({'%total%': total}, 'ChamiloThemeBundle') }}</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
@ -19,6 +19,6 @@
{% endfor %}
</ul>
</li>
<li class="footer"><a href="{{ path('chamilo_admin_all_notifications') }}">{{'View all'|trans({}, 'ChamiloAdminTheme')}}</a></li>
<li class="footer"><a href="{{ path('chamilo_admin_all_notifications') }}">{{'View all'|trans({}, 'ChamiloThemeBundle')}}</a></li>
</ul>
</li>

@ -5,7 +5,7 @@
<span class="label label-danger">{{ total }}</span>
</a>
<ul class="dropdown-menu">
<li class="header">{{ 'You have %total% tasks' |trans({'%total%':total}, 'ChamiloAdminTheme') }}</li>
<li class="header">{{ 'You have %total% tasks' |trans({'%total%':total}, 'ChamiloThemeBundle') }}</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
@ -23,7 +23,7 @@
aria-valuenow="{{ task.progress }}"
aria-valuemin="0"
aria-valuemax="100">
<span class="sr-only">{{ '%progress%% Complete'|trans({'%progress%':task.progress}, 'ChamiloAdminTheme') }}</span>
<span class="sr-only">{{ '%progress%% Complete'|trans({'%progress%':task.progress}, 'ChamiloThemeBundle') }}</span>
</div>
</div>
</a>
@ -31,7 +31,7 @@
{% endfor %}
</ul>
<li class="footer">
<a href="{{ path('chamilo_admin_all_tasks') }}">{{'View all tasks'|trans({}, 'ChamiloAdminTheme')}}</a>
<a href="{{ path('chamilo_admin_all_tasks') }}">{{'View all tasks'|trans({}, 'ChamiloThemeBundle')}}</a>
</li>
</ul>
</li>

@ -12,7 +12,7 @@
<p>
{{ user.username }}
<small>
{{ 'Member since %date%'|trans({'%date%': user.memberSince|date('m.Y') }, 'ChamiloAdminTheme') }}
{{ 'Member since %date%'|trans({'%date%': user.memberSince|date('m.Y') }, 'ChamiloThemeBundle') }}
</small>
</p>
</li>
@ -34,12 +34,12 @@
<li class="user-footer">
<div class="pull-left">
<a href="{{ path('chamilo_core_user_user_profile', {'username' : user.identifier}) }}" class="btn btn-default btn-flat">
{{'Profile'|trans({}, 'ChamiloAdminTheme')}}
{{'Profile'|trans({}, 'ChamiloThemeBundle')}}
</a>
</div>
<div class="pull-right">
<a href="{{ path('logout') }}" class="btn btn-default btn-flat">
{{ 'Sign out'|trans({}, 'ChamiloAdminTheme') }}
{{ 'Sign out'|trans({}, 'ChamiloThemeBundle') }}
</a>
</div>
</li>

@ -12,7 +12,7 @@
{% endif %#}
</div>
<div class="pull-left info">
<p>{{ 'Hello, %user%'|trans({'%user%': user.username }, 'ChamiloAdminTheme') }}</p>
<p>{{ 'Hello, %user%'|trans({'%user%': user.username }, 'ChamiloThemeBundle') }}</p>
<a href="#"><i class="fa fa-circle text-success"></i> Online</a>
</div>
</div>

@ -50,11 +50,11 @@ $minorProblems = $collection->getFailedRecommendations();
$translator->addLoader('yml', new YamlFileLoader());
$translator->addResource(
'yml',
__DIR__ . '/../app/Resources/translations/install.' . $locale . '.yml',
__DIR__ . '/../src/Chamilo/InstallerBundle/Resources/translations/messages.' . $locale . '.yml',
$locale
);
function iterateRequirements(array $collection) {
function iterateRequirements(array $collection, $translator) {
foreach ($collection as $requirement) :
?>
<tr>
@ -75,12 +75,12 @@ function iterateRequirements(array $collection) {
<td>
<?php
if ($requirement->isFulfilled()) {
echo '<span class="label label-success">OK</span>';
echo '<h4><span class="label label-success"><i class="fa fa-check-circle"></i> '.$translator->trans('process.step.check.requirement_status.ok').'</span></h4>';
} else {
if (!$requirement->isOptional()) {
echo '<span class="label label-danger">';
echo '<h4><span class="label label-danger"><i class="fa fa-exclamation-triangle"> </i> '.$translator->trans('process.step.check.requirement_status.danger').'</span></h4>';
} else {
echo '<span class="label label-warning">';
echo '<h4><span class="label label-warning"><i class="fa fa-exclamation-triangle"></i> '.$translator->trans('process.step.check.requirement_status.warning').'</span></h4>';
}
$requirement->getHelpHtml();
echo '</span>';
@ -103,9 +103,10 @@ function iterateRequirements(array $collection) {
<title><?php echo $translator->trans('title'); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="bundles/chamiloadmintheme/components/adminlte/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="bundles/chamilotheme/components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="bundles/chamilotheme/components/fontawesome/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="bundles/chamiloinstaller/css/install.css" />
<script type="text/javascript" src="bundles/chamiloadmintheme/components/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="bundles/chamilotheme/components/jquery/dist/jquery.min.js"></script>
<script type="text/javascript">
$(function() {
@ -136,17 +137,6 @@ function iterateRequirements(array $collection) {
<?php endif; ?>
});
</script>
<style>
td pre.output {
background-color: #232125;
overflow: auto;
line-height: 1.3em;
color: #fff;
font-size: 14px;
padding: .7em;
margin-top: 10px;
}
</style>
</head>
<body>
<div class="container">
@ -154,40 +144,9 @@ function iterateRequirements(array $collection) {
<h1 class="logo"><?php echo $translator->trans('title'); ?></h1>
</div>
<div class="content">
<div class="progress-bar">
<ul>
<li class="active">
<em class="fix-bg">&nbsp;</em>
<strong class="step">1</strong>
<span><?php echo $translator->trans('process.step.check.header'); ?></span>
</li>
<li>
<em class="fix-bg">&nbsp;</em>
<strong class="step">2</strong>
<span><?php echo $translator->trans('process.step.configure'); ?></span>
</li>
<li>
<em class="fix-bg">&nbsp;</em>
<strong class="step">3</strong>
<span><?php echo $translator->trans('process.step.schema'); ?></span>
</li>
<li>
<em class="fix-bg">&nbsp;</em>
<strong class="step">4</strong>
<span><?php echo $translator->trans('process.step.setup'); ?></span>
</li>
<li>
<em class="fix-bg">&nbsp;</em>
<strong class="step">5</strong>
<span><?php echo $translator->trans('process.step.final'); ?></span>
</li>
</ul>
</div>
<div class="page-title">
<h2><?php echo $translator->trans('process.step.check.header'); ?></h2>
</div>
<div>
<?php if (count($majorProblems)) : ?>
<div class="alert alert-warning" role="alert">
@ -217,7 +176,7 @@ function iterateRequirements(array $collection) {
$requirements = array(
'mandatory' => $collection->getMandatoryRequirements(),
'php' => $collection->getPhpIniRequirements(),
'oro' => $collection->getRequirements(),
'chamilo' => $collection->getChamiloRequirements(),
'cli' => $collection->getCliRequirements(),
'optional' => $collection->getRecommendations(),
);
@ -229,30 +188,28 @@ function iterateRequirements(array $collection) {
<thead>
<tr>
<th><?php echo $translator->trans('process.step.check.table.' . $type); ?></th>
<th><?php echo $translator->trans('process.step.check.table.check'); ?></th>
<th><?php echo $translator->trans('process.step.check.table.status'); ?></th>
</tr>
</thead>
<tbody>
<?php iterateRequirements($requirement); ?>
<?php iterateRequirements($requirement, $translator); ?>
</tbody>
</table>
<?php endforeach; ?>
</div>
<hr/ >
<hr />
<br />
<div class="button-set">
<div class="pull-right">
<?php if (count($majorProblems) || count($minorProblems)): ?>
<a href="install.php" class="btn btn-default icon-reset">
<span><?php echo $translator->trans('process.button.refresh'); ?></span>
</a>
<?php endif; ?>
<a href="<?php echo count($majorProblems) ? 'javascript: void(0);' : 'app_dev.php/installer/flow/chamilo_installer/welcome'; ?>" class="btn btn-primary next <?php echo count($majorProblems) ? 'disabled' : 'primary'; ?>">
<span><?php echo $translator->trans('process.button.next'); ?></span>
</a>
</div>
<div class="install-form-actions">
<?php if (count($majorProblems) || count($minorProblems)): ?>
<a href="install.php" class="btn btn-default icon-reset">
<span><?php echo $translator->trans('process.button.refresh'); ?></span>
</a>
<?php endif; ?>
<a href="<?php echo count($majorProblems) ? 'javascript: void(0);' : 'app_dev.php/installer/flow/chamilo_installer/welcome'; ?>" class="btn btn-lg btn-primary <?php echo count($majorProblems) ? 'disabled' : 'primary'; ?>">
<i class="fa fa-chevron-right"></i> <?php echo $translator->trans('process.button.continue'); ?>
</a>
</div>
</div>
</div>
@ -260,22 +217,6 @@ function iterateRequirements(array $collection) {
<hr/ >
<br />
<div class="start-box" style="display: none;">
<div class="fade-box"></div>
<div class="start-content">
<div class="start-content-holder">
<div class="center"></div>
<h2><?php echo $translator->trans('welcome.header'); ?></h2>
<h3><?php echo $translator->trans('welcome.content'); ?></h3>
<div class="start-footer">
<button type="button" id="begin-install" class="btn btn-primary next" href="javascript: void(0);">
<span><?php echo $translator->trans('welcome.button'); ?></span>
</button>
</div>
</div>
</div>
</div>
<footer class="footer">
<div class="container">
<p class="text-muted">

Loading…
Cancel
Save