This is an automated email from the ASF dual-hosted git repository. alexott pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push: new d594de4 [ZEPPELIN-4787] HTML output in Cassandra interpreter is broken d594de4 is described below commit d594de4bb7e8668f2a198839fd35c54edd7965ac Author: Alex Ott <alex...@gmail.com> AuthorDate: Mon Jul 20 12:35:45 2020 +0200 [ZEPPELIN-4787] HTML output in Cassandra interpreter is broken ### What is this PR for? For a some unknown reason, previously working tags, like, `<i ... />`, and `<div .. />`, stopped working, and were need fixing. Besides that fix, this changeset also includes minor formatting changes for better representation of information ### What type of PR is it? Bug Fix, Improvement ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-4787 ### How should this be tested? * https://travis-ci.org/github/alexott/zeppelin/builds/709947972 * tested manually ### Screenshots (if appropriate)  Author: Alex Ott <alex...@gmail.com> Closes #3858 from alexott/ZEPPELIN-4787 and squashes the following commits: 68f421b2c [Alex Ott] [ZEPPELIN-4787] HTML output in Cassandra interpreter is broken --- .../main/resources/scalate/aggregateDetails.ssp | 18 +- .../src/main/resources/scalate/allAggregates.ssp | 15 +- .../src/main/resources/scalate/allFunctions.ssp | 15 +- .../resources/scalate/allMaterializedViews.ssp | 16 +- cassandra/src/main/resources/scalate/allTables.ssp | 11 +- cassandra/src/main/resources/scalate/allUDTs.ssp | 12 +- .../src/main/resources/scalate/clusterContent.ssp | 3 +- .../src/main/resources/scalate/clusterDetails.ssp | 6 +- .../resources/scalate/dropDownMenuForCluster.ssp | 4 +- .../resources/scalate/dropDownMenuForKeyspace.ssp | 12 +- .../src/main/resources/scalate/functionDetails.ssp | 18 +- cassandra/src/main/resources/scalate/helpMenu.ssp | 377 ++++++++-------- .../src/main/resources/scalate/keyspaceContent.ssp | 11 +- .../src/main/resources/scalate/keyspaceDetails.ssp | 10 +- .../resources/scalate/materializedViewDetails.ssp | 44 +- cassandra/src/main/resources/scalate/menu.ssp | 48 +- .../scalate/noResultWithExecutionInfo.ssp | 12 +- .../src/main/resources/scalate/tableDetails.ssp | 47 +- .../src/main/resources/scalate/udtDetails.ssp | 6 +- .../test/resources/scalate/DescribeCluster.html | 2 +- .../scalate/DescribeKeyspace_live_data.html | 2 +- .../test/resources/scalate/DescribeKeyspaces.html | 2 +- .../DescribeTable_live_data_complex_table.html | 2 +- .../src/test/resources/scalate/DescribeTables.html | 481 +-------------------- .../scalate/DescribeType_live_data_address.html | 2 +- ..._live_data_address_within_current_keyspace.html | 2 +- .../src/test/resources/scalate/DescribeTypes.html | 183 +------- cassandra/src/test/resources/scalate/Help.html | 2 +- .../scalate/NoResultWithExecutionInfo.html | 46 +- 29 files changed, 342 insertions(+), 1067 deletions(-) diff --git a/cassandra/src/main/resources/scalate/aggregateDetails.ssp b/cassandra/src/main/resources/scalate/aggregateDetails.ssp index 02800a2..04f1f09 100644 --- a/cassandra/src/main/resources/scalate/aggregateDetails.ssp +++ b/cassandra/src/main/resources/scalate/aggregateDetails.ssp @@ -20,46 +20,46 @@ <%@ val sameNameAggregateDetails: SameNameAggregateDetails %> <%@ val withCaption: Boolean%> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2"> #for (aggregate <- sameNameAggregateDetails.aggregates) <div class="panel panel-default table-responsive table-bordered"> <table class="table"> #if(withCaption) - <caption><h4 class="text-success"><i class="glyphicon glyphicon-retweet"/> ${aggregate.name}</h4></caption> + <caption><h4 class="text-success"><span class="glyphicon glyphicon-retweet"></span> ${aggregate.name}</h4></caption> #end <tbody> <tr> <td class="col-md-6"><strong>Keyspace</strong></td> - <td class="col-md-6 text-danger">${aggregate.keyspace}</td> + <td class="col-md-6 text-danger" style="text-align:left">${aggregate.keyspace}</td> </tr> <tr> <td class="col-md-6"><strong>Arguments</strong></td> - <td class="col-md-6">${aggregate.arguments.toList.mkString(", ")}</td> + <td class="col-md-6" style="text-align:left">${aggregate.arguments.toList.mkString(", ")}</td> </tr> <tr> <td class="col-md-6"><strong>State Function</strong></td> - <td class="col-md-6">${aggregate.sFunc}</td> + <td class="col-md-6" style="text-align:left">${aggregate.sFunc}</td> </tr> <tr> <td class="col-md-6"><strong>State Type</strong></td> - <td class="col-md-6">${aggregate.sType}</td> + <td class="col-md-6" style="text-align:left">${aggregate.sType}</td> </tr> #if(aggregate.finalFunc.isDefined) <tr> <td class="col-md-6"><strong>Final Function</strong></td> - <td class="col-md-6">${aggregate.finalFunc.get}</td> + <td class="col-md-6" style="text-align:left">${aggregate.finalFunc.get}</td> </tr> #end #if(aggregate.initCond.isDefined) <tr> <td class="col-md-6"><strong>Initial State</strong></td> - <td class="col-md-6">${aggregate.initCond.get}</td> + <td class="col-md-6" style="text-align:left">${aggregate.initCond.get}</td> </tr> #end <tr> <td class="col-md-6"><strong>Return type</strong></td> - <td class="col-md-6">${aggregate.returnType}</td> + <td class="col-md-6" style="text-align:left">${aggregate.returnType}</td> </tr> </tbody> </table> diff --git a/cassandra/src/main/resources/scalate/allAggregates.ssp b/cassandra/src/main/resources/scalate/allAggregates.ssp index e806d73..e543dd4 100644 --- a/cassandra/src/main/resources/scalate/allAggregates.ssp +++ b/cassandra/src/main/resources/scalate/allAggregates.ssp @@ -30,34 +30,33 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${ksName}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${ksName}</span> </a> </h4> </div> <div id="${ksId}" class="panel-collapse collapse" role="tabpanel"> <div class="panel-body"> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> <table class="table"> <thead> <tr> - <th>Aggregate</th> - <th>Return Type</th> + <th style="text-align:right">Aggregate</th> + <th style="text-align:left">Return Type</th> </tr> </thead> <tbody> #for (aggregate <- aggregates) <tr class="text-success"> - <td>${aggregate.name + aggregate.arguments.mkString("(", ", ", ")")}</td> - <td>${aggregate.returnType}</td> + <td style="text-align:right">${aggregate.name + aggregate.arguments.mkString("(", ", ", ")")}</td> + <td style="text-align:left">${aggregate.returnType}</td> </tr> #end - </tbody> </table> </div> - <div class="col-md-2"/> + <div class="col-md-2"></div> </div> </div> </div> diff --git a/cassandra/src/main/resources/scalate/allFunctions.ssp b/cassandra/src/main/resources/scalate/allFunctions.ssp index e026687..16cd857 100644 --- a/cassandra/src/main/resources/scalate/allFunctions.ssp +++ b/cassandra/src/main/resources/scalate/allFunctions.ssp @@ -30,34 +30,33 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${ksName}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${ksName}</span> </a> </h4> </div> <div id="${ksId}" class="panel-collapse collapse" role="tabpanel"> <div class="panel-body"> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> <table class="table"> <thead> <tr> - <th>Function</th> - <th>Return Type</th> + <th style="text-align:right">Function</th> + <th style="text-align:left">Return Type</th> </tr> </thead> <tbody> #for (function <- functions) <tr class="text-success"> - <td>${function.name + function.arguments.mkString("(",", ", ")")}</td> - <td>${function.returnType}</td> + <td style="text-align:right">${function.name + function.arguments.mkString("(",", ", ")")}</td> + <td style="text-align:left">${function.returnType}</td> </tr> #end - </tbody> </table> </div> - <div class="col-md-2"/> + <div class="col-md-2"></div> </div> </div> </div> diff --git a/cassandra/src/main/resources/scalate/allMaterializedViews.ssp b/cassandra/src/main/resources/scalate/allMaterializedViews.ssp index 58efdb4..cdf8cbd 100644 --- a/cassandra/src/main/resources/scalate/allMaterializedViews.ssp +++ b/cassandra/src/main/resources/scalate/allMaterializedViews.ssp @@ -28,36 +28,34 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${ksName}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${ksName}</span> </a> </h4> </div> <div id="${ksId}" class="panel-collapse collapse" role="tabpanel"> <div class="panel-body"> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> <table class="table"> <thead> - <tr><th>Materialized View</th></tr> + <tr><th style="text-align:left">Materialized View</th></tr> </thead> <tbody> #for (mv <- mvs) - <tr class="text-primary"> - <td> + <td style="text-align:left"> ${mv.name} - <i class="glyphicon glyphicon-arrow-right"/> - <i class="glyphicon glyphicon-th-list"/> + <span class="glyphicon glyphicon-arrow-right"></span> + <span class="glyphicon glyphicon-th-list"></span> ${mv.baseTable} </td> </tr> #end - </tbody> </table> </div> - <div class="col-md-2"/> + <div class="col-md-2"></div> </div> </div> </div> diff --git a/cassandra/src/main/resources/scalate/allTables.ssp b/cassandra/src/main/resources/scalate/allTables.ssp index 0464325..231c261 100644 --- a/cassandra/src/main/resources/scalate/allTables.ssp +++ b/cassandra/src/main/resources/scalate/allTables.ssp @@ -28,29 +28,28 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${ksName}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${ksName}</span> </a> </h4> </div> <div id="${ksId}" class="panel-collapse collapse" role="tabpanel"> <div class="panel-body"> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> <table class="table"> <thead> - <tr><th>Tables</th></tr> + <tr><th style="text-align:left">Tables</th></tr> </thead> <tbody> #for (table <- tables) - - <tr class="text-primary"><td>${table}</td></tr> + <tr class="text-primary"><td style="text-align:left">${table}</td></tr> #end </tbody> </table> </div> - <div class="col-md-2"/> + <div class="col-md-2"></div> </div> </div> </div> diff --git a/cassandra/src/main/resources/scalate/allUDTs.ssp b/cassandra/src/main/resources/scalate/allUDTs.ssp index 0fa40ee..7674a20 100644 --- a/cassandra/src/main/resources/scalate/allUDTs.ssp +++ b/cassandra/src/main/resources/scalate/allUDTs.ssp @@ -28,29 +28,27 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${ksName}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${ksName}</span> </a> </h4> </div> <div id="${ksId}" class="panel-collapse collapse" role="tabpanel"> <div class="panel-body"> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> <table class="table"> <thead> - <tr><th>UDT</th></tr> + <tr><th style="text-align:left">UDT</th></tr> </thead> <tbody> #for (udt <- udts) - - <tr class="text-warning"><td>${udt}</td></tr> + <tr class="text-warning"><td style="text-align:left">${udt}</td></tr> #end - </tbody> </table> </div> - <div class="col-md-2"/> + <div class="col-md-2"></div> </div> </div> </div> diff --git a/cassandra/src/main/resources/scalate/clusterContent.ssp b/cassandra/src/main/resources/scalate/clusterContent.ssp index 9ae7e5c..776e3b5 100644 --- a/cassandra/src/main/resources/scalate/clusterContent.ssp +++ b/cassandra/src/main/resources/scalate/clusterContent.ssp @@ -32,13 +32,12 @@ </table> <div class="row"> <div class="panel-group" role="tablist" aria-multiselectable="true"> - #for ((id, name, keyspaceHTML) <- clusterContent.keyspaces) <div class="panel panel-default"> <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${name}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${name}</span> </a> </h4> </div> diff --git a/cassandra/src/main/resources/scalate/clusterDetails.ssp b/cassandra/src/main/resources/scalate/clusterDetails.ssp index 6473d60..67671c1 100644 --- a/cassandra/src/main/resources/scalate/clusterDetails.ssp +++ b/cassandra/src/main/resources/scalate/clusterDetails.ssp @@ -25,17 +25,17 @@ <table class="table"> <caption> <h4 class="text-muted"> - <i class="glyphicon glyphicon-dashboard"/> ${clusterDetails.name} + <span class="glyphicon glyphicon-dashboard"></span> ${clusterDetails.name} </h4> </caption> <thead> <tr> - <th>Partitioner</th> + <th style="text-align:left">Partitioner</th> </tr> </thead> <tbody> <tr> - <td>${clusterDetails.partitioner}</td> + <td style="text-align:left">${clusterDetails.partitioner}</td> </tr> <tbody> </table> diff --git a/cassandra/src/main/resources/scalate/dropDownMenuForCluster.ssp b/cassandra/src/main/resources/scalate/dropDownMenuForCluster.ssp index fbe6d5d..35bcee9 100644 --- a/cassandra/src/main/resources/scalate/dropDownMenuForCluster.ssp +++ b/cassandra/src/main/resources/scalate/dropDownMenuForCluster.ssp @@ -20,14 +20,14 @@ <%@ val clusterContent: ClusterContent %> <li role="presentation" class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <span class="text-muted"><i class="glyphicon glyphicon-dashboard"/> <strong>${clusterContent.clusterName}</strong></span> + <span class="text-muted"><span class="glyphicon glyphicon-dashboard"></span> <strong>${clusterContent.clusterName}</strong></span> <span class="text-muted caret"></span> <ul class="dropdown-menu"> <li class="dropdown-header"><span class="text-danger">Keyspaces</span></li> #for((id, name, _) <- clusterContent.keyspaces) <li> <a role="button" data-toggle="collapse" data-target="#${id}"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> ${name}</span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> ${name}</span> </a> </li> #end diff --git a/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp b/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp index 6c2aad1..99af401 100644 --- a/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp +++ b/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp @@ -20,7 +20,7 @@ <%@ val ksContent: KeyspaceContent %> <li role="presentation" class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> <strong>${ksContent.keyspaceName}</strong></span> + <span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> <strong>${ksContent.keyspaceName}</strong></span> <span class="text-danger caret"></span> <ul class="dropdown-menu"> #if(ksContent.tables.nonEmpty) @@ -29,7 +29,7 @@ #for((id,name,_) <- ksContent.tables) <li> <a role="button" data-toggle="collapse" data-target="#${id}"> - <span class="text-primary"><i class="glyphicon glyphicon-th-list"/> ${name}</span> + <span class="text-primary"><span class="glyphicon glyphicon-th-list"></span> ${name}</span> </a> </li> #end @@ -41,7 +41,7 @@ #for((id,name,_) <- ksContent.views) <li> <a role="button" data-toggle="collapse" data-target="#${id}"> - <span class="text-primary"><i class="glyphicon glyphicon-eye-open"/> ${name}</span> + <span class="text-primary"><span class="glyphicon glyphicon-eye-open"></span> ${name}</span> </a> </li> #end @@ -53,7 +53,7 @@ #for((id,name,_) <- ksContent.udts) <li> <a role="button" data-toggle="collapse" data-target="#${id}"> - <span class="text-warning"><i class="glyphicon glyphicon-copyright-mark"/> ${name}</span> + <span class="text-warning"><span class="glyphicon glyphicon-copyright-mark"></span> ${name}</span> </a> </li> #end @@ -65,7 +65,7 @@ #for((id,name,_) <- ksContent.functions) <li> <a role="button" data-toggle="collapse" data-target="#${id}"> - <span class="text-success"><i class="glyphicon glyphicon-random"/> ${name}</span> + <span class="text-success"><span class="glyphicon glyphicon-random"></span> ${name}</span> </a> </li> #end @@ -77,7 +77,7 @@ #for((id,name,_) <- ksContent.aggregates) <li> <a role="button" data-toggle="collapse" data-target="#${id}"> - <span class="text-success"><i class="glyphicon glyphicon-retweet"/> ${name}</span> + <span class="text-success"><span class="glyphicon glyphicon-retweet"></span> ${name}</span> </a> </li> #end diff --git a/cassandra/src/main/resources/scalate/functionDetails.ssp b/cassandra/src/main/resources/scalate/functionDetails.ssp index 7d61400..6cd463a 100644 --- a/cassandra/src/main/resources/scalate/functionDetails.ssp +++ b/cassandra/src/main/resources/scalate/functionDetails.ssp @@ -20,42 +20,42 @@ <%@ val sameNameFunctionDetails: SameNameFunctionDetails %> <%@ val withCaption: Boolean%> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2"> #for (function <- sameNameFunctionDetails.functions) <div class="panel panel-default table-responsive table-bordered"> <table class="table"> #if(withCaption) - <caption><h4 class="text-success"><i class="glyphicon glyphicon-random"/> ${function.name}</h4></caption> + <caption><h4 class="text-success"><span class="glyphicon glyphicon-random"></span> ${function.name}</h4></caption> #end <tbody> <tr> <td class="col-md-6"><strong>Keyspace</strong></td> - <td class="col-md-6 text-danger">${function.keyspace}</td> + <td class="col-md-6 text-danger" style="text-align:left">${function.keyspace}</td> </tr> <tr> <td class="col-md-6"><strong>Arguments</strong></td> - <td class="col-md-6">${function.arguments.toList.mkString(", ")}</td> + <td class="col-md-6" style="text-align:left">${function.arguments.toList.mkString(", ")}</td> </tr> <tr> <td class="col-md-6"><strong>Null Input</strong></td> #if(function.calledOnNullInput) - <td class="col-md-6">CALLED ON NULL INPUT</td> + <td class="col-md-6" style="text-align:left">CALLED ON NULL INPUT</td> #else - <td class="col-md-6">RETURN NULL ON NULL INPUT</td> + <td class="col-md-6" style="text-align:left">RETURN NULL ON NULL INPUT</td> #end </tr> <tr> <td class="col-md-6"><strong>Return type</strong></td> - <td class="col-md-6">${function.returnType}</td> + <td class="col-md-6" style="text-align:left">${function.returnType}</td> </tr> <tr> <td class="col-md-6"><strong>Language</strong></td> - <td class="col-md-6">${function.language}</td> + <td class="col-md-6" style="text-align:left">${function.language}</td> </tr> <tr> <td class="col-md-6"><strong>Body</strong></td> - <td class="col-md-6">${escape(function.body)}</td> + <td class="col-md-6" style="text-align:left">${escape(function.body)}</td> </tr> </tbody> </table> diff --git a/cassandra/src/main/resources/scalate/helpMenu.ssp b/cassandra/src/main/resources/scalate/helpMenu.ssp index 5e1224d..8ed2ae2 100644 --- a/cassandra/src/main/resources/scalate/helpMenu.ssp +++ b/cassandra/src/main/resources/scalate/helpMenu.ssp @@ -39,58 +39,58 @@ <ul class="nav navbar-nav"> <li role="presentation" class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <span class="text-info"><i class="glyphicon glyphicon-book"/> <strong>Please select ...</strong></span> + <span class="text-info"><span class="glyphicon glyphicon-book"></span> <strong>Please select ...</strong></span> <span class="text-info caret"></span> <ul class="dropdown-menu"> <li class="dropdown-header"><span class="text-info">Topics</span></li> <li> <a role="button" data-toggle="collapse" data-target="#${basicCommandsId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Basic Commands</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Basic Commands</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${schemaDiscoveryId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Schema Discovery</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Schema Discovery</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${queryParamsId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Query Parameters</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Query Parameters</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${formatParamsId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Formatting Parameters</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Formatting Parameters</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${preparedStatementsId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Prepared Statements</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Prepared Statements</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${dynamicFormsId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Dynamic Forms</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Dynamic Forms</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${configurationId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Interpreter Configuration</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Interpreter Configuration</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${sharedStatesId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Shared States</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Shared States</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${changelogId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Change Log</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Change Log</span> </a> </li> <li> <a role="button" data-toggle="collapse" data-target="#${contactsId}"> - <span class="text-info"><i class="glyphicon glyphicon-bookmark"/> Contacts & Bugs</span> + <span class="text-info"><span class="glyphicon glyphicon-bookmark"></span> Contacts & Bugs</span> </a> </li> </ul> @@ -151,8 +151,7 @@ <div class="col-md-6 col-md-offset-3"> <pre> INSERT INTO users(login,name) VALUES('jdoe','John DOE'); - SELECT * FROM users WHERE login='jdoe'; - </pre> + SELECT * FROM users WHERE login='jdoe';</pre> </div> </div> <br/> @@ -171,8 +170,7 @@ SELECT * FROM artists - WHERE login='jlennon'; - </pre> + WHERE login='jlennon';</pre> </div> </div> <br/> @@ -191,8 +189,7 @@ CREATE TABLE IF NOT EXISTS test( key int PRIMARY KEY, value text - ); - </pre> + );</pre> </div> </div> <br/> @@ -204,8 +201,7 @@ <div class="col-md-8 col-md-offset-2"> <pre> INSERT INTO users(login,name) VALUES('jdoe','John DOE'); - Insert into users(login,name) vAlues('hsue','Helen SUE'); - </pre> + Insert into users(login,name) vAlues('hsue','Helen SUE');</pre> </div> </div> <br/> @@ -215,28 +211,30 @@ <div class="col-md-6 col-md-offset-3"> <table class="table table-bordered"> <thead> - <tr><th>Cassandra version</th><th>Documentation</th></tr> + <tr> + <th style="text-align:left" width="20%">Cassandra version</th> + <th style="text-align:left">Documentation</th></tr> </thead> <tbody> <tr> - <td><strong>3.x</strong></td> - <td> + <td style="text-align:left"><strong>3.x</strong></td> + <td style="text-align:left"> <a href="http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html" target="_blank"> http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html </a> </td> </tr> <tr> - <td><strong>2.2</strong></td> - <td> + <td style="text-align:left"><strong>2.2</strong></td> + <td style="text-align:left"> <a href="http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html" target="_blank"> http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html </a> </td> </tr> <tr> - <td><strong>2.1</strong></td> - <td> + <td style="text-align:left"><strong>2.1</strong></td> + <td style="text-align:left"> <a href="http://docs.datastax.com/en/cql/3.1/cql/cql_intro_c.html" target="_blank"> http://docs.datastax.com/en/cql/3.1/cql/cql_intro_c.html </a> @@ -271,8 +269,7 @@ Multi line comments **/ - Insert into users(login,name) vAlues('hsue','Helen SUE'); - </pre> + Insert into users(login,name) vAlues('hsue','Helen SUE');</pre> </div> </div> <br/> @@ -315,77 +312,80 @@ <br/><br/> <table class="table table-bordered"> <thead> - <tr><th>Command</th><th>Description</th></tr> + <tr> + <th style="text-align:left" width="40%">Command</th> + <th style="text-align:left">Description</th> + </tr> </thead> <tbody> <tr> - <td><strong>DESCRIBE CLUSTER;</strong></td> - <td>Show the current cluster name and its partitioner</td> + <td style="text-align:left"><strong>DESCRIBE CLUSTER;</strong></td> + <td style="text-align:left">Show the current cluster name and its partitioner</td> </tr> <tr> - <td><strong>DESCRIBE KEYSPACES;</strong></td> - <td>List all existing keyspaces in the cluster and their configuration + <td style="text-align:left"><strong>DESCRIBE KEYSPACES;</strong></td> + <td style="text-align:left">List all existing keyspaces in the cluster and their configuration (replication factor, durable write ...)</td> </tr> <tr> - <td><strong>DESCRIBE TABLES;</strong></td> - <td>List all existing keyspaces in the cluster and for each, all the tables name</td> + <td style="text-align:left"><strong>DESCRIBE TABLES;</strong></td> + <td style="text-align:left">List all existing keyspaces in the cluster and for each, all the tables name</td> </tr> <tr> - <td><strong>DESCRIBE TYPES;</strong></td> - <td>List all existing keyspaces in the cluster and for each, all the types name</td> + <td style="text-align:left"><strong>DESCRIBE TYPES;</strong></td> + <td style="text-align:left">List all existing keyspaces in the cluster and for each, all the types name</td> </tr> <tr> - <td><strong>DESCRIBE FUNCTIONS;</strong></td> - <td>List all existing keyspaces in the cluster and for each, all the functions name and arguments</td> + <td style="text-align:left"><strong>DESCRIBE FUNCTIONS;</strong></td> + <td style="text-align:left">List all existing keyspaces in the cluster and for each, all the functions name and arguments</td> </tr> <tr> - <td><strong>DESCRIBE AGGREGATES;</strong></td> - <td>List all existing keyspaces in the cluster and for each, all the aggregates name and arguments</td> + <td style="text-align:left"><strong>DESCRIBE AGGREGATES;</strong></td> + <td style="text-align:left">List all existing keyspaces in the cluster and for each, all the aggregates name and arguments</td> </tr> <tr> - <td><strong>DESCRIBE MATERIALIZED VIEWS;</strong></td> - <td>List all existing keyspaces in the cluster and for each, all the materialized view name</td> + <td style="text-align:left"><strong>DESCRIBE MATERIALIZED VIEWS;</strong></td> + <td style="text-align:left">List all existing keyspaces in the cluster and for each, all the materialized view name</td> </tr> <tr> - <td><strong>DESCRIBE KEYSPACE <keyspace name>;</strong></td> - <td>Describe the given keyspace configuration and all its table details (name, columns, ...)</td> + <td style="text-align:left"><strong>DESCRIBE KEYSPACE <keyspace name>;</strong></td> + <td style="text-align:left">Describe the given keyspace configuration and all its table details (name, columns, ...)</td> </tr> <tr> - <td><strong>DESCRIBE TABLE <em>(<keyspace name>).</em><table name>;</strong></td> - <td> + <td style="text-align:left"><strong>DESCRIBE TABLE <em>(<keyspace name>).</em><table name>;</strong></td> + <td style="text-align:left"> Describe the given table. If the keyspace is not provided, the current <strong>logged in</strong> keyspace is used. If there is no logged in keyspace, the default <em>system</em> keyspace is used. If no table is found, an error message is raised </td> </tr> <tr> - <td><strong>DESCRIBE TYPE <em>(<keyspace name>).</em><type name>;</strong></td> - <td> + <td style="text-align:left"><strong>DESCRIBE TYPE <em>(<keyspace name>).</em><type name>;</strong></td> + <td style="text-align:left"> Describe the given type(UDT). If the keyspace is not provided, the current <strong>logged in</strong> keyspace is used. If there is no logged in keyspace, the default <em>system</em> keyspace is used. If no type is found, an error message is raised </td> </tr> <tr> - <td><strong>DESCRIBE FUNCTION <em>(<keyspace name>).</em><function name>;</strong></td> - <td> + <td style="text-align:left"><strong>DESCRIBE FUNCTION <em>(<keyspace name>).</em><function name>;</strong></td> + <td style="text-align:left"> Describe the given function. If the keyspace is not provided, the current <strong>logged in</strong> keyspace is used. If there is no logged in keyspace, the default <em>system</em> keyspace is used. If no function is found, an error message is raised </td> </tr> <tr> - <td><strong>DESCRIBE AGGREGATE <em>(<keyspace name>).</em><aggregate name>;</strong></td> - <td> + <td style="text-align:left"><strong>DESCRIBE AGGREGATE <em>(<keyspace name>).</em><aggregate name>;</strong></td> + <td style="text-align:left"> Describe the given aggregate. If the keyspace is not provided, the current <strong>logged in</strong> keyspace is used. If there is no logged in keyspace, the default <em>system</em> keyspace is used. If no aggregate is found, an error message is raised </td> </tr> <tr> - <td><strong>DESCRIBE MATERIALIZED VIEW <em>(<keyspace name>).</em><view name>;</strong></td> - <td> + <td style="text-align:left"><strong>DESCRIBE MATERIALIZED VIEW <em>(<keyspace name>).</em><view name>;</strong></td> + <td style="text-align:left"> Describe the given materialized view. If the keyspace is not provided, the current <strong>logged in</strong> keyspace is used. If there is no logged in keyspace, the default <em>system</em> keyspace is used. If no materialized view is found, an error message is raised @@ -434,38 +434,38 @@ </caption> <thead> <tr> - <th>Parameter</th> - <th>Syntax</th> - <th>Description</th> + <th style="text-align:left" width="20%">Parameter</th> + <th style="text-align:left" width="20%">Syntax</th> + <th style="text-align:left">Description</th> </tr> </thead> <tbody> <tr> - <td>Consistency Level</td> - <td><strong>@consistency=<em>value</em></strong></td> - <td>Apply the given consistency level to all queries in the paragraph</td> + <td style="text-align:left">Consistency Level</td> + <td style="text-align:left"><strong>@consistency=<em>value</em></strong></td> + <td style="text-align:left">Apply the given consistency level to all queries in the paragraph</td> </tr> <tr> - <td>Serial Consistency Level</td> - <td><strong>@serialConsistency=<em>value</em></strong></td> - <td>Apply the given serial consistency level to all queries in the paragraph</td> + <td style="text-align:left">Serial Consistency Level</td> + <td style="text-align:left"><strong>@serialConsistency=<em>value</em></strong></td> + <td style="text-align:left">Apply the given serial consistency level to all queries in the paragraph</td> </tr> <tr> - <td>Timestamp</td> - <td><strong>@timestamp=<em>long value</em></strong></td> - <td>Apply the given timestamp to all queries in the paragraph.<br/> + <td style="text-align:left">Timestamp</td> + <td style="text-align:left"><strong>@timestamp=<em>long value</em></strong></td> + <td style="text-align:left">Apply the given timestamp to all queries in the paragraph.<br/> Please note that timestamp value passed directly in CQL statement will override this value </td> </tr> <tr> - <td>Fetch Size</td> - <td><strong>@fetchSize=<em>int value</em></strong></td> - <td>Apply the given fetch size to all queries in the paragraph</td> + <td style="text-align:left">Fetch Size</td> + <td style="text-align:left"><strong>@fetchSize=<em>int value</em></strong></td> + <td style="text-align:left">Apply the given fetch size to all queries in the paragraph</td> </tr> <tr> - <td>Request Timeout</td> - <td><strong>@requestTimeOut=<em>int value</em></strong></td> - <td>Apply the given request timeout <strong>in millisecs</strong> to all queries in the paragraph</td> + <td style="text-align:left">Request Timeout</td> + <td style="text-align:left"><strong>@requestTimeOut=<em>int value</em></strong></td> + <td style="text-align:left">Apply the given request timeout <strong>in millisecs</strong> to all queries in the paragraph</td> </tr> </tbody> </table> @@ -479,30 +479,30 @@ </caption> <thead> <tr> - <th>Parameter</th> - <th>Possible Values</th> + <th style="text-align:left" width="30%">Parameter</th> + <th style="text-align:left">Possible Values</th> </tr> </thead> <tbody> <tr> - <td>Consistency Level</td> - <td><strong>ALL, ANY, ONE, TWO, THREE, QUORUM, LOCAL_ONE, LOCAL_QUORUM, EACH_QUORUM</strong></td> + <td style="text-align:left">Consistency Level</td> + <td style="text-align:left"><strong>ALL, ANY, ONE, TWO, THREE, QUORUM, LOCAL_ONE, LOCAL_QUORUM, EACH_QUORUM</strong></td> </tr> <tr> - <td>Serial Consistency Level</td> - <td><strong>SERIAL, LOCAL_SERIAL</strong></td> + <td style="text-align:left">Serial Consistency Level</td> + <td style="text-align:left"><strong>SERIAL, LOCAL_SERIAL</strong></td> </tr> <tr> - <td>Timestamp</td> - <td>Any long value</td> + <td style="text-align:left">Timestamp</td> + <td style="text-align:left">Any long value</td> </tr> <tr> - <td>Fetch Size</td> - <td>Any integer value</td> + <td style="text-align:left">Fetch Size</td> + <td style="text-align:left">Any integer value</td> </tr> <tr> - <td>Request Timeout</td> - <td>Any integer value</td> + <td style="text-align:left">Request Timeout</td> + <td style="text-align:left">Any integer value</td> </tr> </tbody> </table> @@ -536,8 +536,7 @@ INSERT INTO spark_demo.ts(key,value) VALUES(1,'second insert'); // Check for the result. You should see 'first insert' - SELECT value FROM spark_demo.ts WHERE key=1; - </pre> + SELECT value FROM spark_demo.ts WHERE key=1;</pre> </div> </div> <br/> @@ -591,64 +590,64 @@ </caption> <thead> <tr> - <th>Parameter</th> - <th>Syntax</th> - <th>Description</th> + <th style="text-align:left" width="20%">Parameter</th> + <th style="text-align:left" width="20%">Syntax</th> + <th style="text-align:left">Description</th> </tr> </thead> <tbody> <tr> - <td>Output Format</td> - <td><strong>outputFormat=<em>cql|human</em></strong></td> - <td>Selects formatting of the results - as CQL + <td style="text-align:left">Output Format</td> + <td style="text-align:left"><strong>outputFormat=<em>cql|human</em></strong></td> + <td style="text-align:left">Selects formatting of the results - as CQL literals, or human-readable (default)</td> </tr> <tr> - <td>Locale</td> - <td><strong>locale=<em>value</em></strong></td> - <td>Name of the locale for formatting of results. + <td style="text-align:left">Locale</td> + <td style="text-align:left"><strong>locale=<em>value</em></strong></td> + <td style="text-align:left">Name of the locale for formatting of results. Should be a locale name supported by JVM.</td> </tr> <tr> - <td>Timezone</td> - <td><strong>timezone=<em>value</em></strong></td> - <td>Timezone string for formatting of values of + <td style="text-align:left">Timezone</td> + <td style="text-align:left"><strong>timezone=<em>value</em></strong></td> + <td style="text-align:left">Timezone string for formatting of values of time/date/timestamp type. Should be a timezone supported by JVM.</td> </tr> <tr> - <td>Timestamp Format</td> - <td><strong>timestampFormat=<em>string</em></strong></td> - <td>Format string + <td style="text-align:left">Timestamp Format</td> + <td style="text-align:left"><strong>timestampFormat=<em>string</em></strong></td> + <td style="text-align:left">Format string for <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</> that will be used for formatting of the values of <tt>timestamp</tt> type</td> </tr> <tr> - <td>Time Format</td> - <td><strong>timeFormat=<em>string</em></strong></td> - <td>Format string + <td style="text-align:left">Time Format</td> + <td style="text-align:left"><strong>timeFormat=<em>string</em></strong></td> + <td style="text-align:left">Format string for <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</> that will be used for formatting of the values of <tt>time</tt> type</td> </tr> <tr> - <td>Date Format</td> - <td><strong>dateFormat=<em>string</em></strong></td> - <td>Format string + <td style="text-align:left">Date Format</td> + <td style="text-align:left"><strong>dateFormat=<em>string</em></strong></td> + <td style="text-align:left">Format string for <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</> that will be used for formatting of the values of <tt>date</tt> type</td> </tr> <tr> - <td>Float Precision</td> - <td><strong>floatPrecision=<em>int value</em></strong></td> - <td>Precision when output values of <tt>float</tt> type</td> + <td style="text-align:left">Float Precision</td> + <td style="text-align:left"><strong>floatPrecision=<em>int value</em></strong></td> + <td style="text-align:left">Precision when output values of <tt>float</tt> type</td> </tr> <tr> - <td>Double Precision</td> - <td><strong>doublePrecision=<em>int value</em></strong></td> - <td>Precision when output values of <tt>double</tt> type</td> + <td style="text-align:left">Double Precision</td> + <td style="text-align:left"><strong>doublePrecision=<em>int value</em></strong></td> + <td style="text-align:left">Precision when output values of <tt>double</tt> type</td> </tr> </tbody> </table> @@ -659,15 +658,12 @@ corresponding settings on the interpreter level! Some examples: <br/><br/> <div class="row"> - <div class="col-md-8 col-md-offset-2"> <pre> %cassandra(locale=de_DE, floatPrecision=2, doublePrecision=4, timeFormat=hh:mma, timestampFormat=MM/dd/yy HH:mm, dateFormat="E, d MMM yy", timezone=Etc/GMT+2) select date, time, timestamp, double, float, tuple, udt from zep.test_format; %cassandra(outputFormat=cql) -select id, double, float, text, date, time, timestamp from zep.test_format; - </pre> - </div> +select id, double, float, text, date, time, timestamp from zep.test_format;</pre> </div> </p> </div> @@ -714,9 +710,7 @@ select id, double, float, text, date, time, timestamp from zep.test_format; @bind[statement-name-with-no-bound-value] - @remove_prepare[statement-name] - - </pre> + @remove_prepare[statement-name]</pre> </div> </div> <br/> @@ -746,8 +740,7 @@ select id, double, float, text, date, time, timestamp from zep.test_format; <pre> @prepare[select]=SELECT * FROM spark_demo.albums LIMIT ? - @prepare[select]=SELECT * FROM spark_demo.artists LIMIT ? - </pre> + @prepare[select]=SELECT * FROM spark_demo.artists LIMIT ?</pre> </div> </div> <br/> @@ -767,8 +760,7 @@ select id, double, float, text, date, time, timestamp from zep.test_format; <div class="row"> <div class="col-md-10 col-md-offset-1"> <pre> - @bind[select_first]=10 - </pre> + @bind[select_first]=10</pre> </div> </div> <br/> @@ -811,8 +803,7 @@ select id, double, float, text, date, time, timestamp from zep.test_format; BEGIN BATCH @bind[insert_user]='jdoe','John DOE' UPDATE users SET age = 27 WHERE login='hsue'; - APPLY BATCH; - </pre> + APPLY BATCH;</pre> </div> <br/> </p> @@ -868,9 +859,7 @@ select id, double, float, text, date, time, timestamp from zep.test_format; SELECT name, country, performer FROM spark_demo.performers WHERE name='\${performer=Sheryl Crow|Doof|Fanfarlo|Los Paranoia}' - AND styles CONTAINS '\${style=Rock}'; - - </pre> + AND styles CONTAINS '\${style=Rock}';</pre> </div> </div> <br/> @@ -913,134 +902,134 @@ select id, double, float, text, date, time, timestamp from zep.test_format; </caption> <thead> <tr> - <th>Parameter</th> - <th>Default Value</th> + <th style="text-align:left">Parameter</th> + <th style="text-align:left">Default Value</th> </tr> </thead> <tbody> <tr> - <td>cassandra.cluster</td> - <td><strong>Test Cluster</strong></td> + <td style="text-align:left">cassandra.cluster</td> + <td style="text-align:left"><strong>Test Cluster</strong></td> </tr> <tr> - <td>cassandra.compression.protocol</td> - <td><strong>NONE</strong>, possible values: LZ4, SNAPPY</td> + <td style="text-align:left">cassandra.compression.protocol</td> + <td style="text-align:left"><strong>NONE</strong>, possible values: LZ4, SNAPPY</td> </tr> <tr> - <td>cassandra.credentials.password</td> - <td><strong>none</strong></td> + <td style="text-align:left">cassandra.credentials.password</td> + <td style="text-align:left"><strong>none</strong></td> </tr> <tr> - <td>cassandra.credentials.username</td> - <td><strong>none</strong></td> + <td style="text-align:left">cassandra.credentials.username</td> + <td style="text-align:left"><strong>none</strong></td> </tr> <tr> - <td>cassandra.hosts</td> - <td><strong>localhost</strong></td> + <td style="text-align:left">cassandra.hosts</td> + <td style="text-align:left"><strong>localhost</strong></td> </tr> <tr> - <td>cassandra.interpreter.parallelism</td> - <td><strong>10</strong></td> + <td style="text-align:left">cassandra.interpreter.parallelism</td> + <td style="text-align:left"><strong>10</strong></td> </tr> <tr> - <td>cassandra.keyspace</td> - <td><strong>system</strong></td> + <td style="text-align:left">cassandra.keyspace</td> + <td style="text-align:left"><strong>system</strong></td> </tr> <tr> - <td>cassandra.load.balancing.policy</td> - <td><strong>DEFAULT</strong>, or a FQCN of a custom class</td> + <td style="text-align:left">cassandra.load.balancing.policy</td> + <td style="text-align:left"><strong>DEFAULT</strong>, or a FQCN of a custom class</td> </tr> <tr> - <td>cassandra.max.schema.agreement.wait.second</td> - <td><strong>10</strong></td> + <td style="text-align:left">cassandra.max.schema.agreement.wait.second</td> + <td style="text-align:left"><strong>10</strong></td> </tr> <tr> - <td>cassandra.native.port</td> - <td><strong>9042</strong></td> + <td style="text-align:left">cassandra.native.port</td> + <td style="text-align:left"><strong>9042</strong></td> </tr> <tr> - <td>cassandra.pooling.core.connection.per.host.local</td> - <td><strong>V3 and above: 1</strong></td> + <td style="text-align:left">cassandra.pooling.core.connection.per.host.local</td> + <td style="text-align:left"><strong>V3 and above: 1</strong></td> </tr> <tr> - <td>cassandra.pooling.core.connection.per.host.remote</td> - <td><strong>V3 and above: 1</strong></td> + <td style="text-align:left">cassandra.pooling.core.connection.per.host.remote</td> + <td style="text-align:left"><strong>V3 and above: 1</strong></td> </tr> <tr> - <td>cassandra.pooling.heartbeat.interval.seconds</td> - <td><strong>30</strong></td> + <td style="text-align:left">cassandra.pooling.heartbeat.interval.seconds</td> + <td style="text-align:left"><strong>30</strong></td> </tr> <tr> - <td>cassandra.pooling.idle.timeout.seconds</td> - <td><strong>Test Cluster</strong></td> + <td style="text-align:left">cassandra.pooling.idle.timeout.seconds</td> + <td style="text-align:left"><strong>Test Cluster</strong></td> </tr> <tr> - <td>cassandra.pooling.max.connection.per.host.local</td> - <td><strong>V3 and above: 1</strong></td> + <td style="text-align:left">cassandra.pooling.max.connection.per.host.local</td> + <td style="text-align:left"><strong>V3 and above: 1</strong></td> </tr> <tr> - <td>cassandra.pooling.max.connection.per.host.remote</td> - <td><strong>V3 and above: 1</strong></td> + <td style="text-align:left">cassandra.pooling.max.connection.per.host.remote</td> + <td style="text-align:left"><strong>V3 and above: 1</strong></td> </tr> <tr> - <td>cassandra.pooling.max.request.per.connection.local</td> - <td><strong>V3 and above: 1024</strong></td> + <td style="text-align:left">cassandra.pooling.max.request.per.connection.local</td> + <td style="text-align:left"><strong>V3 and above: 1024</strong></td> </tr> <tr> - <td>cassandra.pooling.max.request.per.connection.remote</td> - <td><strong>V3 and above: 256</strong></td> + <td style="text-align:left">cassandra.pooling.max.request.per.connection.remote</td> + <td style="text-align:left"><strong>V3 and above: 256</strong></td> </tr> <tr> - <td>cassandra.pooling.new.connection.threshold.local</td> - <td><strong>V3 and above: 800</strong></td> + <td style="text-align:left">cassandra.pooling.new.connection.threshold.local</td> + <td style="text-align:left"><strong>V3 and above: 800</strong></td> </tr> <tr> - <td>cassandra.pooling.new.connection.threshold.remote</td> - <td><strong>V3 and above: 200</strong></td> + <td style="text-align:left">cassandra.pooling.new.connection.threshold.remote</td> + <td style="text-align:left"><strong>V3 and above: 200</strong></td> </tr> <tr> - <td>cassandra.pooling.pool.timeout.millisecs</td> - <td><strong>5000</strong></td> + <td style="text-align:left">cassandra.pooling.pool.timeout.millisecs</td> + <td style="text-align:left"><strong>5000</strong></td> </tr> <tr> - <td>cassandra.protocol.version</td> - <td><strong>4</strong></td> + <td style="text-align:left">cassandra.protocol.version</td> + <td style="text-align:left"><strong>4</strong></td> </tr> <tr> - <td>cassandra.query.default.consistency</td> - <td><strong>ONE</strong></td> + <td style="text-align:left">cassandra.query.default.consistency</td> + <td style="text-align:left"><strong>ONE</strong></td> </tr> <tr> - <td>cassandra.query.default.fetchSize</td> - <td><strong>5000</strong></td> + <td style="text-align:left">cassandra.query.default.fetchSize</td> + <td style="text-align:left"><strong>5000</strong></td> </tr> <tr> - <td>cassandra.query.default.serial.consistency</td> - <td><strong>SERIAL</strong></td> + <td style="text-align:left">cassandra.query.default.serial.consistency</td> + <td style="text-align:left"><strong>SERIAL</strong></td> </tr> <tr> - <td>cassandra.reconnection.policy</td> - <td><strong>DEFAULT</strong>, or a FQCN of a custom class</td> + <td style="text-align:left">cassandra.reconnection.policy</td> + <td style="text-align:left"><strong>DEFAULT</strong>, or a FQCN of a custom class</td> </tr> <tr> - <td>cassandra.retry.policy</td> - <td><strong>DEFAULT</strong>, or a FQCN of a custom class</td> + <td style="text-align:left">cassandra.retry.policy</td> + <td style="text-align:left"><strong>DEFAULT</strong>, or a FQCN of a custom class</td> </tr> <tr> - <td>cassandra.socket.connection.timeout.millisecs</td> - <td><strong>500</strong></td> + <td style="text-align:left">cassandra.socket.connection.timeout.millisecs</td> + <td style="text-align:left"><strong>500</strong></td> </tr> <tr> - <td>cassandra.socket.read.timeout.millisecs</td> - <td><strong>12000</strong></td> + <td style="text-align:left">cassandra.socket.read.timeout.millisecs</td> + <td style="text-align:left"><strong>12000</strong></td> </tr> <tr> - <td>cassandra.socket.tcp.no_delay</td> - <td><strong>true</strong></td> + <td style="text-align:left">cassandra.socket.tcp.no_delay</td> + <td style="text-align:left"><strong>true</strong></td> </tr> <tr> - <td>cassandra.speculative.execution.policy</td> - <td><strong>DEFAULT</strong>, or a FQCN of a custom class</td> + <td style="text-align:left">cassandra.speculative.execution.policy</td> + <td style="text-align:left"><strong>DEFAULT</strong>, or a FQCN of a custom class</td> </tr> </tbody> </table> diff --git a/cassandra/src/main/resources/scalate/keyspaceContent.ssp b/cassandra/src/main/resources/scalate/keyspaceContent.ssp index 152c657..b3e2e34 100644 --- a/cassandra/src/main/resources/scalate/keyspaceContent.ssp +++ b/cassandra/src/main/resources/scalate/keyspaceContent.ssp @@ -34,13 +34,12 @@ <div class="row"> <div class="panel-group" role="tablist" aria-multiselectable="true"> #for((id,name,tableHTML) <- ksContent.tables) - <div class="panel panel-default"> <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false"> <span class="text-primary"> - <i class="glyphicon glyphicon-th-list"/> ${name} + <span class="glyphicon glyphicon-th-list"></span> ${name} </span> </a> </h4> @@ -72,7 +71,7 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false"> - <span class="text-primary"><i class="glyphicon glyphicon-eye-open"/> ${name}</span> + <span class="text-primary"><span class="glyphicon glyphicon-eye-open"></span> ${name}</span> </a> </h4> </div> @@ -102,7 +101,7 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false"> - <span class="text-warning"><i class="glyphicon glyphicon-copyright-mark"/> ${name}</span> + <span class="text-warning"><span class="glyphicon glyphicon-copyright-mark"></span> ${name}</span> </a> </h4> </div> @@ -133,7 +132,7 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false"> - <span class="text-success"><i class="glyphicon glyphicon-random"/> ${name}</span> + <span class="text-success"><span class="glyphicon glyphicon-random"></span> ${name}</span> </a> </h4> </div> @@ -163,7 +162,7 @@ <div class="panel-heading" role="tab"> <h4 class="panel-title"> <a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false"> - <span class="text-success"><i class="glyphicon glyphicon-retweet"/> ${name}</span> + <span class="text-success"><span class="glyphicon glyphicon-retweet"></span> ${name}</span> </a> </h4> </div> diff --git a/cassandra/src/main/resources/scalate/keyspaceDetails.ssp b/cassandra/src/main/resources/scalate/keyspaceDetails.ssp index c0b9f8f..157e3d9 100644 --- a/cassandra/src/main/resources/scalate/keyspaceDetails.ssp +++ b/cassandra/src/main/resources/scalate/keyspaceDetails.ssp @@ -28,20 +28,20 @@ #if (withCaption) <caption> <h4 class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> ${ksDetails.name} + <span class="glyphicon glyphicon-folder-open"></span> ${ksDetails.name} </h4> </caption> #end <thead> <tr> - <th class="col-md-10">Replication</th> - <th class="col-md-2">Durable Writes</th> + <th class="col-md-10" style="text-align:left">Replication</th> + <th class="col-md-2" style="text-align:left">Durable Writes</th> </tr> </thead> <tbody> <tr> - <td class="col-md-10">${ksDetails.getReplicationMap}</td> - <td class="col-md-2">${ksDetails.durableWrites}</td> + <td class="col-md-10" style="text-align:left">${ksDetails.getReplicationMap}</td> + <td class="col-md-2" style="text-align:left">${ksDetails.durableWrites}</td> </tr> <tbody> </table> diff --git a/cassandra/src/main/resources/scalate/materializedViewDetails.ssp b/cassandra/src/main/resources/scalate/materializedViewDetails.ssp index 182776a..063886d 100644 --- a/cassandra/src/main/resources/scalate/materializedViewDetails.ssp +++ b/cassandra/src/main/resources/scalate/materializedViewDetails.ssp @@ -20,26 +20,26 @@ <%@ val mvDetails: MaterializedViewDetails %> <%@ val withCaption: Boolean%> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2"> <div class="panel panel-default table-responsive table-bordered"> <table class="table"> #if(withCaption) <caption> <h4 class="text-primary"> - <i class="glyphicon glyphicon-eye-open"/> + <span class="glyphicon glyphicon-eye-open"></span> ${mvDetails.name} - <i class="glyphicon glyphicon-arrow-right"/> - <i class="glyphicon glyphicon-th-list"/> + <span class="glyphicon glyphicon-arrow-right"></span> + <span class="glyphicon glyphicon-th-list"></span> ${mvDetails.baseTable} </h4> </caption> #end <thead> <tr> - <th class="col-md-4">Column Type</th> + <th class="col-md-4" width="10%">Column Type</th> <th class="col-md-4">Column Name</th> - <th class="col-md-4">Data Type</th> + <th class="col-md-4" style="text-align:left">Data Type</th> </tr> </thead> <tbody> @@ -48,45 +48,45 @@ #case(PartitionKey) <tr class="info"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-fullscreen" title="Partition Key"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-fullscreen" title="Partition Key"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #case(StaticColumn) <tr class="warning"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-pushpin" title="Static Column"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-pushpin" title="Static Column"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #case(ClusteringColumn(ASC)) <tr class="success"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-sort" title="Clustering Column"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-sort" title="Clustering Column"></span> - <i class="glyphicon glyphicon-sort-by-attributes" title="Sort ASC"/> + <span class="glyphicon glyphicon-sort-by-attributes" title="Sort ASC"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #case(ClusteringColumn(DESC)) <tr class="success"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-sort" title="Clustering Column"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-sort" title="Clustering Column"></span> - <i class="glyphicon glyphicon-sort-by-attributes-alt" title="Sort DESC"/> + <span class="glyphicon glyphicon-sort-by-attributes-alt" title="Sort DESC"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #otherwise <tr> - <td class="col-md-4"></td> + <td class="col-md-4" width="10%"></td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #end #end diff --git a/cassandra/src/main/resources/scalate/menu.ssp b/cassandra/src/main/resources/scalate/menu.ssp index 0d5a36e..18ae986 100644 --- a/cassandra/src/main/resources/scalate/menu.ssp +++ b/cassandra/src/main/resources/scalate/menu.ssp @@ -35,65 +35,65 @@ </a> <ul class="dropdown-menu"> <li> - <a role="button"> - <i class="glyphicon glyphicon-dashboard text-muted" /> Cluster + <a href="#"> + <span class="glyphicon glyphicon-dashboard text-muted" aria-hidden="true" ></span> Cluster </a> </li> <li> - <a role="button"> - <i class="glyphicon glyphicon-folder-open text-danger" /> Keyspace + <a href="#"> + <span class="glyphicon glyphicon-folder-open text-danger" aria-hidden="true" ></span> Keyspace </a> </li> <li> - <a role="button"> - <i class="glyphicon glyphicon-copyright-mark text-warning" /> UDT + <a href="#"> + <span class="glyphicon glyphicon-copyright-mark text-warning" aria-hidden="true" ></span> UDT </a> </li> <li> - <a role="button"> - <i class="glyphicon glyphicon-th-list text-primary" /> Table + <a href="#"> + <span class="glyphicon glyphicon-th-list text-primary" aria-hidden="true" ></span> Table </a> </li> <li> - <a role="button"> - <i class="glyphicon glyphicon-eye-open text-primary" /> Materialized View + <a href="#"> + <span class="glyphicon glyphicon-eye-open text-primary" aria-hidden="true" ></span> Materialized View </a> </li> <li> - <a role="button"> - <i class="glyphicon glyphicon-random text-success" /> Function + <a href="#"> + <span class="glyphicon glyphicon-random text-success" aria-hidden="true" ></span> Function </a> </li> <li> - <a role="button"> - <i class="glyphicon glyphicon-retweet text-success" /> Aggregate + <a href="#"> + <span class="glyphicon glyphicon-retweet text-success" aria-hidden="true" ></span> Aggregate </a> </li> <li role="separator" class="divider text-muted"></li> <li class="dropdown-header"><span class="text-primary">Table icons</span></li> <li class="bg-info"> - <a role="button"> - <i class="glyphicon glyphicon-fullscreen" /> Partition Key + <a href="#"> + <span class="glyphicon glyphicon-fullscreen" aria-hidden="true" ></span> Partition Key </a> </li> <li class="bg-warning"> - <a role="button"> - <i class="glyphicon glyphicon-pushpin" /> Static Column + <a href="#"> + <span class="glyphicon glyphicon-pushpin" aria-hidden="true" ></span> Static Column </a> </li> <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort" /> Clustering Column + <a href="#"> + <span class="glyphicon glyphicon-sort" aria-hidden="true" ></span> Clustering Column </a> </li> <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort-by-attributes" /> Clustering Order ASC + <a href="#"> + <span class="glyphicon glyphicon-sort-by-attributes" aria-hidden="true" ></span> Clustering Order ASC </a> </li> <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort-by-attributes-alt" /> Clustering Order DESC + <a href="#"> + <span class="glyphicon glyphicon-sort-by-attributes-alt" aria-hidden="true" ></span> Clustering Order DESC </a> </li> </ul> diff --git a/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp b/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp index 7517f1f..5e6d96a 100644 --- a/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp +++ b/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp @@ -42,26 +42,26 @@ <table class="table"> <thead> <tr> - <th>Info</th> - <th>Value</th> + <th>Information</th> + <th style="text-align:left">Value</th> </tr> </thead> <tbody> <tr> <td>Statement</td> - <td>${query}</td> + <td style="text-align:left">${query}</td> </tr> <tr> <td>Tried Hosts</td> - <td>${triedHosts}</td> + <td style="text-align:left">${triedHosts}</td> </tr> <tr> <td>Queried Hosts</td> - <td>${queriedHosts}</td> + <td style="text-align:left">${queriedHosts}</td> </tr> <tr> <td>Schema in Agreement</td> - <td>${schemaInAgreement}</td> + <td style="text-align:left">${schemaInAgreement}</td> </tr> </tbody> </table> diff --git a/cassandra/src/main/resources/scalate/tableDetails.ssp b/cassandra/src/main/resources/scalate/tableDetails.ssp index 0938c8e..1216eab 100644 --- a/cassandra/src/main/resources/scalate/tableDetails.ssp +++ b/cassandra/src/main/resources/scalate/tableDetails.ssp @@ -20,18 +20,18 @@ <%@ val tableDetails: TableDetails %> <%@ val withCaption: Boolean%> <div class="row"> - <div class="col-md-2"/> + <div class="col-md-2"></div> <div class="col-md-8 col-offset-md-2"> <div class="panel panel-default table-responsive table-bordered"> <table class="table"> #if(withCaption) - <caption><h4 class="text-primary"><i class="glyphicon glyphicon-th-list"/> ${tableDetails.tableName}</h4></caption> + <caption><h4 class="text-primary"><span class="glyphicon glyphicon-th-list"></span> ${tableDetails.tableName}</h4></caption> #end <thead> <tr> - <th class="col-md-4">Column Type</th> + <th class="col-md-4" width="10%">Column Type</th> <th class="col-md-4">Column Name</th> - <th class="col-md-4">Data Type</th> + <th class="col-md-4" style="text-align:left">Data Type</th> </tr> </thead> <tbody> @@ -40,49 +40,48 @@ #case(PartitionKey) <tr class="info"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-fullscreen" title="Partition Key"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-fullscreen" title="Partition Key"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #case(StaticColumn) <tr class="warning"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-pushpin" title="Static Column"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-pushpin" title="Static Column"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #case(ClusteringColumn(ASC)) <tr class="success"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-sort" title="Clustering Column"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-sort" title="Clustering Column"></span> - <i class="glyphicon glyphicon-sort-by-attributes" title="Sort ASC"/> + <span class="glyphicon glyphicon-sort-by-attributes" title="Sort ASC"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #case(ClusteringColumn(DESC)) <tr class="success"> - <td class="col-md-4"> - <i class="glyphicon glyphicon-sort" title="Clustering Column"/> + <td class="col-md-4" width="10%"> + <span class="glyphicon glyphicon-sort" title="Clustering Column"></span> - <i class="glyphicon glyphicon-sort-by-attributes-alt" title="Sort DESC"/> + <span class="glyphicon glyphicon-sort-by-attributes-alt" title="Sort DESC"></span> </td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #otherwise <tr> - <td class="col-md-4"></td> + <td class="col-md-4" width="10%"></td> <td class="col-md-4">${column.name}</td> - <td class="col-md-4">${column.dataType.asCql(true,true)}</td> + <td class="col-md-4" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #end #end - </tbody> </table> <div class="panel-footer"> @@ -100,19 +99,19 @@ <hr/> <div class="panel panel-default table-responsive table-bordered"> <table class="table"> - <caption><h4 class="text-danger"><i class="glyphicon glyphicon-info-sign"/> ${tableDetails.tableName}'s indices</h4> + <caption><h4 class="text-danger"><span class="glyphicon glyphicon-info-sign"></span> ${tableDetails.tableName}'s indices</h4> </caption> <thead> <tr> <th class="col-md-6">Name</th> - <th class="col-md-6">Target</th> + <th class="col-md-6" style="text-align:left">Target</th> </tr> </thead> <tbody> #for (index <- tableDetails.indices) <tr> <td class="col-md-6">${index.name}</td> - <td class="col-md-6">${index.target}</td> + <td class="col-md-6" style="text-align:left">${index.target}</td> </tr> #end </tbody> diff --git a/cassandra/src/main/resources/scalate/udtDetails.ssp b/cassandra/src/main/resources/scalate/udtDetails.ssp index 804033c..c9db5ff 100644 --- a/cassandra/src/main/resources/scalate/udtDetails.ssp +++ b/cassandra/src/main/resources/scalate/udtDetails.ssp @@ -25,13 +25,13 @@ <div class="panel panel-default table-responsive table-bordered"> <table class="table"> #if(withCaption) - <caption><h4 class="text-warning"><i class="glyphicon glyphicon-copyright-mark"/> ${udtDetails.typeName}</h4></caption> + <caption><h4 class="text-warning"><span class="glyphicon glyphicon-copyright-mark"></span> ${udtDetails.typeName}</h4></caption> #end <thead> <tr> <th class="col-md-6">Column Name</th> - <th class="col-md-6">Data Type</th> + <th class="col-md-6" style="text-align:left">Data Type</th> </tr> </thead> <tbody> @@ -39,7 +39,7 @@ <tr> <td class="col-md-6">${column.name}</td> - <td class="col-md-6">${column.dataType.asCql(true,true)}</td> + <td class="col-md-6" style="text-align:left">${column.dataType.asCql(true,true)}</td> </tr> #end diff --git a/cassandra/src/test/resources/scalate/DescribeCluster.html b/cassandra/src/test/resources/scalate/DescribeCluster.html index 3a5c001..2378f32 100644 --- a/cassandra/src/test/resources/scalate/DescribeCluster.html +++ b/cassandra/src/test/resources/scalate/DescribeCluster.html @@ -1 +1 @@ -<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE CLUSTER;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a role="button"><i class="glyphicon glyphicon-dashboard text-muted" /> Cluster</a></li><li><a role="button" [...] \ No newline at end of file +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE CLUSTER;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a href="#"><span class="glyphicon glyphicon-dashboard text-muted" aria-hidden="true" ></span> Cluster</a></ [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html index 22086f5..8d721ef 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html @@ -1 +1 @@ -<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-danger"><i class="glyphicon glyphicon-folder-open"/> <strong>live_data</strong></span><span class="text-danger caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-primary">Tables</span></li><li><a role="button [...] +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span> <strong>live_data</strong></span><span class="text-danger caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-primary">Tables</span></li><li><a rol [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspaces.html b/cassandra/src/test/resources/scalate/DescribeKeyspaces.html index 76a8ed9..ac48bd3 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspaces.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspaces.html @@ -1 +1 @@ -<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-muted"><i class="glyphicon glyphicon-dashboard"/> <strong>Test Cluster</strong></span><span class="text-muted caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-danger">Keyspaces</span></li><li><a role="button" dat [...] \ No newline at end of file +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-muted"><span class="glyphicon glyphicon-dashboard"></span> <strong>Test Cluster</strong></span><span class="text-muted caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-danger">Keyspaces</span></li><li><a role="bu [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html index e6be8b4..b31dc11 100644 --- a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html +++ b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html @@ -1 +1 @@ -<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE TABLE live_data.complex_table;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a role="button"><i class="glyphicon glyphicon-dashboard text-muted" /> Cluster</a></l [...] +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE TABLE live_data.complex_table;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a href="#"><span class="glyphicon glyphicon-dashboard text-muted" aria-hidden="true" ></sp [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTables.html b/cassandra/src/test/resources/scalate/DescribeTables.html index a017fda..0599291 100644 --- a/cassandra/src/test/resources/scalate/DescribeTables.html +++ b/cassandra/src/test/resources/scalate/DescribeTables.html @@ -1,480 +1 @@ -<br/> -<br/> -<nav class="navbar navbar-default"> - <ul class="nav navbar-nav"> - <li role="presentation" class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <span class="text-muted"> - <i class="glyphicon glyphicon-dashboard"/> <strong>Test Cluster</strong> - </span> - <span class="text-muted caret"> - </span> - <ul class="dropdown-menu"> - <li class="dropdown-header"> - <span class="text-danger">Keyspaces</span> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> live_data</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_auth</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_distributed</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_schema</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_traces</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> zeppelin</span> - </a> - </li> - </ul> - </a> - </li> - <li> - <a> - <strong>DESCRIBE TABLES;</strong> - </a> - </li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <strong>Legend</strong> - <span class="caret"> - </span> - </a> - <ul class="dropdown-menu"> - <li> - <a role="button"> - <i class="glyphicon glyphicon-dashboard text-muted" /> Cluster</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-folder-open text-danger" /> Keyspace</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-copyright-mark text-warning" /> UDT</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-th-list text-primary" /> Table</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-eye-open text-primary" /> Materialized View</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-random text-success" /> Function</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-retweet text-success" /> Aggregate</a> - </li> - <li role="separator" class="divider text-muted"> - </li> - <li class="dropdown-header"> - <span class="text-primary">Table icons</span> - </li> - <li class="bg-info"> - <a role="button"> - <i class="glyphicon glyphicon-fullscreen" /> Partition Key</a> - </li> - <li class="bg-warning"> - <a role="button"> - <i class="glyphicon glyphicon-pushpin" /> Static Column</a> - </li> - <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort" /> Clustering Column</a> - </li> - <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort-by-attributes" /> Clustering Order ASC</a> - </li> - <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort-by-attributes-alt" /> Clustering Order DESC</a> - </li> - </ul> - </li> - <li> - <a href="#"> - </a> - </li> - </ul> -</nav> -<hr/> -<div class="container"> - <div class="row"> - <div class="panel-group" role="tablist" aria-multiselectable="true"> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> live_data</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>complex_table</td> - </tr> - <tr class="text-primary"> - <td>sensor_data</td> - </tr> - <tr class="text-primary"> - <td>stations</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>"IndexInfo"</td> - </tr> - <tr class="text-primary"> - <td>available_ranges</td> - </tr> - <tr class="text-primary"> - <td>batches</td> - </tr> - <tr class="text-primary"> - <td>batchlog</td> - </tr> - <tr class="text-primary"> - <td>built_views</td> - </tr> - <tr class="text-primary"> - <td>compaction_history</td> - </tr> - <tr class="text-primary"> - <td>hints</td> - </tr> - <tr class="text-primary"> - <td>local</td> - </tr> - <tr class="text-primary"> - <td>paxos</td> - </tr> - <tr class="text-primary"> - <td>peer_events</td> - </tr> - <tr class="text-primary"> - <td>peers</td> - </tr> - <tr class="text-primary"> - <td>prepared_statements</td> - </tr> - <tr class="text-primary"> - <td>range_xfers</td> - </tr> - <tr class="text-primary"> - <td>size_estimates</td> - </tr> - <tr class="text-primary"> - <td>sstable_activity</td> - </tr> - <tr class="text-primary"> - <td>transferred_ranges</td> - </tr> - <tr class="text-primary"> - <td>views_builds_in_progress</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_auth</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>resource_role_permissons_index</td> - </tr> - <tr class="text-primary"> - <td>role_members</td> - </tr> - <tr class="text-primary"> - <td>role_permissions</td> - </tr> - <tr class="text-primary"> - <td>roles</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_distributed</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>parent_repair_history</td> - </tr> - <tr class="text-primary"> - <td>repair_history</td> - </tr> - <tr class="text-primary"> - <td>view_build_status</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_schema</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>aggregates</td> - </tr> - <tr class="text-primary"> - <td>columns</td> - </tr> - <tr class="text-primary"> - <td>dropped_columns</td> - </tr> - <tr class="text-primary"> - <td>functions</td> - </tr> - <tr class="text-primary"> - <td>indexes</td> - </tr> - <tr class="text-primary"> - <td>keyspaces</td> - </tr> - <tr class="text-primary"> - <td>tables</td> - </tr> - <tr class="text-primary"> - <td>triggers</td> - </tr> - <tr class="text-primary"> - <td>types</td> - </tr> - <tr class="text-primary"> - <td>views</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> system_traces</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>events</td> - </tr> - <tr class="text-primary"> - <td>sessions</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> zeppelin</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Tables</th> - </tr> - </thead> - <tbody> - <tr class="text-primary"> - <td>artists</td> - </tr> - <tr class="text-primary"> - <td>no_select</td> - </tr> - <tr class="text-primary"> - <td>prepared</td> - </tr> - <tr class="text-primary"> - <td>test_format</td> - </tr> - <tr class="text-primary"> - <td>ts</td> - </tr> - <tr class="text-primary"> - <td>users</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - </div> - </div> -</div> +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-muted"><span class="glyphicon glyphicon-dashboard"></span> <strong>Test Cluster</strong></span><span class="text-muted caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-danger">Keyspaces</span></li><li><a role="bu [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html b/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html index 9d4aaff..e6ee9f9 100644 --- a/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html +++ b/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html @@ -1 +1 @@ -<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE TYPE live_data.address;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a role="button"><i class="glyphicon glyphicon-dashboard text-muted" /> Cluster</a></li><li>< [...] \ No newline at end of file +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE TYPE live_data.address;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a href="#"><span class="glyphicon glyphicon-dashboard text-muted" aria-hidden="true" ></span>&nbs [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html b/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html index 13b1ce4..33e88cc 100644 --- a/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html +++ b/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html @@ -1 +1 @@ -<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE TYPE address;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a role="button"><i class="glyphicon glyphicon-dashboard text-muted" /> Cluster</a></li><li><a role="bu [...] \ No newline at end of file +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li><a><strong>DESCRIBE TYPE address;</strong></a></li></ul><ul class="nav navbar-nav navbar-right"><li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><strong>Legend</strong><span class="caret"></span></a><ul class="dropdown-menu"><li><a href="#"><span class="glyphicon glyphicon-dashboard text-muted" aria-hidden="true" ></span> Cluster< [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTypes.html b/cassandra/src/test/resources/scalate/DescribeTypes.html index 2e161ae..943403e 100644 --- a/cassandra/src/test/resources/scalate/DescribeTypes.html +++ b/cassandra/src/test/resources/scalate/DescribeTypes.html @@ -1,182 +1 @@ -<br/> -<br/> -<nav class="navbar navbar-default"> - <ul class="nav navbar-nav"> - <li role="presentation" class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <span class="text-muted"> - <i class="glyphicon glyphicon-dashboard"/> <strong>Test Cluster</strong> - </span> - <span class="text-muted caret"> - </span> - <ul class="dropdown-menu"> - <li class="dropdown-header"> - <span class="text-danger">Keyspaces</span> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> live_data</span> - </a> - </li> - <li> - <a role="button" data-toggle="collapse" > - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> zeppelin</span> - </a> - </li> - </ul> - </a> - </li> - <li> - <a> - <strong>DESCRIBE TYPES;</strong> - </a> - </li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> - <strong>Legend</strong> - <span class="caret"> - </span> - </a> - <ul class="dropdown-menu"> - <li> - <a role="button"> - <i class="glyphicon glyphicon-dashboard text-muted" /> Cluster</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-folder-open text-danger" /> Keyspace</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-copyright-mark text-warning" /> UDT</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-th-list text-primary" /> Table</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-eye-open text-primary" /> Materialized View</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-random text-success" /> Function</a> - </li> - <li> - <a role="button"> - <i class="glyphicon glyphicon-retweet text-success" /> Aggregate</a> - </li> - <li role="separator" class="divider text-muted"> - </li> - <li class="dropdown-header"> - <span class="text-primary">Table icons</span> - </li> - <li class="bg-info"> - <a role="button"> - <i class="glyphicon glyphicon-fullscreen" /> Partition Key</a> - </li> - <li class="bg-warning"> - <a role="button"> - <i class="glyphicon glyphicon-pushpin" /> Static Column</a> - </li> - <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort" /> Clustering Column</a> - </li> - <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort-by-attributes" /> Clustering Order ASC</a> - </li> - <li class="bg-success"> - <a role="button"> - <i class="glyphicon glyphicon-sort-by-attributes-alt" /> Clustering Order DESC</a> - </li> - </ul> - </li> - <li> - <a href="#"> - </a> - </li> - </ul> -</nav> -<hr/> -<div class="container"> - <div class="row"> - <div class="panel-group" role="tablist" aria-multiselectable="true"> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> live_data</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>UDT</th> - </tr> - </thead> - <tbody> - <tr class="text-warning"> - <td>address</td> - </tr> - <tr class="text-warning"> - <td>geolocation</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - <div class="panel panel-default"> - <div class="panel-heading" role="tab"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" aria-expanded="false"> - <span class="text-danger"> - <i class="glyphicon glyphicon-folder-open"/> zeppelin</span> - </a> - </h4> - </div> - <div class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-2"/> - <div class="col-md-8 col-offset-md-2 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>UDT</th> - </tr> - </thead> - <tbody> - <tr class="text-warning"> - <td>address</td> - </tr> - <tr class="text-warning"> - <td>tudt</td> - </tr> - </tbody> - </table> - </div> - <div class="col-md-2"/> - </div> - </div> - </div> - </div> - </div> - </div> -</div> +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-muted"><span class="glyphicon glyphicon-dashboard"></span> <strong>Test Cluster</strong></span><span class="text-muted caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-danger">Keyspaces</span></li><li><a role="bu [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/Help.html b/cassandra/src/test/resources/scalate/Help.html index 32b7808..4ca95c3 100644 --- a/cassandra/src/test/resources/scalate/Help.html +++ b/cassandra/src/test/resources/scalate/Help.html @@ -1 +1 @@ -<div class="container"><div class="panel panel-default"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" aria-expanded="false"><span class="text-info"><strong>Basic Commands</strong></span></a></h4></div><div class="panel-collapse collapse" role="tabpanel"><div class="panel-body"><div class="panel panel-default"><div class="panel-body"><h3>I CQL Statements</h3><p>This interpreter is compatible with any CQL statement supported by Cass [...] +<br/><br/><nav class="navbar navbar-default"><ul class="nav navbar-nav"><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="text-info"><span class="glyphicon glyphicon-book"></span> <strong>Please select ...</strong></span><span class="text-info caret"></span><ul class="dropdown-menu"><li class="dropdown-header"><span class="text-info">Topics</span></li><li><a role="button" d [...] \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html b/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html index 3f58d0f..bd713ad 100644 --- a/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html +++ b/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html @@ -1,45 +1 @@ -<div class="container"> -<div class="row"> - <h5>No Result - <a role="button" data-toggle="collapse" data-target="#72c620c4-bb6c-4a26-a604-ee10ae22c301" aria-expanded="false"> - <span class="text-info"><strong>Last query execution info</strong></span> - </a> - </h5> -</div> -<div class="panel panel-default"> - <div id="72c620c4-bb6c-4a26-a604-ee10ae22c301" class="panel-collapse collapse" role="tabpanel"> - <div class="panel-body"> - <div class="row"> - <div class="col-md-3"></div> - <div class="col-md-6 col-offset-md-3 table-responsive table-bordered"> - <table class="table"> - <thead> - <tr> - <th>Info</th> - <th>Value</th> - </tr> - </thead> - <tbody> - <tr> - <td>Statement</td> - <td>CREATE TABLE IF NOT EXISTS no_select(id int PRIMARY KEY);</td> - </tr> - <tr> - <td>Tried Hosts</td> - <td>localhost:9142</td> - </tr> - <tr> - <td>Queried Hosts</td> - <td>localhost:9142</td> - </tr> - <tr> - <td>Schema in Agreement</td> - <td>true</td> - </tr> - </tbody> - </table> - </div> - </div> - </div> - </div> -</div> +<div class="container"><div class="row"><h5>No Result <a role="button" data-toggle="collapse" aria-expanded="false"><span class="text-info"><strong>Last query execution info</strong></span></a></h5></div><div class="panel panel-default"><div class="panel-collapse collapse" role="tabpanel"><div class="panel-body"><div class="row"><div class="col-md-3"></div><div class="col-md-6 col-offset-md-3 table-responsive table-bordered"><table class="table"><thead><tr [...] \ No newline at end of file