blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 00:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

- beautified composer.json

Browse Source 
- added borgar/textile-js to composer requirements (composer.json)
- removed textile.min.js from include directory
- replaced old textile js path with the new one in header.php
- changed the call of js textile in application/views/system/phraseinhaltEdit.php
This commit is contained in:
Paolo
2017-08-25 11:27:41 +02:00
parent d1fa93a2b6
commit 921bdd1242
4 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/templates/header.php
+3 -3
View File
@@ -28,7 +28,7 @@ if($jqueryui)
$jqueryComposer = true;
if($jquery && $jqueryComposer)
show_error("Two JQuery versions used: composer and includefolderversion");
show_error("Two JQuery versions used: composer and include folder version");
?>
<!DOCTYPE HTML>
@@ -93,7 +93,7 @@ if($jquery && $jqueryComposer)
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
<?php endif ?>
<?php if($textile) : ?>
<script type="text/javascript" src="<?php echo base_url('include/js/textile.min.js');?>"></script>
<script type="text/javascript" src="<?php echo base_url('vendor/borgar/textile-js/lib/textile.min.js');?>"></script>
<?php endif ?>
<?php if($jsoneditor) : ?>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/jsoneditor/dist/jsoneditor.css');?>" />
@@ -106,4 +106,4 @@ if($jquery && $jqueryComposer)
<?php if($widgetsCSS) : ?>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/widgets.css'); ?>" />
<?php endif ?>
</head>
</head>