blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-06 14:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
alex
2018-01-24 17:18:13 +01:00
parent 785609584c f61ca3cc36
commit 8ec02c7aaa
18 changed files with 117 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfoCenter.php
+24 -2
View File
@@ -45,6 +45,7 @@ class InfoCenter extends VileSci_Controller
);
private $uid; // contains the UID of the logged user
private $navigationMenuArray; // contains all the voices for the navigation menu
private $navigationHeaderArray;
/**
* Constructor
@@ -70,6 +71,11 @@ class InfoCenter extends VileSci_Controller
$this->_setAuthUID(); // sets property uid
$this->_setNavigationMenuArray(); // sets property navigationMenuArray
$this->navigationHeaderArray = array(
'headertext' => 'Infocenter',
'headertextlink' => base_url('index.ci.php/system/infocenter/InfoCenter')
);
}
// -----------------------------------------------------------------------------------------------------------------
@@ -80,7 +86,13 @@ class InfoCenter extends VileSci_Controller
*/
public function index()
{
$this->load->view('system/infocenter/infocenter.php', array('navigationMenuArray' => $this->navigationMenuArray));
$this->load->view(
'system/infocenter/infocenter.php',
array(
'navigationHeaderArray' => $this->navigationHeaderArray,
'navigationMenuArray' => $this->navigationMenuArray
)
);
}
/**
@@ -98,7 +110,17 @@ class InfoCenter extends VileSci_Controller
$prestudentdata = $this->_loadPrestudentData($person_id);
$this->load->view('system/infocenter/infocenterDetails.php', array_merge($persondata, $prestudentdata, array('navigationMenuArray' => $this->navigationMenuArray)));
$this->load->view(
'system/infocenter/infocenterDetails.php',
array_merge(
$persondata,
$prestudentdata,
array(
'navigationHeaderArray' => $this->navigationHeaderArray,
'navigationMenuArray' => $this->navigationMenuArray
)
)
);
}
/**
application/views/example.php
-46
View File
@@ -1,46 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<?php
foreach($css_files as $file): ?>
<link type="text/css" rel="stylesheet" href="<?php echo $file; ?>" />
<?php endforeach; ?>
<?php foreach($js_files as $file): ?>
<script src="<?php echo $file; ?>"></script>
<?php endforeach; ?>
<style type='text/css'>
body
{
font-family: Arial;
font-size: 14px;
}
a {
color: blue;
text-decoration: none;
font-size: 14px;
}
a:hover
{
text-decoration: underline;
}
</style>
</head>
<body>
<div>
<a href='<?php echo site_url('examples/customers_management')?>'>Customers</a> |
<a href='<?php echo site_url('examples/orders_management')?>'>Orders</a> |
<a href='<?php echo site_url('examples/products_management')?>'>Products</a> |
<a href='<?php echo site_url('examples/offices_management')?>'>Offices</a> |
<a href='<?php echo site_url('examples/employees_management')?>'>Employees</a> |
<a href='<?php echo site_url('examples/film_management')?>'>Films</a> |
<a href='<?php echo site_url('examples/multigrids')?>'>Multigrid [BETA]</a>
</div>
<div style='height:20px;'></div>
<div>
<?php echo $output; ?>
</div>
</body>
</html>
application/views/home.php
-130
View File
@@ -1,130 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title><?php echo $this->config->item('nama_aplikasi');?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Administrator PORTAL Ujian Nasional 2014">
<meta name="keywords" content="portal un, portal un banten, ujian nasional, pengumuman ujian nasional 2014">
<meta name="author" content="Deddy Rusdiansyah">
<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>asset/favicon.ico" />
<!-- Bootstrap -->
<link rel="stylesheet" href="<?php echo base_url();?>asset/css/bootstrap-checkbox.css" >
<link href="<?php echo base_url();?>asset/css/bootstrap.css" rel="stylesheet" media="screen">
<link href="<?php echo base_url();?>asset/css/bootstrap-box.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="<?php echo base_url();?>asset/css/bootstrap-responsive.css" />
<link rel="stylesheet" href="<?php echo base_url();?>asset/css/custom.css" />
<link type="text/css" href="<?php echo base_url();?>asset/css/custom-theme/jquery-ui-1.10.0.custom.css" rel="stylesheet" />
<link rel="stylesheet" href="<?php echo base_url();?>asset/css/bootstrap-notify.css" />
<link type="text/css" href="<?php echo base_url();?>asset/css/font-awesome.min.css" rel="stylesheet" />
<link href="<?php echo base_url();?>asset/css/docs.css" rel="stylesheet">
<link href="<?php echo base_url();?>asset/js/google-code-prettify/prettify.css" rel="stylesheet">
<script src="<?php echo base_url(); ?>asset/js/jquery-1.9.0.min.js" type="text/javascript"></script>
<script src="<?php echo base_url(); ?>asset/js/bootstrap.min.js" type="text/javascript"></script>
<script src="<?php echo base_url(); ?>asset/js/jquery-ui-1.10.0.custom.min.js" type="text/javascript"></script>
<script type="text/javascript" src="<?php echo base_url();?>asset/js/bootstrap-checkbox.js"></script>
<script src="<?php echo base_url();?>asset/js/jquery.js"></script>
<script src="<?php echo base_url();?>asset/js/bootstrap.min.js"></script>
<script src="<?php echo base_url();?>asset/js/jquery-ui-1.10.0.custom.min.js" type="text/javascript"></script>
<script src="<?php echo base_url();?>asset/js/google-code-prettify/prettify.js" type="text/javascript"></script>
<script src="<?php echo base_url();?>asset/js/docs.js" type="text/javascript"></script>
<script src="<?php echo base_url();?>asset/js/ajaxfileupload.js" type="text/javascript"></script>
<script src="<?php echo base_url();?>asset/js/bootstrap-notify.js" type="text/javascript"></script>
<script type="text/javascript" src="<?php echo base_url();?>asset/tinymce/tinymce.min.js"></script>
<script src="<?php echo base_url(); ?>asset/js/bootstrap-scrollspy.js"></script>
<script src="<?php echo base_url(); ?>asset/js/ui.datepicker-id.js"></script>
<script type="text/javascript">
$(document).ready(function(){
});
$(function () {
//####### Buttons
$('button,.button,#sampleButton').button();
});
</script>
</head>
<body>
<div class='notifications bottom-right'></div>
<div class='notifications top-right'></div>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a href="<?php echo base_url(); ?>" class="brand">easyRDF</a>
<a data-toggle="collapse" data-target=".nav-collapse" class="btn btn-navbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<div class="collapse nav-collapse">
<ul class="nav pull-left">
<li class="dropdown" id="preview-menu"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i> Examples <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="<?php echo base_url(); ?>index.php/rdf/basic"><i class="icon-star"></i> Basic</a></li>
<li><a href="<?php echo base_url(); ?>index.php/rdf/basic/sparql"><i class="icon-star"></i> Sparql</a></li>
<li><a href="<?php echo base_url(); ?>index.php/rdf/basic/foafinfo"><i class="icon-star"></i> Foafinfo</a></li>
<li><a href="<?php echo base_url(); ?>index.php/rdf/basic/foafmaker"><i class="icon-star"></i> Foafmaker</a></li>
<li><a href="<?php echo base_url(); ?>index.php/rdf/basic/converter"><i class="icon-star"></i> Converter</a></li>
</ul>
</li>
</ul>
<ul class="nav pull-right">
<li class="active"><a href="#"><i class="icon-home"></i> Home</a></li>
<li class="dropdown" id="preview-menu"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i> Hello, <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#"><i class="icon-plus"></i> User</a></li>
<li><a href="#"><i class="icon-download"></i> Backup Database</a></li>
<li><a href="#"><i class="icon-off"></i> Logout</a></li>
</ul>
</li>
</ul>
</div>
</div>
</div>
</div> <!-- end navbar -->
<!-- FEATURED PRODUCT -->
<section>
<div class="container">
<div class="bootstrap-widget">
<?php echo $content;?>
</div>
</div> <!-- end container -->
</section>
<div class="container">
<!-- FOOTER -->
<section>
<p class="text-center muted">&copy; Copyright 2014 - <br>Created By : <a href="http://ndesostyle.wordpress.com" target="_blank">Slamet Nurhadi</a><br>Page rendered in <strong>{elapsed_time}</strong> seconds</p>
</section>
</div> <!-- end container -->
</body>
</html>
application/views/system/infocenter/infocenter.php
+7 -11
View File
@@ -19,19 +19,15 @@
<body>
<div id="wrapper">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<?php
<?php
echo $this->widgetlib->widget(
'FHC_navheader'
'NavigationWidget',
array(
'navigationHeader' => $navigationHeaderArray,
'navigationMenu' => $navigationMenuArray
)
);
echo $this->widgetlib->widget(
'FHC_navigation',
$navigationMenuArray
);
?>
</nav>
?>
<div id="page-wrapper">
<div class="container-fluid">
<div class="row">
application/views/system/infocenter/infocenterDetails.php
+7 -11
View File
@@ -3,19 +3,15 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
?>
<body>
<div id="wrapper">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<?php
<?php
echo $this->widgetlib->widget(
'FHC_navheader'
'NavigationWidget',
array(
'navigationHeader' => $navigationHeaderArray,
'navigationMenu' => $navigationMenuArray
)
);
echo $this->widgetlib->widget(
'FHC_navigation',
$navigationMenuArray
);
?>
</nav>
?>
<div id="page-wrapper">
<div class="container-fluid">
<div class="row">
application/views/tbl_studiengang_form.php
-20
View File
@@ -1,20 +0,0 @@
<!doctype html>
<html>
<head>
<title>harviacode.com - codeigniter crud generator</title>
<link rel="stylesheet" href="<?php echo base_url('assets/bootstrap/css/bootstrap.min.css') ?>"/>
<style>
body{
padding: 15px;
}
</style>
</head>
<body>
<h2 style="margin-top:0px">Tbl_studiengang <?php echo $button ?></h2>
<form action="<?php echo $action; ?>" method="post">
<input type="hidden" name="studiengang_kz" value="<?php echo $studiengang->studiengang_kz; ?>" />
<button type="submit" class="btn btn-primary"><?php echo $button ?></button>
<a href="<?php echo site_url('studiengang') ?>" class="btn btn-default">Cancel</a>
</form>
</body>
</html>
application/views/tbl_studiengang_list.php
-71
View File
@@ -1,71 +0,0 @@
<!doctype html>
<html>
<head>
<title>harviacode.com - codeigniter crud generator</title>
<link rel="stylesheet" href="<?php echo base_url('assets/bootstrap/css/bootstrap.min.css') ?>"/>
<style>
body{
padding: 15px;
}
</style>
</head>
<body>
<h2 style="margin-top:0px">Tbl_studiengang List</h2>
<div class="row" style="margin-bottom: 10px">
<div class="col-md-4">
<?php echo anchor(site_url('studiengang/create'),'Create', 'class="btn btn-primary"'); ?>
</div>
<div class="col-md-4 text-center">
<div style="margin-top: 8px" id="message">
<?php echo $this->session->userdata('message') <> '' ? $this->session->userdata('message') : ''; ?>
</div>
</div>
<div class="col-md-4 text-right">
<form action="<?php echo site_url('studiengang/search'); ?>" class="form-inline" method="post">
<input name="keyword" class="form-control" value="<?php echo $keyword; ?>" />
<?php
if ($keyword <> '')
{
?>
<a href="<?php echo site_url('studiengang'); ?>" class="btn btn-default">Reset</a>
<?php
}
?>
<input type="submit" value="Search" class="btn btn-primary" />
</form>
</div>
</div>
<table class="table table-bordered" style="margin-bottom: 10px">
<tr>
<th>No</th>
<th>Action</th>
</tr><?php
foreach ($studiengang_data as $studiengang)
{
?>
<tr>
<td><?php echo ++$start ?></td>
<td style="text-align:center">
<?php
echo anchor(site_url('studiengang/read/'.$studiengang->studiengang_kz),'Read');
echo ' | ';
echo anchor(site_url('studiengang/update/'.$studiengang->studiengang_kz),'Update');
echo ' | ';
echo anchor(site_url('studiengang/delete/'.$studiengang->studiengang_kz),'Delete','onclick="javasciprt: return confirm(\'Are You Sure ?\')"');
?>
</td>
</tr>
<?php
}
?>
</table>
<div class="row">
<div class="col-md-6">
<a href="#" class="btn btn-primary">Total Record : <?php echo $total_rows ?></a>
</div>
<div class="col-md-6 text-right">
<?php echo $pagination ?>
</div>
</div>
</body>
</html>
application/views/tbl_studiengang_read.php
-18
View File
@@ -1,18 +0,0 @@
<!doctype html>
<html>
<head>
<title>harviacode.com - codeigniter crud generator</title>
<link rel="stylesheet" href="<?php echo base_url('assets/bootstrap/css/bootstrap.min.css') ?>"/>
<style>
body{
padding: 15px;
}
</style>
</head>
<body>
<h2 style="margin-top:0px">Tbl_studiengang Read</h2>
<table class="table">
<tr><td></td><td><a href="<?php echo site_url('studiengang') ?>" class="btn btn-default">Cancel</button></td></tr>
</table>
</body>
</html>
application/views/widgets/fhcnavheader.php
-39
View File
@@ -1,39 +0,0 @@
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Men&uuml; umschalten </span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php echo $headertextlink ?>"><?php echo $headertext ?></a>
</div>
<ul class="nav navbar-top-links navbar-right">
<?php foreach($items as $name => $item): ?>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-<?php echo $item['icon'] ?> fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-<?php echo $name ?>">
<?php foreach($item['children'] as $child): ?>
<li>
<a href="<?php echo $child['link'] ?>">
<?php echo $child['html'] ?>
</a>
</li>
<li class="divider"></li>
<?php endforeach;
if(isset($item['showall'])):
?>
<li>
<a class="text-center" href="<?php echo $item['showall']['showalllink'] ?>">
<strong><?php echo $item['showall']['showalltext'] ?></strong>
<i class="fa fa-angle-right"></i>
</a>
</li>
<?php endif; ?>
</ul>
</li>
<?php endforeach; ?>
</ul>
application/views/widgets/fhcnavigation.php
-9
View File
@@ -1,9 +0,0 @@
<div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse">
<ul class="nav" id="side-menu">
<?php
FHC_navigation::printNavigationMenu();
?>
</ul>
</div>
</div>
application/views/widgets/navigation.php
+9
View File
@@ -0,0 +1,9 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<?php
// Header
echo $this->widgetlib->widget('NavigationHeaderWidget', $widgetData[NavigationWidget::NAVIGATION_HEADER]);
// Left menu
echo $this->widgetlib->widget('NavigationMenuWidget', $widgetData[NavigationWidget::NAVIGATION_MENU]);
?>
</nav>
application/views/widgets/navigationHeader.php
+9
View File
@@ -0,0 +1,9 @@
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Men&uuml; umschalten </span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php echo $headertextlink ?>"><?php echo $headertext ?></a>
</div>
application/views/widgets/navigationMenu.php
+7
View File
@@ -0,0 +1,7 @@
<div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse">
<ul class="nav" id="side-menu">
<?php NavigationMenuWidget::printNavigationMenu(); ?>
</ul>
</div>
</div>
application/widgets/FHC_navheader.php
-56
View File
@@ -1,56 +0,0 @@
<?php
class FHC_navheader extends Widget
{
public function display($data)
{
if (!isset($data['items']))
{
//default nav header
$data = array('headertext' => 'Infocenter', 'headertextlink' => base_url('index.ci.php/system/infocenter/InfoCenter'));
$data['items'] = array(
'messages' =>
array(
'icon' => 'envelope', 'showall' => array('showalllink' => '#', 'showalltext' => 'Alle Nachrichten anzeigen'), 'children' =>
array(array('link' => '#', 'html' => '
<div>
<strong>Maximillion Pegasus</strong>
<span class="pull-right text-muted">
<em>Gestern</em>
</span>
</div>
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
'), array('link' => '#', 'html' => '
<div>
<strong>Yugi Muto</strong>
<span class="pull-right text-muted">
<em>Vorgestern</em>
</span>
</div>
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
'))
),
'alerts' =>
array(
'icon' => 'bell', 'showall' => array('showalllink' => '#', 'showalltext' => 'Alle Aktionen anzeigen'), 'children' =>
array(array('link' => '#', 'html' => '
<div>
<i class="fa fa-upload fa-fw"></i> Dokument hochgeladen
<span class="pull-right text-muted small">vor 2 Minuten</span>
</div>'), array('link' => '#', 'html' => '
<div>
<i class="fa fa-envelope fa-fw"></i> Nachricht versandt
<span class="pull-right text-muted small">vor 4 Minuten</span>
</div>'), array('link' => '#', 'html' => '
<div>
<i class="fa fa-share fa-fw"></i> InteressentIn freigegeben
<span class="pull-right text-muted small">vor 5 Minuten</span>
</div>'))
)
);
}
$this->view('widgets/fhcnavheader', $data);
}
}
application/widgets/NavigationHeaderWidget.php
+15
View File
@@ -0,0 +1,15 @@
<?php
/**
*
*/
class NavigationHeaderWidget extends Widget
{
/**
*
*/
public function display($data)
{
$this->view('widgets/navigationHeader', $data);
}
}
application/widgets/FHC_navigation.php → application/widgets/NavigationMenuWidget.php
+7 -7
View File
@@ -3,13 +3,11 @@
/**
*
*/
class FHC_navigation extends Widget
class NavigationMenuWidget extends Widget
{
const NAVIGATION_MENU = 'navigationMenu'; //
private $navigationMenu;
private static $FHC_navigationInstance;
private static $NavigationMenuWidgetInstance;
/**
*
@@ -18,9 +16,9 @@ class FHC_navigation extends Widget
{
$this->navigationMenu = $widgetData;
self::$FHC_navigationInstance = $this;
self::$NavigationMenuWidgetInstance = $this;
$this->view('widgets/fhcnavigation');
$this->view('widgets/navigationMenu');
}
/**
@@ -28,8 +26,10 @@ class FHC_navigation extends Widget
*/
public static function printNavigationMenu()
{
foreach (self::$FHC_navigationInstance->navigationMenu as $item)
foreach (self::$NavigationMenuWidgetInstance->navigationMenu as $item)
{
self::printNavItem($item);
}
}
/**
application/widgets/NavigationWidget.php
+18
View File
@@ -0,0 +1,18 @@
<?php
/**
*
*/
class NavigationWidget extends Widget
{
const NAVIGATION_HEADER = 'navigationHeader'; //
const NAVIGATION_MENU = 'navigationMenu'; //
/**
*
*/
public function display($widgetData)
{
$this->view('widgets/navigation', array('widgetData' => $widgetData));
}
}
cis/private/jahresplan/jahresplan_funktionen.inc.php
+14 -1
View File
@@ -517,7 +517,20 @@ function jahresplan_veranstaltungskategorie_kalenderanzeige($veranstaltung,$wart
if (!$wartungsberechtigt)
$showHTML.=$cTmpJavaWartungInfo;
$showHTML.=' title="'.$p->t("eventkalender/veranstaltung").' '.$iTmpStartTagErgebniss[$iTmpVeranstaltung]->bezeichnung." ID ".$iTmpStartTagErgebniss[$iTmpVeranstaltung]->veranstaltung_id." \n".htmlspecialchars($iTmpStartTagErgebniss[$iTmpVeranstaltung]->beschreibung)." \n".htmlspecialchars($iTmpStartTagErgebniss[$iTmpVeranstaltung]->inhalt)." \n ".strftime(constKalenderDetailDatumZeit,$iTmpStartTagErgebniss[$iTmpVeranstaltung]->start_timestamp)." Uhr \n - ". ($iTmpStartTagErgebniss[$iTmpVeranstaltung]->start_datum==$iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_datum?strftime(constKalenderZeit,$iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_timestamp) : strftime(constKalenderDetailDatumZeit,$iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_timestamp) ).' Uhr">';
$showHTML.=' title="'.$p->t("eventkalender/veranstaltung").' '.
$iTmpStartTagErgebniss[$iTmpVeranstaltung]->bezeichnung.
" ID ".$iTmpStartTagErgebniss[$iTmpVeranstaltung]->veranstaltung_id.
" \n".htmlspecialchars($iTmpStartTagErgebniss[$iTmpVeranstaltung]->beschreibung).
" \n".htmlspecialchars($iTmpStartTagErgebniss[$iTmpVeranstaltung]->inhalt).
" \n ".$iTmpStartTagErgebniss[$iTmpVeranstaltung]->start_datum." ".
$iTmpStartTagErgebniss[$iTmpVeranstaltung]->start_zeit." Uhr - ";
if($iTmpStartTagErgebniss[$iTmpVeranstaltung]->start_datum == $iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_datum)
{
$showHTML .= $iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_zeit;
}
else
$showHTML .= $iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_datum.' '.$iTmpStartTagErgebniss[$iTmpVeranstaltung]->ende_zeit;
$showHTML.=' Uhr">';
$showHTML.='<td class="kalender_tages_info">
<table summary="blank'.$iTmpMonat.$iTmpWoche.$iTmpTag.'" style="border:0px;vertical-align:top;text-align:left;" cellpadding="0" cellspacing="0">