Skip to content

Commit

Permalink
Made HTML more W3C valid
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastien Giroux committed Jul 7, 2011
1 parent 6c307c9 commit b876280
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions columnfamily_action.php
View file
Expand Up @@ -446,7 +446,7 @@
try {
$sys_manager->truncate_column_family($keyspace_name, $columnfamily_name);

redirect('describe_columnfamily.php?keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name);
redirect('describe_columnfamily.php?keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name);
}
catch(Exception $e) {
echo 'Something wrong happened '.$e->getMessage();
Expand Down Expand Up @@ -664,7 +664,7 @@

$column_family->remove($key);

redirect('columnfamily_action.php?action=browse_data&keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name);
redirect('columnfamily_action.php?action=browse_data&keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name);
}
catch (cassandra_NotFoundException $e) {
echo displayErrorMessage('columnfamily_doesnt_exists',array('column_name' => $columnfamily_name));
Expand Down
2 changes: 1 addition & 1 deletion views/cluster_info.php
View file
Expand Up @@ -27,7 +27,7 @@
echo '<ul>';
for ($j = 0; $j < count($keyspaces_details[$i]['columnfamilys_name']); $j++):
$columnfamily_name = $keyspaces_details[$i]['columnfamilys_name'][$j];
echo '<li><a href="describe_columnfamily.php?keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'">'.$columnfamily_name.'</a></li>';
echo '<li><a href="describe_columnfamily.php?keyspace_name='.$keyspace_name.'&amp;columnfamily_name='.$columnfamily_name.'">'.$columnfamily_name.'</a></li>';
endfor;
echo '</ul>';
echo '</li>';
Expand Down
10 changes: 5 additions & 5 deletions views/columnfamily_browse_data.php
View file
@@ -1,7 +1,7 @@
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Browse Data</h3>
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Browse Data</h3>

<div id="menu">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=insert_row&keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>'">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=insert_row&amp;keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>'">
<div class="icon insert_row"></div> Insert Row
</div>
<div class="clear_left"></div>
Expand All @@ -23,11 +23,11 @@
</table>

<?php
if ($show_begin_page_link): echo '<a href="columnfamily_action.php?action=browse_data&keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'&pos=begin&nb_rows='.$nb_rows.'">&lt;&lt; Begin</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;'; endif;
if ($show_begin_page_link): echo '<a href="columnfamily_action.php?action=browse_data&amp;keyspace_name='.$keyspace_name.'&amp;columnfamily_name='.$columnfamily_name.'&amp;pos=begin&nb_rows='.$nb_rows.'">&lt;&lt; Begin</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;'; endif;

if ($show_prev_page_link): echo '<a href="columnfamily_action.php?action=browse_data&keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'&offset_key='.$current_offset_key.'&pos=prev&nb_rows='.$nb_rows.'">&lt; Prev Page</a>'; endif;
if ($show_prev_page_link): echo '<a href="columnfamily_action.php?action=browse_data&amp;keyspace_name='.$keyspace_name.'&amp;columnfamily_name='.$columnfamily_name.'&amp;offset_key='.$current_offset_key.'&amp;pos=prev&nb_rows='.$nb_rows.'">&lt; Prev Page</a>'; endif;

if ($show_prev_page_link && $show_next_page_link) echo '&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;';

if ($show_next_page_link): echo '<a href="columnfamily_action.php?action=browse_data&keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'&offset_key='.$offset_key.'&pos=next&nb_rows='.$nb_rows.'">Next Page &gt;</a>'; endif;
if ($show_next_page_link): echo '<a href="columnfamily_action.php?action=browse_data&amp;keyspace_name='.$keyspace_name.'&amp;columnfamily_name='.$columnfamily_name.'&offset_key='.$offset_key.'&pos=next&nb_rows='.$nb_rows.'">Next Page &gt;</a>'; endif;
?>
2 changes: 1 addition & 1 deletion views/columnfamily_browse_data_row.php
View file
Expand Up @@ -3,7 +3,7 @@
<td><pre><?if ($is_super_cf): echo displaySCFRow($value); else: echo displayCFRow($value); endif;?></pre></td>
<?php if ($show_actions_link): ?>
<td>
<div class="edit_row_icon"></div><div class="float_left"><a href="columnfamily_action.php?action=edit_row&keyspace_name=<?php echo $keyspace_name; ?>&columnfamily_name=<?php echo $columnfamily_name; ?>&key=<?php echo $key; ?>">Edit</a> | </div>
<div class="edit_row_icon"></div><div class="float_left"><a href="columnfamily_action.php?action=edit_row&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>&key=<?php echo $key; ?>">Edit</a> | </div>
<div class="small_horizontal_spacer"></div><div class="delete_row_icon"></div><div class="float_left"><a href="#" onclick="deleteRow('<?php echo $keyspace_name; ?>','<?php echo $columnfamily_name; ?>','<?php echo $key; ?>')">Delete</a></div>
</td>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion views/columnfamily_getkey.php
View file
@@ -1,4 +1,4 @@
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Get Key</h3>
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Get Key</h3>

<?=$success_message?>
<?=$error_message?>
Expand Down
2 changes: 1 addition & 1 deletion views/columnfamily_insert_edit_row.php
View file
@@ -1,4 +1,4 @@
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; <?php if ($mode == 'insert'): ?>Insert a Row<?php elseif ($mode == 'edit'): ?>Edit Row "<?php echo $key; ?>"<?php endif; ?></h3>
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; <?php if ($mode == 'insert'): ?>Insert a Row<?php elseif ($mode == 'edit'): ?>Edit Row "<?php echo $key; ?>"<?php endif; ?></h3>

<script type="text/javascript">
var num_columns = 0;
Expand Down
2 changes: 1 addition & 1 deletion views/columnfamily_row.php
View file
@@ -1,5 +1,5 @@
<?php if ($show_edit_link): ?>
<h4><a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> - <a href="columnfamily_action.php?action=edit&keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>">Edit</a></h4>
<h4><a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> - <a href="columnfamily_action.php?action=edit&amp;keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>">Edit</a></h4>
<?php endif; ?>

<table>
Expand Down
2 changes: 1 addition & 1 deletion views/create_edit_secondary_index.php
View file
@@ -1,4 +1,4 @@
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Create Secondary Index</h3>
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <a href="describe_keyspace.php?keyspace_name=<?=$keyspace_name?>"><?=$keyspace_name?></a> &gt; <a href="describe_columnfamily.php?keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>"><?=$columnfamily_name?></a> &gt; Create Secondary Index</h3>

<?=$success_message?>
<?=$error_message?>
Expand Down
12 changes: 6 additions & 6 deletions views/describe_columnfamily.php
View file
Expand Up @@ -2,20 +2,20 @@

<div id="menu">
<?php if ($partitioner == 'org.apache.cassandra.dht.OrderPreservingPartitioner'): ?>
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=browse_data&keyspace_name=<?php echo $keyspace_name; ?>&columnfamily_name=<?php echo $columnfamily_name; ?>'">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=browse_data&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>'">
<div class="icon browse_data"></div> Browse Data
</div>
<?php endif; ?>
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=create_secondary_index&keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>'">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=create_secondary_index&amp;keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>'">
<div class="icon create_secondary_index"></div> Create Secondary Index
</div>
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=get_key&keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>'">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=get_key&amp;keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>'">
<div class="icon get_key"></div> Get Key
</div>
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=insert_row&keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>'">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=insert_row&amp;keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>'">
<div class="icon insert_row"></div> Insert Row
</div>
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=edit&keyspace_name=<?=$keyspace_name?>&columnfamily_name=<?=$columnfamily_name?>'">
<div class="menu_item" onclick="location.href='columnfamily_action.php?action=edit&amp;keyspace_name=<?=$keyspace_name?>&amp;columnfamily_name=<?=$columnfamily_name?>'">
<div class="icon edit_column_family"></div> Edit Column Family
</div>
<div class="menu_item" onclick="return truncateColumnFamily('<?=$keyspace_name?>','<?=$columnfamily_name?>');">
Expand All @@ -35,7 +35,7 @@
echo '<h3>Secondary Indexes</h3>';

foreach ($secondary_indexes as $one_si) {
echo '<div id="menu"><div class="menu_item" onclick="location.href=\'describe_columnfamily.php?keyspace_name='.$keyspace_name.'&columnfamily_name='.$columnfamily_name.'&action=drop_index&column='.$one_si['name'].'\'"><div class="icon drop_secondary_index"></div> Drop Index</div><div class="clear_left"></div></div>';
echo '<div id="menu"><div class="menu_item" onclick="location.href=\'describe_columnfamily.php?keyspace_name='.$keyspace_name.'&amp;columnfamily_name='.$columnfamily_name.'&action=drop_index&column='.$one_si['name'].'\'"><div class="icon drop_secondary_index"></div> Drop Index</div><div class="clear_left"></div></div>';
echo '<table class="table_secondary_index">';
echo '<tr><td>Column Name:</td><td>'.$one_si['name'].'</td></tr>';
echo '<tr><td>Validation Class:</td><td>'.$one_si['validation_class'].'</td></tr>';
Expand Down
10 changes: 5 additions & 5 deletions views/describe_keyspace.php
View file
@@ -1,9 +1,9 @@
<h3><a href="index.php"><?=$cluster_name?></a> &gt; <?=$keyspace_name?></h3>
<div id="menu">
<div class="menu_item" style="width: 220px;" onclick="location.href='keyspace_action.php?action=create_cf&keyspace_name=<?=$keyspace_name?>'">
<div class="menu_item" style="width: 220px;" onclick="location.href='keyspace_action.php?action=create_cf&amp;keyspace_name=<?=$keyspace_name?>'">
<div class="icon create_column_family"></div> Create New Column Family
</div>
<div class="menu_item" onclick="location.href='keyspace_action.php?action=edit&keyspace_name=<?=$keyspace_name?>'">
<div class="menu_item" onclick="location.href='keyspace_action.php?action=edit&amp;keyspace_name=<?=$keyspace_name?>'">
<div class="icon edit_keyspace"></div> Edit Keyspace
</div>
<div class="menu_item" onclick="return dropKeyspace('<?=$keyspace_name?>');">
Expand All @@ -13,13 +13,13 @@
</div>

<h3>Keyspace Details</h3>
<p>
<div>
<table>
<tr><td>Strategy Class:</td><td><?=$strategy_class?></td></tr>
<tr><td>Strategy Options:</td><td><?if (empty($strategy_options)): echo 'None'; else: echo $strategy_options; endif;?></td></tr>
<tr><td>Replication Factor:</td><td><?=$replication_factor?></td></tr>
</table>
</p>
</div>

<h3>List of Column Families in Keyspace</h3>
<?=$list_column_families?>
Expand All @@ -37,7 +37,7 @@
}
}
else {
echo $ring;
echo '<p>'.$ring.'</p>';
}

?>

0 comments on commit b876280

Please sign in to comment.