From 31cf31ab17efafe057af43d03350dc8af9ee0699 Mon Sep 17 00:00:00 2001 From: Ben Tadiar Date: Thu, 7 May 2015 21:20:29 +0100 Subject: [PATCH 1/7] Updated Vagrant box IP in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index df472b9..3ae3515 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ docker run -p 80:80 -v `pwd`:/var/www --link mysql ppi docker logs -f ppi ``` -Now you can now browse to your ppi application at http://192.168.66.66 +Now you can now browse to your ppi application at http://192.168.33.99 OSX ------------ @@ -31,7 +31,7 @@ Just ensure you have Vagrant installed and run: vagrant up && vagrant ssh -c "docker logs -f ppi" ``` -Now you can now browse to your ppi application at http://192.168.66.66 +Now you can now browse to your ppi application at http://192.168.33.99 Rolling your own ------------ From cd909da2d149df53f77871cb05809a79ae59a7d8 Mon Sep 17 00:00:00 2001 From: Paul Dragoonis Date: Thu, 7 May 2015 22:30:02 +0100 Subject: [PATCH 2/7] Removing an unneeded file --- virtual-host.conf | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 virtual-host.conf diff --git a/virtual-host.conf b/virtual-host.conf deleted file mode 100644 index 7be97b5..0000000 --- a/virtual-host.conf +++ /dev/null @@ -1,18 +0,0 @@ - - ServerAdmin webmaster@localhost - DocumentRoot /var/www/public - - - Options Indexes FollowSymLinks - AllowOverride All - Order allow,deny - Allow from all - - - CustomLog /var/log/apache2/access.log combined - ErrorLog /var/log/apache2/error.log - - LogLevel debug - - - From d462346c311f38ce7bb893f18f81ff29389f9e4d Mon Sep 17 00:00:00 2001 From: Ben Tadiar Date: Sat, 9 May 2015 00:04:00 +0100 Subject: [PATCH 3/7] Updated installation instructions --- README.md | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 07e7831..db013cf 100644 --- a/README.md +++ b/README.md @@ -10,21 +10,13 @@ PPI bootstraps framework components for you from the top frameworks such as Zend Installation ------------ -Linux ------ -Install vagrant and ansible - -``` -vagrant up -``` - -Now you can now browse to your ppi application at http://192.168.33.99 - -OSX ---- -Install vagrant and ansible +Linux & OSX +----------- +If you don't already have them, you will need to install Vagrant, Ansible, Composer and Bower. Once you have these, simply run the following commands: ``` +composer install +bower install vagrant up ``` From 00fac6684fb20ebd2a79e36b2b82176c66ac763d Mon Sep 17 00:00:00 2001 From: Ben Tadiar Date: Mon, 11 May 2015 19:50:51 +0100 Subject: [PATCH 4/7] Started restyling skeleton application --- app/FrameworkRequirements.php | 2 +- app/views/base.html.php | 8 +- .../resources/views/index/index.html.php | 68 +++++---- public/css/main.css | 134 +++++++++--------- 4 files changed, 106 insertions(+), 106 deletions(-) diff --git a/app/FrameworkRequirements.php b/app/FrameworkRequirements.php index 6c202ac..52968ce 100644 --- a/app/FrameworkRequirements.php +++ b/app/FrameworkRequirements.php @@ -516,7 +516,7 @@ function_exists('simplexml_import_dom'), /* optional recommendations follow */ $this->addRecommendation( - file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/ppi/distribution-module/src/resources/skeleton/app/FrameworkRequirements.php'), + file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/ppi/distribution-module/PPI/DistributionModule/resources/skeleton/app/FrameworkRequirements.php'), 'Requirements file should be up-to-date', 'Your requirements file is outdated. Run composer install and re-check your configuration.' ); diff --git a/app/views/base.html.php b/app/views/base.html.php index 48fd0e9..fc2a74f 100644 --- a/app/views/base.html.php +++ b/app/views/base.html.php @@ -1,12 +1,8 @@ - - - - + <?php $view['slots']->output('title', 'PPI Skeleton Application') ?> - @@ -30,7 +26,7 @@ -
+
output('_content'); ?>
diff --git a/modules/Application/resources/views/index/index.html.php b/modules/Application/resources/views/index/index.html.php index f227d34..67b6bbb 100644 --- a/modules/Application/resources/views/index/index.html.php +++ b/modules/Application/resources/views/index/index.html.php @@ -1,40 +1,48 @@ extend('::base.html.php'); ?> -
-
- + -

