Commit b96b89d5 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.0.0-rc.19'

parents aa46b599 8d96b457
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.0.0-rc.18';
const VERSION = '4.0.0-rc.19';
/**
* Performs some startup checks
......
......@@ -152,7 +152,7 @@ class Assets
$this->enableLibraries($this->libraries[$library]['dependencies']);
}
// Enabled the javascript library
// Enable the javascript library
$this->libraries[$library]['enabled'] = true;
}
}
......
......@@ -56,10 +56,18 @@
height: auto;
margin: 0;
}
.dataset-box .navbar-header {
float: left;
}
.dataset-box small.navbar-text,
.dataset-box .small.navbar-text {
margin-top: 17px;
margin-bottom: 16px;
line-height: 20px;
}
@media (max-width: 767px) {
.dataset-box small.navbar-text,
.dataset-box .small.navbar-text {
margin-right: 15px;
}
}
.dataset-box .content {
margin: -8px 20px 10px;
......
/**
* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
*/
!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.2",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b)}(this,document);
\ No newline at end of file
* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
*/
!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document);
\ No newline at end of file
......@@ -6,10 +6,17 @@
margin: 0;
}
.navbar-header {
float: left;
}
small.navbar-text,
.small.navbar-text {
margin-top: 17px;
margin-bottom: 16px;
line-height: 20px;
@media(max-width: 767px) {
margin-right: 15px;
}
}
.content {
......
{javascripts}
{include_js module="system" file="dataTables.bootstrap" depends="datatables"}
{include_js module="system" file="libs/dataTables.bootstrap" depends="datatables"}
<script type="text/javascript">
$(document).ready(function () {
$('{$dt.element}').dataTable({
......
......@@ -5,5 +5,5 @@
<!-- STYLESHEETS -->
{event name="core.layout.head"}
<!--[if lt IE 9]>
{include_js module="system" file="libs/html5shiv"}
{include_js module="system" file="libs/html5shiv.min"}
<![endif]-->
......@@ -23,6 +23,7 @@
"fancybox": "^2.1.5",
"bootbox.js": "bootbox#^4.4.0",
"moment": "^2.14.1",
"eonasdan-bootstrap-datetimepicker": "^4.17.37"
"eonasdan-bootstrap-datetimepicker": "^4.17.37",
"html5shiv": "^3.7.3"
}
}
......@@ -12,3 +12,6 @@ ul {
#main-navigation img {
height: 40px;
}
.footer {
margin-bottom: 10px;
}
......@@ -17,3 +17,7 @@ ul {
height: 40px;
}
}
.footer {
margin-bottom: 10px;
}
......@@ -42,12 +42,6 @@
</nav>
<div class="row">
<div class="col-sm-3 col-md-2">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{lang t="system|navigation"}</h3>
</div>
{navbar block="sidebar" class="list-group" classLink="list-group-item" dropdownItemClass="dropdown" itemTag="" dropdownWrapperTag="div" tag="div"}
</div>
{load_module module="widget/users/index/user_menu"}
{load_module module="widget/users/index/login"}
</div>
......@@ -70,6 +64,14 @@
{load_module module="widget/polls"}
</div>
</div>
<footer class="row footer">
<div class="col-xs-5 copyright">
&copy; {site_title}
</div>
<div class="col-xs-7">
{navbar block="sidebar" class="list-inline text-right" use_bootstrap=false}
</div>
</footer>
</div>
<!-- JAVASCRIPTS -->
</body>
......
......@@ -4,58 +4,115 @@
*/
var gulp = require('gulp'),
modifyCssUrls = require('gulp-modify-css-urls');
rename = require('gulp-rename'),
plumber = require('gulp-plumber'),
less = require('gulp-less'),
modifyCssUrls = require('gulp-modify-css-urls'),
gutil = require('gulp-util'),
change = require('gulp-change'),
argv = require('yargs').argv;
gulp.task('copy', function () {
var bowerBasePath = 'bower_components',
systemBasePath = 'ACP3/Modules/ACP3/System/Resources/Assets',
var bowerBasePath = './bower_components',
systemBasePath = './ACP3/Modules/ACP3/System/Resources/Assets',
paths = [
{
'src': [
bowerBasePath + '/jquery/dist/jquery.min.js',
bowerBasePath + '/bootbox.js/bootbox.js',
bowerBasePath + '/moment/min/moment.min.js',
bowerBasePath + '/datatables.net/js/jquery.dataTables.min.js',
bowerBasePath + '/bootstrap/dist/js/bootstrap.min.js',
bowerBasePath + '/fancybox/source/jquery.fancybox.pack.js',
bowerBasePath + '/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js'
],
'dest': systemBasePath + '/js/libs'
},
{
'src': bowerBasePath + '/datatables.net-bs/js/dataTables.bootstrap.js',
'dest': systemBasePath + '/js'
},
{
'src': bowerBasePath + '/bootstrap/dist/fonts/*',
'dest': systemBasePath + '/fonts'
},
{
'src': [
bowerBasePath + '/fancybox/source/*.gif',
bowerBasePath + '/fancybox/source/*.png'
],
'dest': systemBasePath + '/images/fancybox'
},
{
'src': [
bowerBasePath + '/bootstrap/dist/css/bootstrap.min.css',
bowerBasePath + '/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css',
bowerBasePath + '/datatables.net-bs/css/dataTables.bootstrap.css'
],
'dest': systemBasePath + '/css'
}
];
{
'src': [
bowerBasePath + '/jquery/dist/jquery.min.js',
bowerBasePath + '/bootbox.js/bootbox.js',
bowerBasePath + '/moment/min/moment.min.js',
bowerBasePath + '/datatables.net/js/jquery.dataTables.min.js',
bowerBasePath + '/datatables.net-bs/js/dataTables.bootstrap.js',
bowerBasePath + '/bootstrap/dist/js/bootstrap.min.js',
bowerBasePath + '/fancybox/source/jquery.fancybox.pack.js',
bowerBasePath + '/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
bowerBasePath + '/html5shiv/dist/html5shiv.min.js'
],
'dest': systemBasePath + '/js/libs'
},
{
'src': bowerBasePath + '/bootstrap/dist/fonts/*',
'dest': systemBasePath + '/fonts'
},
{
'src': [
bowerBasePath + '/fancybox/source/*.gif',
bowerBasePath + '/fancybox/source/*.png'
],
'dest': systemBasePath + '/images/fancybox'
},
{
'src': [
bowerBasePath + '/bootstrap/dist/css/bootstrap.min.css',
bowerBasePath + '/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css',
bowerBasePath + '/datatables.net-bs/css/dataTables.bootstrap.css'
],
'dest': systemBasePath + '/css'
}
];
for (var i = 0; i < paths.length; i++) {
gulp.src(paths[i].src)
.pipe(gulp.dest(paths[i].dest));
}
gulp.src(bowerBasePath + '/fancybox/source/jquery.fancybox.css')
return gulp.src(bowerBasePath + '/fancybox/source/jquery.fancybox.css')
.pipe(modifyCssUrls({
prepend: '../images/fancybox/'
}))
.pipe(gulp.dest(systemBasePath + '/css'));
});
gulp.task('acp3-version', function () {
if (argv.from === undefined || argv.to === undefined) {
gutil.log(gutil.colors.red('Error: Please specify the arguments "from" and "to".'));
return;
}
return gulp.src(
[
'./ACP3/Core/Application/BootstrapInterface.php',
'./package.json'
],
{base: './'}
)
.pipe(change(function (content) {
return content.replace(argv.from, argv.to);
}))
.pipe(gulp.dest('./'))
});
gulp.task('less', function () {
return gulp.src(
[
'./ACP3/Modules/*/*/Resources/Assets/less/style.less',
'./ACP3/Modules/*/*/Resources/Assets/less/append.less',
'./designs/*/*/Assets/less/style.less',
'./designs/*/*/Assets/less/append.less',
'./designs/*/Assets/less/*.less',
'./installation/design/Assets/less/*.less',
'./installation/Installer/Modules/*/Resources/Assets/less/style.less'
],
{base: './'}
)
.pipe(plumber())
.pipe(less())
.pipe(rename(function (path) {
path.dirname = path.dirname.substring(0, path.dirname.length - 4) + 'css'
}))
.pipe(gulp.dest('./'));
});
gulp.task('watch', function () {
// Watch all the .less files, then run the less task
return gulp.watch(
[
'./ACP3/Modules/*/*/Resources/Assets/less/**/*.less',
'./designs/*/**/Assets/less/*.less'
],
['less']
);
});
gulp.task('default', ['watch']);
......@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="{$DESIGN_PATH}Assets/css/style.css">
<!-- STYLESHEETS -->
<!--[if lt IE 9]>
<script src="{$ROOT_DIR}ACP3/Modules/ACP3/System/Resources/Assets/js/libs/html5shiv.js"></script>
<script src="{$ROOT_DIR}ACP3/Modules/ACP3/System/Resources/Assets/js/libs/html5shiv.min.js"></script>
<![endif]-->
</head>
......
{
"name": "acp3-cms",
"version": "4.0.0-rc.18",
"version": "4.0.0-rc.19",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......@@ -17,6 +17,12 @@
"homepage": "http://www.acp3-cms.net",
"devDependencies": {
"gulp": "^3.9.1",
"gulp-modify-css-urls": "^0.2.2"
"gulp-change": "^1.0.0",
"gulp-less": "^3.1.0",
"gulp-modify-css-urls": "^0.2.2",
"gulp-plumber": "^1.1.0",
"gulp-rename": "^1.2.2",
"gulp-util": "^3.0.7",
"yargs": "^4.8.1"
}
}
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