Skip to content

Commit

Permalink
Up to v2.6.0
Browse files Browse the repository at this point in the history
    ====
    - [=] [Bootstrap](https://getbootstrap.com/docs/4.4/) updated from 3.4.1 to 4.4.1
    - [=] [Bootstrap Menu](https://github.com/cryol/bootstrap-menu) fork and refactoring
    - [=] [Datatables](https://datatables.net/) change bs to bs4 v1.10.20
    - [=] Rewrite templates to bs4.
    - [=] Rewrite compiler - CDN/NON-CDN exclude to assets.part/assets.cdn.part.
  • Loading branch information
cryol authored and Marco Dickert committed Jun 8, 2020
1 parent a7d5d46 commit e76da46
Show file tree
Hide file tree
Showing 21 changed files with 399 additions and 1,613 deletions.
12 changes: 6 additions & 6 deletions .gitattributes
@@ -1,9 +1,9 @@
ifm.php -diff
ifm.min.php -diff
build/* -diff
dist/ifm.php -diff
dist/ifm.min.php -diff
dist/* -diff
src/includes/ace.js -diff

src export-ignore
compiler.php export-ignore
src export-ignore
compiler.php export-ignore
.gitignore export-ignore
.gitattributes export-ignore
.gitattributes export-ignore
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -2,4 +2,5 @@
*.zip
misc
src/includes/ace/*
sftp-config.json
sftp-config.json
dist/*
10 changes: 5 additions & 5 deletions compiler.php
Expand Up @@ -10,20 +10,20 @@

// output files and common attrs
define( "IFM_CDN", true );
define( "IFM_VERSION", "v2.5.2" );
define( "IFM_VERSION", "v2.6.0" );
define( "IFM_STANDALONE", "dist/ifm.php" );
define( "IFM_STANDALONE_GZ", "dist/ifm.min.php" );
define( "IFM_LIB", "dist/libifm.php" );

if( IFM_CDN ){
$main_src = "src/main.cdn.php";
$IFM_ASSETS = "src/assets.cdn.part";
} else {
$main_src = "src/main.php";
$IFM_ASSETS = "src/assets.part";
}

// php source files
$IFM_SRC_PHP = array(
0 => $main_src,
0 => "src/main.php",
1 => "src/ifmarchive.php",
2 => "src/htpasswd.php"
);
Expand Down Expand Up @@ -56,7 +56,7 @@
$compiled = array_merge( $compiled, $lines );
}
$compiled = join( $compiled );

$compiled = str_replace( "IFM_ASSETS", file_get_contents( $IFM_ASSETS ), $compiled );
/**
* Process file includes
*/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
32 changes: 32 additions & 0 deletions src/assets.cdn.part
@@ -0,0 +1,32 @@
public function getCSS() {
print '
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.20/datatables.min.css"/>
<style type="text/css">';?> @@@file:src/includes/bootstrap-treeview.min.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/includes/fontello-embedded.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/includes/animation.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/style.css@@@ <?php print '</style>
';
}

public function getJS() {
print '
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.20/datatables.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.8/ace.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.2/mustache.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mouse0270-bootstrap-notify/3.1.7/bootstrap-notify.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/classnames/2.2.6/index.min.js"></script>
';
echo <<<'f00bar'
<script>
@@@file:src/includes/bootstrap-treeview.min.js@@@
@@@file:src/includes/BootstrapMenu.min.js@@@
@@@file:src/ifm.js@@@
</script>
f00bar;
}
31 changes: 31 additions & 0 deletions src/assets.part
@@ -0,0 +1,31 @@
public function getCSS() {
print '
<style type="text/css">';?> @@@file:src/includes/bootstrap.min.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/includes/bootstrap-treeview.min.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/includes/datatables.min.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/includes/fontello-embedded.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/includes/animation.css@@@ <?php print '</style>
<style type="text/css">';?> @@@file:src/style.css@@@ <?php print '</style>
';
}

public function getJS() {
echo <<<'f00bar'
<script>
@@@file:src/includes/jquery.min.js@@@
@@@file:src/includes/jquery.ui.min.js@@@
@@@file:src/includes/popper.min.js@@@
@@@file:src/includes/bootstrap.min.js@@@
@@@file:src/includes/bootstrap-notify.min.js@@@
@@@file:src/includes/bootstrap-treeview.min.js@@@
@@@file:src/includes/datatables.min.js@@@
@@@file:src/includes/lodash.min.js@@@
@@@file:src/includes/classnames.js@@@
@@@file:src/includes/BootstrapMenu.min.js@@@
@@@file:src/includes/mustache.min.js@@@
@@@file:src/includes/ace.js@@@
@@@acedir:src/includes/ace@@@
@@@file:src/ifm.js@@@
</script>
f00bar;
}
14 changes: 7 additions & 7 deletions src/includes/BootstrapMenu.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions src/includes/bootstrap.min.js

Large diffs are not rendered by default.

0 comments on commit e76da46

Please sign in to comment.