Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 5 files changed
  • 0 commit comments
  • 4 contributors
Commits on Aug 23, 2013
@jaredmorrow jaredmorrow Roll riak_core and webmachine dependencies for 1.4.2 2f08324
Commits on Sep 03, 2013
@lukebakken lukebakken Small fix to use 'reachable' instead of 'available' as the JSON prope…
…rty being bound to is 'reachable'.

This allows the "RAM Usage" bar-graphs to be rendered correctly.

See support ticket #5675
7c9a4ce
@jgnewman jgnewman Merge pull request #140 from basho/small-template-fix-1.4
Small template fix 1.4
5445ea4
Commits on Dec 16, 2013
@jaredmorrow jaredmorrow Bump riak_core dep to 1.4.4 9a74e57
Commits on May 27, 2014
@jaredmorrow jaredmorrow Update riak_core dependency to 1.4.9 3cf4abe
Commits on Jul 07, 2014
@jaredmorrow jaredmorrow Update riak_core dep 1.4.10 73c43c3
Commits on Nov 19, 2014
@engelsanchez engelsanchez Tagging 1.4.12 964c5db
View
4 priv/admin/js/generated/templates.js
@@ -5,6 +5,6 @@ Ember.TEMPLATES['nodes'] = Ember.Handlebars.compile('<div id="nodes-page"> <s
Ember.TEMPLATES['ring'] = Ember.Handlebars.compile('<div id="ring-page"> <section id="title-container"> <div class="side-line"></div> <div class="title-box"> <span class="vert-border-left"></span> <h1 id="ring-headline" class="gui-headline-bold page-title">Current Ring</h1> <span class="vert-border-right"></span> </div> <div class="side-line"> {{outlet partitionFilter}} </div> <div class="clear"></div> </section> <ul class="pagination first gui-text"> <li name="prev"><span class="paginator" {{action prevPage href=true target="controller"}}>Prev</span></li> {{#each pages}} {{view RiakControl.PaginationItemView contentBinding="this"}} {{/each}} <li name="next"><span class="paginator" {{action nextPage href=true target="controller"}}>Next</span></li> </ul> <div class="cut"></div> <div id="partition-list"> <table class="list-table" id="ring-table"> <thead> <tr class="table-head has-cut"> <th><h3>#</h3></th> <th><h3>Owner Node</h3></th> <th><h3>KV</h3></th> <th><h3>Pipe</h3></th> <th><h3>Search</h3></th> </tr> </thead> {{#collection RiakControl.PartitionView contentBinding="controller.paginatedContent"}} {{#with view.content}} <td class="partition-number gui-text">{{i}}</td> <td class="owner-box gui-text"> <div class="owner gui-field">{{node}}</div> <div class="partition-index hide">{{index}}</div> </td> {{/with}} {{#with view}} <td class="kv-box gui-text"> <a {{bindAttr class="kvIndicator lightClasses"}}> <span class="kv-status">{{kvStatus}}</span> <span class="hide fallback-to"></span> </a> </td> <td class="pipe-box gui-text"> <a {{bindAttr class="pipeIndicator lightClasses"}}> <span class="pipe-status">{{pipeStatus}}</span> <span class="hide fallback-to"></span> </a> </td> <td class="search-box gui-text"> <a {{bindAttr class="searchIndicator lightClasses"}}> <span class="search-status">{{searchStatus}}</span> <span class="hide fallback-to"></span> </a> </td> {{/with}} {{/collection}} </table> </div> <div class="cut"></div> <ul class="pagination gui-text"> <li name="prev"><span class="paginator" {{action prevPage href=true target="controller"}}>Prev</span></li> {{#each pages}} {{view RiakControl.PaginationItemView contentBinding="this"}} {{/each}} <li name="next"><span class="paginator" {{action nextPage href=true target="controller"}}>Next</span></li> </ul> </div>');
Ember.TEMPLATES['partition_filter'] = Ember.Handlebars.compile('<div id="ring-filter" class="right"> <div class="gui-dropdown-wrapper"> <div class="gui-dropdown-bg gui-text">Filter by...</div> <div class="gui-dropdown-cap left"></div> {{view RiakControl.PartitionFilterSelectView id="filter" classNames="gui-dropdown" contentBinding="filters" optionLabelPath="content.name" optionValuePath="content.value" prompt="All" selectionBinding="controller.selectedPartitionFilter"}} </div></div>');
Ember.TEMPLATES['pagination_item'] = Ember.Handlebars.compile('{{#with view}}<a {{action paginateRing content href=true}}> <span {{bindAttr class="spanClasses isActive:active"}}>{{content.page_id}}</span></a>{{/with}}');
-Ember.TEMPLATES['current_cluster_item'] = Ember.Handlebars.compile('{{#with view}} <div class="node"> <div class="item1 toggle-container"> {{#view RiakControl.CurrentClusterToggleView}} <div class="actions-toggle gui-field"> <a class="slider"></a> </div> {{/view}} </div> <div class="item2 name-box gui-text"> <div {{bindAttr class="indicatorLights"}}> </div><div class="gui-text field-container inline-block"> <div class="name gui-field">{{name}}</div> </div> </div> <div class="item3 gui-text ring-pct-box"> <div {{bindAttr class="coloredArrows"}}></div> <div class="left gui-text pct-box"> <span class="ring-pct">{{ringPctReadable}}%</span> </div> <div class="clear"></div> </div> <div class="item4 gui-text memory-box"> {{#if available}} <div class="membar-bg"> <div class="mem-colors"> <div class="erlang-mem mem-color" {{bindAttr style="memErlangStyle"}} {{bindAttr name="memErlangCeil"}}></div> <div class="non-erlang-mem mem-color" {{bindAttr style="memNonErlangStyle"}} {{bindAttr name="memNonErlang"}}></div> <div class="unknown-mem" {{bindAttr style="memFreeStyle"}} {{bindAttr name="memFreeReadable"}}></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory">{{memUsedReadable}}%</span> {{else}} <div class="membar-bg"> <div class="mem-colors"> <div class="unknown-mem" style="width: 100%"></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory"></span> {{/if}} </div> <div class="clear"></div> <!-- Actions container --> <div class="actions-container"> <div class="actions-pointer"></div> <div class="actions-box"> <h4 class="gui-headline-bold"> Use these actions to prepare this node to leave the cluster. </h4> {{#if me}} <span class="warning gui-text-flat italic"> Warning: This node is hosting Riak Control. If it leaves the cluster, Riak Control will be shut down. </span> {{/if}} <div class="replacement-controls"> <div class="gui-radio-wrapper default"> <input class="gui-radio" type="radio" value="leave" {{bindAttr name="name" id="normalLeaveRadio"}} checked="checked"/> <label class="serif" {{bindAttr for="normalLeaveRadio"}}>Allow this node to leave normally.</label> </div> <div class="gui-radio-wrapper"> <input class="gui-radio" type="radio" value="remove" {{bindAttr name="name" id="forceLeaveRadio"}} /> <label class="serif" {{bindAttr for="forceLeaveRadio"}}>Force this node to leave.</label> </div> <div {{bindAttr class="replaceRadioClasses"}}> <input class="gui-radio" type="radio" value="replace" {{bindAttr name="name" id="replaceRadio"}} /> <label class="serif" {{bindAttr for="replaceRadio"}}>Choose a new node to replace this one.</label> </div> <div class="extra-actions"> <div class="right-angle-arrow"></div> {{#if controller.joiningNodesExist}} <div class="gui-dropdown-wrapper replacement-node-dropdown"> <div class="gui-dropdown-bg gui-text">Select Replacement Node</div> <div class="gui-dropdown-cap left"></div> {{view RiakControl.ClusterItemSelectView prompt="Select Replacement Node" classNames="gui-dropdown" contentBinding="controller.joiningNodes" optionLabelPath="content.name"}} </div> <div class="gui-checkbox-wrapper"> <input class="gui-checkbox" type="checkbox" {{bindAttr name="name" id="forceReplaceCheck"}} value="true" /> <label class="serif" {{bindAttr for="forceReplaceCheck"}}>Force this replacement?</label> </div> <div class="clear"></div> <div class="disabler"></div> {{else}} <div class="no-joining-nodes gui-text-flat serif italic"> No new nodes are currently staged to join. </div> <div class="disabler show slide-up"></div> {{/if}} </div> <div class="clear"></div> </div> <div class="clear"></div> <span class="gui-text-flat serif italic stage-instructions">Click "STAGE" when you are ready to stage this action.</span> <a class="stage-button gui-point-button-right gui-text-bold right" {{action stageChange target="view"}}> <span class="gui-button-msg">STAGE</span> </a> <div class="clear"></div> </div> <div class="clear"></div> </div><!-- .actions-box --> <div class="clear"></div> </div><!-- .node -->{{/with}}');
-Ember.TEMPLATES['current_nodes_item'] = Ember.Handlebars.compile('{{#with view}} <div class="node"> <div class="item1"> <div {{bindAttr class="stopRadioClasses"}}> <input class="gui-radio" type="radio" value="stop" {{bindAttr name="name" id="stopRadio"}} /> <div {{bindAttr class="stopDisablerClasses"}}></div> </div> </div> <div class="item2"> <div {{bindAttr class="downRadioClasses"}}> <input class="gui-radio" type="radio" value="down" {{bindAttr name="name" id="downRadio"}} /> <div {{bindAttr class="downDisablerClasses"}}></div> </div> </div> <div class="item3 name-box gui-text"> <div {{bindAttr class="indicatorLights"}}> </div><div class="gui-text field-container inline-block"> <div class="name gui-field">{{name}}</div> </div> </div> <div class="item4 gui-text ring-pct-box"> <div {{bindAttr class="coloredArrows"}}></div> <div class="left gui-text pct-box"> <span class="ring-pct">{{ringPctReadable}}%</span> </div> <div class="clear"></div> </div> <div class="item5 gui-text memory-box"> {{#if available}} <div class="membar-bg"> <div class="mem-colors"> <div class="erlang-mem mem-color" {{bindAttr style="memErlangStyle"}} {{bindAttr name="memErlangCeil"}}></div> <div class="non-erlang-mem mem-color" {{bindAttr style="memNonErlangStyle"}} {{bindAttr name="memNonErlang"}}></div> <div class="unknown-mem" {{bindAttr style="memFreeStyle"}} {{bindAttr name="memFreeReadable"}}></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory">{{memUsedReadable}}%</span> {{else}} <div class="membar-bg"> <div class="mem-colors"> <div class="unknown-mem" style="width: 100%"></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory"></span> {{/if}} </div> <div class="clear"></div> </div><!-- .node -->{{/with}}');
+Ember.TEMPLATES['current_cluster_item'] = Ember.Handlebars.compile('{{#with view}} <div class="node"> <div class="item1 toggle-container"> {{#view RiakControl.CurrentClusterToggleView}} <div class="actions-toggle gui-field"> <a class="slider"></a> </div> {{/view}} </div> <div class="item2 name-box gui-text"> <div {{bindAttr class="indicatorLights"}}> </div><div class="gui-text field-container inline-block"> <div class="name gui-field">{{name}}</div> </div> </div> <div class="item3 gui-text ring-pct-box"> <div {{bindAttr class="coloredArrows"}}></div> <div class="left gui-text pct-box"> <span class="ring-pct">{{ringPctReadable}}%</span> </div> <div class="clear"></div> </div> <div class="item4 gui-text memory-box"> {{#if reachable}} <div class="membar-bg"> <div class="mem-colors"> <div class="erlang-mem mem-color" {{bindAttr style="memErlangStyle"}} {{bindAttr name="memErlangCeil"}}></div> <div class="non-erlang-mem mem-color" {{bindAttr style="memNonErlangStyle"}} {{bindAttr name="memNonErlang"}}></div> <div class="unknown-mem" {{bindAttr style="memFreeStyle"}} {{bindAttr name="memFreeReadable"}}></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory">{{memUsedReadable}}%</span> {{else}} <div class="membar-bg"> <div class="mem-colors"> <div class="unknown-mem" style="width: 100%"></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory"></span> {{/if}} </div> <div class="clear"></div> <!-- Actions container --> <div class="actions-container"> <div class="actions-pointer"></div> <div class="actions-box"> <h4 class="gui-headline-bold"> Use these actions to prepare this node to leave the cluster. </h4> {{#if me}} <span class="warning gui-text-flat italic"> Warning: This node is hosting Riak Control. If it leaves the cluster, Riak Control will be shut down. </span> {{/if}} <div class="replacement-controls"> <div class="gui-radio-wrapper default"> <input class="gui-radio" type="radio" value="leave" {{bindAttr name="name" id="normalLeaveRadio"}} checked="checked"/> <label class="serif" {{bindAttr for="normalLeaveRadio"}}>Allow this node to leave normally.</label> </div> <div class="gui-radio-wrapper"> <input class="gui-radio" type="radio" value="remove" {{bindAttr name="name" id="forceLeaveRadio"}} /> <label class="serif" {{bindAttr for="forceLeaveRadio"}}>Force this node to leave.</label> </div> <div {{bindAttr class="replaceRadioClasses"}}> <input class="gui-radio" type="radio" value="replace" {{bindAttr name="name" id="replaceRadio"}} /> <label class="serif" {{bindAttr for="replaceRadio"}}>Choose a new node to replace this one.</label> </div> <div class="extra-actions"> <div class="right-angle-arrow"></div> {{#if controller.joiningNodesExist}} <div class="gui-dropdown-wrapper replacement-node-dropdown"> <div class="gui-dropdown-bg gui-text">Select Replacement Node</div> <div class="gui-dropdown-cap left"></div> {{view RiakControl.ClusterItemSelectView prompt="Select Replacement Node" classNames="gui-dropdown" contentBinding="controller.joiningNodes" optionLabelPath="content.name"}} </div> <div class="gui-checkbox-wrapper"> <input class="gui-checkbox" type="checkbox" {{bindAttr name="name" id="forceReplaceCheck"}} value="true" /> <label class="serif" {{bindAttr for="forceReplaceCheck"}}>Force this replacement?</label> </div> <div class="clear"></div> <div class="disabler"></div> {{else}} <div class="no-joining-nodes gui-text-flat serif italic"> No new nodes are currently staged to join. </div> <div class="disabler show slide-up"></div> {{/if}} </div> <div class="clear"></div> </div> <div class="clear"></div> <span class="gui-text-flat serif italic stage-instructions">Click "STAGE" when you are ready to stage this action.</span> <a class="stage-button gui-point-button-right gui-text-bold right" {{action stageChange target="view"}}> <span class="gui-button-msg">STAGE</span> </a> <div class="clear"></div> </div> <div class="clear"></div> </div><!-- .actions-box --> <div class="clear"></div> </div><!-- .node -->{{/with}}');
+Ember.TEMPLATES['current_nodes_item'] = Ember.Handlebars.compile('{{#with view}} <div class="node"> <div class="item1"> <div {{bindAttr class="stopRadioClasses"}}> <input class="gui-radio" type="radio" value="stop" {{bindAttr name="name" id="stopRadio"}} /> <div {{bindAttr class="stopDisablerClasses"}}></div> </div> </div> <div class="item2"> <div {{bindAttr class="downRadioClasses"}}> <input class="gui-radio" type="radio" value="down" {{bindAttr name="name" id="downRadio"}} /> <div {{bindAttr class="downDisablerClasses"}}></div> </div> </div> <div class="item3 name-box gui-text"> <div {{bindAttr class="indicatorLights"}}> </div><div class="gui-text field-container inline-block"> <div class="name gui-field">{{name}}</div> </div> </div> <div class="item4 gui-text ring-pct-box"> <div {{bindAttr class="coloredArrows"}}></div> <div class="left gui-text pct-box"> <span class="ring-pct">{{ringPctReadable}}%</span> </div> <div class="clear"></div> </div> <div class="item5 gui-text memory-box"> {{#if reachable}} <div class="membar-bg"> <div class="mem-colors"> <div class="erlang-mem mem-color" {{bindAttr style="memErlangStyle"}} {{bindAttr name="memErlangCeil"}}></div> <div class="non-erlang-mem mem-color" {{bindAttr style="memNonErlangStyle"}} {{bindAttr name="memNonErlang"}}></div> <div class="unknown-mem" {{bindAttr style="memFreeStyle"}} {{bindAttr name="memFreeReadable"}}></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory">{{memUsedReadable}}%</span> {{else}} <div class="membar-bg"> <div class="mem-colors"> <div class="unknown-mem" style="width: 100%"></div> </div> <div class="membar-fg"></div> </div> <span class="used-memory"></span> {{/if}} </div> <div class="clear"></div> </div><!-- .node -->{{/with}}');
Ember.TEMPLATES['staged_cluster_item'] = Ember.Handlebars.compile('{{#with view}} <div class="node"> <div class="item1 name-box gui-text"> <div {{bindAttr class="indicatorLights"}}> </div><div class="gui-text field-container inline-block"> <div class="name gui-field">{{name}}</div> </div> </div> <div class="item2 gui-text ring-pct-box"> <div class="left gui-text pct-box"> <span class="ring-pct">{{ringPctReadable}}%</span> </div> <div class="clear"></div> </div> {{#if isAction}} <div class="item3 action-taken gui-text"> <span class="action-name">{{node_action}}</span> </div> {{/if}} {{#if isReplaced}} <div class="item4 replacing-box"> <div class="gui-text field-container inline-block"> <div class="name gui-field">{{replacement}}</div> </div> </div> {{/if}} <div class="clear"></div> </div>{{/with}}');
View
2  priv/admin/js/templates/current_cluster_item.hbs
@@ -21,7 +21,7 @@
<div class="clear"></div>
</div>
<div class="item4 gui-text memory-box">
- {{#if available}}
+ {{#if reachable}}
<div class="membar-bg">
<div class="mem-colors">
<div class="erlang-mem mem-color" {{bindAttr style="memErlangStyle"}} {{bindAttr name="memErlangCeil"}}></div>
View
2  priv/admin/js/templates/current_nodes_item.hbs
@@ -26,7 +26,7 @@
<div class="clear"></div>
</div>
<div class="item5 gui-text memory-box">
- {{#if available}}
+ {{#if reachable}}
<div class="membar-bg">
<div class="mem-colors">
<div class="erlang-mem mem-color" {{bindAttr style="memErlangStyle"}} {{bindAttr name="memErlangCeil"}}></div>
View
9 rebar.config
@@ -10,12 +10,9 @@
{cover_enabled, true}.
{deps, [
- {webmachine, ".*",
- {git, "git://github.com/basho/webmachine", {tag, "1.10.2"}}},
- {riak_core, ".*",
- {git, "git://github.com/basho/riak_core", {tag, "1.4.1"}}},
- {erlydtl, ".*",
- {git, "git://github.com/evanmiller/erlydtl.git", {tag, "d20b53f0"}}}
+ {webmachine, ".*", {git, "git://github.com/basho/webmachine", {tag, "1.10.4"}}},
+ {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {tag, "1.4.12"}}},
+ {erlydtl, ".*", {git, "git://github.com/evanmiller/erlydtl.git", {tag, "d20b53f0"}}}
]}.
{plugin_dir, "src"}.
View
2  src/riak_control.app.src
@@ -1,7 +1,7 @@
{application, riak_control,
[
{description, "Riak Admin Interface"},
- {vsn, "1.4.1"},
+ {vsn, git},
{registered, []},
{applications, [
kernel,

No commit comments for this range

Something went wrong with that request. Please try again.