From 3a8e36649af10241b7283eb37a0847d09d093a4e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 8 Jan 2015 12:10:30 +0100 Subject: [PATCH] Minor - UI improvements --- .../Resources/public/css/install.css | 167 ++++++++++++++++++ .../Resources/translations/messages.en.yml | 1 + .../views/Process/Step/configure.html.twig | 8 +- .../views/Process/Step/final.html.twig | 2 +- .../views/Process/Step/installation.html.twig | 16 +- .../views/Process/Step/schema.html.twig | 20 +-- .../views/Process/Step/setup.html.twig | 6 +- .../views/Process/Step/welcome.html.twig | 6 +- .../Resources/views/layout.html.twig | 28 ++- .../Resources/views/progress.html.twig | 156 ++-------------- web/install.php | 31 +++- 11 files changed, 244 insertions(+), 197 deletions(-) create mode 100644 src/Chamilo/InstallerBundle/Resources/public/css/install.css diff --git a/src/Chamilo/InstallerBundle/Resources/public/css/install.css b/src/Chamilo/InstallerBundle/Resources/public/css/install.css new file mode 100644 index 0000000000..b0ca6aab69 --- /dev/null +++ b/src/Chamilo/InstallerBundle/Resources/public/css/install.css @@ -0,0 +1,167 @@ +/* Sticky footer styles +-------------------------------------------------- */ +html { + position: relative; + min-height: 100%; +} +body { + /* Margin bottom by footer height */ + margin-bottom: 60px; +} + +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: 60px; + background-color: #f5f5f5; +} + +.container .text-muted { + margin: 20px 0; +} + +.wizard-container { + padding-bottom: 20px; +} + +.install-form-actions { + padding:20px 0px 20px 0px; +} + +/* Wizard nav*/ + +/* https://github.com/LeadDyno/bootstrap-nav-wizard/blob/master/dist/bootstrap-nav-wizard.css + http://leaddyno.github.io/bootstrap-nav-wizard/ + */ +ul.nav-wizard { + background-color: #f9f9f9; + border: 1px solid #d4d4d4; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + *zoom: 1; + position: relative; + overflow: hidden; +} +ul.nav-wizard:before { + display: block; + position: absolute; + left: 0px; + right: 0px; + top: 46px; + height: 47px; + border-top: 1px solid #d4d4d4; + border-bottom: 1px solid #d4d4d4; + z-index: 11; + content: " "; +} +ul.nav-wizard:after { + display: block; + position: absolute; + left: 0px; + right: 0px; + top: 138px; + height: 47px; + border-top: 1px solid #d4d4d4; + border-bottom: 1px solid #d4d4d4; + z-index: 11; + content: " "; +} +ul.nav-wizard li { + position: relative; + float: left; + height: 46px; + display: inline-block; + text-align: middle; + padding: 0 20px 0 30px; + margin: 0; + font-size: 16px; + line-height: 46px; +} +ul.nav-wizard li a { + color: #468847; + padding: 0; +} +ul.nav-wizard li a:hover { + background-color: transparent; +} +ul.nav-wizard li:before { + position: absolute; + display: block; + border: 24px solid transparent; + border-left: 16px solid #d4d4d4; + border-right: 0; + top: -1px; + z-index: 10; + content: ''; + right: -16px; +} +ul.nav-wizard li:after { + position: absolute; + display: block; + border: 24px solid transparent; + border-left: 16px solid #f9f9f9; + border-right: 0; + top: -1px; + z-index: 10; + content: ''; + right: -15px; +} +ul.nav-wizard li.active { + color: #3a87ad; + background: #d9edf7; +} +ul.nav-wizard li.active:after { + border-left: 16px solid #d9edf7; +} +ul.nav-wizard li.active a, +ul.nav-wizard li.active a:active, +ul.nav-wizard li.active a:visited, +ul.nav-wizard li.active a:focus { + color: #3a87ad; + background: #d9edf7; +} +ul.nav-wizard .active ~ li { + color: #999999; + background: #ededed; +} +ul.nav-wizard .active ~ li:after { + border-left: 16px solid #ededed; +} +ul.nav-wizard .active ~ li a, +ul.nav-wizard .active ~ li a:active, +ul.nav-wizard .active ~ li a:visited, +ul.nav-wizard .active ~ li a:focus { + color: #999999; + background: #ededed; +} +ul.nav-wizard.nav-wizard-backnav li:hover { + color: #468847; + background: #f6fbfd; +} +ul.nav-wizard.nav-wizard-backnav li:hover:after { + border-left: 16px solid #f6fbfd; +} +ul.nav-wizard.nav-wizard-backnav li:hover a, +ul.nav-wizard.nav-wizard-backnav li:hover a:active, +ul.nav-wizard.nav-wizard-backnav li:hover a:visited, +ul.nav-wizard.nav-wizard-backnav li:hover a:focus { + color: #468847; + background: #f6fbfd; +} +ul.nav-wizard.nav-wizard-backnav .active ~ li { + color: #999999; + background: #ededed; +} +ul.nav-wizard.nav-wizard-backnav .active ~ li:after { + border-left: 16px solid #ededed; +} +ul.nav-wizard.nav-wizard-backnav .active ~ li a, +ul.nav-wizard.nav-wizard-backnav .active ~ li a:active, +ul.nav-wizard.nav-wizard-backnav .active ~ li a:visited, +ul.nav-wizard.nav-wizard-backnav .active ~ li a:focus { + color: #999999; + background: #ededed; +} diff --git a/src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml b/src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml index 4620c28be6..2fc240d651 100644 --- a/src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml +++ b/src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml @@ -106,5 +106,6 @@ process: next: Next install: Install finish: Launch application + continue: Continue operation: Operation status: Status diff --git a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/configure.html.twig b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/configure.html.twig index f20950d835..872c347a14 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/configure.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/configure.html.twig @@ -31,11 +31,9 @@ {{ form_rest(form) }} -
-
- {{ 'process.button.back'|trans }} - -
+
+ {{ 'process.button.back'|trans }} +
diff --git a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/final.html.twig b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/final.html.twig index 3922a7b20e..896a87efd8 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/final.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/final.html.twig @@ -17,7 +17,7 @@

