Skip to content

Commit df1019c

Browse files
leofeyerleofeyer
committed
Some minor fixed (now ready to be merged)
1 parent 0cb2db1 commit df1019c

File tree

15 files changed

+22
-94
lines changed

15 files changed

+22
-94
lines changed

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232
font-family:Verdana,sans-serif;
3333
}
3434
#debug .info {
35-
background:url("../../system/themes/default/images/show.gif") left 0 no-repeat;
35+
background:url("../../../system/themes/default/images/show.gif") left 0 no-repeat;
3636
}
3737
#debug .time {
38-
background:url("../../system/themes/default/images/news.gif") left 0 no-repeat;
38+
background:url("../../../system/themes/default/images/news.gif") left 0 no-repeat;
3939
}
4040
#debug .memory {
41-
background:url("../../system/themes/default/images/modules.gif") left 0 no-repeat;
41+
background:url("../../../system/themes/default/images/modules.gif") left 0 no-repeat;
4242
}
4343
#debug .db {
44-
background:url("../../system/themes/default/images/db.gif") left 0 no-repeat;
44+
background:url("../../../system/themes/default/images/db.gif") left 0 no-repeat;
4545
}
4646
#debug .rows {
47-
background:url("../../system/themes/default/images/rows.gif") left 0 no-repeat;
47+
background:url("../../../system/themes/default/images/rows.gif") left 0 no-repeat;
4848
}
4949
#debug div {
5050
height:260px;
@@ -70,9 +70,9 @@
7070
top:2px;
7171
height:28px;
7272
right:28px;
73-
background:url("../../system/themes/default/images/expand.gif") right 5px no-repeat;
73+
background:url("../../../system/themes/default/images/expand.gif") right 5px no-repeat;
7474
cursor:pointer;
7575
}
7676
#debug.closed #tog {
77-
background-image:url("../../system/themes/default/images/collapse.gif");
77+
background-image:url("../../../system/themes/default/images/collapse.gif");
7878
}

‎assets/contao/css/debug.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/contao/index.html

-9
This file was deleted.

‎assets/css3pie/index.html

-9
This file was deleted.

‎assets/highlighter/index.html

-9
This file was deleted.

‎assets/html5shiv/index.html

-9
This file was deleted.

‎assets/images/index.html

-9
This file was deleted.

‎assets/jquery/index.html

-9
This file was deleted.

‎assets/mootools/index.html

-9
This file was deleted.

‎assets/tinymce/index.html

-9
This file was deleted.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ public function purgeImageCache()
104104
// Walk through the subfolders
105105
foreach (scan(TL_ROOT . '/assets/images') as $dir)
106106
{
107-
if ($dir != 'index.html')
107+
if ($dir != 'index.html' && strncmp($dir, '.', 1) !== 0)
108108
{
109109
// Purge the folder
110110
$objFolder = new \Folder('assets/images/' . $dir);
111111
$objFolder->purge();
112112

113113
// Restore the index.html file
114-
$objFile = new \File('assets/contao/index.html');
114+
$objFile = new \File('templates/index.html');
115115
$objFile->copyTo('assets/images/' . $dir . '/index.html');
116116
}
117117
}
@@ -137,7 +137,7 @@ public function purgeScriptCache()
137137
$objFolder->purge();
138138

139139
// Restore the index.html file
140-
$objFile = new \File('assets/contao/index.html');
140+
$objFile = new \File('templates/index.html');
141141
$objFile->copyTo($dir . '/index.html');
142142
}
143143

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function run()
136136

