Skip to content

Commit 34f80c8

Browse files
DavertMikDavertMik
committed
Merge pull request Codeception#76 from cjaoude/master
Refine UX for new and current users.
2 parents 13df755 + 436314e commit 34f80c8

File tree

7 files changed

+283
-323
lines changed

7 files changed

+283
-323
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
_site/
1+
_site/
2+
.jekyll-metadata

‎_includes/guides.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<li><a href="/docs/01-Introduction">Introduction</a></li><li><a href="/docs/02-GettingStarted">Getting Started</a></li><li><a href="/docs/03-AcceptanceTests">Acceptance Tests</a></li><li><a href="/docs/04-FunctionalTests">Functional Tests</a></li><li><a href="/docs/05-UnitTests">Unit Tests</a></li><li><a href="/docs/06-ReusingTestCode">Reusing Test Code</a></li><li><a href="/docs/07-AdvancedUsage">Advanced Usage</a></li><li><a href="/docs/08-Customization">Customization</a></li><li><a href="/docs/09-Data">Data</a></li><li><a href="/docs/10-WebServices">Web Services</a></li><li><a href="/docs/11-Codecoverage">Codecoverage</a></li><li><a href="/docs/12-ParallelExecution">Parallel Execution</a></li>
1+
<li><a href="/docs/01-Introduction">Introduction</a></li><li><a href="/docs/02-GettingStarted">Getting Started</a></li><li><a href="/docs/03-AcceptanceTests">Acceptance Tests</a></li><li><a href="/docs/04-FunctionalTests">Functional Tests</a></li><li><a href="/docs/05-UnitTests">Unit Tests</a></li><li><a href="/docs/06-ReusingTestCode">Reusing Test Code</a></li><li><a href="/docs/07-AdvancedUsage">Advanced Usage</a></li><li><a href="/docs/08-Customization">Customization</a></li><li><a href="/docs/09-Data">Data</a></li><li><a href="/docs/10-WebServices">Web Services</a></li><li><a href="/docs/11-Codecoverage">Codecoverage</a></li><li><a href="/docs/12-ParallelExecution">Parallel Execution</a></li><li><a href="/video">Nettuts+ Video Course</a></li>

‎_includes/reference.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<li><a href="/docs/reference/Autoload">Autoload</a></li><li><a href="/docs/reference/Commands">Commands</a></li><li><a href="/docs/reference/Configuration">Configuration</a></li><li><a href="/docs/reference/Fixtures">Fixtures</a></li><li><a href="/docs/reference/Functions">Functions</a></li><li><a href="/docs/reference/JsonType">JsonType</a></li><li><a href="/docs/reference/Locator">Locator</a></li><li><a href="/docs/reference/Stub">Stub</a></li><li><a href="/docs/reference/XmlBuilder">XmlBuilder</a></li>
1+
<li><a href="/install">Installation</a></li><li><a href="/changelog">Changelog</a></li><li role="separator" class="divider"></li><li><a href="/docs/reference/Autoload">Autoload</a></li><li><a href="/docs/reference/Commands">Commands</a></li><li><a href="/docs/reference/Configuration">Configuration</a></li><li><a href="/docs/reference/Fixtures">Fixtures</a></li><li><a href="/docs/reference/Functions">Functions</a></li><li><a href="/docs/reference/JsonType">JsonType</a></li><li><a href="/docs/reference/Locator">Locator</a></li><li><a href="/docs/reference/Stub">Stub</a></li><li><a href="/docs/reference/XmlBuilder">XmlBuilder</a></li>

‎_layouts/bootstrap.html

Lines changed: 130 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -10,128 +10,117 @@
1010
</title>
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
1212
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
13+
14+
<!-- CSS -->
1315
<link href='http://fonts.googleapis.com/css?family=Philosopher&amp;subset=latin' rel='stylesheet' type='text/css'>
14-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
16+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
17+
1518
<link rel="stylesheet" href="/css/codeception.css">
1619
<link rel="stylesheet" href="/css/contributors.css">
1720
<link rel="stylesheet" type="text/css" media="screen" href="/css/syntax.css">
18-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js" type="text/javascript"></script>
19-
<script src="/js/jquery.toc.min.js" type="text/javascript" charset="utf-8"></script>
20-
<script src="/js/contributors.js" type="text/javascript" charset="utf-8"></script>
2121

