Kaynağa Gözat

Merge pull request #14 from alexdcrane/patch-1

Added the card and heading counter divs
FusionPBX 1 yıl önce
ebeveyn
işleme
1513272a39

+ 1 - 1
message_contact.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):

+ 3 - 1
message_edit.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -222,6 +222,7 @@
 		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]);
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -375,6 +376,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br /><br />\n";
 
 	echo "<input type='hidden' name='message_uuid' value='".escape($message_uuid)."'>\n";

+ 5 - 3
message_logs.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -148,7 +148,7 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'><b>".$text['title-message_log']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='heading'><b>".$text['title-message_log']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'messages.php']);
 	if (permission_exists('message_delete') && $messages) {
@@ -182,6 +182,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('message_delete')) {
@@ -251,6 +252,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".($paging_controls ?? '')."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
@@ -259,4 +261,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>

+ 1 - 1
message_media.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):

+ 5 - 3
message_queue.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -148,7 +148,7 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'><b>".$text['title-message_log']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='heading'><b>".$text['title-message_log']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'messages.php']);
 	if (permission_exists('message_delete') && $messages) {
@@ -182,6 +182,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('message_delete')) {
@@ -251,6 +252,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
@@ -259,4 +261,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>

+ 2 - 2
message_send.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -65,4 +65,4 @@
 //URL to send
 	// https://voip.fusionpbx.com/app/messages/message_send.php?message_from=12083334444&message_to=12083330000&message_text=bbb
 
-?>
+?>

+ 2 - 2
message_update.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -34,4 +34,4 @@
 		echo $cache->get("messages:user:last_message:".$_GET['id']);
 	}
 
-?>
+?>

+ 14 - 12
messages.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -34,7 +34,7 @@
 		exit;
 	}
 
-//missing application - app/providers is required 
+//missing application - app/providers is required
 	if (!file_exists($_SERVER["PROJECT_ROOT"].'/app/providers/app_config.php')) {
 		$document['title'] = $text['title-messages'];
 		require_once "resources/header.php";
@@ -85,7 +85,7 @@
 	$rows = $database->select($sql, $parameters, 'all');
 	if (is_array($rows) && @sizeof($rows)) {
 		foreach ($rows as $row) {
-		
+
 			$destinations[] = $row['destination_number'];
 		}
 	}
@@ -400,13 +400,14 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<div class='container'>\n";
-	echo "	<div class='contacts'>\n";
-	echo "		<iframe id='contacts_frame' style='width: 100%; height: 100%;' src='messages_contacts.php' frameborder='0'></iframe>\n";
-	echo "	</div>\n";
-	echo "	<div class='messages'>\n";
-	echo "		<iframe id='messages_frame' class='myautoscroll' style='width: 100%; height: 100%;' src='messages_thread.php' frameborder='0'></iframe>\n";
-	echo "	</div>\n";
+	echo "<div class='card'>\n";
+	echo "	<div class='container'>\n";
+	echo "		<div class='contacts'>\n";
+	echo "			<iframe id='contacts_frame' style='width: 100%; height: 100%;' src='messages_contacts.php' frameborder='0'></iframe>\n";
+	echo "		</div>\n";
+	echo "		<div class='messages'>\n";
+	echo "			<iframe id='messages_frame' class='myautoscroll' style='width: 100%; height: 100%;' src='messages_thread.php' frameborder='0'></iframe>\n";
+	echo "		</div>\n";
 
 	if (permission_exists('message_add')) {
 		echo "	<div class='send'>\n";
@@ -518,7 +519,8 @@
 		}
 		echo "	</div>\n";
 	}
-	echo "</div>\n"; //container
+	echo "	</div>\n"; //container
+	echo "</div>\n";
 
 /*
 	echo "<script>\n";
@@ -659,4 +661,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>

+ 1 - 1
messages_contacts.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):

+ 1 - 1
messages_thread.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2023
+	Portions created by the Initial Developer are Copyright (C) 2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):