Skip to content

Commit 5979ea6

Browse files
DavertMikDavertMik
committed
latest updates to website
1 parent 1b54c5d commit 5979ea6

File tree

13 files changed

+1480
-39
lines changed

13 files changed

+1480
-39
lines changed

‎_includes/for.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<div class="row">
2-
<div class="col-sm-12 col-lg-6">
3-
<a href="/for/symfony" class="btn btn-default btn-lg btn-block">Symfony</a>
4-
<a href="/for/laravel" class="btn btn-default btn-lg btn-block">Laravel</a>
5-
<a href="#" class="btn btn-default btn-lg btn-block disabled">Zend Framework 2</a>
6-
</div>
7-
<div class="col-sm-12 col-lg-6">
8-
<a href="#" class="btn btn-default btn-lg btn-block disabled">Yii2</a>
9-
<a href="#" class="btn btn-default btn-lg btn-block disabled">Phalcon</a>
10-
<a href="#" class="btn btn-default btn-lg btn-block disabled">Joomla</a>
1+
<div class="row casestudy">
2+
<div class="col-sm-12 col-lg-6">
3+
<a href="/for/symfony" class="btn btn-default btn-lg btn-block">Symfony</a>
4+
<a href="/for/laravel" class="btn btn-default btn-lg btn-block">Laravel</a>
5+
<a href="#" class="btn btn-default btn-lg btn-block disabled">Zend Framework 2</a>
6+
</div>
7+
<div class="col-sm-12 col-lg-6">
8+
<a href="#" class="btn btn-default btn-lg btn-block disabled">Yii2</a>
9+
<a href="#" class="btn btn-default btn-lg btn-block disabled">Phalcon</a>
10+
<a href="#" class="btn btn-default btn-lg btn-block disabled">Joomla</a>
1111

12-
</div>
12+
</div>

‎_includes/guides.html.orig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<<<<<<< HEAD
2+
<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>
3+
=======
4+
<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>
5+
>>>>>>> master

‎_includes/reference.html.orig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<<<<<<< HEAD
2+
<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>
3+
=======
4+
<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>
5+
>>>>>>> master

‎_layouts/bootstrap.html‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@ <h4>Modules</h4>
9494
<li>
9595
<a href="/blog">Blog</a>
9696
</li>
97+
<li class="dropdown">
98+
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
99+
Case Study
100+
<b class="caret"></b>
101+
</a>
102+
<ul class="dropdown-menu">
103+
104+
<li><a href="/for/symfony">Symfony</a></li>
105+
<li><a href="/for/laravel">Larvel</a></li>
106+
</ul>
107+
</li>
108+
97109
<li class="dropdown">
98110
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
99111
Community
@@ -102,6 +114,7 @@ <h4>Modules</h4>
102114
<ul class="dropdown-menu">
103115

104116
<li><a href="/credits"><strong>Credits</strong></a></li>
117+
<li><a href="/addons">Addons</a></li>
105118
<li role="separator" class="divider"></li>
106119
<li><a href="http://phptest.club/category/codeception">Forum @ PHPTestClub</a></li>
107120
<li><a href="http://automated-testing.info/category/codeception">Russian Forum @ AT.info</a></li>
@@ -110,9 +123,6 @@ <h4>Modules</h4>
110123
<li><a href="https://github.com/codeception/codeception/issues">GitHub Issues</a></li>
111124
</ul>
112125
</li>
113-
<li>
114-
<a href="/addons">Addons</a>
115-
</li>
116126

117127
<li>
118128
<a href="https://github.com/codeception/codeception" style="padding: 0; padding-right: 5px; padding-top: 5px;"><img src="/images/github.png" alt="GitHub" style="height: 40px; float: right;"> </a>

‎_layouts/bootstrap.html.orig‎