22+
<!-- Other -->
2223
<link title="Codeception Blog" type="application/rss+xml" rel="alternate" href="/rss.xml">
2324
<link rel="shortcut icon" href="/images/favicon.png">
2425
<link rel="author" href="https://plus.google.com/+Codeception">
2526
</head>
27+
2628
<body>{% capture guides %}{% include guides.html %}{% endcapture %}
27-
{% capture modules %}{% include modules.html %}{% endcapture %}
28-
{% capture reference %}{% include reference.html %}{% endcapture %}
29-
<nav class="navbar nav-custom navbar-inverse">
30-
<div class="container">
31-
<div class="navbar-header">
32-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
33-
<span class="sr-only">Toggle navigation</span>
34-
<span class="icon-bar"></span>
35-
<span class="icon-bar"></span>
36-
<span class="icon-bar"></span>
37-
</button>
38-
<a href="/" class="navbar-brand"><img src="/images/toplogo.png" alt="codeception"/></a>
39-
</div>
40-
<div class="navbar-inner">
41-
<ul class="nav navbar-nav navbar-collapse collapse menu">
42-
<li>
43-
<a href="/quickstart">Quickstart</a>
44-
</li>
45-
<li>
46-
</li>
47-
<li class="dropdown">
48-
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Guides
49-
<b class="caret"></b>
50-
</a>
51-
<ul class="dropdown-menu">
52-
{{ guides }}
53-
</ul>
54-
</li>
55-
<li class="dropdown">
56-
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Modules
57-
<b class="caret"></b>
58-
</a>
59-
<ul class="dropdown-menu dropdown-modules">
60-
{{ modules }}
61-
</ul>
62-
</li>
63-
<li class="dropdown">
64-
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Reference
65-
<b class="caret"></b>
66-
</a>
67-
<ul class="dropdown-menu">
68-
{{ reference }}
29+
{% capture modules %}{% include modules.html %}{% endcapture %}
30+
{% capture reference %}{% include reference.html %}{% endcapture %}
31+
<nav class="navbar nav-custom navbar-inverse">
32+
<div class="container">
33+
<div class="navbar-header">
34+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
35+
<span class="sr-only">Toggle navigation</span>
36+
<span class="icon-bar"></span>
37+
<span class="icon-bar"></span>
38+
<span class="icon-bar"></span>
39+
</button>
40+
<a href="/" class="navbar-brand"><img src="/images/toplogo.png" alt="codeception"/></a>
41+
</div>
42+
<div class="collapse navbar-collapse menu ">
43+
<ul class="nav navbar-nav navbar-left">
44+
<li><a href="/quickstart">Quick Start</a></li>
6945
</ul>
70-
</li>
71-
<li>
72-
<a href="/video">Video</a>
73-
</li>
74-
<li>
75-
<a href="/blog">Blog</a>
76-
</li>
77-
<li class="dropdown">
78-
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
79-
Community
80-
<b class="caret"></b>
81-
</a>
82-
<ul class="dropdown-menu">
83-
<li><a href="http://phptest.club/category/codeception">Community Forum</a></li>
84-
<li><a href="http://automated-testing.info/category/codeception">Russian Community</a></li>
85-
<li><a href="http://stackoverflow.com/questions/tagged/codeception">StackOverflow</a></li>
46+
<ul class="nav navbar-nav navbar-right">
47+
<li class="dropdown">
48+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Guides
49+
<b class="caret"></b>
50+
</a>
51+
<ul class="dropdown-menu">
52+
{{ guides }}
53+
</ul>
54+
</li>
55+
<li class="dropdown">
56+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Modules
57+
<b class="caret"></b>
58+
</a>
59+
<ul class="dropdown-menu dropdown-modules">
60+
{{ modules }}
61+
</ul>
62+
</li>
63+
<li>
64+
<a href="/addons">Extensions</a>
65+
</li>
66+
<li class="dropdown">
67+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Reference
68+
<b class="caret"></b>
69+
</a>
70+
<ul class="dropdown-menu">
71+
{{ reference }}
72+
</ul>
73+
</li>
74+
<li class="dropdown">
75+
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
76+
Community
77+
<b class="caret"></b>
78+
</a>
79+
<ul class="dropdown-menu">
80+
<li><a href="/blog">Blog</a> </li>
81+
<li><a href="http://phptest.club/category/codeception">Community Forum</a></li>
82+
<li><a href="http://automated-testing.info/category/codeception">Russian Community</a></li>
83+
<li><a href="http://stackoverflow.com/questions/tagged/codeception">StackOverflow</a></li>
84+
<li><a href="/video">Nettuts+ Video Course</a></li>
85+
</ul>
86+
</li>
8687
</ul>
87-
</li>
88-
<li>
89-
<a href="/credits">Credits</a>
90-
</li>
91-
<li>
92-
<a href="/install">Install</a>
93-
</li>
94-
<li>
95-
<a href="/addons">Addons</a>
96-
</li>
97-
<li>
98-
<a href="/changelog">Changelog</a>
99-
</li>
100-
</ul>
101-
</div>
102-
</div> <!-- /.container -->
103-
</nav>
104-
<div class="container">
105-
{{ content }}
106-
</div>
107-
<div id="footer">
88+
</div>
89+
</div> <!-- /.container -->
90+
</nav>
91+
92+
<!-- CONTENT -->
10893
<div class="container">
109-
<div class="row">
110-
<div class="col-sm-4 col-lg-4">
111-
<h3>Credits</h3>
94+
{{ content }}
95+
</div>
96+
97+
<div id="footer">
98+
<div class="container">
99+
<div class="row">
100+
<div class="col-sm-4 col-lg-4">
101+
<h3>Credits</h3>
112102

