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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
alex
2018-01-30 16:53:15 +01:00
parent c7008c9ccd 458f78084c
commit 8eedae0df9
31 changed files with 1579 additions and 2939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Vilesci.php
+9 -4
View File
@@ -1,9 +1,16 @@
<?php
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
class Vilesci extends FHC_Controller
{
public function __construct()
{
parent::__construct();
$this->load->library('WidgetLib');
}
/**
* Index Page for this controller.
*
@@ -22,8 +29,6 @@ class Vilesci extends FHC_Controller
*/
public function index()
{
$this->load->view('templates/header');
$this->load->view('vilesci_frameset');
$this->load->view('templates/footer');
$this->load->view('home');
}
}
application/controllers/system/infocenter/InfoCenter.php
+4
View File
@@ -70,6 +70,10 @@ class InfoCenter extends VileSci_Controller
$this->_setAuthUID(); // sets property uid
$this->load->library('PermissionLib');
if(!$this->permissionlib->isBerechtigt('basis/person'))
show_error('You have no Permission! You need Infocenter Role');
$this->_setNavigationMenuArray(); // sets property navigationMenuArray
$this->navigationHeaderArray = array(
application/views/home.php
+158
View File
@@ -0,0 +1,158 @@
<?php
$this->load->view('templates/FHC-Header',
array(
'title' => 'FH-Complete',
'jquery' => true,
'bootstrap' => true,
'fontawesome' => true,
'sbadmintemplate' => true
)
);
?>
<body>
<div id="wrapper">
<?php
$navigationHeaderArray = array('headertext' => 'FH-Complete', 'headertextlink' => base_url('index.ci.php/'));
$navigationMenuArray = array(
'Dashboard' => array('link' => '#', 'description' => 'Dashboard', 'icon' => 'dashboard'),
'Lehre' => array('link' => '#', 'icon' => 'graduation-cap', 'description' => 'Lehre', 'expand' => true,
'children'=> array(
'CIS' => array('link' => CIS_ROOT, 'icon' => '', 'description' => 'CIS', 'expand' => true),
'Infocenter' => array('link' => base_url('index.ci.php/system/infocenter/InfoCenter'), 'icon' => 'info', 'description' => 'Infocenter', 'expand' => true),
)
),
'Administration' => array('link' => '#', 'icon' => 'gear', 'description' => 'Administration', 'expand' => false,
'children'=> array(
'Vilesci' => array('link' => base_url('vilesci/'), 'icon' => '', 'description' => 'Vilesci', 'expand' => true),
'Extensions' => array('link' => base_url('index.ci.php/system/extensions/Manager'), 'icon' => 'cubes', 'description' => 'Extensions Manager', 'expand' => true),
'Datenschutz' => array('link' => base_url('index.ci.php/extensions/FHC-Core-DSMS/export'), 'description' => 'Datenschutz', 'icon' => 'legal','expand' => true)
)
),
);
echo $this->widgetlib->widget(
'NavigationWidget',
array(
'navigationHeader' => $navigationHeaderArray,
'navigationMenu' => $navigationMenuArray
)
);
?>
<div id="page-wrapper">
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<h3 class="page-header">FH-Complete</h3>
</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-6">
<div class="panel panel-primary">
<div class="panel-heading">
<div class="row">
<div class="col-xs-3">
<i class="fa fa-comments fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">26</div>
<div>neue Messages</div>
</div>
</div>
</div>
<a href="#">
<div class="panel-footer">
<span class="pull-left">View Details</span>
<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
<div class="clearfix"></div>
</div>
</a>
</div>
</div>
<div class="col-lg-3 col-md-6">
<div class="panel panel-green">
<div class="panel-heading">
<div class="row">
<div class="col-xs-3">
<i class="fa fa-tasks fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">12</div>
<div>neue Interessenten</div>
</div>
</div>
</div>
<a href="#">
<div class="panel-footer">
<span class="pull-left">View Details</span>
<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
<div class="clearfix"></div>
</div>
</a>
</div>
</div>
<div class="col-lg-3 col-md-6">
<div class="panel panel-yellow">
<div class="panel-heading">
<div class="row">
<div class="col-xs-3">
<i class="fa fa-clock-o fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">124</div>
<div>inaktive Interessenten</div>
</div>
</div>
</div>
<a href="#">
<div class="panel-footer">
<span class="pull-left">View Details</span>
<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
<div class="clearfix"></div>
</div>
</a>
</div>
</div>
<div class="col-lg-3 col-md-6">
<div class="panel panel-red">
<div class="panel-heading">
<div class="row">
<div class="col-xs-3">
<i class="fa fa-support fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">13</div>
<div>Support Tickets!</div>
</div>
</div>
</div>
<a href="#">
<div class="panel-footer">
<span class="pull-left">View Details</span>
<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
<div class="clearfix"></div>
</div>
</a>
</div>
</div>
</div>
<!-- /.row -->
<span>
<?php
//$this->load->view('system/infocenter/infocenterData.php');
?>
</span>
</div>
</div>
</div>
<script>
//javascript hacks for bootstrap
$("select").addClass("form-control");
$("input[type=text]").addClass("form-control");
$("input[type=button]").addClass("btn btn-default");
$("#tableDataset").addClass('table-bordered');
</script>
</body>
<?php $this->load->view('templates/FHC-Footer'); ?>
application/views/vilesci_frameset.php
-13
View File
@@ -1,13 +0,0 @@
<frameset id="frameset-vilesci" rows="55px,*" frameborder="0" framespacing="0">
<frame src="<?php echo base_url('vilesci/top.php')?>" id="top" name="top" scrolling="No"/>
<frameset border="4" frameborder="1" framespacing="0" cols="200px,*" >
<frame style="border-right: 3px; border-right-style:solid; border-right-color: grey;" src="<?php echo base_url('vilesci/left.php')?>" id="nav" name="nav" />
<frame frameborder="1" src="<?php echo base_url('vilesci/main.php')?>" id="main" name="main" />
</frameset>
<noframes>
<body bgcolor="#FFFFFF">
This application works only with a frames-enabled browser.<br />
<a href="<?php echo base_url('vilesci/main.php')?>">Use without frames</a>
</body>
</noframes>
</frameset>
application/widgets/FilterWidget.php
+2 -2
View File
@@ -1051,7 +1051,7 @@ class FilterWidget extends Widget
&& ($activeFiltersOption[$field] == self::OPT_DAYS
|| $activeFiltersOption[$field] == self::OPT_MONTHS))
{
$condition = ' > (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)';
$condition = ' < (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)';
}
else
{
@@ -1065,7 +1065,7 @@ class FilterWidget extends Widget
&& ($activeFiltersOption[$field] == self::OPT_DAYS
|| $activeFiltersOption[$field] == self::OPT_MONTHS))
{
$condition = ' < (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)';
$condition = ' > (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)';
}
else
{