Lines changed: 273 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,273 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<title>
5+
{% if page.title %}
6+
{{ page.title }}
7+
{% else %}
8+
Codeception
9+
{% endif %}
10+
</title>
11+
<meta name="viewport" content="width=device-width, initial-scale=1">
12+
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
13+
14+
{% if page.meta %}
15+
{{ page.meta }}
16+
{% endif %}
17+
18+
<!-- CSS -->
19+
<<<<<<< HEAD
20+
<link href='https://fonts.googleapis.com/css?family=Yantramanav:400,700' rel='stylesheet' type='text/css'>
21+
<link href='https://fonts.googleapis.com/css?family=Shanti:400,700' rel='stylesheet' type='text/css'>
22+
=======
23+
>>>>>>> master
24+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
25+
<link rel="stylesheet" href="/css/codeception.css">
26+
<link rel="stylesheet" href="/css/contributors.css">
27+
<link rel="stylesheet" type="text/css" media="screen" href="/css/syntax.css">
28+
29+
<!-- SCRIPTS -->
30+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js" type="text/javascript"></script>
31+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
32+
<script src="/js/jquery.toc.min.js" type="text/javascript" charset="utf-8"></script>
33+
<script src="/js/contributors.js" type="text/javascript" charset="utf-8"></script>
34+
<script src="//cdnjs.cloudflare.com/ajax/libs/list.js/1.2.0/list.min.js"></script>
35+
36+
<!-- Other -->
37+
<link title="Codeception Blog" type="application/rss+xml" rel="alternate" href="/rss.xml">
38+
<link rel="shortcut icon" href="/images/favicon.png">
39+
<link rel="author" href="https://plus.google.com/+Codeception">
40+
</head>
41+
42+
<body>{% capture guides %}{% include guides.html %}{% endcapture %}
43+
{% capture modules %}{% include modules.html %}{% endcapture %}
44+
{% capture reference %}{% include reference.html %}{% endcapture %}
45+
<nav class="navbar nav-custom navbar-inverse">
46+
<div class="container-fluid">
47+
<div class="navbar-header">
48+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
49+
<span class="sr-only">Toggle navigation</span>
50+
<span class="icon-bar"></span>
51+
<span class="icon-bar"></span>
52+
<span class="icon-bar"></span>
53+
</button>
54+
<a href="/" class="navbar-brand"><img src="/images/toplogo.png" alt="codeception"/></a>
55+
</div>
56+
<div class="collapse navbar-collapse menu ">
57+
<ul class="nav navbar-nav navbar-left">
58+
<li><a href="/quickstart">Quick Start</a></li>
59+
</ul>
60+
<ul class="nav navbar-nav navbar-right">
61+
<li class="dropdown">
62+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Docs
63+
<b class="caret"></b>
64+
</a>
65+
<ul class="dropdown-menu multi-column columns-3">
66+
<div class="row">
67+
<div class="col-sm-3">
68+
69+
<ul class="multi-column-dropdown">
70+
<li><h4>Guides</h4></li>
71+
{{ guides }}
72+
<li role="separator" class="divider"></li>
73+
<li><a href="/video">Video</a></li>
74+
</ul>
75+
</div>
76+
77+
<div class="col-sm-6">
78+
<ul class="dropdown-modules multi-column-dropdown">
79+
<h4>Modules</h4>
80+
{{ modules }}
81+
</ul>
82+
</div>
83+
84+
<div class="col-sm-3">
85+
<ul class="multi-column-dropdown">
86+
<li><h4>Reference</h4></li>
87+
<li><a href="/install">Install</a></li>
88+
<li><a href="/docs/reference/Configuration">Configuration</a></li>
89+
<li><a href="/docs/reference/Commands">Commands</a></li>
90+
<li role="separator" class="divider"></li>
91+
<li><h4>Util Classes</h4></li>
92+
{{ reference }}
93+
</ul>
94+
</div>
95+
96+
</ul>
97+
</li>
98+
<li>
99+
<a href="/changelog">Releases</a>
100+
</li>
101+
<li>
102+
<a href="/blog">Blog</a>
103+
</li>
104+
<li class="dropdown">
105+
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
106+
Community
107+
<b class="caret"></b>
108+
</a>
109+
<ul class="dropdown-menu">
110+
111+
<li><a href="/credits"><strong>Credits</strong></a></li>
112+
<li role="separator" class="divider"></li>
113+
<li><a href="http://phptest.club/category/codeception">Forum @ PHPTestClub</a></li>
114+
<li><a href="http://automated-testing.info/category/codeception">Russian Forum @ AT.info</a></li>
115+
<li><a href="http://stackoverflow.com/questions/tagged/codeception">StackOverflow</a></li>
116+
<li><a href="https://gitter.im/codeception/codeception/">Chat @ Gitter</a></li>
117+
<li><a href="https://github.com/codeception/codeception/issues">GitHub Issues</a></li>
118+
</ul>
119+
</li>
120+
<li>
121+
<a href="/addons">Addons</a>
122+
</li>
123+
124+
<li>
125+
<a href="https://github.com/codeception/codeception" style="padding: 0; padding-right: 5px; padding-top: 5px;"><img src="/images/github.png" alt="GitHub" style="height: 40px; float: right;"> </a>
126+
</li>
127+
</ul>
128+
</div>
129+
</div> <!-- /.container -->
130+
</nav>
131+
132+
<<<<<<< HEAD
133+
{% if page.hero %}
134+
<div>{% include {{ page.hero }} %}</div>
135+
{% endif %}
136+
137+
<!-- CONTENT -->
138+
<div class="wide">
139+
<div class="container-fluid">
140+
{{ content }}
141+
</div>
142+
</div>
143+
=======
144+
{{ content }}
145+
>>>>>>> master
146+
147+
<div id="footer">
148+
<div class="container">
149+
<div class="row">
150+
<div class="col-sm-6 col-lg-3">
151+
<p>
152+
Codeception is a BDD-styled PHP testing framework, brought to you by <a href="http://codeception.com/credits">Codeception Team</a>.
153+
Logo by <a
154+
href="https://twitter.com/adnanblog">Mr. Adnan</a>. OpenSource <strong>MIT Licensed</strong>.
155+
</p>
156+
157+
<h4>Sponsored by</h4>
158+
<a href="https://www.rebilly.com/">
159+
<img src="/images/Rebilly.png" style="width:100%; background: #fff; border-radius: 20px;" alt="Your Partner
160+
In Subscription Billing
161+
Uncover your revenue potential with
162+
our recurring billing software." title="Your Partner
163+
In Subscription Billing">
164+
</a>
165+
166+
167+
</div>
168+
169+
170+
<div class="col-sm-6 col-lg-3">
171+
172+
<div>
173+
174+
<a href="https://github.com/codeception/codeception" class="pull-left">
175+
<img src="/images/github.png">
176+
</a>
177+
178+
<a href="https://twitter.com/codeception" class="pull-left">
179+
<img src="/images/twitter.png">
180+
</a>
181+
182+
<a href="http://www.facebook.com/pages/Codeception/288959711204412" class="pull-left">
183+
<img src="/images/facebook.png">
184+
</a>
185+
186+
187+
188+
</div>
189+
190+
<div style="clear: both; display: block"></div>
191+
<ul class="footer-links" >
192+
<li><a href="/install">Installation</a></li>
193+
<li><a href="/credits">Credits</a></li>
194+
<li><a href="/blog">Blog</a></li>
195+
<li><a href="/changelog">Releases</a></li>
196+
<li><a href="https://github.com/Codeception/Codeception/blob/master/LICENSE">License</a></li>
197+
</ul>
198+
199+
200+
201+
202+
</div>
203+
204+
205+
<div class="col-sm-6 col-lg-6">
206+
207+
<h4>Codeception Family</h4>
208+
209+
210+
211+
<div>
212+
<div class="sublogo">
213+
<a href="http://robo.li">
214+
<img src="http://robo.li/img/robo.png" alt="Robo">
215+
</a>
216+
</div>
217+
<a href="http://robo.li"><h3>Robo</h3></a>
218+
<p>Modern PHP <strong>Task Runner</strong>.
219+
Allows to declare tasks with zero configuration in pure PHP.
220+
</p>
221+
</div>
222+
223+
224+
<div>
225+
<div class="sublogo">
226+
<a href="http://codecept.io">
227+
<img src="/images/cjs-logo.png" alt="Robo">
228+
</a>
229+
</div>
230+
<a href="http://codecept.io"><h3>CodeceptJS</h3></a>
231+
<p>Codeception for <strong>NodeJS</strong>.
232+
Write acceptance tests in ES6 and execute in webdriverio, Selenium WebDriver, and Protractor.
233+
</p>
234+
</div>
235+
236+
237+
238+
239+
</div>
240+
</div>
241+
</div>
242+
<div id="copyright">
243+
© 2011&ndash;{{ site.time | date: '%Y' }}
244+
</div>
245+
</div>
246+
247+
<!-- SCRIPTS -->
248+
<script type="text/javascript">
249+
var _gaq = _gaq || [];
250+
_gaq.push(['_setAccount', 'UA-1899308-9']);
251+
_gaq.push(['_trackPageview']);
252+
253+
(function () {
254+
var ga = document.createElement('script');
255+
ga.type = 'text/javascript';
256+
ga.async = true;
257+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
258+
var s = document.getElementsByTagName('script')[0];
259+
s.parentNode.insertBefore(ga, s);
260+
})();
261+
</script>
262+
263+
<script>
264+
// Adding this layout functionality for mobile views with the homepage hero
265+
$(document).ready(function(){
266+
$('.navbar-toggle').click(function(){
267+
$('.row.home').toggleClass('no-padding-top');
268+
});
269+
});
270+
</script>
271+
272+
</body>
273+
</html>

‎_layouts/doc.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,7 @@
33
---
44

55
<div class="row">
6-
<div class="col-sm-8 col-lg-8">
7-
<div class="content page">
8-
<div>
9-
10-
<div id="page">
11-
{{ content }}
12-
</div>
13-
</div>
14-
15-
</div>
16-
</div>
17-
<div class="col-sm-4 col-lg-4">
6+
<div class="col-sm-3 col-lg-3">
187

198
<div id="searchable">
209
<input type="search" class="search" placeholder="live search...">
@@ -47,4 +36,15 @@
4736
</script>
4837

4938
</div>
39+
<div class="col-sm-9 col-lg-9">
40+
<div class="content page">
41+
<div>
42+
43+
<div id="page">
44+
{{ content }}
45+
</div>
46+
</div>
47+
48+
</div>
49+
</div>
5050
</div>

0 commit comments

Comments
 (0)