Skip to content

Commit bf0cb65

Browse files
leofeyerleofeyer
committed
Moved all core assets to assets/contao 
1 parent fce8c84 commit bf0cb65

36 files changed

+25
-39
lines changed

‎assets/contao/src/debug.css ‎assets/contao/css/debug-uncompressed.css

File renamed without changes.

‎assets/contao/debug.css ‎assets/contao/css/debug.css

File renamed without changes.

‎assets/contao/src/layout.css ‎assets/contao/css/layout-uncompressed.css

File renamed without changes.

‎assets/contao/layout.css ‎assets/contao/css/layout.css

File renamed without changes.

‎assets/contao/src/reset.css ‎assets/contao/css/reset-uncompressed.css

File renamed without changes.

‎assets/contao/reset.css ‎assets/contao/css/reset.css

File renamed without changes.

‎assets/contao/src/responsive.css ‎assets/contao/css/responsive-uncompressed.css

File renamed without changes.

‎assets/contao/responsive.css ‎assets/contao/css/responsive.css

File renamed without changes.

‎system/modules/core/html/facebook.gif ‎assets/contao/images/facebook.gif

File renamed without changes.

‎system/modules/core/html/gplus.gif ‎assets/contao/images/gplus.gif

File renamed without changes.

‎system/modules/core/html/pdf.gif ‎assets/contao/images/pdf.gif

File renamed without changes.

‎system/modules/core/html/print.gif ‎assets/contao/images/print.gif

File renamed without changes.

‎system/modules/core/html/twitter.gif ‎assets/contao/images/twitter.gif

File renamed without changes.

‎assets/contao/src/core.js ‎assets/contao/js/core-uncompressed.js

File renamed without changes.

‎assets/contao/core.js ‎assets/contao/js/core.js

File renamed without changes.

‎assets/contao/src/scheduler.js ‎assets/contao/js/scheduler-uncompressed.js

File renamed without changes.

‎assets/contao/scheduler.js ‎assets/contao/js/scheduler.js

File renamed without changes.

‎assets/contao/src/index.html

-9
This file was deleted.

‎contao/install.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ protected function storeFtpCredentials()
287287
$this->Template->ftpUserError = true;
288288
$this->outputAndExit();
289289
}
290-
elseif (ftp_size($resFtp, $GLOBALS['TL_CONFIG']['ftpPath'] . 'assets/contao/debug.css') == -1)
290+
elseif (ftp_size($resFtp, $GLOBALS['TL_CONFIG']['ftpPath'] . 'assets/contao/css/debug.css') == -1)
291291
{
292292
$this->Template->ftpPathError = true;
293293
$this->outputAndExit();

‎robots.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
User-agent: *
22
Disallow: /contao/
3-
Disallow: /plugins/
43
Disallow: /system/
54
Disallow: /templates/
65
Disallow: /share/index.php
76
Disallow: /contao-check.php
87
Disallow: /flash.php
98
Disallow: /README.md
10-
Allow: /assets/
11-
Allow: /plugins/*.js
12-
Allow: /plugins/*.css
9+
Allow: /assets/

‎system/bin/minify

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ contao()
5151
copyright="/* Contao Open Source CMS, (C) 2005-2012 Leo Feyer, LGPL license */"
5252

5353
# CSS
54-
for file in `ls $version/src | grep ".css"`; do
55-
echo "$copyright" > $version/$file
56-
$css $version/src/$file >> $version/$file
57-
echo " Created $version/$file"
54+
for file in `ls $version/css | grep "\-uncompressed"`; do
55+
echo "$copyright" > $version/css/${file/-uncompressed/}
56+
$css $version/css/$file >> $version/css/${file/-uncompressed/}
57+
echo " Created $version/css/${file/-uncompressed/}"
5858
done
5959

6060
# JavaScript
61-
for file in `ls $version/src | grep ".js"`; do
62-
echo "$copyright" > $version/$file
63-
$js $version/src/$file >> $version/$file
64-
echo " Created $version/$file"
61+
for file in `ls $version/js | grep "\-uncompressed"`; do
62+
echo "$copyright" > $version/js/${file/-uncompressed/}
63+
$js $version/js/$file >> $version/js/${file/-uncompressed/}
64+
echo " Created $version/js/${file/-uncompressed/}"
6565
done
6666
}
6767

