Commit 9b1a494b authored by Björn Bartels's avatar Björn Bartels

extract js and css into separate assets module,

add Foundation(6) support and base-theme,
update install shell script
parent a77b3bb5
......@@ -16,9 +16,9 @@
"dudapiotr/zftable" : ">=3.1",
"org_heigl/piwik" : ">=1.0",
"visualappeal/php-auto-update": "^0.9.2",
"my-application/module-admin" : "dev-master",
"my-application/module-twbs-api" : "dev-master",
"my-application/application-assets" : "dev-master",
"my-application/theme-bootstrap" : "dev-master",
"my-application/theme-foundation" : "dev-master",
"my-application/theme-adminlte" : "dev-master",
"my-application/theme-remark" : "dev-master",
"my-application/theme-taurus" : "dev-master",
......@@ -33,8 +33,14 @@
"datatables/datatables" : ">=1.10"
},
"repositories" : [ {
"type" : "git",
"url" : "https://gitlab.bjoernbartels.earth/zf2/application-assets.git"
}, {
"type" : "git",
"url" : "https://gitlab.bjoernbartels.earth/zf2/theme-bootstrap.git"
}, {
"type" : "git",
"url" : "https://gitlab.bjoernbartels.earth/zf2/theme-foundation.git"
}, {
"type" : "git",
"url" : "https://gitlab.bjoernbartels.earth/zf2/theme-adminlte.git"
......@@ -60,16 +66,19 @@
"installer-paths" : {
"module/Admin" : ["my-application/module-admin"],
"module/TwitterBootstrapAPI" : ["my-application/module-twbs-api"],
"public/themes/{$name}" : ["my-application/theme-bootstrap", "my-application/theme-adminlte", "my-application/theme-remark", "my-application/theme-taurus"],
"public/{$name}" : ["my-application/application-assets"],
"public/themes/{$name}" : ["my-application/theme-bootstrap", "my-application/theme-foundation", "my-application/theme-adminlte", "my-application/theme-remark", "my-application/theme-taurus"],
"public/themes/bootstrap/assets/js/{$name}" : ["components/modernizr", "components/jquery", "components/jqueryui", "tinymce/tinymce", "datatables/datatables"],
"public/themes/bootstrap/assets/css/{$name}" : ["components/normalize.css", "twitter/bootstrap", "fortawesome/font-awesome"]
"public/themes/bootstrap/assets/css/{$name}" : ["components/normalize.css", "twitter/bootstrap", "fortawesome/font-awesome"],
"public/themes/foundation/assets/js/{$name}" : ["components/modernizr", "components/jquery", "components/jqueryui", "tinymce/tinymce", "datatables/datatables"],
"public/themes/foundation/assets/css/{$name}" : ["components/normalize.css", "twitter/bootstrap", "fortawesome/font-awesome"]
}
},
"type" : "project",
"scripts" : {
"pre-install-cmd" : [ "mkdir -p public/themes/bootstrap/assets/js; mkdir -p public/themes/bootstrap/assets/css; chmod -R ugoa+r ./public" ],
"pre-install-cmd" : [ "mkdir -p public/themes/bootstrap/assets/js; mkdir -p public/themes/bootstrap/assets/css; mkdir -p public/themes/foundation/assets/js; mkdir -p public/themes/foundation/assets/css; chmod -R ugoa+r ./public" ],
"post-install-cmd" : [ "chmod -R ugoa+rx ./shell; chmod -R ugoa+r ./public; ./shell/files.components.sh" ],
"pre-update-cmd" : [ "mkdir -p public/themes/bootstrap/assets/js; mkdir -p public/themes/bootstrap/assets/css; chmod -R ugoa+r ./public" ],
"pre-update-cmd" : [ "mkdir -p public/themes/bootstrap/assets/js; mkdir -p public/themes/bootstrap/assets/css; mkdir -p public/themes/foundation/assets/js; mkdir -p public/themes/foundation/assets/css; chmod -R ugoa+r ./public" ],
"post-update-cmd" : [ "chmod -R ugoa+rx ./shell; chmod -R ugoa+r ./public; ./shell/files.components.sh" ],
"never-to-be-executed" : [ "rm -rf components" ]
},
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
return array(
......@@ -52,6 +52,10 @@ return array(
'./public/themes',
'./module',
'./vendor',
//'TwitterBootstrapAPI' => '../module-twbs-api/',
//'Admin' => '../module-admin/',
),
// An array of paths from which to glob configuration files after
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
return array(
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
namespace Application;
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
return array(
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
namespace Application\Controller;
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
namespace Application\Controller;
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
namespace Application\Controller;
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
namespace Application\Controller;
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
namespace Application\Controller;
......
......@@ -2,7 +2,7 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h2><?php echo sprintf($this->translate('About %s[MyApplication]%s'), '<span class="appname">', '</span>') ?></h2>
<br />
<p><?php echo sprintf($this->translate('This should serve as a fully functional basic ZendFramework2 application construct. Just do a checkout %sfrom our GitLab%s and adjust it to your needs.'), '<a href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank">', '</a>'); ?></p>
<p><?php echo sprintf($this->translate('This should serve as a fully functional basic ZendFramework2 application construct. Just do a checkout %sfrom our GitLab%s and adjust it to your needs.'), '<a href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank">', '</a>'); ?></p>
<br />
<p><?php echo sprintf($this->translate('Please, take a look into %sMyApplication User Help section%s to get some guidance around this application.'), '<a href="'.$this->url('application/default', array('action' => 'help')).'">', '</a>'); ?></p>
<br />
......@@ -22,15 +22,15 @@
<br />
<p>
<?php echo sprintf($this->translate('Powered by...')); ?><br />
<a href="http://php.net" target="_blank"><img src="/assets/my-application/zf2-theme-basic/img/php-logo.gif" height="20" alt="php" /> <span class="linklabel"> - php</span></a><br />
<a href="http://framework.zend.com" target="_blank"><img src="/assets/my-application/zf2-theme-basic/img/zf2-logo.png" height="16" alt="ZendFramework 2" /> <span class="linklabel"> - ZendFramework2</span></a><br />
<a href="http://www.w3.org/html/" target="_blank"><img src="/assets/my-application/zf2-theme-basic/img/html5-badge-h-solo.png" height="16" alt="HTML5" /> <span class="linklabel"> - HTML5</span></a><br />
<a href="http://jquery.com" target="_blank"><img src="/assets/my-application/zf2-theme-basic/img/jquery-logo.png" height="16" alt="jQuery" /> <span class="linklabel"> - jQuery</span></a><br />
<a href="http://php.net" target="_blank"><img src="/application-assets/dist/img/php-logo.gif" height="20" alt="php" /> <span class="linklabel"> - php</span></a><br />
<a href="http://framework.zend.com" target="_blank"><img src="/application-assets/dist/img/zf2-logo.png" height="16" alt="ZendFramework 2" /> <span class="linklabel"> - ZendFramework2</span></a><br />
<a href="http://www.w3.org/html/" target="_blank"><img src="/application-assets/dist/img/html5-badge-h-solo.png" height="16" alt="HTML5" /> <span class="linklabel"> - HTML5</span></a><br />
<a href="http://jquery.com" target="_blank"><img src="/application-assets/dist/img/jquery-logo.png" height="16" alt="jQuery" /> <span class="linklabel"> - jQuery</span></a><br />
</p>
<br />
<p><a class="btn btn-success btn-lg" href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank"><?php echo $this->translate('If you are interested, please follow development on our GitLab...') ?> &raquo;</a></p>
<p><a class="btn btn-success btn-lg" href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank"><?php echo $this->translate('If you are interested, please follow development on our GitLab...') ?> &raquo;</a></p>
<br class="hide" />
<hr class="hide" />
<br class="hide" />
<span class="copyright hide"><small>&copy; <?php echo date('Y') ?> by <a href="//dragon-projects.net" target="_blank">[dragon-projects.net]</a> - <?php echo $this->translate('All rights reserved.') ?></small></span>
<span class="copyright hide"><small>&copy; <?php echo date('Y') ?> by <a href="https://bjoernbartels.earth" target="_blank">[Bj&ouml;rn Bartels]</a> - <?php echo $this->translate('All rights reserved.') ?></small></span>
</div>
<div class="row">
<div class="col-md-4">
<div class="medium-4 columns col-md-4">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->translate('Follow Development') ?></h3>
</div>
<div class="panel-body">
<p><?php echo sprintf($this->translate('%s[MyApplication]%s is under active development. If you are interested in following the development of %s[MyApplication]%s, there is a special portal on the official website which provides links to the %s[MyApplication]%s %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'), '<span class="appname">', '</span>', '<span class="appname">', '</span>', '<span class="appname">', '</span>', '<a href="//gitlab.dragon-projects.de:81/zf2/application-base/wikis/home" target="_blank">', '</a>', '<a href="//gitlab.dragon-projects.de:81/zf2/application-base/wikis/blog" target="_blank">', '</a>', '<a href="//gitlab.dragon-projects.de:81/zf2/application-base/issues" target="_blank">', '</a>') ?></p>
<p><a class="btn btn-success pull-right" href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank"><?php echo sprintf($this->translate('%s[MyApplication]%s Development Portal'), '<span class="appname">', '</span>') ?> &raquo;</a></p>
<p><?php echo sprintf($this->translate('%s[MyApplication]%s is under active development. If you are interested in following the development of %s[MyApplication]%s, there is a special portal on the official website which provides links to the %s[MyApplication]%s %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'), '<span class="appname">', '</span>', '<span class="appname">', '</span>', '<span class="appname">', '</span>', '<a href="//gitlab.bjoernbartels.earth/zf2/application-base/wikis/home" target="_blank">', '</a>', '<a href="//gitlab.bjoernbartels.earth/zf2/application-base/wikis/blog" target="_blank">', '</a>', '<a href="//gitlab.bjoernbartels.earth/zf2/application-base/issues" target="_blank">', '</a>') ?></p>
<p><a class="btn btn-success pull-right" href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank"><?php echo sprintf($this->translate('%s[MyApplication]%s Development Portal'), '<span class="appname">', '</span>') ?> &raquo;</a></p>
</div>
</div>
</div>
<div class="col-md-4">
<div class="medium-4 columns col-md-4">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->translate('Discover Modules') ?></h3>
</div>
<div class="panel-body">
<p><?php echo sprintf($this->translate('We are working on developing a community site to serve as a repository and gallery for %s[MyApplication]%s modules. These projects are available %son our GitLab%s. The site is currently under development and will soon contain a list of some of the modules already available for this application.'), '<span class="appname">', '</span>', '<a href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank">', '</a>'); ?></p>
<p><a class="btn btn-success pull-right" href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank"><?php echo sprintf($this->translate('Explore %s[MyApplication]%s Modules'), '<span class="appname">', '</span>') ?> &raquo;</a></p>
<p><?php echo sprintf($this->translate('We are working on developing a community site to serve as a repository and gallery for %s[MyApplication]%s modules. These projects are available %son our GitLab%s. The site is currently under development and will soon contain a list of some of the modules already available for this application.'), '<span class="appname">', '</span>', '<a href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank">', '</a>'); ?></p>
<p><a class="btn btn-success pull-right" href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank"><?php echo sprintf($this->translate('Explore %s[MyApplication]%s Modules'), '<span class="appname">', '</span>') ?> &raquo;</a></p>
</div>
</div>
</div>
<div class="col-md-4">
<div class="medium-4 columns col-md-4">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<div class="panel panel-default">
<div class="panel-heading">
......
......@@ -7,7 +7,7 @@
<small><?php echo sprintf($this->translate('This install is for demonstration purposes only.')); ?> <?php echo sprintf($this->translate('You are able to login with username "sysadmin" and password "sysadmin".')); ?><br />
<?php echo sprintf($this->translate('Database and sessions will be flushed every ten minutes.')); ?></small>
</p>
<p><a class="btn btn-success btn-lg" href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank"><?php echo $this->translate('Follow on our GitLab') ?> &raquo;</a></p>
<p><a class="btn btn-success btn-lg" href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank"><?php echo $this->translate('Follow on our GitLab') ?> &raquo;</a></p>
</div>
<?php include 'development_info.phtml'; ?>
\ No newline at end of file
......@@ -20,7 +20,7 @@
<a href="http://jquery.com" target="_blank"><img src="/img/jquery-logo.png" height="16" alt="jQuery" /> <span class="linklabel"> - jQuery</span></a><br />
</p>
<br />
<p><a class="btn btn-success btn-lg" href="//gitlab.dragon-projects.de:81/groups/zf2" target="_blank"><?php echo $this->translate('If you are interested, please follow development on our GitLab...') ?> &raquo;</a></p>
<p><a class="btn btn-success btn-lg" href="//gitlab.bjoernbartels.earth/groups/zf2" target="_blank"><?php echo $this->translate('If you are interested, please follow development on our GitLab...') ?> &raquo;</a></p>
<br class="hide" />
<hr class="hide" />
<br class="hide" />
......
......@@ -7,10 +7,10 @@
* @package [MyApplication]
* @package BB's Zend Framework 2 Components
* @package BaseApp
* @author Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @link http://gitlab.dragon-projects.de:81/groups/zf2
* @author Björn Bartels <development@bjoernbartels.earth>
* @link https://gitlab.bjoernbartels.earth/groups/zf2
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @copyright copyright (c) 2016 Björn Bartels [dragon-projects.net] <info@dragon-projects.net>
* @copyright copyright (c) 2016 Björn Bartels <development@bjoernbartels.earth>
*/
ini_set('error_reporting', E_ALL);
......
......@@ -45,6 +45,8 @@ cp -r vendor/tinymce/tinymce/skins public/themes/bootstrap/assets/css/tinymce/
## datatables
mkdir -p public/themes/bootstrap/assets/js/datatables
cp -r vendor/datatables/datatables/media/* public/themes/bootstrap/assets/js/datatables/
mkdir -p public/themes/foundation/assets/js/datatables
cp -r vendor/datatables/datatables/media/* public/themes/foundation/assets/js/datatables/
## font-awesome
mkdir -p public/themes/bootstrap/assets/css/fontawesome
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment