Skip to content

Commit

Permalink
Introduce brand new design of website
Browse files Browse the repository at this point in the history
  • Loading branch information
stloyd committed Sep 7, 2012
1 parent 963eaba commit bdd9502
Show file tree
Hide file tree
Showing 125 changed files with 3,711 additions and 2,118 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.markdown
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* 2012-09-07
* Introduced new design!
* Replaced `knp-components` with `pagerfanta`

* 2012-08-30
* Removed `ScoreRepository#setScore()`

Expand Down
2 changes: 1 addition & 1 deletion app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public function registerBundles()
new Knp\Bundle\MenuBundle\KnpMenuBundle(),
new Knp\Bundle\ZendCacheBundle\KnpZendCacheBundle(),
new Knp\Bundle\DisqusBundle\KnpDisqusBundle(),
new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
new Nelmio\SolariumBundle\NelmioSolariumBundle(),
new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),

// register your applications here
new Knp\Bundle\KnpBundlesBundle\KnpBundlesBundle(),
Expand Down
27 changes: 20 additions & 7 deletions app/Resources/HWIOAuthBundle/views/Connect/login.html.twig
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
{% extends 'KnpBundlesBundle::layout.html.twig' %}
{% extends 'KnpBundlesBundle::layout/900px.html.twig' %}

{% block body_attributes %}id="developer-show"{% endblock %}
{% block title %}Sign-in{% endblock %}

{% block content %}
<h1 class="developer-name">Login via</h1>
<div class="actions">
<a class="button github" href="{{ hwi_oauth_login_url('github') }}">GitHub</a>
<a class="button github" href="{{ hwi_oauth_login_url('sensio') }}">Sensio Connect</a>
{% block intro %}
<div id="intro">
<h1>Sign in to KnpBundles.com</h1>
<h2>Action you want to perform, require from you to sign-in</h2>
</div>
{% endblock %}

{% block left %}
<div class="content-box">
<hgroup>
<h2>No "Sign up" form?</h2>
<h4>Yep, there is no sign-up form, but why you ask? We don't like them it same as you! All sign-up job is done automatically in background when you choose which way you want to sign in into <strong>KnpBundles.com</strong></h4>
</hgroup>

<section>
<a class="btn btn-large" href="{{ hwi_oauth_login_url('github') }}">GitHub</a>
<a class="btn btn-large" href="{{ hwi_oauth_login_url('sensio') }}">Sensio Connect</a>
</section>
</div>
{% endblock %}
26 changes: 18 additions & 8 deletions app/Resources/TwigBundle/views/Exception/error.html.twig
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
{% extends 'KnpBundlesBundle::layout.html.twig' %}
{% extends 'KnpBundlesBundle::layout/960px.html.twig' %}

{% block body_attributes %}class="error"{% endblock %}
{% block title %}ERROR - {% trans %}error.500.title{% endtrans %}{% endblock %}

{% block title %}{% trans %}error.500.title{% endtrans %}{% endblock %}
{% block content_header %}{% endblock %}

{% block content %}
<div id="main">
<h1>{% trans %}error.500.title{% endtrans %}</h1>
<p>{% trans %}error.500.content{% endtrans %}</p>
</div>
{% block content_holder %}
<div id="error">
<h1>ERROR 500</h1>

<section id="error-crap">
<span>O<br>H<br><span>!</span></span>
<span>C<br>R<br>A<br>P</span>
</section>

<section id="error-desc">
<p>An error occurred</p>
<p>Edgar found some issue at this page<br>and reported it to our ninja developers.</p>
<p id="error-sorry">(we're terribly sorry about this)</p>
</section>
</div>
{% endblock %}
26 changes: 18 additions & 8 deletions app/Resources/TwigBundle/views/Exception/error404.html.twig
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
{% extends 'KnpBundlesBundle::layout.html.twig' %}
{% extends 'KnpBundlesBundle::layout/960px.html.twig' %}

{% block body_attributes %}class="error"{% endblock %}
{% block title %}ERROR 404 - {% trans %}error.404.title{% endtrans %}{% endblock %}

{% block title %}{% trans %}error.404.title{% endtrans %}{% endblock %}
{% block content_header %}{% endblock %}

{% block content %}
<div id="main">
<h1>{% trans %}error.404.title{% endtrans %}</h1>
<p>{% trans %}error.404.content{% endtrans %}</p>
</div>
{% block content_holder %}
<div id="error">
<h1>ERROR 404</h1>

<section id="error-crap">
<span>O<br>H<br><span>!</span></span>
<span>C<br>R<br>A<br>P</span>
</section>

<section id="error-desc">
<p>Edgar and hid Jedi friends</p>
<p>Can't find page you're lookign for.</p>
<p id="error-sorry">(we're terribly sorry about this)</p>
</section>
</div>
{% endblock %}
3 changes: 0 additions & 3 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ knp_time: ~ # Enable the time helper
knp_menu:
twig: true

# Paginator Configuration
knp_paginator: ~

# KnpBundles Configuration
knp_bundles: ~

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"knplabs/knp-menu-bundle": "1.1.*",
"knplabs/knp-disqus-bundle": "dev-master",
"knplabs/knp-time-bundle": "dev-master",
"knplabs/knp-paginator-bundle": "2.1",
"knplabs/knp-zend-cache-bundle": "dev-master",
"knplabs/github-api": "dev-master",
"avalanche123/imagine-bundle": "dev-master",
"kriswallsmith/buzz": "0.7",
"nelmio/solarium-bundle": "dev-master",
"igorw/file-serve-bundle": "dev-master",
"white-october/pagerfanta-bundle": "dev-master",

"videlalvaro/php-amqplib": "dev-master",
"oldsound/rabbitmq-bundle": "dev-master",
Expand Down
103 changes: 52 additions & 51 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bdd9502

Please sign in to comment.