diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index 21b1a515e..54c697950 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -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 + ) + ) + ); } /** diff --git a/application/views/example.php b/application/views/example.php deleted file mode 100644 index 1241c352b..000000000 --- a/application/views/example.php +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - -
- '>Customers | - '>Orders | - '>Products | - '>Offices | - '>Employees | - '>Films | - '>Multigrid [BETA] - -
-
-
- -
- - diff --git a/application/views/home.php b/application/views/home.php deleted file mode 100644 index 5f2438c2d..000000000 --- a/application/views/home.php +++ /dev/null @@ -1,130 +0,0 @@ - - - - <?php echo $this->config->item('nama_aplikasi');?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- easyRDF - - - - - - - -
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
- -
-

© Copyright 2014 -
Created By : Slamet Nurhadi
Page rendered in {elapsed_time} seconds

-
-
- - - diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index b57fe1c0c..7b8b077bf 100644 --- a/application/views/system/infocenter/infocenter.php +++ b/application/views/system/infocenter/infocenter.php @@ -19,19 +19,15 @@
- + ?>
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index 9f6f4a03e..bc89479f8 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -3,19 +3,15 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', ?>
- + ?>
diff --git a/application/views/tbl_studiengang_form.php b/application/views/tbl_studiengang_form.php deleted file mode 100644 index 7aece4d74..000000000 --- a/application/views/tbl_studiengang_form.php +++ /dev/null @@ -1,20 +0,0 @@ - - - - harviacode.com - codeigniter crud generator - - - - -

Tbl_studiengang

-
- - - Cancel -
- - diff --git a/application/views/tbl_studiengang_list.php b/application/views/tbl_studiengang_list.php deleted file mode 100644 index a86d3b89e..000000000 --- a/application/views/tbl_studiengang_list.php +++ /dev/null @@ -1,71 +0,0 @@ - - - - harviacode.com - codeigniter crud generator - - - - -

Tbl_studiengang List

-
-
- -
-
-
- session->userdata('message') <> '' ? $this->session->userdata('message') : ''; ?> -
-
-
-
- - '') - { - ?> - Reset - - -
-
-
- - - - - - - - - - -
NoAction
- 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 ?\')"'); - ?> -
-
-
- Total Record : -
-
- -
-
- - diff --git a/application/views/tbl_studiengang_read.php b/application/views/tbl_studiengang_read.php deleted file mode 100644 index 9f690ef3b..000000000 --- a/application/views/tbl_studiengang_read.php +++ /dev/null @@ -1,18 +0,0 @@ - - - - harviacode.com - codeigniter crud generator - - - - -

Tbl_studiengang Read

- - -
Cancel
- - \ No newline at end of file diff --git a/application/views/widgets/fhcnavheader.php b/application/views/widgets/fhcnavheader.php deleted file mode 100644 index 7f7684ce4..000000000 --- a/application/views/widgets/fhcnavheader.php +++ /dev/null @@ -1,39 +0,0 @@ -
- - -
- - - \ No newline at end of file diff --git a/application/views/widgets/fhcnavigation.php b/application/views/widgets/fhcnavigation.php deleted file mode 100644 index 9b72afeb1..000000000 --- a/application/views/widgets/fhcnavigation.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/application/views/widgets/navigation.php b/application/views/widgets/navigation.php new file mode 100644 index 000000000..0ce49a10b --- /dev/null +++ b/application/views/widgets/navigation.php @@ -0,0 +1,9 @@ + diff --git a/application/views/widgets/navigationHeader.php b/application/views/widgets/navigationHeader.php new file mode 100644 index 000000000..eea77939c --- /dev/null +++ b/application/views/widgets/navigationHeader.php @@ -0,0 +1,9 @@ +
+ + +
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php new file mode 100644 index 000000000..d957be2b6 --- /dev/null +++ b/application/views/widgets/navigationMenu.php @@ -0,0 +1,7 @@ + diff --git a/application/widgets/FHC_navheader.php b/application/widgets/FHC_navheader.php deleted file mode 100644 index 0c02ff9ad..000000000 --- a/application/widgets/FHC_navheader.php +++ /dev/null @@ -1,56 +0,0 @@ - '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' => ' -
- Maximillion Pegasus - - Gestern - -
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...
- '), array('link' => '#', 'html' => ' -
- Yugi Muto - - Vorgestern - -
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...
- ')) - ), - 'alerts' => - array( - 'icon' => 'bell', 'showall' => array('showalllink' => '#', 'showalltext' => 'Alle Aktionen anzeigen'), 'children' => - array(array('link' => '#', 'html' => ' -
- Dokument hochgeladen - vor 2 Minuten -
'), array('link' => '#', 'html' => ' -
- Nachricht versandt - vor 4 Minuten -
'), array('link' => '#', 'html' => ' -
- InteressentIn freigegeben - vor 5 Minuten -
')) - ) - ); - } - - $this->view('widgets/fhcnavheader', $data); - } -} \ No newline at end of file diff --git a/application/widgets/NavigationHeaderWidget.php b/application/widgets/NavigationHeaderWidget.php new file mode 100644 index 000000000..95daf33e1 --- /dev/null +++ b/application/widgets/NavigationHeaderWidget.php @@ -0,0 +1,15 @@ +view('widgets/navigationHeader', $data); + } +} diff --git a/application/widgets/FHC_navigation.php b/application/widgets/NavigationMenuWidget.php similarity index 78% rename from application/widgets/FHC_navigation.php rename to application/widgets/NavigationMenuWidget.php index bc6465208..9d0121e4c 100644 --- a/application/widgets/FHC_navigation.php +++ b/application/widgets/NavigationMenuWidget.php @@ -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); + } } /** diff --git a/application/widgets/NavigationWidget.php b/application/widgets/NavigationWidget.php new file mode 100644 index 000000000..7835032ce --- /dev/null +++ b/application/widgets/NavigationWidget.php @@ -0,0 +1,18 @@ +view('widgets/navigation', array('widgetData' => $widgetData)); + } +} diff --git a/cis/private/jahresplan/jahresplan_funktionen.inc.php b/cis/private/jahresplan/jahresplan_funktionen.inc.php index a2b8699c4..37a5c6634 100644 --- a/cis/private/jahresplan/jahresplan_funktionen.inc.php +++ b/cis/private/jahresplan/jahresplan_funktionen.inc.php @@ -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.='