diff --git a/application/controllers/ViewMessage.php b/application/controllers/ViewMessage.php index 019c1013e..c88a83889 100644 --- a/application/controllers/ViewMessage.php +++ b/application/controllers/ViewMessage.php @@ -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'); } } } diff --git a/application/views/system/messageForm.php b/application/views/system/messageForm.php index 5267c3f27..d1436a492 100644 --- a/application/views/system/messageForm.php +++ b/application/views/system/messageForm.php @@ -1,7 +1,7 @@
- +
Message:

On '.date_format(date_create($message->sent), 'd.m.Y H:i').' '.$receivers[0]->Vorname.' '.$receivers[0]->Nachname.' wrote:'.'
'; + $body .= '

On '.date_format(date_create($message->sent), 'd.m.Y H:i').' '.$receivers[0]->Vorname.' '.$receivers[0]->Nachname.' wrote:'.'
'; $body .= '
'; $body .= $message->body.'
'; } @@ -58,7 +58,7 @@ ?>
- + + name="subject">
@@ -100,7 +100,7 @@ $href = site_url().'/system/Messages/send/';

-
+
widgetlib->widget( 'Vorlage_widget', @@ -109,7 +109,7 @@ $href = site_url().'/system/Messages/send/'; ); ?>
-
+
diff --git a/application/views/system/messageWriteReply.php b/application/views/system/messageWriteReply.php index 89be989e1..0987b6226 100644 --- a/application/views/system/messageWriteReply.php +++ b/application/views/system/messageWriteReply.php @@ -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';
-

Send Message

+

Send message

@@ -85,7 +85,5 @@ $href = site_url().'/ViewMessage/sendReply'; } }); - - load->view("templates/FHC-Footer"); ?> diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php index 81cbc9dcd..0fa0c8478 100755 --- a/application/views/templates/FHC-Header.php +++ b/application/views/templates/FHC-Header.php @@ -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'); diff --git a/public/css/messaging/messageReply.css b/public/css/messaging/messageReply.css new file mode 100644 index 000000000..17f978ecc --- /dev/null +++ b/public/css/messaging/messageReply.css @@ -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; +} diff --git a/public/css/messaging/messageSent.css b/public/css/messaging/messageSent.css new file mode 100644 index 000000000..96403d797 --- /dev/null +++ b/public/css/messaging/messageSent.css @@ -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; + } +} diff --git a/public/css/messageWrite.css b/public/css/messaging/messageWrite.css similarity index 76% rename from public/css/messageWrite.css rename to public/css/messaging/messageWrite.css index bfc2a5d2b..91b20729f 100644 --- a/public/css/messageWrite.css +++ b/public/css/messaging/messageWrite.css @@ -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; } \ No newline at end of file