diff --git a/Gruntfile.js b/Gruntfile.js
index e08b8c833..e387dbd82 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -26,6 +26,9 @@ module.exports = function(grunt) {
marionette: {
deps: ['underscore', 'backbone' /*, 'jquery' */],
exports: 'Marionette'
+ },
+ jqueryTinyTimer: {
+ deps: [/* 'jquery' */]
}
},
// paths used by r.js
@@ -39,6 +42,7 @@ module.exports = function(grunt) {
humanize: '../dev/bower_components/humanize/js/humanize',
jquery: '../dev/bower_components/jquery/jquery',
jqueryAutosize: '../dev/bower_components/jquery-autosize/js/jquery.autosize',
+ jqueryTinyTimer: '../dev/bower_components/jquery-tinytimer/jquery.tinytimer',
jqueryUi: 'lib/jquery-ui/jquery-ui-1.9.2.custom.min',
marionette: '../dev/bower_components/marionette/backbone.marionette',
text: '../dev/bower_components/requirejs-text/js/text',
@@ -60,6 +64,7 @@ module.exports = function(grunt) {
'marionette',
'humanize',
'jqueryAutosize',
+ 'jqueryTinyTimer',
'jqueryUi',
'text',
'underscore'
@@ -138,10 +143,6 @@ module.exports = function(grunt) {
src: ['./app/webroot/release-tmp/main.js'],
dest: './app/webroot/dist/main.js'
},
- {
- src: ['./app/webroot/dev/vendors/countdown/jquery.countdown.min.js'],
- dest: './app/webroot/dist/jquery.countdown.min.js'
- },
{
expand: true,
cwd: './app/webroot/dev/vendors/farbtastic/',
diff --git a/app/Config/saito_config.php b/app/Config/saito_config.php
index 1d4ad28c5..b0550978f 100644
--- a/app/Config/saito_config.php
+++ b/app/Config/saito_config.php
@@ -3,7 +3,7 @@
/**
* Saito Enduser Configuration
*/
-
+
/**
* Setting default language (mandantory)
*
diff --git a/app/Config/version.php b/app/Config/version.php
index 4c03f6230..c9e1cf224 100644
--- a/app/Config/version.php
+++ b/app/Config/version.php
@@ -1,2 +1,2 @@
layout = 'default';
- $this->theme = 'default';
+ $this->layout = 'plugin-m';
$this->set('title_for_layout', 'Mobile');
$this->set(
'short_title_for_layout',
@@ -31,22 +30,6 @@ public function manifest() {
$this->autoLayout = false;
$this->response->type('appcache');
$this->response->disableCache();
-
- $this->set(
- 'touch',
- md5(
- Configure::read('debug') .
- filemtime(App::pluginPath('M') . 'webroot/touch.txt') .
- filemtime(App::pluginPath('M') . 'View/Elements/custom_html_header.ctp') .
- filemtime(App::pluginPath('M') . 'webroot/dist/js.js') .
- filemtime(
- App::pluginPath('M') . 'webroot/dist/common.css'
- ) .
- filemtime(
- App::pluginPath('M') . 'webroot/dist/theme.css'
- )
- )
- );
}
public function clientLog() {
diff --git a/app/Plugin/M/View/Layouts/default.ctp b/app/Plugin/M/View/Layouts/plugin-m.ctp
similarity index 83%
rename from app/Plugin/M/View/Layouts/default.ctp
rename to app/Plugin/M/View/Layouts/plugin-m.ctp
index d81c132f5..1143b7615 100644
--- a/app/Plugin/M/View/Layouts/default.ctp
+++ b/app/Plugin/M/View/Layouts/plugin-m.ctp
@@ -7,7 +7,13 @@
- = $this->Html->css(['M.../dist/common.css', 'M.../dist/theme.css']) ?>
+ '.css', 'fullBase' => true];
+ echo $_commonCssUrl = $this->Html->css([
+ $this->Html->assetUrl('M.dist/common', $_cssOptions),
+ $this->Html->assetUrl('M.dist/theme', $_cssOptions)
+ ]);
+ ?>
diff --git a/docs/dev-bb-views.odg b/docs/dev-bb-views.odg
index 413a33447..487e7edd4 100644
Binary files a/docs/dev-bb-views.odg and b/docs/dev-bb-views.odg differ