diverse include-Umbauten

-vendor/FHC-vendor angelegt
	-.gitignore dementsprechend angepasst
	-easyui nach FHC-vendor verschoben
	-jquery meta-include angelegt
	-jquery-tablesorter meta-include angelegt
This commit is contained in:
Andreas Moik
2015-11-30 15:54:44 +01:00
parent cfda95c996
commit a8a38dade5
1121 changed files with 101880 additions and 8 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
.htaccess
/nbproject/
/vendor/*
!/vendor/easyui
!/vendor/FHC-vendor
/.idea/
documents/
.settings
+13 -7
View File
@@ -19,17 +19,23 @@
*/
//require_once('/config/vilesci.config.inc.php'); Muss vor dieser Datei eingebunden werden!
$ar = APP_ROOT;
if(isset($_SERVER["https"]) && $_SERVER["https"] != "")
$ar = preg_replace("/^http:/i", "https:", $ar);
else
$ar = preg_replace("/^https:/i", "http:", $ar);
//Originaldateien des herstellers
echo '<link rel="stylesheet" type="text/css" href="'.APP_ROOT.'vendor/easyui/themes/icon.css">';
echo '<link rel="stylesheet" type="text/css" href="'.APP_ROOT.'vendor/easyui/themes/gray/easyui.css">';
//Originaldateien des Herstellers
echo '<link rel="stylesheet" type="text/css" href="'.$ar.'vendor/FHC-vendor/easyui/themes/icon.css">';
echo '<link rel="stylesheet" type="text/css" href="'.$ar.'vendor/FHC-vendor/easyui/themes/gray/easyui.css">';
echo '<script src="'.APP_ROOT.'vendor/easyui/jquery.min.js"></script>';
echo '<script src="'.APP_ROOT.'vendor/easyui/jquery.easyui.min.js"></script>';
echo '<script src="'.$ar.'vendor/FHC-vendor/easyui/jquery.min.js"></script>';
echo '<script src="'.$ar.'vendor/FHC-vendor/easyui/jquery.easyui.min.js"></script>';
//Anpassungen
echo '<link rel="stylesheet" type="text/css" href="'.APP_ROOT.'include/vendor_custom/easyui/easyui.css">';
echo '<link rel="stylesheet" type="text/css" href="'.APP_ROOT.'include/vendor_custom/easyui/icon.css">';
echo '<link rel="stylesheet" type="text/css" href="'.$ar.'include/vendor_custom/easyui/easyui.css">';
echo '<link rel="stylesheet" type="text/css" href="'.$ar.'include/vendor_custom/easyui/icon.css">';
?>
+38
View File
@@ -0,0 +1,38 @@
<?php
/* Copyright (C) 2015 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Moik <moik@technikum-wien.at>
*/
//require_once('/config/vilesci.config.inc.php'); Muss vor dieser Datei eingebunden werden!
$ar = APP_ROOT;
if(isset($_SERVER["https"]) && $_SERVER["https"] != "")
$ar = preg_replace("/^http:/i", "https:", $ar);
else
$ar = preg_replace("/^https:/i", "http:", $ar);
//Originaldateien des Herstellers
echo '<link rel="stylesheet" type="text/css" href="'.$ar.'vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css">';
echo '<script src="'.$ar.'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js"></script>';
//Anpassungen
echo '<link rel="stylesheet" type="text/css" href="'.$ar.'include/vendor_custom/jquery-tablesorter/tablesort.css">';
?>
+33
View File
@@ -0,0 +1,33 @@
<?php
/* Copyright (C) 2015 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Moik <moik@technikum-wien.at>
*/
//require_once('/config/vilesci.config.inc.php'); Muss vor dieser Datei eingebunden werden!
$ar = APP_ROOT;
if(isset($_SERVER["https"]) && $_SERVER["https"] != "")
$ar = preg_replace("/^http:/i", "https:", $ar);
else
$ar = preg_replace("/^https:/i", "http:", $ar);
//Originaldateien des Herstellers
echo '<script src="'.$ar.'vendor/components/jquery/jquery.min.js"></script>';
?>
@@ -0,0 +1,44 @@
/* tables */
table.tablesorter {
font-family:arial;
/*background-color: white;*/
margin:10px 0pt 15px;
font-size: 8pt;
width: 100%;
text-align: left;
}
table.tablesorter thead tr th, table.tablesorter tfoot tr th {
background:#DCE4EF;
border: 1px solid #FFF;
font-size: 8pt;
padding: 4px;
}
table.tablesorter thead tr .header {
background-image: url(../../../skin/images/bg_sort.gif);
background-repeat: no-repeat;
background-position: center left;
padding-left: 20px;
cursor: pointer;
}
table.tablesorter tbody td {
padding: 4px;
background-color: #EEEEEE;
vertical-align: top;
}
table.tablesorter tbody tr.odd td {
background-color:lightgray;
}
table.tablesorter thead tr .headerSortUp {
background-image: url(../../../skin/images/asc.gif);
}
table.tablesorter thead tr .headerSortDown {
background-image: url(../../../skin/images/desc.gif);
}
table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
background-color: #8dbdd8;
}
TD,TH
{
font-size: 9pt;
}

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Some files were not shown because too many files have changed in this diff Show More