Welcome!

-

Congratulations! You have successfully installed a new PPI application.

+
+
+ +

Welcome!

+

Congratulations! You have successfully installed a new PPI application.

-
-
-

Documentation

- -
+
+
+

Documentation

+ +
-
-

Configuration

- -
+
+

Configuration

+ +
-
-

Community

- +
+

Community

+ +
-
\ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css index f90e599..be2fe7b 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1,86 +1,82 @@ html, body { + min-height:100%; + height:100%; + position:relative; background:#161616; - width: 100%; - height: 100%; } - -.clearfix:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; +h2 { + margin:0; } -.clearfix { display: inline-block; } -/* start commented backslash hack \*/ -* html .clearfix { height: 1%; } -.clearfix { display: block; } -/* close commented backslash hack */ - -#landing-index { +h3 { + margin:0 0 10px 0; +} +#container { + height:100%; +} +#landing, #landing-two { + height:100%; + position:relative; + background:#284545; + border-top:1px solid; text-align:center; - font-family: 'Open Sans', sans-serif; + padding:50px; +} +#landing-two { + background:#202020; + text-align:left; + padding:50px; color:#fff; - padding: 0 10% 5% 10%; - width: 80%; - margin: 2% auto 5% auto; - display: block; - border: 1px solid #fff; - height: 100%; + border:none; } - -#landing-index img { - margin-top: 5%; +#landing img, #landing-two img { + width:120px; + margin-bottom:50px; } - -#landing-index h2 { - margin-top: 5%; - font-weight:300; - font-size: 2.0em; +#landing .landing-wrapper { + position:relative; + top:50%; + margin-top:-100px; + height:215px; } -#landing-index p { - /*border: 1px solid red;*/ - font-size: 1.3em; +#landing .landing-wrapper .buttons a { + width:200px; + background:#406c6c; + border-radius:4px; + padding:15px; + display:inline-block; + color:#fff; + text-decoration:none; + border:1px solid #303030; + outline:none; } - -#landing-index .landing-list { - float: left; - width: 33%; - display: block; +#landing .landing-wrapper .buttons a:first-child { + margin-right:5px; } -#landing-index .landing-list .list-title { - text-align: left; - font-size: 1.8em; +.list-container { + width:100%; + margin-top:50px; } - -#landing-index .landing-list ul { - list-style-type: none; - padding: 0; - /*padding: 0 0 0 12px;*/ - margin: 0; - - - /*list-style-image: url(/modules/framework/images/bullet-grey.png);*/ - +.landing-list { + width:30%; + height:200px; + padding:1% 1.5%; + float:left; + margin-left:5%; + background:rgba(255, 255, 255, 0.05); + border-radius:4px; } - -#landing-index .landing-list li { - padding-left: 0; - text-align: left; - margin-bottom: 5px; - background-image: url(/modules/framework/images/bullet-grey.png); - background-repeat: no-repeat; +.landing-list:first-child { + margin-left:0; } - -#landing-index .landing-list li a { - font-size: 1.5em; - color: #c1c1c1; - display: block; - padding-left: 1.8em; +.landing-list ul { + list-style:none; + padding:0; + margin:0; } - -#landing-index .list-container { - margin-top: 5%; +.landing-list:first-child ul { + border:none; +} +.landing-list a { + color:#406c6c; } \ No newline at end of file From 9074b839e47aadc32bc3e90a559a9ebd177b8dfd Mon Sep 17 00:00:00 2001 From: Ben Tadiar Date: Mon, 11 May 2015 20:18:17 +0100 Subject: [PATCH 5/7] Started restyling skeleton application --- app/views/base.html.php | 2 ++ bower.json | 4 +++- .../Application/resources/views/index/index.html.php | 7 ++++++- public/css/main.css | 9 ++++++++- public/js/home.js | 11 +++++++---- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/views/base.html.php b/app/views/base.html.php index fc2a74f..b9d1e5a 100644 --- a/app/views/base.html.php +++ b/app/views/base.html.php @@ -8,6 +8,7 @@ + output('include_css'); ?> @@ -31,6 +32,7 @@
+ output('include_js_body'); ?> diff --git a/bower.json b/bower.json index d6ecfdf..1a931f2 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,9 @@ "name": "ppi/skeletonapp", "dependencies": { "bootstrap": "3.3.2", - "modernizr": "2.8.3" + "modernizr": "2.8.3", + "fontawesome": "4.3.0", + "jquery-ui": "1.11.4" }, "private": true } \ No newline at end of file diff --git a/modules/Application/resources/views/index/index.html.php b/modules/Application/resources/views/index/index.html.php index 67b6bbb..cda0afe 100644 --- a/modules/Application/resources/views/index/index.html.php +++ b/modules/Application/resources/views/index/index.html.php @@ -1,11 +1,16 @@ extend('::base.html.php'); ?> +start('include_js_body'); ?> + +stop(); ?> + diff --git a/public/css/main.css b/public/css/main.css index be2fe7b..bfc6b04 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -49,8 +49,15 @@ h3 { border:1px solid #303030; outline:none; } +#landing .landing-wrapper .buttons a { + margin-left:5px; +} #landing .landing-wrapper .buttons a:first-child { - margin-right:5px; + margin-left:0; +} +#landing .landing-wrapper .buttons a:last-child { + background:#202020; + border-color:#161616; } .list-container { diff --git a/public/js/home.js b/public/js/home.js index 7803443..da2099d 100644 --- a/public/js/home.js +++ b/public/js/home.js @@ -1,5 +1,8 @@ -jQuery(document).ready(function($) { - - $('.flashes .alert').alert(); - +$(document).ready(function($) { + $('.find-out-more').on('click', function(event){ + event.preventDefault(); + $('html, body').animate({ + scrollTop: $('#landing-two').position().top + }, 1500, 'easeInOutCubic'); + }); }); \ No newline at end of file From 7afda1345ae0c7622328f8a5c254d7bb9378dffa Mon Sep 17 00:00:00 2001 From: Paul Dragoonis Date: Tue, 12 May 2015 20:41:42 +0100 Subject: [PATCH 6/7] Styling tweaks --- modules/Application/resources/views/index/index.html.php | 2 +- public/css/main.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/Application/resources/views/index/index.html.php b/modules/Application/resources/views/index/index.html.php index cda0afe..3863067 100644 --- a/modules/Application/resources/views/index/index.html.php +++ b/modules/Application/resources/views/index/index.html.php @@ -37,7 +37,7 @@

Configuration

diff --git a/public/css/main.css b/public/css/main.css index bfc6b04..419fac4 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -86,4 +86,5 @@ h3 { } .landing-list a { color:#406c6c; + font-size: 1.2em; } \ No newline at end of file From 3ac27a792fd35f872ec380a61f098f808dfc5bf2 Mon Sep 17 00:00:00 2001 From: Paul Dragoonis Date: Tue, 12 May 2015 20:42:20 +0100 Subject: [PATCH 7/7] Fixing check requirements --- app/FrameworkRequirements.php | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/FrameworkRequirements.php b/app/FrameworkRequirements.php index 52968ce..6c202ac 100644 --- a/app/FrameworkRequirements.php +++ b/app/FrameworkRequirements.php @@ -516,7 +516,7 @@ function_exists('simplexml_import_dom'), /* optional recommendations follow */ $this->addRecommendation( - file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/ppi/distribution-module/PPI/DistributionModule/resources/skeleton/app/FrameworkRequirements.php'), + file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/ppi/distribution-module/src/resources/skeleton/app/FrameworkRequirements.php'), 'Requirements file should be up-to-date', 'Your requirements file is outdated. Run composer install and re-check your configuration.' ); diff --git a/composer.lock b/composer.lock index 312163d..5199677 100755 --- a/composer.lock +++ b/composer.lock @@ -906,7 +906,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ppi/framework/zipball/bc67ac3aec80ce748326a012af42fcf3bc040669", + "url": "https://api.github.com/repos/ppi/framework/zipball/02e19b045b0e9c523a2ab58870c08e482de0e1bb", "reference": "bc67ac3aec80ce748326a012af42fcf3bc040669", "shasum": "" },