Redesign #38
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,4 @@ web/apidoc | |
| web/Composer-Setup.exe | ||
| web/book.pdf | ||
| cache/ | ||
| silex.log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| web1: | ||
| php_extensions: | ||
| - zip | ||
| after_build: | ||
| - "if [ ! -f composer.phar ]; then curl -s http://getcomposer.org/installer | php; fi; php composer.phar install" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,40 @@ | ||
| {% extends "layout.html.twig" %} | ||
|
|
||
| {% block content %} | ||
| <!-- Page --> | ||
| <div id="page" class="docs paddingtop paddingbottom nudgeheader"> | ||
| <div class="wrapper grid"> | ||
| <div class="column col-2-third"> | ||
| <h1>Download Composer</h1> | ||
| <p>Run this in your terminal to get the latest Composer version:</p> | ||
| <pre><code>curl -s https://getcomposer.org/installer | php</code></pre> | ||
| <p>Or if you don't have curl:</p> | ||
| <pre><code>php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));"</code></pre> | ||
| <p>This installer script will simply check some php.ini settings, warn you if they are set incorrectly, and then download the latest composer.phar in the current directory</p> | ||
|
|
||
| <h2>Installer Options</h2> | ||
| <p>You can install composer to a specific directory by using the <code>--install-dir</code> option and providing a target directory. Options must be appended to <code>--</code> so that PHP ignores them, like <code>-- --install-dir=bin</code>, example:</p> | ||
| <pre><code>curl -s https://getcomposer.org/installer | php -- --install-dir=bin</code></pre> | ||
| {% if windows %} | ||
| <h2>Windows Installer</h2> | ||
| <p>The installer will download composer for you and set up your PATH environment variable so you can simply call <code>composer</code> from any directory.</p> | ||
| <p>Download and run <a href="/Composer-Setup.exe">Composer-Setup.exe</a> - it will install the latest composer version whenever it is executed.</p> | ||
| {% endif %} | ||
| </div> | ||
| <div class="column col-1-third"> | ||
| <h2>Manual Download</h2> | ||
| <p>If you prefer to download the phar manually, here are the available versions:</p> | ||
| <p> | ||
| <div class="block_button download_button marginbottom"> | ||
| <a href="{{ app.request.basePath }}/composer.phar"><span class="icon">à</span>Latest Snapshot</a> | ||
| </div> | ||
| {% for version, date in versions %} | ||
| <div class="block_button download_button marginbottom"> | ||
| <a href="{{ path('download_version', {version: version}) }}"><span class="icon">à</span>{{ version }} ({{ date|date('Y-m-d') }})</a> | ||
| </div> | ||
| {% endfor %} | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,49 @@ | ||
| {% extends "layout.html.twig" %} | ||
|
|
||
| {% block content %} | ||
| <!-- Intro --> | ||
| <div id="intro"> | ||
| <h1>Composer is a dependency manager for PHP</h1> | ||
| <p>Allowing you to declare the dependant libraries your project needs and it will automatically install them for you</p> | ||
| <div id="composer_graphic"> | ||
| <img src="{{ app.request.basePath }}/img/logo-composer-transparent.png" /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <!-- Page --> | ||
| <div id="page" class="paddingtop paddingbottom"> | ||
| <div class="wrapper grid"> | ||
| <div class="column col-2-third"> | ||
| <h2>What is Composer?</h2> | ||
| <p>Composer is a tool for dependency management in PHP. It allows you to declare the dependent libraries your project needs and it will install them in your project for you.</p> | ||
| <h4>Dependency Management</h4> | ||
| <p>Composer is not a package manager. Yes, it deals with "packages" or libraries, but it manages them on a per-project basis, installing them in a directory (e.g. vendor) inside your project. By default it will never install anything globally. Thus, it is a dependency manager.</p> | ||
| <p>This idea is not new and Composer is strongly inspired by node's npm and ruby's bundler. But there has not been such a tool for PHP.</p> | ||
| <h4>The problem Composer solves:</h4> | ||
| <ol> | ||
| <li>You have a project that depends on a number of libraries.</li> | ||
| <li>Some of those libraries depend on other libraries.</li> | ||
| <li>You declare the things you depend on.</li> | ||
| <li>Composer finds out which versions of which packages need to be installed, and installs them (meaning it downloads them into your project).</li> | ||
| </ol> | ||
| </div> | ||
| <div class="column col-1-third" id="sidebar"> | ||
| <div id="get_started" class="button_block"> | ||
| <a href="{{ path('docs.view', {page: '00-intro.md'}) }}"><span class="icon">Y</span>Getting Started</a> | ||
| </div> | ||
| <p class="margintop marginbottom"><span>Composer</span>, written by <a href="#">Nils Andermann</a>, <a href="#">Jordi Boggiano</a> and many <a href="#">community contributors</a>, is an <span>open-source technology</span> licensed under the <a href="#">MIT license</a>.</p> | ||
|
|
||
| <div id="latest_commit" class="margintop loading"> | ||
| <div id="post_info"> | ||
| <a href="#" target="_blank"><span class="icon">â</span><span>Loading</span></a> | ||
| <a href="#" target="_blank"><span class="icon">[</span><span class="realtime_time">Loading</span></a> | ||
| </div> | ||
| <h2>Latest Commit:</h2> | ||
| <p>Loading</p> | ||
| </div> | ||
| <div id="get_github" class="button_block"> | ||
| <a href="http://github.com/composer/composer"><span class="icon social icon-github"></span>Get it on Github</a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,80 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||
| <meta name="description" contAll ent="Dependency Management for PHP"> | ||
| <meta name="viewport" content="width=320, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/> | ||
| <meta name="apple-mobile-web-app-capable" content="yes" /> | ||
| <title>{% block title %}Composer{% endblock %}</title> | ||
| <!-- Google Webfonts --> | ||
| <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Montserrat:400,700" /> | ||
| <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:400,700" /> | ||
| <!-- /Google Webfonts --> | ||
| <link rel="stylesheet" type="text/css" href="{{ app.request.basePath }}/css/base.css" /> | ||
| </head> | ||
|
|
||
| <body> | ||
| {% block header %} | ||
| <!-- Header --> | ||
| <div id="header"> | ||
|
There was a problem hiding this comment. Please use 4 spaces for the indentation to be consistent with the current coding standards |
||
| <div class="wrapper"> | ||
| <ul> | ||
| <li class="mini_nav"><a href="{{ path('home') }}" class="logo">Composer</a></li> | ||
| <li><a href="{{ path('docs.view', {page: '00-intro.md'}) }}"><span class="icon">Y</span><p>Getting Started</p></a></li> | ||
|
There was a problem hiding this comment. Having letters for the icons looks wrong to me. A screen-reader would read it as There was a problem hiding this comment. Do you have a suggestion to combat this? I could make use of the CSS :before pseudo class, but is it a big enough issue to warrant this? There was a problem hiding this comment. Well, your social icons are already using There was a problem hiding this comment. Would you be satisfied by the :before fix for now? I have no idea how to edit the icon font I'm using. There was a problem hiding this comment. Well, some screen-readers are reading the generated content too (but not all of them): http://www.456bereastreet.com/archive/201205/css_generated_content_and_screen_readers/ I don't know exactly what are the icons you are using (well, I saw a few of them but I'm not sure I found all of them) but FontAwesome or IcoMoon probably provide the icons needed for the website, and they are using the PUA There was a problem hiding this comment. Okay sweet, when I get a chance I'll swap the icons over to Font Awesome (used by Bootstrap I think?). On 15 Mar 2013, at 15:08, Christophe Coevoet notifications@github.com wrote:
There was a problem hiding this comment. no, they are not using it. They use glyphicons (the png in version 2 and the font in the upcoming version 3). However, FontAwesome is meant as a drop-in replacement (they use the same classes than BS 2 for the corresponding icons) There was a problem hiding this comment. Ahhh! Gotcha. Won't be able to change this til later today. I never actually got your feedback for the actual design part, what do you think? On 15 Mar 2013, at 15:18, Christophe Coevoet notifications@github.com wrote:
There was a problem hiding this comment. I find it better than the current one. |
||
| <li><a href="http://packagist.org/"><span class="icon">\</span><p>Browse Packages</p></a></li> | ||
| <li><a href="{{ path('docs') }}"><span class="icon">é</span><p>Documentation</p></a></li> | ||
| <li><a href="http://github.com/composer/composer/issues"><span class="icon">!</span><p>Issues</p></a></li> | ||
|
|
||
| <li class="right mini_nav show_menu"><a href="#">Open Menu</a></li> | ||
| <li class="right"><a href="{{ path('download') }}" class="download"><span class="icon">à</span><p>Download</p></a></li> | ||
| <li class="right"><a href="http://github.com/composer/composer"><span class="icon social icon-github"></span><p>Github</p></a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
|
|
||
| <ul id="mini_nav"> | ||
| <li><a href="{{ path('docs.view', {page: '00-intro.md'}) }}"><span class="icon">Y</span><p>Getting Started</p></a></li> | ||
| <li><a href="http://packagist.org/"><span class="icon">\</span><p>Browse Packages</p></a></li> | ||
| <li><a href="{{ path('docs') }}"><span class="icon">é</span><p>Documentation</p></a></li> | ||
| <li><a href="http://github.com/composer/composer/issues"><span class="icon">!</span><p>Issues</p></a></li> | ||
| <li><a href="{{ path('download') }}"><span class="icon">à</span><p>Download</p></a></li> | ||
| <li><a href="http://github.com/composer/composer"><span class="icon social icon-github"></span><p>Github</p></a></li> | ||
| </ul> | ||
| {% endblock %} | ||
|
|
||
| <div id="slide_wrapper"> | ||
| {% block content %} | ||
| {% endblock %} | ||
|
|
||
| {% block footer %} | ||
| <!-- Footer --> | ||
| <div id="footer"> | ||
| <div class="wrapper"> | ||
| <div class="grid"> | ||
| <div class="column"> | ||
| <ul> | ||
| <li><a href="{{ path('docs') }}">Documentation</a></li> | ||
| <li><a href="/apidoc/master/index.html">API</a></li> | ||
| <li><a href="{{ path('docs') }}">FAQs</a></li> | ||
|
There was a problem hiding this comment. This should link to the right page of the doc directly There was a problem hiding this comment. Again, I agree. I didn't actually get to invest that much time into it, so there will be a few problems like this. All easy to fix though, thanks! |
||
| <li class="right">Started by Nils Andermann & Jordi Boggiano</li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} | ||
| </div> | ||
|
|
||
| <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script> | ||
| <script type="text/javascript" src="{{ app.request.basePath }}/js/libs/timeago.js"></script> | ||
| <script type="text/javascript" src="{{ app.request.basePath }}/js/base.js"></script> | ||
| <script> | ||
| var _gaq=[['_setAccount','UA-26723099-2'],['_trackPageview']]; | ||
| (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1; | ||
| g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js'; | ||
| s.parentNode.insertBefore(g,s)}(document,'script')); | ||
| </script> | ||
| </body> | ||
| </html> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of repeating it on all pages, couldn't you move it to the layout template ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It adds page specific classes. This was the only way to do it without messing with any application logic.