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

- Renamed parameter jquery into jquery19 in file application/views/templates/header.php

Browse Source 
- Fixed includes in prestudentMultiAssign.php and messageWrite.php
- Fixed new lines in prestudentMultiAssign.php and messageWrite.php
This commit is contained in:
Paolo
2017-08-25 14:13:46 +02:00
parent fbb4a492b5
commit 2beba613e6
3 changed files with 613 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/aufnahme/prestudentMultiAssign.php
+1 -1
View File
@@ -1,4 +1,4 @@
<?php $this->load->view("templates/header", array("title" => "Users manager", "jquery" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?> <?php $this->load->view("templates/header", array("title" => "Users manager", "jquery19" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?>
<body> <body>
<form id="usersFiltersForm" action="" method="post"> <form id="usersFiltersForm" action="" method="post">
application/views/system/messageWrite.php
+1 -1
View File
@@ -1,4 +1,4 @@
<?php $this->load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?> <?php $this->load->view("templates/header", array("title" => "MessageReply", "jquery19" => true, "tinymce" => true)); ?>
<body> <body>
application/views/templates/header.php
+4 -4
View File
@@ -2,7 +2,7 @@
if (! defined('BASEPATH')) exit('No direct script access allowed'); if (! defined('BASEPATH')) exit('No direct script access allowed');
isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
!isset($jquery) ? $jquery = false : $jquery = $jquery; !isset($jquery19) ? $jquery19 = false : $jquery19 = $jquery19;
!isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer; !isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer;
!isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui; !isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui;
!isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes; !isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes;
@@ -19,7 +19,7 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
!isset($datepicker) ? $datepicker = false : $datepicker = $datepicker; !isset($datepicker) ? $datepicker = false : $datepicker = $datepicker;
if ($tablesort || $jquery_checkboxes || $jquery_custom) if ($tablesort || $jquery_checkboxes || $jquery_custom)
$jquery = true; $jquery19 = true;
if($datepicker) if($datepicker)
$jqueryui = true; $jqueryui = true;
@@ -27,7 +27,7 @@ if($datepicker)
if($jqueryui) if($jqueryui)
$jqueryComposer = true; $jqueryComposer = true;
if($jquery && $jqueryComposer) if($jquery19 && $jqueryComposer)
show_error("Two JQuery versions used: composer and include folder version"); show_error("Two JQuery versions used: composer and include folder version");
?> ?>
@@ -42,7 +42,7 @@ if($jquery && $jqueryComposer)
<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/tablesort.css'); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/tablesort.css'); ?>" />
<?php endif ?> <?php endif ?>
<?php if($jquery) : ?> <?php if($jquery19) : ?>
<script type="text/javascript" src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>"></script> <script type="text/javascript" src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>"></script>
<?php endif ?> <?php endif ?>