137137
foreach (scan(TL_ROOT . '/' . $folder) as $dir)
138138
{
139-
if ($dir != 'index.html')
139+
if ($dir != 'index.html' && strncmp($dir, '.', 1) !== 0)
140140
{
141141
$total += count(scan(TL_ROOT . '/' . $folder . '/' . $dir));
142142
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<!-- indexer::stop -->
66
<div class="pdf_link">
77
<?php if ($this->printButton): ?>
8-
<a href="<?php echo $this->print; ?>" rel="nofollow" title="<?php echo $this->printTitle; ?>" onclick="window.print();return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/print.gif" width="16" height="16" alt=""></a>
8+
<a href="<?php echo $this->print; ?>" rel="nofollow" title="<?php echo $this->printTitle; ?>" onclick="window.print();return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/print.gif" width="16" height="16" alt=""></a>
99
<?php endif; ?>
1010
<?php if ($this->pdfButton): ?>
11-
<a href="<?php echo $this->href; ?>" rel="nofollow" title="<?php echo $this->pdfTitle; ?>"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/pdf.gif" width="16" height="16" alt=""></a>
11+
<a href="<?php echo $this->href; ?>" rel="nofollow" title="<?php echo $this->pdfTitle; ?>"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/pdf.gif" width="16" height="16" alt=""></a>
1212
<?php endif; ?>
1313
<?php if ($this->facebookButton): ?>
14-
<a href="share/?p=facebook&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->facebookTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/facebook.gif" width="16" height="16" alt=""></a>
14+
<a href="share/?p=facebook&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->facebookTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/facebook.gif" width="16" height="16" alt=""></a>
1515
<?php endif; ?>
1616
<?php if ($this->twitterButton): ?>
17-
<a href="share/?p=twitter&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->twitterTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/twitter.gif" width="16" height="16" alt=""></a>
17+
<a href="share/?p=twitter&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->twitterTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/twitter.gif" width="16" height="16" alt=""></a>
1818
<?php endif; ?>
1919
<?php if ($this->gplusButton): ?>
20-
<a href="share/?p=gplus&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->gplusTitle; ?>" onclick="window.open(this.href,'','width=600,height=200,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/gplus.gif" width="16" height="16" alt=""></a>
20+
<a href="share/?p=gplus&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->gplusTitle; ?>" onclick="window.open(this.href,'','width=600,height=200,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/gplus.gif" width="16" height="16" alt=""></a>
2121
<?php endif; ?>
2222
</div>
2323
<!-- indexer::continue -->

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<!-- indexer::stop -->
66
<div class="pdf_link">
77
<?php if ($this->printButton): ?>
8-
<a href="<?php echo $this->print; ?>" rel="nofollow" title="<?php echo $this->printTitle; ?>" onclick="window.print();return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/print.gif" width="16" height="16" alt="" /></a>
8+
<a href="<?php echo $this->print; ?>" rel="nofollow" title="<?php echo $this->printTitle; ?>" onclick="window.print();return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/print.gif" width="16" height="16" alt="" /></a>
99
<?php endif; ?>
1010
<?php if ($this->pdfButton): ?>
11-
<a href="<?php echo $this->href; ?>" rel="nofollow" title="<?php echo $this->pdfTitle; ?>"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/pdf.gif" width="16" height="16" alt="" /></a>
11+
<a href="<?php echo $this->href; ?>" rel="nofollow" title="<?php echo $this->pdfTitle; ?>"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/pdf.gif" width="16" height="16" alt="" /></a>
1212
<?php endif; ?>
1313
<?php if ($this->facebookButton): ?>
14-
<a href="share/?p=facebook&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->facebookTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/facebook.gif" width="16" height="16" alt="" /></a>
14+
<a href="share/?p=facebook&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->facebookTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/facebook.gif" width="16" height="16" alt="" /></a>
1515
<?php endif; ?>
1616
<?php if ($this->twitterButton): ?>
17-
<a href="share/?p=twitter&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->twitterTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/twitter.gif" width="16" height="16" alt="" /></a>
17+
<a href="share/?p=twitter&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->twitterTitle; ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/twitter.gif" width="16" height="16" alt="" /></a>
1818
<?php endif; ?>
1919
<?php if ($this->gplusButton): ?>
20-
<a href="share/?p=gplus&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->gplusTitle; ?>" onclick="window.open(this.href,'','width=600,height=200,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>system/modules/core/html/gplus.gif" width="16" height="16" alt="" /></a>
20+
<a href="share/?p=gplus&amp;u=<?php echo $this->encUrl; ?>&amp;t=<?php echo $this->encTitle; ?>" rel="nofollow" title="<?php echo $this->gplusTitle; ?>" onclick="window.open(this.href,'','width=600,height=200,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?php echo TL_FILES_URL; ?>assets/contao/images/gplus.gif" width="16" height="16" alt="" /></a>
2121
<?php endif; ?>
2222
</div>
2323
<!-- indexer::continue -->

‎assets/codemirror/index.html ‎templates/index.html

File renamed without changes.

0 commit comments

Comments
 (0)