Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

refactored assets based on the recent changes in Symfony

  • Loading branch information...
commit f656890de430820d3d7e045f1b11e52df384c2fa 1 parent 4e86595
@fabpot fabpot authored
View
73 Resources/public/webconfigurator/css/configurator.css
@@ -0,0 +1,73 @@
+@import url("install.css");
+
+.step h1 {
+ margin-top: 10px;
+ margin-bottom: 30px;
+ font-size: 26px;
+}
+.step p {
+ line-height: 20px;
+ padding-bottom: 20px;
+}
+.step .symfony-block-steps span {
+ display: inline-block;
+ padding: 2px 3px;
+ font-size: 11px;
+ line-height: 15px;
+ color: #868686;
+ font-weight: bold;
+ text-transform: uppercase;
+}
+.step .symfony-block-steps span.selected {
+ background-color: #aacd4e;
+ color: #FFFFFF;
+}
+.step .symfony-form-row {
+ padding-bottom: 40px;
+}
+.step .symfony-form-column {
+ width: 430px;
+ float: left;
+}
+.step .symfony-form-footer {
+ padding-top: 20px;
+ clear: both;
+}
+.step .symfony-form-field {
+ height: 20px;
+}
+.step .symfony-form-row label {
+ display: block;
+ padding-bottom: 8px;
+}
+.step .symfony-form-field input[type=text],
+.step .symfony-form-field input[type=password],
+.step .symfony-form-field textarea,
+.step .symfony-form-field select {
+ font-size: 13px;
+ color: #565656;
+ width: 200px;
+}
+.step .symfony-form-field input[type=text],
+.step .symfony-form-field input[type=password],
+.step .symfony-form-field textarea {
+ border: 1px solid #dadada;
+ background: #FFFFFF url(../../../framework/images/input_bg.gif) repeat-x left top;
+ width: 194px;
+ padding: 5px 6px;
+}
+.step .symfony-form-errors ul {
+ padding: 0;
+}
+.step .symfony-form-errors li {
+ background: url(../images/notification.gif) no-repeat left 6px;
+ font-size: 11px;
+ line-height: 16px;
+ color: #759e1a;
+ padding: 10px 25px;
+}
+.step .symfony-configuration {
+ margin: 10px 0;
+ width: 100%;
+ height: 240px;
+}
View
153 Resources/public/webconfigurator/css/configure.css
@@ -1,153 +0,0 @@
-@import url("install.css");
-
-h1 {
- margin-top: 10px;
- font-size: 26px;
-}
-
-#symfony-wrapper {
- padding-top: 0;
-}
-
-#symfony-search {
- position: absolute;
- top: 50px;
- right: 30px;
-}
-
-#symfony-search-field {
- width: 190px;
-}
-
-#symfony-search label {
- display: block;
- float: left;
- width: 20px;
- height: 25px;
- background: url(../images/search.png) no-repeat left 5px;
-}
-
-#symfony-search label span {
- display: none;
-}
-
-input[type=text] {
- border: 1px solid #DADADA;
- background: white url(../images/field-background.gif) repeat-x left top;
- padding: 5px 6px;
- color: #565656;
- font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-
-.symfony-button-grey, .symfony-button-green {
- font-size: 0.85em;
- font-weight: bold;
- cursor: pointer;
- display: inline-block;
- outline: none;
- text-align: center;
- text-transform: uppercase;
- padding: 3px 10px;
- text-shadow: 0 1px 1px rgba(0,0,0,.3);
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-
-.symfony-button-grey {
- color: #868686;
- font-weight: normal;
- padding: 5px 10px;
- border: solid 1px #d7d7d7;
- background: #ffffff;
- background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#d7d7d7));
- background: -moz-linear-gradient(top, #ffffff, #d7d7d7);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#d7d7d7');
-}
-
-.symfony-button-green {
- padding: 5px 12px;
- color: white;
- border: solid 1px #a7da39;
- background: #a7da39;
- background: -webkit-gradient(linear, left top, left bottom, from(#a7da39), to(#6a9211));
- background: -moz-linear-gradient(top, #a7da39, #6a9211);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a7da39', endColorstr='#6a9211');
-}
-
-.symfony-block-steps span {
- display: inline-block;
- padding: 2px 3px;
- font-size: 11px;
- line-height: 15px;
- color: #868686;
- font-weight: bold;
- text-transform: uppercase;
-}
-
-.symfony-block-steps span.selected {
- background-color: #aacd4e;
- color: #FFFFFF;
-}
-
-
-.symfony-form-row {
- padding-bottom: 40px;
-}
-
-.symfony-form-column {
- width: 430px;
- float: left;
-}
-
-.symfony-form-footer {
- padding-top: 20px;
- clear: both;
-}
-
-.symfony-form-field {
- height: 20px;
-}
-
-.symfony-form-row label {
- display: block;
- padding-bottom: 8px;
-}
-
-.symfony-form-field input[type=text],
-.symfony-form-field input[type=password],
-.symfony-form-field textarea,
-.symfony-form-field select {
- font-size: 13px;
- color: #565656;
- width: 200px;
-}
-
-.symfony-form-field input[type=text],
-.symfony-form-field input[type=password],
-.symfony-form-field textarea {
- border: 1px solid #dadada;
- background: #FFFFFF url(../images/background-textfield.gif) repeat-x left top;
- width: 194px;
- padding: 5px 6px;
-}
-
-.symfony-form-errors ul {
- padding: 0;
-}
-
-.symfony-form-errors li {
- background: url(../images/notification.gif) no-repeat left 6px;
- font-size: 11px;
- line-height: 16px;
- color: #759e1a;
- padding: 10px 25px;
-}
-
-.symfony-configuration {
- margin: 10px 0;
- width: 100%;
- height: 240px;
-}
View
136 Resources/public/webconfigurator/css/install.css
@@ -1,52 +1,12 @@
-/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
-
-Reset
-*/
-
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
-
-html, body {
- background-color: #EFEFEF;
-}
-
body {
font-size: 14px;
font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
- color: #313131;
}
-
-a {
- color: #08C;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-strong {
- font-weight: bold;
-}
-
-em {
- font-style: italic;
-}
-
-h1, h2, h3 {
- font-family: Georgia, "Times New Roman", Times, serif;
- color: #404040;
-}
-
-h1 {
+.sf-reset h1.title {
font-size: 45px;
padding-bottom: 30px;
}
-
-h2 {
+.sf-reset h2 {
font-weight: bold;
color: #FFFFFF;
/* Font is reset to sans-serif (like body) */
@@ -57,92 +17,58 @@ h2 {
display: inline-block;
text-transform: uppercase;
}
-
-p {
- line-height: 20px;
- padding-bottom: 20px;
-}
-
-ul a {
+.sf-reset ul a,
+.sf-reset ul a:hover {
background: url(../images/blue-arrow.png) no-repeat right 6px;
padding-right: 10px;
}
-
-ul, ol {
+.sf-reset ul, ol {
padding-left: 20px;
}
-
-li {
+.sf-reset li {
padding-bottom: 18px;
}
-
-ol li {
+.sf-reset ol li {
list-style-type: decimal;
}
-
-ul li {
+.sf-reset ul li {
list-style-type: none;
}
-
-#symfony-header {
- position: relative;
- padding: 30px 30px 20px 30px;
-}
-
-#symfony-wrapper {
- width: 970px;
- margin: 0 auto;
- padding-top: 50px;
-}
-
-#symfony-content {
- background-color: white;
- border: 1px solid #DFDFDF;
- padding: 50px;
- -moz-border-radius: 16px;
- -webkit-border-radius: 16px;
- border-radius: 16px;
- margin-bottom: 5px;
-}
-
-
-.symfony-blocks-install {
+.sf-reset .symfony-blocks-install {
overflow: hidden;
}
-
-.symfony-blocks-install .symfony-block-logo {
- float: left;
- width: 358px;
-}
-
-.symfony-blocks-install .symfony-block-content {
- float: left;
- width: 510px;
-}
-
-.symfony-install-continue {
+.sf-reset .symfony-install-continue {
font-size: 0.95em;
padding-left: 0;
}
-
-.symfony-install-continue li {
+.sf-reset .symfony-install-continue li {
padding-bottom: 10px;
}
-
-.version {
- text-align: right;
- font-size: 10px;
- margin-right: 20px;
-}
-
-.ok {
+.sf-reset .ok {
color: #fff;
font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
background-color: #6d6;
padding: 10px;
margin-bottom: 20px;
}
-
-.ko {
+.sf-reset .ko {
background-color: #d66;
}
+.version {
+ text-align: right;
+ font-size: 10px;
+ margin-right: 20px;
+}
+.sf-reset a,
+.sf-reset li a {
+ color: #08C;
+ text-decoration: none;
+}
+.sf-reset a:hover,
+.sf-reset li a:hover {
+ color: #08C;
+ text-decoration: underline;
+}
+.sf-reset textarea {
+ padding: 7px;
+}
View
BIN  Resources/public/webconfigurator/images/background-textfield.gif
Deleted file not rendered
View
BIN  Resources/public/webconfigurator/images/logo-big.gif
Deleted file not rendered
View
BIN  Resources/public/webconfigurator/images/logo-small.gif
Deleted file not rendered
View
44 Resources/skeleton/web/config.php
@@ -21,22 +21,48 @@
?>
<!DOCTYPE html>
-<html lang="en">
+<html>
<head>
- <meta charset="UTF-8" />
- <link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <meta name="robots" content="noindex,nofollow" />
<title>Symfony Configuration</title>
+ <link rel="stylesheet" href="bundles/framework/css/structure.css" media="all" />
+ <link rel="stylesheet" href="bundles/framework/css/body.css" media="all" />
+ <link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
</head>
<body>
- <div id="symfony-wrapper">
- <div id="symfony-content">
- <div class="symfony-blocks-install">
- <div class="symfony-block-logo">
- <img src="bundles/sensiodistribution/webconfigurator/images/logo-big.gif" alt="Symfony logo" />
+ <div id="content">
+ <div class="header clear-fix">
+ <div class="header-logo">
+ <img src="bundles/framework/images/logo_symfony.png" alt="Symfony" />
+ </div>
+
+ <div class="search">
+ <form method="get" action="http://symfony.com/search">
+ <div class="form-row">
+
+ <label for="search-id">
+ <img src="bundles/framework/images/grey_magnifier.png" alt="Search on Symfony website" />
+ </label>
+
+ <input name="q" id="search-id" type="search" placeholder="Search on Symfony website" />
+
+ <button type="submit" class="sf-button">
+ <span class="border-l">
+ <span class="border-r">
+ <span class="btn-bg">OK</span>
+ </span>
+ </span>
+ </button>
</div>
+ </form>
+ </div>
+ </div>
+ <div class="sf-reset">
+ <div class="block">
<div class="symfony-block-content">
- <h1>Welcome!</h1>
+ <h1 class="title">Welcome!</h1>
<p>Welcome to your new Symfony project.</p>
<p>
This script will guide you through the basic configuration of your project.
View
51 Resources/views/Configurator/Step/doctrine.html.twig
@@ -4,28 +4,39 @@
{% block content %}
{% form_theme form "SensioDistributionBundle::Configurator/form.html.twig" %}
- {% include "SensioDistributionBundle::Configurator/steps.html.twig" with { "index": index, "count": count } %}
- <h1>Configure your Database</h1>
- <p>If your website needs a database connection, please configure it here.</p>
+ <div class="step">
+ {% include "SensioDistributionBundle::Configurator/steps.html.twig" with { "index": index, "count": count } %}
- {{ form_errors(form) }}
- <form action="{{ path('_configurator_step', { 'index': index }) }}" method="POST">
- <div class="symfony-form-column">
- {{ form_row(form.driver) }}
- {{ form_row(form.host) }}
- {{ form_row(form.name) }}
- </div>
- <div class="symfony-form-column">
- {{ form_row(form.user) }}
- {{ form_row(form.password) }}
- </div>
+ <h1>Configure your Database</h1>
+ <p>If your website needs a database connection, please configure it here.</p>
- {{ form_rest(form) }}
+ {{ form_errors(form) }}
+ <form action="{{ path('_configurator_step', { 'index': index }) }}" method="POST">
+ <div class="symfony-form-column">
+ {{ form_row(form.driver) }}
+ {{ form_row(form.host) }}
+ {{ form_row(form.name) }}
+ </div>
+ <div class="symfony-form-column">
+ {{ form_row(form.user) }}
+ {{ form_row(form.password) }}
+ </div>
- <div class="symfony-form-footer">
- <p><input type="submit" value="Next Step" class="symfony-button-grey" /></p>
- <p>* mandatory fields</p>
- </div>
- </form>
+ {{ form_rest(form) }}
+
+ <div class="symfony-form-footer">
+ <p>
+ <button type="submit" class="sf-button">
+ <span class="border-l">
+ <span class="border-r">
+ <span class="btn-bg">NEXT STEP</span>
+ </span>
+ </span>
+ </button>
+ </p>
+ <p>* mandatory fields</p>
+ </div>
+ </form>
+ </div>
{% endblock %}
View
79 Resources/views/Configurator/Step/secret.html.twig
@@ -4,41 +4,58 @@
{% block content %}
{% form_theme form "SensioDistributionBundle::Configurator/form.html.twig" %}
- {% include "SensioDistributionBundle::Configurator/steps.html.twig" with { "index": index, "count": count } %}
-
- <h1>Global Secret</h1>
- <p>Configure the global secret for your website (the secret is used for the CSRF protection among other things):</p>
-
- {{ form_errors(form) }}
- <form action="{{ path('_configurator_step', { 'index': index }) }} " method="POST">
- <div class="symfony-form-row">
- {{ form_label(form.secret) }}
- <div class="symfony-form-field">
- {{ form_widget(form.secret) }}
- <a class="symfony-button-grey" href="#" onclick="generateSecret(); return false;">Generate</a>
- <div class="symfony-form-errors">
- {{ form_errors(form.secret) }}
+
+ <div class="step">
+ {% include "SensioDistributionBundle::Configurator/steps.html.twig" with { "index": index, "count": count } %}
+
+ <h1>Global Secret</h1>
+ <p>Configure the global secret for your website (the secret is used for the CSRF protection among other things):</p>
+
+ {{ form_errors(form) }}
+ <form action="{{ path('_configurator_step', { 'index': index }) }} " method="POST">
+ <div class="symfony-form-row">
+ {{ form_label(form.secret) }}
+ <div class="symfony-form-field">
+ {{ form_widget(form.secret) }}
+ <a href="#" onclick="generateSecret(); return false;" class="sf-button">
+ <span class="border-l">
+ <span class="border-r">
+ <span class="btn-bg">Generate</span>
+ </span>
+ </span>
+ </a>
+ <div class="symfony-form-errors">
+ {{ form_errors(form.secret) }}
+ </div>
</div>
</div>
- </div>
-
- {{ form_rest(form) }}
- <div class="symfony-form-footer">
- <p><input type="submit" value="Next Step" class="symfony-button-grey" /></p>
- <p>* mandatory fields</p>
- </div>
+ {{ form_rest(form) }}
+
+ <div class="symfony-form-footer">
+ <p>
+ <button type="submit" class="sf-button">
+ <span class="border-l">
+ <span class="border-r">
+ <span class="btn-bg">NEXT STEP</span>
+ </span>
+ </span>
+ </button>
+ </p>
+ <p>* mandatory fields</p>
+ </div>
- </form>
+ </form>
- <script type="text/javascript">
- function generateSecret()
- {
- var result = '';
- for (i=0; i < 32; i++) {
- result += Math.round(Math.random()*16).toString(16);
+ <script type="text/javascript">
+ function generateSecret()
+ {
+ var result = '';
+ for (i=0; i < 32; i++) {
+ result += Math.round(Math.random()*16).toString(16);
+ }
+ document.getElementById('distributionbundle_secret_step_secret').value = result;
}
- document.getElementById('distributionbundle_secret_step_secret').value = result;
- }
- </script>
+ </script>
+ </div>
{% endblock %}
View
44 Resources/views/Configurator/final.html.twig
@@ -2,27 +2,29 @@
{% block content_class %}config_done{% endblock %}
{% block content %}
- <h1>Well done!</h1>
- {% if is_writable %}
- <h2>Your distribution is configured!</h2>
- {% else %}
- <h2 class="configure-error">Your distribution is almost configured but...</h2>
- {% endif %}
- <h3>
- <span>
- {% if is_writable %}
- Your parameters.yml file has been overwritten with these parameters (in <em>{{ yml_path }}</em>):
- {% else %}
- Your parameters.yml file is not writeable! Here are the parameters you can copy and paste in <em>{{ yml_path }}</em>:
- {% endif %}
- </span>
- </h3>
+ <div class="step">
+ <h1>Well done!</h1>
+ {% if is_writable %}
+ <h2>Your distribution is configured!</h2>
+ {% else %}
+ <h2 class="configure-error">Your distribution is almost configured but...</h2>
+ {% endif %}
+ <h3>
+ <span>
+ {% if is_writable %}
+ Your parameters.yml file has been overwritten with these parameters (in <em>{{ yml_path }}</em>):
+ {% else %}
+ Your parameters.yml file is not writeable! Here are the parameters you can copy and paste in <em>{{ yml_path }}</em>:
+ {% endif %}
+ </span>
+ </h3>
- <textarea class="symfony-configuration">{{ parameters }}</textarea>
+ <textarea class="symfony-configuration">{{ parameters }}</textarea>
- {% if welcome_url %}
- <ul>
- <li><a href="{{ welcome_url }}">Go to the Welcome page</a></li>
- </ul>
- {% endif %}
+ {% if welcome_url %}
+ <ul>
+ <li><a href="{{ welcome_url }}">Go to the Welcome page</a></li>
+ </ul>
+ {% endif %}
+ </div>
{% endblock %}
View
34 Resources/views/Configurator/layout.html.twig
@@ -1,20 +1,14 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="UTF-8" />
- <link rel="stylesheet" href="{{ asset('bundles/sensiodistribution/webconfigurator/css/configure.css') }}" />
- <title>{% block title %}Web Configurator Bundle{% endblock %}</title>
- <link rel="icon" type="image/x-icon" sizes="16x16" href="{{ asset('bundles/sensiodistribution/webconfigurator/images/favicon.ico') }}" />
- </head>
- <body>
- <div id="symfony-wrapper">
- <div id="symfony-header">
- <img src="{{ asset("bundles/sensiodistribution/webconfigurator/images/logo-small.gif") }}" alt="Symfony logo" />
- </div>
- <div id="symfony-content">
- {% block content %}{% endblock %}
- </div>
- <div class="version">Symfony Standard Edition v.{{ version }}</div>
- </div>
- </body>
-</html>
+{% extends "TwigBundle::layout.html.twig" %}
+
+{% block head %}
+ <link rel="stylesheet" href="{{ asset('bundles/sensiodistribution/webconfigurator/css/configurator.css') }}" />
+{% endblock %}
+
+{% block title 'Web Configurator Bundle' %}
+
+{% block body %}
+ <div class="block">
+ {% block content %}{% endblock %}
+ </div>
+ <div class="version">Symfony Standard Edition v.{{ version }}</div>
+{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.