Merge branch 'master' of github.com:sebgiroux/Cassandra-Cluster-Admin

css/style.css

@@ -227,4 +227,7 @@ a, a:visited {
 
 #columnfamily_details {
 	max-width: 400px;
-}
+}
+
+.composite_value {font-size:14px;}
+.composite_value b {color:blue;}

helper/ColumnFamilyHelper.php

@@ -116,6 +116,12 @@ public static function displaySCFRow($row_key,$keyspace_name,$columnfamily_name,
 			return $output;
 		}
 
+		/*
+			Used by usort() method. Assists in sorts column families by name
+			
+			@param $a					cassandra\CFDef Object
+			@param $b					cassandra\CFDef Object
+		 */
 		public static function sortCfDefsCallable($a, $b) {
 			return strcmp($a->name, $b->name);
 		}

views/columnfamily_row.php

@@ -17,7 +17,20 @@
 	<?php foreach ($row as $column => $value): ?>
 		<tr>
 			<td><?php echo htmlentities($column,ENT_COMPAT,'UTF-8'); ?></td>
-			<td><pre><?php echo htmlentities($value,ENT_COMPAT,'UTF-8'); ?></pre></td>
+			<td><pre><?php
+				if (is_array($value)) { // not sure of a better way to determine if composite or not
+
+					foreach ($value as &$valItem) {
+						$valItem = htmlentities($valItem,ENT_COMPAT,'UTF-8');
+					}
+
+					echo '<div class="composite_value" title="CompositeType"><b>CompositeType [</b> <i>'.
+						implode('</i> <b>,</b> <i>', $value).
+						'</i> <b>]</b></div>';
+				} else {
+					echo htmlentities($value,ENT_COMPAT,'UTF-8');
+				}
+			?></pre></td>
 		</tr>
 	<?php endforeach; ?>
 </table>