{{ 'process.step.final.content'|trans|raw }}

-
+
{{ 'process.button.finish'|trans }}
{% endblock %} diff --git a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/installation.html.twig b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/installation.html.twig index b0ccae057f..2b33d4be17 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/installation.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/installation.html.twig @@ -60,15 +60,13 @@ -
-
- - {{ 'process.button.back'|trans }} - - -
+
+ + {{ 'process.button.back'|trans }} + +
{% endblock %} diff --git a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/schema.html.twig b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/schema.html.twig index a0773d1993..6a5f4c81f3 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/schema.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/schema.html.twig @@ -33,15 +33,13 @@ -
-
- - {{ 'process.button.back'|trans }} - - -
+
+ + {{ 'process.button.back'|trans }} + +
{% endblock %} @@ -52,8 +50,8 @@ diff --git a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/setup.html.twig b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/setup.html.twig index c43abc4400..8f0933dceb 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/setup.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/setup.html.twig @@ -30,13 +30,13 @@
{{ form_rest(form) }} -
+
- + {{ 'process.button.back'|trans }}  
diff --git a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/welcome.html.twig b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/welcome.html.twig index 68ad2f8e4f..e32be557b9 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/Process/Step/welcome.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/Process/Step/welcome.html.twig @@ -9,11 +9,13 @@ {% block content %} +
{{ 'process.step.welcome.content'|trans|raw }} +
-
+
- {{ 'process.button.install'|trans }} + {{ 'process.button.continue'|trans }}
{% endblock %} diff --git a/src/Chamilo/InstallerBundle/Resources/views/layout.html.twig b/src/Chamilo/InstallerBundle/Resources/views/layout.html.twig index 9430afb6a3..46569ec733 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/layout.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/layout.html.twig @@ -12,20 +12,15 @@ {% block stylesheets %} {% endblock %} - {#{% stylesheets#} - {#"@bootstrap_css" %}#} - {##} - {#{% endstylesheets %}#} - - {#{% javascripts "@bootstrap_js" %}#} - {##} - {#{% endjavascripts %}#} - + + + + {% block javascript %} {% endblock javascript %} +
@@ -118,13 +114,13 @@
{% block bottom %} -
-
-

- Chamilo -

-
-
+
+
+

+ Chamilo {{ "now"|date("Y") }} +

+
+
{% endblock bottom %} diff --git a/src/Chamilo/InstallerBundle/Resources/views/progress.html.twig b/src/Chamilo/InstallerBundle/Resources/views/progress.html.twig index 3e40a1ce14..78b12b5a08 100644 --- a/src/Chamilo/InstallerBundle/Resources/views/progress.html.twig +++ b/src/Chamilo/InstallerBundle/Resources/views/progress.html.twig @@ -1,6 +1,6 @@ {% block progress %} {% set step = step is defined ? step|lower : 'welcome' %} -
+
    @@ -8,169 +8,33 @@ 1 {{ 'process.step.welcome.header'|trans }} - -   - 2 - {{ 'process.step.check.header'|trans }} - + {##} + {# #} + {#2#} + {#{{ 'process.step.check.header'|trans }}#} + {##}   - 3 + 2 {{ 'process.step.configure.header'|trans }}   - 4 + 3 {{ 'process.step.schema.header'|trans }}   - 5 + 4 {{ 'process.step.setup.header'|trans }}   - 6 + 5 {{ 'process.step.final.header'|trans }}
- - {% endblock %} diff --git a/web/install.php b/web/install.php index c14ca3c15f..c39e8bd6eb 100644 --- a/web/install.php +++ b/web/install.php @@ -1,5 +1,5 @@ getFailedRequirements(); $minorProblems = $collection->getFailedRecommendations(); $translator->addLoader('yml', new YamlFileLoader()); -$translator->addResource('yml', __DIR__ . '/../app/Resources/translations/install.' . $locale . '.yml', $locale); +$translator->addResource( + 'yml', + __DIR__ . '/../app/Resources/translations/install.' . $locale . '.yml', + $locale +); -function iterateRequirements(array $collection) -{ +function iterateRequirements(array $collection) { foreach ($collection as $requirement) : ?> @@ -97,9 +101,12 @@ function iterateRequirements(array $collection) <?php echo $translator->trans('title'); ?> + + +