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

- beautified reply page

Browse Source 
- added bootstrap "messageSent" page
- layout changes in messageWrite views
This commit is contained in:
alex
2018-06-12 17:24:24 +02:00
parent b795fe098b
commit 249f273091
10 changed files with 247 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/ViewMessage.php
+2 -2
View File
@@ -123,7 +123,7 @@ class ViewMessage extends FHC_Controller
'token' => $token
);
$v = $this->load->view('system/messageWriteReply', $data);
$this->load->view('system/messageWriteReply', $data);
}
/**
@@ -207,7 +207,7 @@ class ViewMessage extends FHC_Controller
if (!$error)
{
echo "Messages sent successfully";
$this->load->view('system/messageSent');
}
}
}
application/views/system/messageForm.php
+4 -4
View File
@@ -1,7 +1,7 @@
<div class="row">
<div class="form-group">
<div class="col-lg-1 msgfieldcol-left">
<label>To:</label>
<label>Receiver:</label>
</div>
<div class="col-lg-11 msgfieldcol-right">
<?php
@@ -43,10 +43,10 @@
<label>Message:</label>
<?php
$body = '';
if (isset($message) )
if (isset($message))
{
if (isset($receivers[0]))
$body .= '<br><br><br><!--<hr style="color: #e6e6e6">--><blockquote><i>On '.date_format(date_create($message->sent), 'd.m.Y H:i').' '.$receivers[0]->Vorname.' '.$receivers[0]->Nachname.' wrote:'.'</i></blockquote>';
$body .= '<p></p><p></p><blockquote><i>On '.date_format(date_create($message->sent), 'd.m.Y H:i').' '.$receivers[0]->Vorname.' '.$receivers[0]->Nachname.' wrote:'.'</i></blockquote>';
$body .= '<blockquote style="border-left:2px solid; padding-left: 8px">';
$body .= $message->body.'</blockquote>';
}
@@ -58,7 +58,7 @@
?>
<div class="col-lg-2">
<div class="form-group">
<label>Variables:</label>
<label>Fields:</label>
<select id="variables" class="form-control" size="14" multiple="multiple">
<?php
foreach ($variables as $key => $val)
application/views/system/messageHTML.php
+73 -58
View File
@@ -1,60 +1,75 @@
<?php $this->load->view("templates/header", array("title" => "Message viewer")); ?>
<?php
$this->load->view(
'templates/FHC-Header',
array(
'title' => 'MessageSent',
'jquery' => true,
'bootstrap' => true,
'fontawesome' => true,
'sbadmintemplate' => true,
'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageReply.css')
)
);
?>
<body>
<center>
<br><br>
<table width="70%;" style="border: solid 1px gray; background-color:white; padding:5px;">
<tr style=''>
<td style="width: 80px;">
<b>From:</b>
</td>
<td>
&nbsp;
</td>
<td>
<?php echo $sender->vorname.' '.$sender->nachname; ?>
</td>
</tr>
<tr>
<td style="width: 80px;">
<b>Subject:</b>
</td>
<td>
&nbsp;
</td>
<td>
<?php echo $message->subject; ?>
</td>
</tr>
<tr>
<td valign="top">
<br>
<b>Message:</b>
</td>
<td>
&nbsp;
</td>
<td>
<?php echo $message->body; ?>
</td>
</tr>
<?php
if ($isEmployee === false && $href != '')
{
?>
<tr><td>&nbsp;</td></tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="3" align="center" style="background-color:#dddddd; padding:5px;">
<a href="<?php echo $href; ?>">Reply</a>
</td>
</tr>
<?php
}
?>
</table>
</center>
<div id="wrapper">
<div id="page-wrapper">
<div class="container-fluid">
<div class="row">
<div class="col-xs-12">
<h3 class="page-header text-center">You have a new message</h3>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="panel panel-success">
<div class="panel-heading text-center">
<?php echo $message->subject; ?>
</div>
<div class="panel-body">
<table class="table table-condensed table-bordered" id="msgtable" align="center">
<tr>
<td width="80px">
<b>From:</b>
</td>
<td>
<?php echo $sender->vorname.' '.$sender->nachname; ?>
</td>
</tr>
<tr>
<td width="80px">
<b>Subject:</b>
</td>
<td>
<?php echo $message->subject; ?>
</td>
</tr>
<tr>
<td width="80px">
<b>Message:</b>
</td>
<td>
<?php echo $message->body; ?>
</td>
</tr>
</table>
</div>
<div class="panel-footer">
<div class="row">
<div class="col-xs-12 text-center">
<?php if ($isEmployee === false && $href != ''): ?>
<button class="btn btn-default" id="replybutton" onclick="location.href='<?php echo $href; ?>';">
<i class="fa fa-reply"></i>&nbsp;Reply
</button>
<?php endif; ?>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
<?php $this->load->view("templates/footer"); ?>
<?php $this->load->view("templates/FHC-Footer"); ?>
application/views/system/messageSent.php
+107
View File
@@ -0,0 +1,107 @@
<?php
$this->load->view(
'templates/FHC-Header',
array(
'title' => 'MessageSent',
'jquery' => true,
'bootstrap' => true,
'fontawesome' => true,
'sbadmintemplate' => true,
'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageSent.css')
)
);
?>
<body>
<div id="wrapper">
<div id="page-wrapper">
<div class="container-fluid">
<div class="row">
<div class="col-xs-6">
<h3 class="page-header text-right">Thank you for getting in touch!</h3>
</div>
<div class="col-xs-6">
<h3 class="page-header">Danke für die Kontaktaufnahme!</h3>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="panel panel-success">
<div class="panel-heading">
<div class="row">
<div class="col-xs-6 text-right">
Message sent successfully!
</div>
<div class="col-xs-6">
Nachricht erfolgreich versandt!
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-6 text-right">
<span class="rwd-line">
Thank you for your message.
</span>
<span class="rwd-line">
We will get back to you shortly.
</span>
</div>
<div class="col-xs-6">
<span class="rwd-line">
Herzlichen Dank für Ihre Nachricht.
</span>
<span class="rwd-line">
Wir werden uns schnellstmöglich um Ihr Anliegen kümmern.
</span>
</div>
</div>
<br>
<div class="row">
<div class="col-xs-6 text-right" style="border-right: 1px">
You can safely close this window.
</div>
<div class="col-xs-6">
Sie können dieses Fenster schließen.
</div>
</div>
<br>
<div class="row">
<div class="col-xs-6 text-right">
Ihr InfoCenter@FHTW Team
</div>
<div class="col-xs-6">
Your InfoCenter@FHTW Team
</div>
</div>
<br>
</div>
</div>
<div class="row">
<div class="col-xs-12 text-center">
<p class="signatureblock">
Fachhochschule Technikum Wien | University of Applied Sciences Technikum Wien
<br>Hoechstaedtplatz 6, 1200 Wien, AUSTRIA
<br><a class="signatureblocklink" href="https://www.technikum-wien.at">www.technikum-wien.at</a>
</p>
</div>
</div>
</div>
<!-- <div class="panel-footer">
<div class="row">
<div class="col-xs-12">
<button class="btn btn-default" onclick="javascript:window.close(); return false;">
<i class="fa fa-times"></i>&nbsp;Close | Schlie&szlig;en
</button>
</div>
<div class="col-xs-6 text-right">
<button class="btn btn-default"><i class="glyphicon glyphicon-new-window"></i>&nbsp;My Application | Meine Bewerbung</button>
</div>
</div>
</div>-->
</div>
</div>
</div>
</div>
</body>
<?php $this->load->view("templates/FHC-Footer"); ?>
application/views/system/messageWrite.php
+10 -10
View File
@@ -8,7 +8,7 @@ $this->load->view(
'fontawesome' => true,
'tinymce' => true,
'sbadmintemplate' => true,
'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messageWrite.css'),
'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageWrite.css'),
'customJSs' => array('public/js/bootstrapper.js')
)
);
@@ -28,10 +28,10 @@ $href = site_url().'/system/Messages/send/';
<form id="sendForm" method="post" action="<?php echo $href; ?>">
<div class="row">
<div class="form-group">
<div class="col-lg-1">
<div class="col-lg-1 msgfieldcol-left">
<label><?php echo ucfirst($this->p->t('global', 'empfaenger')) . ':'?></label>
</div>
<div class="col-lg-11">
<div class="col-lg-11 msgfieldcol-right">
<?php
for ($i = 0; $i < count($receivers); $i++)
{
@@ -48,9 +48,9 @@ $href = site_url().'/system/Messages/send/';
</div>
</div>
<div class="row">
<div class="form-group form-inline">
<div class="col-lg-1 msgfield">
<label><?php echo ucfirst($this->p->t('global', 'betreff')) . ':'?></label>
<div class="form-group">
<div class="col-lg-1 msgfield msgfieldcol-left">
<label><?php echo ucfirst($this->p->t('global', 'betreff')) . ':'?></label>
</div>&nbsp;
<?php
$subject = '';
@@ -59,9 +59,9 @@ $href = site_url().'/system/Messages/send/';
$subject = 'Re: '.$message->subject;
}
?>
<div class="col-lg-10">
<div class="col-lg-7">
<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>"
name="subject" size="70">
name="subject">
</div>
</div>
</div>
@@ -100,7 +100,7 @@ $href = site_url().'/system/Messages/send/';
</div>
<br>
<div class="row">
<div class="col-lg-3 text-right">
<div class="col-xs-3">
<?php
echo $this->widgetlib->widget(
'Vorlage_widget',
@@ -109,7 +109,7 @@ $href = site_url().'/system/Messages/send/';
);
?>
</div>
<div class="col-lg-offset-6 col-lg-1 text-right">
<div class="col-lg-7 col-xs-9 text-right">
<button id="sendButton" class="btn btn-default" type="button"><?php echo $this->p->t('ui', 'senden')?></button>
</div>
</div>
application/views/system/messageWriteReply.php
+2 -4
View File
@@ -8,7 +8,7 @@ $this->load->view(
'fontawesome' => true,
'tinymce' => true,
'sbadmintemplate' => true,
'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messageWrite.css'),
'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/messageWrite.css'),
'customJSs' => array('public/js/bootstrapper.js')
)
);
@@ -22,7 +22,7 @@ $href = site_url().'/ViewMessage/sendReply';
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<h3 class="page-header">Send Message</h3>
<h3 class="page-header">Send message</h3>
</div>
</div>
<form id="sendForm" method="post" action="<?php echo $href; ?>">
@@ -85,7 +85,5 @@ $href = site_url().'/ViewMessage/sendReply';
}
});
</script>
</body>
<?php $this->load->view("templates/FHC-Footer"); ?>
application/views/templates/FHC-Header.php
+1 -1
View File
@@ -206,7 +206,7 @@ function _generateAddonsJSsInclude($calledFrom)
// Generates the global object to pass phrases to javascripts
// NOTE: must be called before including the PhrasesLib.js
_generateJSPhrasesStorageObject($phrases);
if ($phrases != null) _generateJSPhrasesStorageObject($phrases);
// JQuery V3
if ($jquery === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
public/css/messaging/messageReply.css
+17
View File
@@ -0,0 +1,17 @@
.panel-heading {
font-size: 16px;
}
@media screen and (min-width: 1500px) {
#msgtable {
width: 70%;
}
}
#msgtable td {
border: none !important;
}
#replybutton {
width: 120px;
}
public/css/messaging/messageSent.css
+25
View File
@@ -0,0 +1,25 @@
.panel-heading {
font-size: 16px;
}
.signatureblock {
color: grey;
}
.signatureblocklink {
color: grey;
}
.signatureblocklink:hover {
color: #337ab7;
}
.rwd-line {
display: block;
}
@media screen and (min-width: 1831px) {
.rwd-line {
display: inline;
}
}
public/css/messageWrite.css → public/css/messaging/messageWrite.css
+6 -2
View File
@@ -1,11 +1,11 @@
/*smaller subject field*/
input[type=text] {
height: 28px;
padding: 0px;
padding: 0;
}
.msgfield label {
margin-bottom: 0px !important;
margin-bottom: 0 !important;
margin-top: 3px;
}
@@ -17,4 +17,8 @@ input[type=text] {
.col-lg-11.msgfieldcol-right {
width: 87%;
}
}
#sendButton {
width: 120px;
}