‎system/modules/core/classes/BackendTemplate.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function output()
107107
// Add the debug style sheet
108108
if ($GLOBALS['TL_CONFIG']['debugMode'])
109109
{
110-
$this->stylesheets .= '<link rel="stylesheet" href="' . $this->addStaticUrlTo('assets/contao/debug.css') . '" media="all">' . "\n";
110+
$this->stylesheets .= '<link rel="stylesheet" href="' . $this->addStaticUrlTo('assets/contao/css/debug.css') . '" media="all">' . "\n";
111111
}
112112

113113
// JavaScripts

‎system/modules/core/html/.htaccess

-2
This file was deleted.

‎system/modules/core/pages/PageRegular.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ protected function createHeaderScripts($objPage, $objLayout)
415415
{
416416
if ($strFile != 'tinymce.css')
417417
{
418-
$GLOBALS['TL_FRAMEWORK_CSS'][] = 'assets/contao/' . $strFile;
418+
$GLOBALS['TL_FRAMEWORK_CSS'][] = 'assets/contao/css/' . $strFile;
419419
}
420420
}
421421
}
@@ -489,7 +489,7 @@ protected function createHeaderScripts($objPage, $objLayout)
489489
// Add the debug style sheet
490490
if ($GLOBALS['TL_CONFIG']['debugMode'])
491491
{
492-
$strStyleSheets .= '<link rel="stylesheet" href="' . $this->addStaticUrlTo('assets/contao/debug.css') . '">' . "\n";
492+
$strStyleSheets .= '<link rel="stylesheet" href="' . $this->addStaticUrlTo('assets/contao/css/debug.css') . '">' . "\n";
493493
}
494494

495495
// Always add conditional style sheets at the end

‎system/modules/core/templates/be_confirm.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$objCombiner = new Combiner();
1818
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
1919
$objCombiner->add('assets/mootools/mootao/Mootao.js');
20-
$objCombiner->add('assets/contao/core.js');
20+
$objCombiner->add('assets/contao/js/core.js');
2121
echo $objCombiner->getCombinedFile();
2222
?>"></script>
2323
<script><?php echo $this->getDateString(); ?></script>

‎system/modules/core/templates/be_files.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
2323
$objCombiner->add('assets/mootools/datepicker/'. DATEPICKER .'/datepicker.js', DATEPICKER);
2424
$objCombiner->add('assets/mootools/mootao/Mootao.js');
25-
$objCombiner->add('assets/contao/core.js');
25+
$objCombiner->add('assets/contao/js/core.js');
2626
$objCombiner->add('system/themes/'. $this->theme .'/hover.js');
2727
echo $objCombiner->getCombinedFile();
2828
?>"></script>

‎system/modules/core/templates/be_help.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$objCombiner = new Combiner();
1818
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
1919
$objCombiner->add('assets/mootools/mootao/Mootao.js');
20-
$objCombiner->add('assets/contao/core.js');
20+
$objCombiner->add('assets/contao/js/core.js');
2121
echo $objCombiner->getCombinedFile();
2222
?>"></script>
2323
<script><?php echo $this->getDateString(); ?></script>

‎system/modules/core/templates/be_install.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<script src="<?php echo TL_PLUGINS_URL; ?>assets/mootools/core/<?php echo MOOTOOLS; ?>/mootools.js"></script>
1414
<script src="<?php echo TL_SCRIPT_URL; ?>assets/mootools/stylect/js/stylect.js"></script>
1515
<script src="<?php echo TL_SCRIPT_URL; ?>assets/mootools/mootao/Mootao.js"></script>
16-
<script src="<?php echo TL_SCRIPT_URL; ?>assets/contao/core.js"></script>
16+
<script src="<?php echo TL_SCRIPT_URL; ?>assets/contao/js/core.js"></script>
1717
<script src="<?php echo TL_SCRIPT_URL; ?>system/themes/<?php echo $this->theme; ?>/hover.js"></script>
1818
<script><?php echo $this->getDateString(); ?></script>
1919
<?php echo $this->javascripts; ?>