113-
<p>
114-
Codeception is a BDD-styled PHP testing framework, brought to you by <a href="http://codeception.com/credits">Codeception Team</a>.
115-
Logo by <a
103+
<p>
104+
Codeception is a BDD-styled PHP testing framework, brought to you by <a href="http://codeception.com/credits">Codeception Team</a>.
105+
Logo by <a
116106
href="https://twitter.com/adnanblog">Mr. Adnan</a>. OpenSource <strong>MIT Licensed</strong>.
117-
</p>
107+
</p>
118108

119-
<div>
109+
<div>
110+
<a href="https://github.com/codeception/codeception" class="pull-left">
111+
<img src="/images/github.png">
112+
</a>
120113

121-
<a href="https://github.com/codeception/codeception" class="pull-left">
122-
<img src="/images/github.png">
123-
</a>
114+
<a href="https://twitter.com/codeception" class="pull-left">
115+
<img src="/images/twitter.png">
116+
</a>
124117

125-
<a href="https://twitter.com/codeception" class="pull-left">
126-
<img src="/images/twitter.png">
127-
</a>
128-
129-
<a href="http://www.facebook.com/pages/Codeception/288959711204412" class="pull-left">
130-
<img src="/images/facebook.png">
131-
</a>
118+
<a href="http://www.facebook.com/pages/Codeception/288959711204412" class="pull-left">
119+
<img src="/images/facebook.png">
120+
</a>
132121

133-
<a href="https://plus.google.com/b/108429499160233541695/108429499160233541695/posts"
134-
class="pull-left">
122+
<a href="https://plus.google.com/b/108429499160233541695/108429499160233541695/posts"
123+
class="pull-left">
135124
<img src="/images/gplus.png">
136125
</a>
137126

@@ -141,21 +130,19 @@ <h3>Credits</h3>
141130
<h4>Sponsored by</h4>
142131
<a href="https://www.rebilly.com/">
143132
<img src="/images/Rebilly.png" style="width:300px;" alt="Your Partner
144-
In Subscription Billing
145-
Uncover your revenue potential with
146-
our recurring billing software." title="Your Partner
147-
In Subscription Billing">
148-
</a>
149-
150-
151-
<!-- <a href="http://2amigos.us/">
152-
<img src="/images/2amigos.png" style="opacity: 0.7"
153-
alt="Sponsored by 2AmigOS web development and consultancy in Miami"
154-
title="Sponsored by 2AmigOS web development and consultancy in Miami">
133+
In Subscription Billing
134+
Uncover your revenue potential with
135+
our recurring billing software." title="Your Partner
136+
In Subscription Billing">
155137
</a>
156-
--> </div>
157-
158-
138+
<!--
139+
<a href="http://2amigos.us/">
140+
<img src="/images/2amigos.png" style="opacity: 0.7"
141+
alt="Sponsored by 2AmigOS web development and consultancy in Miami"
142+
title="Sponsored by 2AmigOS web development and consultancy in Miami">
143+
</a>
144+
-->
145+
</div>
159146
</div>
160147

