Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

cleaned HTML rendering #241

Merged
merged 2 commits into from Jan 2, 2012
Jump to file or symbol
Failed to load files and symbols.
+39 −42
Split
View
@@ -156,63 +156,60 @@
<div id="symfony-wrapper">
<div id="symfony-content">
<div class="symfony-blocks-install">
- <?php if (!$vendorsAreMissing): ?>
- <div class="symfony-block-logo">
- <img src="bundles/sensiodistribution/webconfigurator/images/logo-big.gif" alt="sf_symfony" />
- </div>
- <?php endif; ?>
-
- <div class="symfony-block-content">
- <h1>Welcome!</h1>
- <p>Welcome to your new Symfony project.</p>
- <p>This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘<strong>app/config/parameters.yml</strong>’ file directly.</p>
-
- <?php if (count($majorProblems)): ?>
+ <?php if (!$vendorsAreMissing): ?>
+ <div class="symfony-block-logo">
+ <img src="bundles/sensiodistribution/webconfigurator/images/logo-big.gif" alt="sf_symfony" />
+ </div>
+ <?php endif; ?>
+
+ <div class="symfony-block-content">
+ <h1>Welcome!</h1>
+ <p>Welcome to your new Symfony project.</p>
+ <p>This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘<strong>app/config/parameters.yml</strong>’ file directly.</p>
+
+ <?php if (count($majorProblems)): ?>
<h2>
- <span><?php echo count($majorProblems) ?> Major problems</span>
+ <span><?php echo count($majorProblems); ?> Major problems</span>
@fabpot

fabpot Dec 1, 2011

Owner

There is no need to add ; here. Just keep it the way they were set.

@trompette

trompette Dec 1, 2011

Contributor

The original file was a complete mess:

  • echo with and without semicolon (here and here)
  • endif with and without semicolon (here and here)
  • endforeach with and without semicolon (here and here)

I'm just trying to bring some consistence to the file: either no semicolon at all or semicolons everywhere.

By the way, the first goal of this PR was to add a missing closing div tag reported by Eclipse.

</h2>
- <p>Major problems have been detected and <strong>must</strong> be fixed before continuing :</p>
+ <p>Major problems have been detected and <strong>must</strong> be fixed before continuing:</p>
<ol>
<?php foreach ($majorProblems as $problem): ?>
- <li><?php echo $problem; ?></li>
- <?php endforeach ?>
+ <li><?php echo $problem; ?></li>
+ <?php endforeach; ?>
</ol>
- <?php endif ?>
-
- <?php if (count($minorProblems)): ?>
+ <?php endif; ?>
+
+ <?php if (count($minorProblems)): ?>
<h2>Recommendations</h2>
<p>
- <?php if ($majorProblems): ?>
- Additionally, to
- <?php else: ?>
- To<?php endif; ?>
- enhance your Symfony experience, it’s recommended that you fix the following :
+ <?php if ($majorProblems): ?>Additionally, to<?php else: ?>To<?php endif; ?> enhance your Symfony experience, it’s recommended that you fix the following:
</p>
<ol>
<?php foreach ($minorProblems as $problem): ?>
<li><?php echo $problem; ?></li>
<?php endforeach; ?>
</ol>
- <?php endif ?>
-
- <?php if ($phpini): ?>
- <a id="phpini"></a>
- <p>*
- <?php if (get_cfg_var('cfg_file_path')): ?>
- Changes to the <strong>php.ini</strong> file must be done in "<strong><?php echo get_cfg_var('cfg_file_path') ?></strong>".
- <?php else: ?>
- To change settings, create a "<strong>php.ini</strong>".
- <?php endif; ?>
- </p>
- <?php endif; ?>
-
- <ul class="symfony-install-continue">
- <?php if (!count($majorProblems)): ?>
+ <?php endif; ?>
+
+ <?php if ($phpini): ?>
+ <a id="phpini"></a>
+ <p>*
+ <?php if (get_cfg_var('cfg_file_path')): ?>
+ Changes to the <strong>php.ini</strong> file must be done in "<strong><?php echo get_cfg_var('cfg_file_path') ?></strong>".
+ <?php else: ?>
+ To change settings, create a "<strong>php.ini</strong>".
+ <?php endif; ?>
+ </p>
+ <?php endif; ?>
+
+ <ul class="symfony-install-continue">
+ <?php if (!count($majorProblems)): ?>
<li><a href="app_dev.php/_configurator/">Configure your Symfony Application online</a></li>
<li><a href="app_dev.php/">Bypass configuration and go to the Welcome page</a></li>
- <?php endif ?>
- <li><a href="config.php">Re-check configuration</a></li>
- </ul>
+ <?php endif; ?>
+ <li><a href="config.php">Re-check configuration</a></li>
+ </ul>
+ </div>
</div>
</div>
</div>