‎system/modules/core/templates/be_login.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
2020
$objCombiner->add('assets/mootools/stylect/js/stylect.js');
2121
$objCombiner->add('assets/mootools/mootao/Mootao.js');
22-
$objCombiner->add('assets/contao/core.js');
22+
$objCombiner->add('assets/contao/js/core.js');
2323
echo $objCombiner->getCombinedFile();
2424
?>"></script>
2525
<script><?php echo $this->getDateString(); ?></script>

‎system/modules/core/templates/be_main.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
$objCombiner->add('assets/mootools/simplemodal/'. SIMPLEMODAL .'/js/simplemodal.js', SIMPLEMODAL);
3131
$objCombiner->add('assets/mootools/datepicker/'. DATEPICKER .'/datepicker.js', DATEPICKER);
3232
$objCombiner->add('assets/mootools/mootao/Mootao.js');
33-
$objCombiner->add('assets/contao/core.js');
33+
$objCombiner->add('assets/contao/js/core.js');
3434
$objCombiner->add('system/themes/'. $this->theme .'/hover.js');
3535
echo $objCombiner->getCombinedFile();
3636
?>"></script>

‎system/modules/core/templates/be_password.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$objCombiner = new Combiner();
1818
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
1919
$objCombiner->add('assets/mootools/mootao/Mootao.js');
20-
$objCombiner->add('assets/contao/core.js');
20+
$objCombiner->add('assets/contao/js/core.js');
2121
echo $objCombiner->getCombinedFile();
2222
?>"></script>
2323
<script><?php echo $this->getDateString(); ?></script>

‎system/modules/core/templates/be_picker.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$objCombiner = new Combiner();
1818
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
1919
$objCombiner->add('assets/mootools/mootao/Mootao.js');
20-
$objCombiner->add('assets/contao/core.js');
20+
$objCombiner->add('assets/contao/js/core.js');
2121
$objCombiner->add('system/themes/'. $this->theme .'/hover.js');
2222
echo $objCombiner->getCombinedFile();
2323
?>"></script>

‎system/modules/core/templates/be_popup.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$objCombiner = new Combiner();
1818
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
1919
$objCombiner->add('assets/mootools/mootao/Mootao.js');
20-
$objCombiner->add('assets/contao/core.js');
20+
$objCombiner->add('assets/contao/js/core.js');
2121
echo $objCombiner->getCombinedFile();
2222
?>"></script>
2323
<script><?php echo $this->getDateString(); ?></script>

‎system/modules/core/templates/be_switch.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
$objCombiner->add('assets/mootools/core/' . MOOTOOLS . '/mootools.js', MOOTOOLS);
2020
$objCombiner->add('assets/mootools/stylect/js/stylect.js');
2121
$objCombiner->add('assets/mootools/mootao/Mootao.js');
22-
$objCombiner->add('assets/contao/core.js');
22+
$objCombiner->add('assets/contao/js/core.js');
2323
echo $objCombiner->getCombinedFile();
2424
?>"></script>
2525
<script><?php echo $this->getDateString(); ?></script>

‎system/modules/core/templates/fe_page.html5

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<?php echo $this->mootools; ?>
6868
<?php if (!$this->disableCron): ?>
6969

70-
<script src="<?php echo TL_SCRIPT_URL; ?>assets/contao/scheduler.js"></script>
70+
<script src="<?php echo TL_SCRIPT_URL; ?>assets/contao/js/scheduler.js"></script>
7171
<?php endif; ?>
7272

7373
</body>

‎system/modules/core/templates/fe_page.xhtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<?php echo $this->mootools; ?>
6969
<?php if (!$this->disableCron): ?>
7070

71-
<script type="text/javascript" src="<?php echo TL_SCRIPT_URL; ?>assets/contao/scheduler.js"></script>
71+
<script type="text/javascript" src="<?php echo TL_SCRIPT_URL; ?>assets/contao/js/scheduler.js"></script>
7272
<?php endif; ?>
7373

7474
</body>

0 commit comments

Comments
 (0)