161148
<div class="col-sm-8 col-lg-8">
@@ -164,28 +151,30 @@ <h3>Thanks to all our contributors</h3>
164151
<div id="contributors"></div>
165152

166153
<div>
167-
<div class="addthis_toolbox addthis_default_style ">
168-
<a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
169-
<a class="addthis_button_tweet"></a>
170-
<a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
171-
</div>
172-
<script type="text/javascript">var addthis_config = {"data_track_addressbar":true};</script>
173-
<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-501c6975683af72f"></script>
174-
175-
</div>
176-
177-
</div>
178-
</div>
179-
</div>
180-
</div>
181-
<div id="copyright">
154+
<div class="addthis_toolbox addthis_default_style ">
155+
<a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
156+
<a class="addthis_button_tweet"></a>
157+
<a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
158+
</div>
159+
<script type="text/javascript">var addthis_config = {"data_track_addressbar":true};</script>
160+
<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-501c6975683af72f"></script>
161+
162+
</div>
163+
</div>
164+
</div>
165+
</div>
166+
<div id="copyright">
182167
© 2011&ndash;{{ site.time | date: '%Y' }}
183168
</div>
169+
</div>
184170

185-
171+
<!-- SCRIPTS -->
172+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js" type="text/javascript"></script>
186173
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
187-
<script type="text/javascript">
174+
<script src="/js/jquery.toc.min.js" type="text/javascript" charset="utf-8"></script>
175+
<script src="/js/contributors.js" type="text/javascript" charset="utf-8"></script>
188176

177+
<script type="text/javascript">
189178
var _gaq = _gaq || [];
190179
_gaq.push(['_setAccount', 'UA-1899308-9']);
191180
_gaq.push(['_trackPageview']);
@@ -198,7 +187,6 @@ <h3>Thanks to all our contributors</h3>
198187
var s = document.getElementsByTagName('script')[0];
199188
s.parentNode.insertBefore(ga, s);
200189
})();
201-
202190
</script>
203191

204192
<script>
@@ -212,14 +200,12 @@ <h3>Thanks to all our contributors</h3>
212200

213201
<div id="bugira_widget" style="position: fixed; right: 10px; bottom: 0px;"></div>
214202
<script type="text/javascript">var __bugira_config = {"api_key": "dste248173q7"};
215-
(function () {
216-
var w = document.createElement('script');
217-
w.type = 'text/javascript';
218-
w.async = true;
219-
w.src = 'http://bugiracdn.appspot.com/bugira-widget.js';
220-
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(w);
221-
})();</script>
222-
223-
203+
(function () {
204+
var w = document.createElement('script');
205+
w.type = 'text/javascript';
206+
w.async = true;
207+
w.src = 'http://bugiracdn.appspot.com/bugira-widget.js';
208+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(w);
209+
})();</script>
224210
</body>
225211
</html>

‎_layouts/index.html

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,19 @@
44

55
<!-- Adding the new Homepage here -->
66
<div id="home-hero">
7-
87
<h1><img src="/images/logo.png" alt="Codeception Logo">Codeception</h1>
98
<p class="lead">Modern PHP testing for everyone.</p>
10-
119
</div>
1210

1311
<div class="row home">
1412
<div class="col-sm-12 col-lg-12">
1513
<div class="row home-btns">
16-
<div class="col-sm-12 col-md-4 col-md-offset-2">
17-
<div class="well dark text-center">
18-
<a class="btn btn-primary btn-lg btn-block" href="/install"><span class="btn-label">Install</span></a>
19-
<p><br/>To install codeception you can download it or include it in your composer.json file.
20-
</p>
21-
</div>
22-
</div>
23-
24-
<div class="col-sm-12 col-md-4">
14+
<div class="col-sm-12 col-md-4 col-md-offset-4 ">
2515
<div class="well dark text-center">
26-
<a class="btn btn-lg btn-warning btn-block" href="/quickstart"><span class="btn-label">5min Quick Start</span></a>
27-
<p><br/>Write and execute a test for an existing app<br>
28-
<b>in less then 5 mins!</b>
16+
<a class="btn btn-lg btn-warning btn-block" href="/quickstart"><span class="btn-label">Quick Start</span></a><br>
17+
<p>
18+
Write and execute a test for an existing app<br>
19+
<strong>in less then 5 minutes!</strong>
2920
</p>
3021
</div>
3122
</div>

0 commit comments

Comments
 (0)