OFBiz › OFBiz - Commits

svn commit: r1781731 [35/45] - in /ofbiz/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/ applications/accounting/webapp/ap/error/ applications/accounting/webapp/ar/error/ applications/commonext/webapp/ofbizset...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r1781731 [35/45] - in /ofbiz/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/ applications/accounting/webapp/ap/error/ applications/accounting/webapp/ar/error/ applications/commonext/webapp/ofbizset...

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/libs/jquery.jstree.js
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/trunk/plugins/solr/webapp/solr/libs/ngtimeago.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/webapp/solr/libs/ngtimeago.js?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/webapp/solr/libs/ngtimeago.js (original)
+++ ofbiz/trunk/plugins/solr/webapp/solr/libs/ngtimeago.js Sun Feb 5 11:09:59 2017
@@ -1,102 +1,102 @@
-/*
-Copyright (c) 2014 Uttesh Kumar
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-'use strict';
-
-var catalyst = angular.module('ngtimeago', []);
-
-
-catalyst.filter('timeago', function() {
- return function(input, p_allowFuture) {
-
- if (input === undefined) {
- return "-";
- }
-
- var substitute = function (stringOrFunction, number, strings) {
- var string = angular.isFunction(stringOrFunction) ? stringOrFunction(number, dateDifference) : stringOrFunction;
- var value = (strings.numbers && strings.numbers[number]) || number;
- return string.replace(/%d/i, value);
- },
- nowTime = (new Date()).getTime(),
- date = (new Date(input)).getTime(),
- //refreshMillis= 6e4, //A minute
- allowFuture = p_allowFuture || false,
- strings= {
- prefixAgo: '',
- prefixFromNow: '',
- suffixAgo: "ago",
- suffixFromNow: "from now",
- seconds: "less than a minute",
- minute: "about a minute",
- minutes: "%d minutes",
- hour: "about an hour",
- hours: "about %d hours",
- day: "a day",
- days: "%d days",
- month: "about a month",
- months: "%d months",
- year: "about a year",
- years: "%d years"
- },
- dateDifference = nowTime - date,
- words,
- seconds = Math.abs(dateDifference) / 1000,
- minutes = seconds / 60,
- hours = minutes / 60,
- days = hours / 24,
- years = days / 365,
- separator = strings.wordSeparator === undefined ? " " : strings.wordSeparator,
-
-
- prefix = strings.prefixAgo,
- suffix = strings.suffixAgo;
-
- if (allowFuture) {
- if (dateDifference < 0) {
- prefix = strings.prefixFromNow;
- suffix = strings.suffixFromNow;
- }
- }
-
- words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) ||
- seconds < 90 && substitute(strings.minute, 1, strings) ||
- minutes < 45 && substitute(strings.minutes, Math.round(minutes), strings) ||
- minutes < 90 && substitute(strings.hour, 1, strings) ||
- hours < 24 && substitute(strings.hours, Math.round(hours), strings) ||
- hours < 42 && substitute(strings.day, 1, strings) ||
- days < 30 && substitute(strings.days, Math.round(days), strings) ||
- days < 45 && substitute(strings.month, 1, strings) ||
- days < 365 && substitute(strings.months, Math.round(days / 30), strings) ||
- years < 1.5 && substitute(strings.year, 1, strings) ||
- substitute(strings.years, Math.round(years), strings);
- console.log(prefix+words+suffix+separator);
- prefix.replace(/ /g, '')
- words.replace(/ /g, '')
- suffix.replace(/ /g, '')
- return (prefix+' '+words+' '+suffix+' '+separator);
-
- };
- });
-
-
-
+/*
+Copyright (c) 2014 Uttesh Kumar
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+'use strict';
+
+var catalyst = angular.module('ngtimeago', []);
+
+
+catalyst.filter('timeago', function() {
+ return function(input, p_allowFuture) {
+
+ if (input === undefined) {
+ return "-";
+ }
+
+ var substitute = function (stringOrFunction, number, strings) {
+ var string = angular.isFunction(stringOrFunction) ? stringOrFunction(number, dateDifference) : stringOrFunction;
+ var value = (strings.numbers && strings.numbers[number]) || number;
+ return string.replace(/%d/i, value);
+ },
+ nowTime = (new Date()).getTime(),
+ date = (new Date(input)).getTime(),
+ //refreshMillis= 6e4, //A minute
+ allowFuture = p_allowFuture || false,
+ strings= {
+ prefixAgo: '',
+ prefixFromNow: '',
+ suffixAgo: "ago",
+ suffixFromNow: "from now",
+ seconds: "less than a minute",
+ minute: "about a minute",
+ minutes: "%d minutes",
+ hour: "about an hour",
+ hours: "about %d hours",
+ day: "a day",
+ days: "%d days",
+ month: "about a month",
+ months: "%d months",
+ year: "about a year",
+ years: "%d years"
+ },
+ dateDifference = nowTime - date,
+ words,
+ seconds = Math.abs(dateDifference) / 1000,
+ minutes = seconds / 60,
+ hours = minutes / 60,
+ days = hours / 24,
+ years = days / 365,
+ separator = strings.wordSeparator === undefined ? " " : strings.wordSeparator,
+
+
+ prefix = strings.prefixAgo,
+ suffix = strings.suffixAgo;
+
+ if (allowFuture) {
+ if (dateDifference < 0) {
+ prefix = strings.prefixFromNow;
+ suffix = strings.suffixFromNow;
+ }
+ }
+
+ words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) ||
+ seconds < 90 && substitute(strings.minute, 1, strings) ||
+ minutes < 45 && substitute(strings.minutes, Math.round(minutes), strings) ||
+ minutes < 90 && substitute(strings.hour, 1, strings) ||
+ hours < 24 && substitute(strings.hours, Math.round(hours), strings) ||
+ hours < 42 && substitute(strings.day, 1, strings) ||
+ days < 30 && substitute(strings.days, Math.round(days), strings) ||
+ days < 45 && substitute(strings.month, 1, strings) ||
+ days < 365 && substitute(strings.months, Math.round(days / 30), strings) ||
+ years < 1.5 && substitute(strings.year, 1, strings) ||
+ substitute(strings.years, Math.round(years), strings);
+ console.log(prefix+words+suffix+separator);
+ prefix.replace(/ /g, '')
+ words.replace(/ /g, '')
+ suffix.replace(/ /g, '')
+ return (prefix+' '+words+' '+suffix+' '+separator);
+
+ };
+ });
+
+
+

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/libs/ngtimeago.js
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/trunk/plugins/solr/webapp/solr/partials/analysis.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/webapp/solr/partials/analysis.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/webapp/solr/partials/analysis.html (original)
+++ ofbiz/trunk/plugins/solr/webapp/solr/partials/analysis.html Sun Feb 5 11:09:59 2017
@@ -1,128 +1,128 @@
-
-<div id="analysis">
-
- <div class="block analysis-error" id="analysis-handler-missing" ng-show="isHandlerMissing">
- <div class="head">This Functionality requires the <code>/analysis/field</code> Handler to be registered and active!</div>
- </div>
-
- <div class="block analysis-error" id="analysis-error" ng-show="analysisError">
- <div class="body">{{analysisError}}</div>
- </div>
-
- <div id="analysis-holder">
-
- <div id="field-analysis">
-
- <form method="get">
-
- <ul class="clearfix">
-
- <li class="index">
-
- <label for="analysis_fieldvalue_index">Field Value (Index)</label>
- <textarea name="analysis.fieldvalue" id="analysis_fieldvalue_index" ng-model="indexText"></textarea>
-
- </li>
-
- <li class="query">
-
- <label for="analysis_fieldvalue_query">Field Value (Query)</label>
- <textarea name="analysis.query" id="analysis_fieldvalue_query" ng-model="queryText"></textarea>
-
- </li>
-
- <li class="settings-holder clearfix">
- <div class="settings clearfix">
- <label for="type_or_name">Analyse Fieldname / FieldType:</label>
- <select style="width:130px" chosen ng-change="changeFieldOrType()" id="type_or_name" ng-model="fieldOrType" ng-options="f.value as f.label group by f.group for f in fieldsAndTypes"></select>
-
- <a id="tor_schema" ng-href="#/{{core}}/schema?{{schemaBrowserUrl}}"><span>Schema Browser</span> </a>
-
- <div class="buttons clearfix">
-
- <button type="submit" ng-click="updateQueryString()"><span>Analyse Values</span></button>
-
- <div class="verbose_output" ng-class="{active:verbose}">
- <a ng-click="toggleVerbose()">Verbose Output</a>
- </div>
-
- </div>
-
- </div>
- </li>
-
- </ul>
-
- </form>
-
- </div>
-
- <div id="analysis-result" class="clearfix verbose_output">
- <div ng-class="key" ng-repeat="(key, type) in result">
- <table border="0" cellspacing="0" cellpadding="0">
- <tbody ng-repeat="component in type">
- <tr class="step">
- <td class="part analyzer">
- <div>
- <abbr title="{{component.name}}">{{component.short}}</abbr>
- </div>
- </td>
-
- <td class="part legend" ng-show="verbose">
- <div class="holder">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td>
- <table border="0" cellspacing="0" cellpadding="0">
- <tr ng-repeat="caption in component.captions" class="{{generate_class_name( short_key )}}">
- <td>{{ caption }}</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </td>
- <td class="part data" ng-class="{spacer:token.blank}" colspan="1" ng-repeat="token in component.tokens track by token.index">
- <div class="holder" ng-hide="token.blank">
- <table border="0" cellspacing="0" cellpadding="0">
- <tbody>
- <tr class="details">
- <td class="details">
- <table border="0" cellspacing="0" cellpadding="0">
- <tbody>
- <tr class="{{value.name}}" ng-repeat="value in token.keys" ng-show="verbose || value.name=='text'">
- <td>{{value.value}}</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="holder" ng-show="token.blank"> </div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
-
-</div>
+
+<div id="analysis">
+
+ <div class="block analysis-error" id="analysis-handler-missing" ng-show="isHandlerMissing">
+ <div class="head">This Functionality requires the <code>/analysis/field</code> Handler to be registered and active!</div>
+ </div>
+
+ <div class="block analysis-error" id="analysis-error" ng-show="analysisError">
+ <div class="body">{{analysisError}}</div>
+ </div>
+
+ <div id="analysis-holder">
+
+ <div id="field-analysis">
+
+ <form method="get">
+
+ <ul class="clearfix">
+
+ <li class="index">
+
+ <label for="analysis_fieldvalue_index">Field Value (Index)</label>
+ <textarea name="analysis.fieldvalue" id="analysis_fieldvalue_index" ng-model="indexText"></textarea>
+
+ </li>
+
+ <li class="query">
+
+ <label for="analysis_fieldvalue_query">Field Value (Query)</label>
+ <textarea name="analysis.query" id="analysis_fieldvalue_query" ng-model="queryText"></textarea>
+
+ </li>
+
+ <li class="settings-holder clearfix">
+ <div class="settings clearfix">
+ <label for="type_or_name">Analyse Fieldname / FieldType:</label>
+ <select style="width:130px" chosen ng-change="changeFieldOrType()" id="type_or_name" ng-model="fieldOrType" ng-options="f.value as f.label group by f.group for f in fieldsAndTypes"></select>
+
+ <a id="tor_schema" ng-href="#/{{core}}/schema?{{schemaBrowserUrl}}"><span>Schema Browser</span> </a>
+
+ <div class="buttons clearfix">
+
+ <button type="submit" ng-click="updateQueryString()"><span>Analyse Values</span></button>
+
+ <div class="verbose_output" ng-class="{active:verbose}">
+ <a ng-click="toggleVerbose()">Verbose Output</a>
+ </div>
+
+ </div>
+
+ </div>
+ </li>
+
+ </ul>
+
+ </form>
+
+ </div>
+
+ <div id="analysis-result" class="clearfix verbose_output">
+ <div ng-class="key" ng-repeat="(key, type) in result">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tbody ng-repeat="component in type">
+ <tr class="step">
+ <td class="part analyzer">
+ <div>
+ <abbr title="{{component.name}}">{{component.short}}</abbr>
+ </div>
+ </td>
+
+ <td class="part legend" ng-show="verbose">
+ <div class="holder">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr ng-repeat="caption in component.captions" class="{{generate_class_name( short_key )}}">
+ <td>{{ caption }}</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+ <td class="part data" ng-class="{spacer:token.blank}" colspan="1" ng-repeat="token in component.tokens track by token.index">
+ <div class="holder" ng-hide="token.blank">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr class="details">
+ <td class="details">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr class="{{value.name}}" ng-repeat="value in token.keys" ng-show="verbose || value.name=='text'">
+ <td>{{value.value}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="holder" ng-show="token.blank"> </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+</div>

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/partials/analysis.html
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/trunk/plugins/solr/webapp/solr/partials/cloud.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/webapp/solr/partials/cloud.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/webapp/solr/partials/cloud.html (original)
+++ ofbiz/trunk/plugins/solr/webapp/solr/partials/cloud.html Sun Feb 5 11:09:59 2017
@@ -1,105 +1,105 @@
-
-<div id="cloud" class="clearfix">
-
- <div id="frame">
-
- <div id="tree-content" class="content clearfix" ng-show="showTree">
- <jstree class="tree" on-select="showTreeLink(url)" id="tree" data="tree"></jstree>
-
- <div id="file-content" class="clearfix">
-
- <a id="toggle" ng-click="showProps = !showProps" ng-show="showData" ng-class="showProps ? 'minus' : 'plus'">Metadata</a>
- <div id="prop" ng-show="znode.prop && showData && showProps">
- <ul>
- <li ng-class="{odd:$odd}" ng-repeat="(key, prop) in znode.prop">
- <dl class="clearfix">
- <dt>{{ key }}</dt>
- <dd>{{ prop }}</dd>
- </dl>
- </li>
- </ul>
- </div>
-
- <div id="data" ng-show="showData">
- <em ng-show="!znode.data">Node "{{znode.path }}" has no utf8 Content</em>
- <pre ng-show="znode.data" class="syntax language-{{lang}}"
- ng-bind-html="znode.data | highlight:lang | unsafe">
- </pre>
- <a class="close" ng-click="hideData()"><span> </span></a>
- </div>
-
-
- </div>
-
- </div>
-
- <div graph data="graphData" leaf-count="leafCount" helper-data="helperData" is-radial="isRadial" id="graph-content" class="content clearfix" ng-show="showGraph">
-
- <div id="canvas"></div>
-
- <div id="legend">
- <ul>
- <li class="leader"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Leader</li>
- <li class="active"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Active</li>
- <li class="recovering"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Recovering</li>
- <li class="down"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Down</li>
- <li class="recovery_failed"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Recovery Failed</li>
- <li class="gone"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Gone</li>
- </ul>
- </div>
- <div style="width: 100%; text-align: center;" ng-show="showPaging">
- <div id="cloudGraphPaging">
- <button ng-show="prevEnabled" ng-click="previous()" id="cloudGraphPagingPrev">< Previous</button>
- <span ng-show="total==0">No collections found.</span>
- <span ng-hide="total==0">Collections {{start}} - {{last}} of {{total}}.</span> 
-
- Filter by: <select ng-model="filterType" ng-change="initGraph()" id="cloudGraphPagingFilterType">
- <option value="status">Status</option>
- <option value="name">Name</option>
- </select> T:{{filterType}}
-
- <span ng-show="filterType=='status'">
- <select ng-model="pagingStatusFilter" id="cloudGraphPagingStatusFilter" ng-change="resetGraph()">
- <option value=""> - Any - </option>
- <option value="healthy">Healthy</option>
- <option value="degraded">Degraded</option>
- <option value="downed_shard">Downed Shard</option>
- <option value="recovering">Replica in Recovery</option>
- </select>
- </span>
- <span ng-show="filterType=='name'">
- <input ng-model="pagingFilter" type="text" size="10" name="filter" ng-change="resetGraph()"/> 
- </span>
- Show <input ng-model="rows" ng-change="resetGraph()" type="text" size="2" name="rows" /> per page.
- <button ng-show="nextEnabled" ng-click="next()">Next ></button>
- </div>
- </div>
-
- </div>
-
- </div>
-
- <div id="debug" ng-show="showDebug">
- <ul class="clearfix">
- <li class="clipboard"><a href="#" data-copied="Copied to Clipboard!">Copy to Clipboard (BUGGY!)</a></li>
- <li class="close"><a ng-click="closeDebug()">Close</a></li>
- </ul>
- <pre class="debug"></pre>
- </div>
-
-</div>
+
+<div id="cloud" class="clearfix">
+
+ <div id="frame">
+
+ <div id="tree-content" class="content clearfix" ng-show="showTree">
+ <jstree class="tree" on-select="showTreeLink(url)" id="tree" data="tree"></jstree>
+
+ <div id="file-content" class="clearfix">
+
+ <a id="toggle" ng-click="showProps = !showProps" ng-show="showData" ng-class="showProps ? 'minus' : 'plus'">Metadata</a>
+ <div id="prop" ng-show="znode.prop && showData && showProps">
+ <ul>
+ <li ng-class="{odd:$odd}" ng-repeat="(key, prop) in znode.prop">
+ <dl class="clearfix">
+ <dt>{{ key }}</dt>
+ <dd>{{ prop }}</dd>
+ </dl>
+ </li>
+ </ul>
+ </div>
+
+ <div id="data" ng-show="showData">
+ <em ng-show="!znode.data">Node "{{znode.path }}" has no utf8 Content</em>
+ <pre ng-show="znode.data" class="syntax language-{{lang}}"
+ ng-bind-html="znode.data | highlight:lang | unsafe">
+ </pre>
+ <a class="close" ng-click="hideData()"><span> </span></a>
+ </div>
+
+
+ </div>
+
+ </div>
+
+ <div graph data="graphData" leaf-count="leafCount" helper-data="helperData" is-radial="isRadial" id="graph-content" class="content clearfix" ng-show="showGraph">
+
+ <div id="canvas"></div>
+
+ <div id="legend">
+ <ul>
+ <li class="leader"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Leader</li>
+ <li class="active"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Active</li>
+ <li class="recovering"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Recovering</li>
+ <li class="down"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Down</li>
+ <li class="recovery_failed"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Recovery Failed</li>
+ <li class="gone"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Gone</li>
+ </ul>
+ </div>
+ <div style="width: 100%; text-align: center;" ng-show="showPaging">
+ <div id="cloudGraphPaging">
+ <button ng-show="prevEnabled" ng-click="previous()" id="cloudGraphPagingPrev">< Previous</button>
+ <span ng-show="total==0">No collections found.</span>
+ <span ng-hide="total==0">Collections {{start}} - {{last}} of {{total}}.</span> 
+
+ Filter by: <select ng-model="filterType" ng-change="initGraph()" id="cloudGraphPagingFilterType">
+ <option value="status">Status</option>
+ <option value="name">Name</option>
+ </select> T:{{filterType}}
+
+ <span ng-show="filterType=='status'">
+ <select ng-model="pagingStatusFilter" id="cloudGraphPagingStatusFilter" ng-change="resetGraph()">
+ <option value=""> - Any - </option>
+ <option value="healthy">Healthy</option>
+ <option value="degraded">Degraded</option>
+ <option value="downed_shard">Downed Shard</option>
+ <option value="recovering">Replica in Recovery</option>
+ </select>
+ </span>
+ <span ng-show="filterType=='name'">
+ <input ng-model="pagingFilter" type="text" size="10" name="filter" ng-change="resetGraph()"/> 
+ </span>
+ Show <input ng-model="rows" ng-change="resetGraph()" type="text" size="2" name="rows" /> per page.
+ <button ng-show="nextEnabled" ng-click="next()">Next ></button>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+
+ <div id="debug" ng-show="showDebug">
+ <ul class="clearfix">
+ <li class="clipboard"><a href="#" data-copied="Copied to Clipboard!">Copy to Clipboard (BUGGY!)</a></li>
+ <li class="close"><a ng-click="closeDebug()">Close</a></li>
+ </ul>
+ <pre class="debug"></pre>
+ </div>
+
+</div>

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/partials/cloud.html
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/trunk/plugins/solr/webapp/solr/partials/collection_overview.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/webapp/solr/partials/collection_overview.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/webapp/solr/partials/collection_overview.html (original)
+++ ofbiz/trunk/plugins/solr/webapp/solr/partials/collection_overview.html Sun Feb 5 11:09:59 2017
@@ -1,85 +1,85 @@
-
-<div id="dashboard">
-
- <div class="clearfix">
-
- <div id="collection" class="block fieldlist">
-
- <h2><span>Collection: {{selectedCollection.name}}</span></h2>
-
- <div class="content">
-
- <dl>
-
- <dt>Config name:</dt>
- <dd class="value">{{selectedCollection.configName}}</dd>
-
- <dt>Max shards per node:</dt>
- <dd class="value">{{selectedCollection.maxShardsPerNode}}</dd>
-
- <dt>Replication factor:</dt>
- <dd class="value">{{selectedCollection.replicationFactor}}</dd>
-
- <dt>Auto-add replicas:</dt>
- <dd class="ico value" ng-class="selectedCollection.autoAddReplicas=='true' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
-
- <dt>Router name:</dt>
- <dd class="value">{{selectedCollection.router.name}}</dd>
-
- </dl>
-
- </div>
- </div>
-
- <div id="shards" class="block fieldlist">
-
- <h2><span>Shards</span></h2>
-
- <div>
-
- <div class="shard" ng-repeat="(name, shard) in selectedCollection.shards">
- <a ng-click="hideShard(shard)"><h3 class="shard-title">{{name}}</h3></a>
- <dl class="shard-detail clearfix" ng-hide="shard.hide">
- <dt>Range:</dt>
- <dd class="value">{{ shard.range }}</dd>
-
- <dt>Active:</dt>
- <dd class="ico value" ng-class="shard.state='active' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
-
- <dt>Replicas:</dt>
- <dd>
- <div class="replica clearfix {{$odd?'odd':''}}" ng-repeat="(name, replica) in shard.replicas">
- <a ng-click="showReplica(replica)"><h3>{{replica.core}}</h3></a>
- <dl ng-show="replica.show">
- <dt>Base URL: </dt><dd>{{replica.base_url}}</dd>
- <dt>Core: </dt><dd><a href="{{replica.base_url}}{{rootUrl}}#/{{replica.core}}">{{replica.core}}</a></dd>
- <dt>Active: </dt>
- <dd class="ico value" ng-class="replica.state == 'active' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
- <dt>Leader: </dt>
- <dd class="ico value" ng-class="replica.leader == 'true' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
- </dl>
- </div>
-
- </dd>
- </dl>
- </div>
- </div>
-
- </div>
-
-</div>
+
+<div id="dashboard">
+
+ <div class="clearfix">
+
+ <div id="collection" class="block fieldlist">
+
+ <h2><span>Collection: {{selectedCollection.name}}</span></h2>
+
+ <div class="content">
+
+ <dl>
+
+ <dt>Config name:</dt>
+ <dd class="value">{{selectedCollection.configName}}</dd>
+
+ <dt>Max shards per node:</dt>
+ <dd class="value">{{selectedCollection.maxShardsPerNode}}</dd>
+
+ <dt>Replication factor:</dt>
+ <dd class="value">{{selectedCollection.replicationFactor}}</dd>
+
+ <dt>Auto-add replicas:</dt>
+ <dd class="ico value" ng-class="selectedCollection.autoAddReplicas=='true' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
+
+ <dt>Router name:</dt>
+ <dd class="value">{{selectedCollection.router.name}}</dd>
+
+ </dl>
+
+ </div>
+ </div>
+
+ <div id="shards" class="block fieldlist">
+
+ <h2><span>Shards</span></h2>
+
+ <div>
+
+ <div class="shard" ng-repeat="(name, shard) in selectedCollection.shards">
+ <a ng-click="hideShard(shard)"><h3 class="shard-title">{{name}}</h3></a>
+ <dl class="shard-detail clearfix" ng-hide="shard.hide">
+ <dt>Range:</dt>
+ <dd class="value">{{ shard.range }}</dd>
+
+ <dt>Active:</dt>
+ <dd class="ico value" ng-class="shard.state='active' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
+
+ <dt>Replicas:</dt>
+ <dd>
+ <div class="replica clearfix {{$odd?'odd':''}}" ng-repeat="(name, replica) in shard.replicas">
+ <a ng-click="showReplica(replica)"><h3>{{replica.core}}</h3></a>
+ <dl ng-show="replica.show">
+ <dt>Base URL: </dt><dd>{{replica.base_url}}</dd>
+ <dt>Core: </dt><dd><a href="{{replica.base_url}}{{rootUrl}}#/{{replica.core}}">{{replica.core}}</a></dd>
+ <dt>Active: </dt>
+ <dd class="ico value" ng-class="replica.state == 'active' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
+ <dt>Leader: </dt>
+ <dd class="ico value" ng-class="replica.leader == 'true' ? 'ico-1' : 'ico-0'"><span>yes</span></dd>
+ </dl>
+ </div>
+
+ </dd>
+ </dl>
+ </div>
+ </div>
+
+ </div>
+
+</div>

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/partials/collection_overview.html
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/trunk/plugins/solr/webapp/solr/partials/collections.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/webapp/solr/partials/collections.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/webapp/solr/partials/collections.html (original)
+++ ofbiz/trunk/plugins/solr/webapp/solr/partials/collections.html Sun Feb 5 11:09:59 2017
@@ -1,343 +1,343 @@
-
-<div id="collections" class="clearfix empty">
-
- <div id="ui-block" style="display:none"> </div>
-
- <div id="frame">
-
- <div id="actions" class="actions clearfix">
-
- <button id="add" class="action" ng-click="showAddCollection()"><span>Add Collection</span></button>
-
- <button id="delete" class="warn requires-core" ng-click="showDeleteCollection()" ng-show="collection"><span>Delete</span></button>
- <button id="reload" class="requires-core" ng-click="reloadCollection()" ng-show="collection"
- ng-class="{success: reloadSuccess, warn: reloadFailure}"><span>Reload</span></button>
- <button id="create-alias" class="action requires-core" ng-click="toggleCreateAlias()"><span>Create Alias</span></button>
- <button id="delete-alias" class="action requires-core" ng-click="toggleDeleteAlias()"><span>Delete Alias</span></button>
-
- <div class="action add" data-rel="add" ng-show="showAdd" style="left:0px">
-
- <form>
-
- <p class="clearfix"><label for="add_name">name:</label>
- <input type="text" name="name" id="add_name" ng-model="newCollection.name" placeholder="new collection"></p>
-
- <p class="clearfix"><label for="add_config">config set:</label> 
- <select chosen ng-options="config.name as config.name for config in configs" name="config_name" id="add_config" ng-model="newCollection.configName">
- </select>
- </p>
-
- <p class="clearfix"><label for="add_numShards">numShards:</label>
- <input type="text" name="numShards" id="add_numShards" ng-model="newCollection.numShards"></p>
-
- <p class="clearfix"><label for="add_replicationFactor">replicationFactor:</label>
- <input type="text" name="replicationFactor" id="add_replicationFactor" ng-model="newCollection.replicationFactor"></p>
-
- <p class="clearfix"><a ng-click="showAdvanced=!showAdvanced">
- <span id="add_advanced" ng-class="{open: showAdvanced}">Show advanced</span></a></p>
- <div ng-show="showAdvanced">
-
- <p>Advanced options: </p>
- <p class="clearfix"><label for="add_router_name">router:</label>
- <select name="routerName" id="add_router_name" ng-model="newCollection.routerName">
- <option value="compositeId">Composite ID</option>
- <option value="implicit">Implicit</option>
- </select>
- </p>
-
- <p class="clearfix"><label for="add_maxShardsPerNode">maxShardsPerNode:</label>
- <input type="text" name="replicationFactor" id="add_maxShardsPerNode" ng-model="newCollection.maxShardsPerNode"></p>
-
- <p class="clearfix"><label for="add_shards">shards:</label>
- <input type="text" name="shards" id="add_shards" ng-model="newCollection.shards"></p>
-
- <p class="clearfix"><label for="add_routerField">routerField:</label>
- <input type="text" name="routerField" id="add_routerField" ng-model="newCollection.routerField"></p>
-
- </div>
- <p class="clearfix note error" ng-show="addMessage">
- <span>{{addMessage}}</span>
- </p>
-
- <p class="clearfix buttons">
- <button type="submit" class="submit" ng-click="addCollection()"><span>Add Collection</span></button>
- <button type="reset" class="reset" ng-click="cancelAddCollection()"><span>Cancel</span></button>
- </p>
-
- </form>
-
- </div>
-
- <div class="action delete" ng-show="showDelete">
-
- <form>
-
- <p>Please type collection name to confirm deletion:</p>
- <p class="clearfix"><label for="collectiondeleteConfirm">Collection</label>
- <input type="text" ng-model="collectionDeleteConfirm" id="collectionDeleteConfirm"></p>
-
- <p class="clearfix note error" ng-show="deleteMessage">
- <span>{{deleteMessage}}</span>
- </p>
-
- <p class="clearfix buttons">
- <button class="submit" ng-click="deleteCollection()"><span>Delete</span></button>
- <button type="reset" class="reset" ng-click="showDelete=false"><span>Cancel</span></button>
- </p>
- </form>
-
- </div>
-
- <div class="action create-alias" ng-show="showCreateAlias">
-
- <form>
-
- <input type="hidden" name="core" data-core="current">
-
- <p class="clearfix"><label for="alias">Alias Name:</label>
- <input type="text" name="alias" ng-model="aliasToCreate" id="alias"></p>
-
- <p class="clearfix"><label for="aliasCollections">Collections:</label>
- <select multiple id="aliasCollections" ng-model="aliasCollections" ng-options="collection.name for collection in collections" class="other">
- </select></p>
-
-
- <p class="clearfix note error" ng-show="renameMessage">
- <span>{{renameMessage}}</span>
- </p>
-
- <p class="clearfix buttons">
- <button class="submit" ng-click="createAlias()"><span>Create Alias</span></button>
- <button type="reset" class="reset" ng-click="cancelCreateAlias()"><span>Cancel</span></button>
- </p>
- </form>
-
- </div>
-
- <div class="action delete-alias" ng-show="showDeleteAlias">
-
- <form>
- <span ng-show="aliases">
- <p class="clearfix"><label for="deleteAlias">Alias:</label>
- <select id="deleteAlias" ng-model="aliasToDelete" ng-options="alias as alias for (alias, collections) in aliases" class="other">
- </select></p>
-
- <p class="clearfix note error" ng-show="swapMessage">
- <span>{{swapMessage}}</span>
- </p>
-
- <p class="clearfix buttons">
- <button type="submit" class="submit" ng-click="deleteAlias()"><span>Delete Alias</span></button>
- <button type="reset" class="reset" ng-click="cancelDeleteAlias()"><span>Cancel</span></button>
- </p>
- </span>
- <span ng-hide="aliases">
- <p>No aliases to delete.</p>
- <p class="clearfix buttons">
- <button type="reset" class="reset" ng-click="cancelDeleteAlias()"><span>Cancel</span></button>
- </p>
- </span>
-
- </form>
-
- </div>
-
- </div>
-
-
- <div class="requires-core" ng-hide="collection">
- <h2>Please select a collection</h2>
- </div>
-
- <div id="data" class="requires-core clearfix" ng-show="collection">
-
- <div class="block" id="collection-data">
-
- <h2>Collection: {{collection.name}}</h2>
-
- <div class="message-container">
- <div class="message"></div>
- </div>
-
- <div class="content">
-
- <ul>
-
- <li>
- <dl class="clearfix">
- <dt><span>Shard count:</span></dt>
- <dd>{{collection.shards.length}}</dd>
- </dl>
- </li>
- <li><dl class="clearfix">
- <dt><span>configName:</span></dt>
- <dd>{{collection.configName}}</dd>
- </dl></li>
-
- <li><dl class="clearfix">
- <dt><span>replicationFactor:</span></dt>
- <dd>{{collection.replicationFactor}}</dd>
- </dl></li>
-
- <li><dl class="clearfix">
- <dt><span>maxShardsPerNode:</span></dt>
- <dd>{{collection.maxShardsPerNode}}</dd>
- </dl></li>
-
- <li><dl class="clearfix">
- <dt><span>router:</span></dt>
- <dd>{{collection.router.name}}</dd>
- </dl></li>
-
- <li><dl class="clearfix">
- <dt><span>autoAddReplicas:</span></dt>
- <dd>{{collection.autoAddReplicas}}</dd>
- </dl></li>
- </ul>
-
- </div>
- </div>
-
- <div class="block" id="shard-data">
- <div class="content shard" ng-repeat="shard in collection.shards">
- <a ng-click="toggleShard(shard)"><h2><span ng-class="{open:shard.show}">Shard: {{shard.name}}</span></h2></a>
- <ul ng-show="shard.show">
- <li>
- <ul>
- <li>
- <dl class="clearfix">
- <dt><span>state:</span></dt>
- <dd>{{shard.state}}</dd>
- </dl>
- </li>
- <li>
- <dl class="clearfix">
- <dt><span>range:</span></dt>
- <dd>{{shard.range}}</dd>
- </dl>
- <br/>
- </li>
- <li>
- <ul class="replica" ng-repeat="replica in shard.replicas">
- <li>
- <h2>
- <a ng-click="toggleReplica(replica)">
- <span class="openReplica" ng-class="{open:replica.show}">Replica: {{replica.name}}</span>
- </a>
- <div style="float:right"><a ng-click="toggleRemoveReplica(replica)"><span class="rem"></span></a></div>
- </h2>
- </li>
- <li>
- <ul ng-show="replica.showRemove">
- <li>
- <form class="delete-replica">
-
- <p class="clearfix"><em>Are you sure you want to delete this replica?</em></p>
-
- <p class="clearfix buttons">
- <button class="submit" ng-class="{success: replica.deleted}" ng-click="deleteReplica(replica)"><span>Delete Replica</span></button>
- <button type="reset" class="reset" ng-click="toggleRemoveReplica(replica)"><span>Cancel</span></button>
- </p>
- </form>
- </li>
- </ul>
- <ul ng-show="replica.show">
- <li>
- <dl class="clearfix">
- <dt><span>core:</span></dt>
- <dd>{{replica.core}}</dd>
- </dl>
- </li>
-
- <li>
- <dl class="clearfix">
- <dt><span>base URL:</span></dt>
- <dd><a ng-href="{{replica.base_url}}{{rootUrl}}">{{replica.base_url}}</a></dd>
- </dl>
- </li>
-
- <li>
- <dl class="clearfix">
- <dt><span>node name:</span></dt>
- <dd>{{replica.node_name}}</dd>
- </dl>
- </li>
-
- <li>
- <dl class="clearfix">
- <dt><span>state:</span></dt>
- <dd>{{replica.state}}</dd>
- </dl>
- </li>
-
- <li>
- <dl class="clearfix">
- <dt><span>leader:</span></dt>
- <dd class="ico" ng-class="replica.leader ?'ico-1' : 'ico-0'"><span></span></dd>
- </dl>
- </li>
- </ul>
- </li>
-
- </ul>
- </li>
- <li ng-hide="shard.showAdd">
- <span class="actions replica">
- <button class="action" id="add-replica" ng-click="toggleAddReplica(shard)"><span>add replica</span></button>
- </span>
- </li>
- </ul>
- <div class="action add-replica" ng-show="shard.showAdd">
-
- <form>
-
- <p id="node-name" class="clearfix"><label for="node-name">Node:</label>
- <select chosen ng-model="shard.replicaNodeName" ng-options="node for node in nodes" class="other">
- <option value="">No specified node</option>
- </select>
- node: {{shard.replicaNodeName}}
- </p>
-
- <p class="clearfix note error" ng-show="createReplicaMessage">
- <span>{{createReplicaMessage}}</span>
- </p>
-
- <p class="clearfix buttons">
- <button class="submit delete" ng-class="{success: shard.replicaAdded}" ng-click="addReplica(shard)"><span>Create Replica</span></button>
- <button type="reset" class="reset" ng-click="toggleAddReplica(shard)"><span>Cancel</span></button>
- </p>
- <p clas="clearfix"> </p>
- </form>
-
- </div>
- </li>
- </ul>
- </div>
- </div>
-
- </div>
-
- </div>
-
- <div id="navigation" class="requires-core clearfix">
- <ul>
- <li ng-repeat="c in collections" ng-class="{current: collection.name == c.name}"><a href="#~collections/{{c.name}}">{{c.name}}</a></li>
- </ul>
- </div>
-
-</div>
+
+<div id="collections" class="clearfix empty">
+
+ <div id="ui-block" style="display:none"> </div>
+
+ <div id="frame">
+
+ <div id="actions" class="actions clearfix">
+
+ <button id="add" class="action" ng-click="showAddCollection()"><span>Add Collection</span></button>
+
+ <button id="delete" class="warn requires-core" ng-click="showDeleteCollection()" ng-show="collection"><span>Delete</span></button>
+ <button id="reload" class="requires-core" ng-click="reloadCollection()" ng-show="collection"
+ ng-class="{success: reloadSuccess, warn: reloadFailure}"><span>Reload</span></button>
+ <button id="create-alias" class="action requires-core" ng-click="toggleCreateAlias()"><span>Create Alias</span></button>
+ <button id="delete-alias" class="action requires-core" ng-click="toggleDeleteAlias()"><span>Delete Alias</span></button>
+
+ <div class="action add" data-rel="add" ng-show="showAdd" style="left:0px">
+
+ <form>
+
+ <p class="clearfix"><label for="add_name">name:</label>
+ <input type="text" name="name" id="add_name" ng-model="newCollection.name" placeholder="new collection"></p>
+
+ <p class="clearfix"><label for="add_config">config set:</label> 
+ <select chosen ng-options="config.name as config.name for config in configs" name="config_name" id="add_config" ng-model="newCollection.configName">
+ </select>
+ </p>
+
+ <p class="clearfix"><label for="add_numShards">numShards:</label>
+ <input type="text" name="numShards" id="add_numShards" ng-model="newCollection.numShards"></p>
+
+ <p class="clearfix"><label for="add_replicationFactor">replicationFactor:</label>
+ <input type="text" name="replicationFactor" id="add_replicationFactor" ng-model="newCollection.replicationFactor"></p>
+
+ <p class="clearfix"><a ng-click="showAdvanced=!showAdvanced">
+ <span id="add_advanced" ng-class="{open: showAdvanced}">Show advanced</span></a></p>
+ <div ng-show="showAdvanced">
+
+ <p>Advanced options: </p>
+ <p class="clearfix"><label for="add_router_name">router:</label>
+ <select name="routerName" id="add_router_name" ng-model="newCollection.routerName">
+ <option value="compositeId">Composite ID</option>
+ <option value="implicit">Implicit</option>
+ </select>
+ </p>
+
+ <p class="clearfix"><label for="add_maxShardsPerNode">maxShardsPerNode:</label>
+ <input type="text" name="replicationFactor" id="add_maxShardsPerNode" ng-model="newCollection.maxShardsPerNode"></p>
+
+ <p class="clearfix"><label for="add_shards">shards:</label>
+ <input type="text" name="shards" id="add_shards" ng-model="newCollection.shards"></p>
+
+ <p class="clearfix"><label for="add_routerField">routerField:</label>
+ <input type="text" name="routerField" id="add_routerField" ng-model="newCollection.routerField"></p>
+
+ </div>
+ <p class="clearfix note error" ng-show="addMessage">
+ <span>{{addMessage}}</span>
+ </p>
+
+ <p class="clearfix buttons">
+ <button type="submit" class="submit" ng-click="addCollection()"><span>Add Collection</span></button>
+ <button type="reset" class="reset" ng-click="cancelAddCollection()"><span>Cancel</span></button>
+ </p>
+
+ </form>
+
+ </div>
+
+ <div class="action delete" ng-show="showDelete">
+
+ <form>
+
+ <p>Please type collection name to confirm deletion:</p>
+ <p class="clearfix"><label for="collectiondeleteConfirm">Collection</label>
+ <input type="text" ng-model="collectionDeleteConfirm" id="collectionDeleteConfirm"></p>
+
+ <p class="clearfix note error" ng-show="deleteMessage">
+ <span>{{deleteMessage}}</span>
+ </p>
+
+ <p class="clearfix buttons">
+ <button class="submit" ng-click="deleteCollection()"><span>Delete</span></button>
+ <button type="reset" class="reset" ng-click="showDelete=false"><span>Cancel</span></button>
+ </p>
+ </form>
+
+ </div>
+
+ <div class="action create-alias" ng-show="showCreateAlias">
+
+ <form>
+
+ <input type="hidden" name="core" data-core="current">
+
+ <p class="clearfix"><label for="alias">Alias Name:</label>
+ <input type="text" name="alias" ng-model="aliasToCreate" id="alias"></p>
+
+ <p class="clearfix"><label for="aliasCollections">Collections:</label>
+ <select multiple id="aliasCollections" ng-model="aliasCollections" ng-options="collection.name for collection in collections" class="other">
+ </select></p>
+
+
+ <p class="clearfix note error" ng-show="renameMessage">
+ <span>{{renameMessage}}</span>
+ </p>
+
+ <p class="clearfix buttons">
+ <button class="submit" ng-click="createAlias()"><span>Create Alias</span></button>
+ <button type="reset" class="reset" ng-click="cancelCreateAlias()"><span>Cancel</span></button>
+ </p>
+ </form>
+
+ </div>
+
+ <div class="action delete-alias" ng-show="showDeleteAlias">
+
+ <form>
+ <span ng-show="aliases">
+ <p class="clearfix"><label for="deleteAlias">Alias:</label>
+ <select id="deleteAlias" ng-model="aliasToDelete" ng-options="alias as alias for (alias, collections) in aliases" class="other">
+ </select></p>
+
+ <p class="clearfix note error" ng-show="swapMessage">
+ <span>{{swapMessage}}</span>
+ </p>
+
+ <p class="clearfix buttons">
+ <button type="submit" class="submit" ng-click="deleteAlias()"><span>Delete Alias</span></button>
+ <button type="reset" class="reset" ng-click="cancelDeleteAlias()"><span>Cancel</span></button>
+ </p>
+ </span>
+ <span ng-hide="aliases">
+ <p>No aliases to delete.</p>
+ <p class="clearfix buttons">
+ <button type="reset" class="reset" ng-click="cancelDeleteAlias()"><span>Cancel</span></button>
+ </p>
+ </span>
+
+ </form>
+
+ </div>
+
+ </div>
+
+
+ <div class="requires-core" ng-hide="collection">
+ <h2>Please select a collection</h2>
+ </div>
+
+ <div id="data" class="requires-core clearfix" ng-show="collection">
+
+ <div class="block" id="collection-data">
+
+ <h2>Collection: {{collection.name}}</h2>
+
+ <div class="message-container">
+ <div class="message"></div>
+ </div>
+
+ <div class="content">
+
+ <ul>
+
+ <li>
+ <dl class="clearfix">
+ <dt><span>Shard count:</span></dt>
+ <dd>{{collection.shards.length}}</dd>
+ </dl>
+ </li>
+ <li><dl class="clearfix">
+ <dt><span>configName:</span></dt>
+ <dd>{{collection.configName}}</dd>
+ </dl></li>
+
+ <li><dl class="clearfix">
+ <dt><span>replicationFactor:</span></dt>
+ <dd>{{collection.replicationFactor}}</dd>
+ </dl></li>
+
+ <li><dl class="clearfix">
+ <dt><span>maxShardsPerNode:</span></dt>
+ <dd>{{collection.maxShardsPerNode}}</dd>
+ </dl></li>
+
+ <li><dl class="clearfix">
+ <dt><span>router:</span></dt>
+ <dd>{{collection.router.name}}</dd>
+ </dl></li>
+
+ <li><dl class="clearfix">
+ <dt><span>autoAddReplicas:</span></dt>
+ <dd>{{collection.autoAddReplicas}}</dd>
+ </dl></li>
+ </ul>
+
+ </div>
+ </div>
+
+ <div class="block" id="shard-data">
+ <div class="content shard" ng-repeat="shard in collection.shards">
+ <a ng-click="toggleShard(shard)"><h2><span ng-class="{open:shard.show}">Shard: {{shard.name}}</span></h2></a>
+ <ul ng-show="shard.show">
+ <li>
+ <ul>
+ <li>
+ <dl class="clearfix">
+ <dt><span>state:</span></dt>
+ <dd>{{shard.state}}</dd>
+ </dl>
+ </li>
+ <li>
+ <dl class="clearfix">
+ <dt><span>range:</span></dt>
+ <dd>{{shard.range}}</dd>
+ </dl>
+ <br/>
+ </li>
+ <li>
+ <ul class="replica" ng-repeat="replica in shard.replicas">
+ <li>
+ <h2>
+ <a ng-click="toggleReplica(replica)">
+ <span class="openReplica" ng-class="{open:replica.show}">Replica: {{replica.name}}</span>
+ </a>
+ <div style="float:right"><a ng-click="toggleRemoveReplica(replica)"><span class="rem"></span></a></div>
+ </h2>
+ </li>
+ <li>
+ <ul ng-show="replica.showRemove">
+ <li>
+ <form class="delete-replica">
+
+ <p class="clearfix"><em>Are you sure you want to delete this replica?</em></p>
+
+ <p class="clearfix buttons">
+ <button class="submit" ng-class="{success: replica.deleted}" ng-click="deleteReplica(replica)"><span>Delete Replica</span></button>
+ <button type="reset" class="reset" ng-click="toggleRemoveReplica(replica)"><span>Cancel</span></button>
+ </p>
+ </form>
+ </li>
+ </ul>
+ <ul ng-show="replica.show">
+ <li>
+ <dl class="clearfix">
+ <dt><span>core:</span></dt>
+ <dd>{{replica.core}}</dd>
+ </dl>
+ </li>
+
+ <li>
+ <dl class="clearfix">
+ <dt><span>base URL:</span></dt>
+ <dd><a ng-href="{{replica.base_url}}{{rootUrl}}">{{replica.base_url}}</a></dd>
+ </dl>
+ </li>
+
+ <li>
+ <dl class="clearfix">
+ <dt><span>node name:</span></dt>
+ <dd>{{replica.node_name}}</dd>
+ </dl>
+ </li>
+
+ <li>
+ <dl class="clearfix">
+ <dt><span>state:</span></dt>
+ <dd>{{replica.state}}</dd>
+ </dl>
+ </li>
+
+ <li>
+ <dl class="clearfix">
+ <dt><span>leader:</span></dt>
+ <dd class="ico" ng-class="replica.leader ?'ico-1' : 'ico-0'"><span></span></dd>
+ </dl>
+ </li>
+ </ul>
+ </li>
+
+ </ul>
+ </li>
+ <li ng-hide="shard.showAdd">
+ <span class="actions replica">
+ <button class="action" id="add-replica" ng-click="toggleAddReplica(shard)"><span>add replica</span></button>
+ </span>
+ </li>
+ </ul>
+ <div class="action add-replica" ng-show="shard.showAdd">
+
+ <form>
+
+ <p id="node-name" class="clearfix"><label for="node-name">Node:</label>
+ <select chosen ng-model="shard.replicaNodeName" ng-options="node for node in nodes" class="other">
+ <option value="">No specified node</option>
+ </select>
+ node: {{shard.replicaNodeName}}
+ </p>
+
+ <p class="clearfix note error" ng-show="createReplicaMessage">
+ <span>{{createReplicaMessage}}</span>
+ </p>
+
+ <p class="clearfix buttons">
+ <button class="submit delete" ng-class="{success: shard.replicaAdded}" ng-click="addReplica(shard)"><span>Create Replica</span></button>
+ <button type="reset" class="reset" ng-click="toggleAddReplica(shard)"><span>Cancel</span></button>
+ </p>
+ <p clas="clearfix"> </p>
+ </form>
+
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+
+ <div id="navigation" class="requires-core clearfix">
+ <ul>
+ <li ng-repeat="c in collections" ng-class="{current: collection.name == c.name}"><a href="#~collections/{{c.name}}">{{c.name}}</a></li>
+ </ul>
+ </div>
+
+</div>

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/partials/collections.html
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/trunk/plugins/solr/webapp/solr/partials/core_overview.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/webapp/solr/partials/core_overview.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/webapp/solr/partials/core_overview.html (original)
+++ ofbiz/trunk/plugins/solr/webapp/solr/partials/core_overview.html Sun Feb 5 11:09:59 2017
@@ -1,227 +1,227 @@
-
-<div id="dashboard">
-
- <div class="clearfix">
-
- <div class="block fieldlist" id="statistics" ng-class="{disabled: statisticsDisabled}">
-
- <h2><span>Statistics</span></h2>
-
- <div class="message-container" ng-show="statsMessage">
- <div class="message">{{statsMessage}}</div>
- </div>
-
- <div class="content">
-
- <dl>
-
- <dt>Last Modified:</dt>
- <dd class="value">{{index.lastModified | timeago}}</dd>
-
- <dt class="index_num-docs">Num Docs:</dt>
- <dd class="value">{{index.numDocs}}</dd>
-
- <dt class="index_max-doc">Max Doc:</dt>
- <dd class="index_max-doc value">{{index.maxDoc}}</dd>
-
- <dt class="index_heap-usage-bytes">Heap Memory Usage:</dt>
- <dd class="index_heap-usage-bytes value">{{index.indexHeapUsageBytes}}</dd>
-
- <dt class="index_deleted-docs">Deleted Docs:</dt>
- <dd class="index_deleted-docs value">{{index.deletedDocs}}</dd>
-
- <dt class="index_version">Version:</dt>
- <dd class="index_version value">{{index.version}}</dd>
-
- <dt class="index_segmentCount">Segment Count:</dt>
- <dd class="index_segmentCount value">{{index.segmentCount}}</dd>
-
- <dt class="index_optimized">Optimized:</dt>
- <dd class="index_optimized ico value" ng-class="index.hasDeletions ? 'ico-0' : 'ico-1'"><span></span>
- <a ng-click="optimizeIndex()" ng-show="index.hasDeletions">optimize now</a></dd>
-
- <dt class="index_current">Current:</dt>
- <dd class="ico" ng-class="index.current ?'ico-1' : 'ico-0'"><span></span></dd>
-
- </dl>
-
- </div>
- </div>
-
- <div class="block fieldlist" id="instance">
-
- <h2><span>Instance</span></h2>
-
- <div class="message-container" ng-show="indexMessage">
- <div class="message">{{indexMessage}}</div>
- </div>
-
- <div class="content">
-
- <dl>
-
- <dt><abbr title="Current Working Directory">CWD</abbr>:</dt>
- <dd class="value">{{ core.directory.cwd }}</dd>
-
- <dt>Instance:</dt>
- <dd class="value">{{ core.directory.instance }}</dd>
-
- <dt>Data:</dt>
- <dd class="value">{{ core.directory.data }}</dd>
-
- <dt>Index:</dt>
- <dd class="value">{{ core.directory.index }}</dd>
-
- <dt>Impl:</dt>
- <dd class="value">{{ core.directory.dirimpl }}</dd>
-
- </dl>
-
- </div>
- </div>
-
- </div>
- <div class="clearfix">
-
- <div class="block" id="replication">
-
- <h2>
- <span class="is-replicating">
- Replication
- <span ng-show="isSlave"> (Slave)</span>
- <span ng-show="isMaster"> (Master)</span>
- </span>
- </h2>
-
- <div class="message-container" ng-show="replicationMessage">
- <div class="message">{{replicationMessage}}</div>
- </div>
-
- <div class="content clearfix" id="details">
-
- <table border="0" cellspacing="0" cellpadding="0">
-
- <thead>
-
- <tr>
-
- <td><span>Index</span></td>
- <th>Version</th>
- <th><abbr title="Generation">Gen</abbr></th>
- <th>Size</th>
-
- </tr>
-
- </thead>
- <tbody>
-
- <tr class="masterSearch" ng-show="isMaster">
-
- <th>Master (Searching)</th>
- <td class="version"><div>{{replication.indexVersion}}</div></td>
- <td class="generation"><div>{{replication.generation}}</div></td>
- <td class="size"><div>{{replication.indexSize || '-'}}</div></td>
-
- </tr>
-
- <tr class="master" ng-show="isMaster">
-
- <th>Master (Replicable)</th>
- <td class="version"><div>{{replication.master.replicableVersion || '-'}}</div></td>
- <td class="generation"><div>{{replication.master.replicableGeneration || '-'}}</div></td>
- <td class="size"><div>-</div></td>
-
- </tr>
-
- <tr class="master" ng-show="isSlave">
-
- <th>Master (Replicable)</th>
- <td class="version"><div>{{replication.master.replicableVersion || '-'}}</div></td>
- <td class="generation"><div>{{replication.master.replicableGeneration || '-'}}</div></td>
- <td class="size"><div>-</div></td>
-
- </tr>
-
- <tr class="masterSearch" ng-show="isSlave">
-
- <th>Master (Searching)</th>
- <td class="version"><div>{{replication.slave.masterDetails.indexVersion}}</div></td>
- <td class="generation"><div>{{replication.slave.masterDetails.generation}}</div></td>
- <td class="size"><div>{{replication.slave.masterDetails.indexSize || '-'}}</div></td>
-
- </tr>
-
- <tr class="slave slaveOnly" ng-show="isSlave">
-
- <th>Slave (Searching)</th>
- <td class="version"><div>{{replication.indexVersion}}</div></td>
- <td class="generation"><div>{{replication.generation}}</div></td>
- <td class="size"><div>{{replication.indexSize || '-'}}</div></td>
-
- </tr>
- </tbody>
-
- </table>
-
- </div>
- </div>
-
- <div class="block fieldlist" id="healthcheck" ng-class="{disabled: healthcheckMessage}">
-
- <h2><span>Healthcheck</span></h2>
-
- <div class="message-container" ng-show="healthcheckMessage">
- <div class="message">{{healthcheckMessage}}</div>
- </div>
-
- <div class="content" ng-show="!healthcheckMessage">
- <dl>
-
- <dt class="status">Status:</dt>
- <dd class="status value ico ico-1" ng-show="healthcheckStatus">
- <button class="healthcheck-status enabled">Healthcheck Status</button>
- </dd>
- <dd class="status value ico ico-0" ng-show="!healthcheckStatus">
- <button class="healthcheck-status">enable ping</button>
- </dd>
- </dl>
- </div>
-
- </div>
-
- </div>
- <div class="clearfix">
-
- <div class="block" id="admin-extra">
-
- <h2><span>Admin Extra</span></h2>
-
- <div class="message-container">
- <div class="message"></div>
- </div>
-
- <div class="content">
-
- </div>
-
- </div>
-
- </div>
-
-
-</div>
+
+<div id="dashboard">
+
+ <div class="clearfix">
+
+ <div class="block fieldlist" id="statistics" ng-class="{disabled: statisticsDisabled}">
+
+ <h2><span>Statistics</span></h2>
+
+ <div class="message-container" ng-show="statsMessage">
+ <div class="message">{{statsMessage}}</div>
+ </div>
+
+ <div class="content">
+
+ <dl>
+
+ <dt>Last Modified:</dt>
+ <dd class="value">{{index.lastModified | timeago}}</dd>
+
+ <dt class="index_num-docs">Num Docs:</dt>
+ <dd class="value">{{index.numDocs}}</dd>
+
+ <dt class="index_max-doc">Max Doc:</dt>
+ <dd class="index_max-doc value">{{index.maxDoc}}</dd>
+
+ <dt class="index_heap-usage-bytes">Heap Memory Usage:</dt>
+ <dd class="index_heap-usage-bytes value">{{index.indexHeapUsageBytes}}</dd>
+
+ <dt class="index_deleted-docs">Deleted Docs:</dt>
+ <dd class="index_deleted-docs value">{{index.deletedDocs}}</dd>
+
+ <dt class="index_version">Version:</dt>
+ <dd class="index_version value">{{index.version}}</dd>
+
+ <dt class="index_segmentCount">Segment Count:</dt>
+ <dd class="index_segmentCount value">{{index.segmentCount}}</dd>
+
+ <dt class="index_optimized">Optimized:</dt>
+ <dd class="index_optimized ico value" ng-class="index.hasDeletions ? 'ico-0' : 'ico-1'"><span></span>
+ <a ng-click="optimizeIndex()" ng-show="index.hasDeletions">optimize now</a></dd>
+
+ <dt class="index_current">Current:</dt>
+ <dd class="ico" ng-class="index.current ?'ico-1' : 'ico-0'"><span></span></dd>
+
+ </dl>
+
+ </div>
+ </div>
+
+ <div class="block fieldlist" id="instance">
+
+ <h2><span>Instance</span></h2>
+
+ <div class="message-container" ng-show="indexMessage">
+ <div class="message">{{indexMessage}}</div>
+ </div>
+
+ <div class="content">
+
+ <dl>
+
+ <dt><abbr title="Current Working Directory">CWD</abbr>:</dt>
+ <dd class="value">{{ core.directory.cwd }}</dd>
+
+ <dt>Instance:</dt>
+ <dd class="value">{{ core.directory.instance }}</dd>
+
+ <dt>Data:</dt>
+ <dd class="value">{{ core.directory.data }}</dd>
+
+ <dt>Index:</dt>
+ <dd class="value">{{ core.directory.index }}</dd>
+
+ <dt>Impl:</dt>
+ <dd class="value">{{ core.directory.dirimpl }}</dd>
+
+ </dl>
+
+ </div>
+ </div>
+
+ </div>
+ <div class="clearfix">
+
+ <div class="block" id="replication">
+
+ <h2>
+ <span class="is-replicating">
+ Replication
+ <span ng-show="isSlave"> (Slave)</span>
+ <span ng-show="isMaster"> (Master)</span>
+ </span>
+ </h2>
+
+ <div class="message-container" ng-show="replicationMessage">
+ <div class="message">{{replicationMessage}}</div>
+ </div>
+
+ <div class="content clearfix" id="details">
+
+ <table border="0" cellspacing="0" cellpadding="0">
+
+ <thead>
+
+ <tr>
+
+ <td><span>Index</span></td>
+ <th>Version</th>
+ <th><abbr title="Generation">Gen</abbr></th>
+ <th>Size</th>
+
+ </tr>
+
+ </thead>
+ <tbody>
+
+ <tr class="masterSearch" ng-show="isMaster">
+
+ <th>Master (Searching)</th>
+ <td class="version"><div>{{replication.indexVersion}}</div></td>
+ <td class="generation"><div>{{replication.generation}}</div></td>
+ <td class="size"><div>{{replication.indexSize || '-'}}</div></td>
+
+ </tr>
+
+ <tr class="master" ng-show="isMaster">
+
+ <th>Master (Replicable)</th>
+ <td class="version"><div>{{replication.master.replicableVersion || '-'}}</div></td>
+ <td class="generation"><div>{{replication.master.replicableGeneration || '-'}}</div></td>
+ <td class="size"><div>-</div></td>
+
+ </tr>
+
+ <tr class="master" ng-show="isSlave">
+
+ <th>Master (Replicable)</th>
+ <td class="version"><div>{{replication.master.replicableVersion || '-'}}</div></td>
+ <td class="generation"><div>{{replication.master.replicableGeneration || '-'}}</div></td>
+ <td class="size"><div>-</div></td>
+
+ </tr>
+
+ <tr class="masterSearch" ng-show="isSlave">
+
+ <th>Master (Searching)</th>
+ <td class="version"><div>{{replication.slave.masterDetails.indexVersion}}</div></td>
+ <td class="generation"><div>{{replication.slave.masterDetails.generation}}</div></td>
+ <td class="size"><div>{{replication.slave.masterDetails.indexSize || '-'}}</div></td>
+
+ </tr>
+
+ <tr class="slave slaveOnly" ng-show="isSlave">
+
+ <th>Slave (Searching)</th>
+ <td class="version"><div>{{replication.indexVersion}}</div></td>
+ <td class="generation"><div>{{replication.generation}}</div></td>
+ <td class="size"><div>{{replication.indexSize || '-'}}</div></td>
+
+ </tr>
+ </tbody>
+
+ </table>
+
+ </div>
+ </div>
+
+ <div class="block fieldlist" id="healthcheck" ng-class="{disabled: healthcheckMessage}">
+
+ <h2><span>Healthcheck</span></h2>
+
+ <div class="message-container" ng-show="healthcheckMessage">
+ <div class="message">{{healthcheckMessage}}</div>
+ </div>
+
+ <div class="content" ng-show="!healthcheckMessage">
+ <dl>
+
+ <dt class="status">Status:</dt>
+ <dd class="status value ico ico-1" ng-show="healthcheckStatus">
+ <button class="healthcheck-status enabled">Healthcheck Status</button>
+ </dd>
+ <dd class="status value ico ico-0" ng-show="!healthcheckStatus">
+ <button class="healthcheck-status">enable ping</button>
+ </dd>
+ </dl>
+ </div>
+
+ </div>
+
+ </div>
+ <div class="clearfix">
+
+ <div class="block" id="admin-extra">
+
+ <h2><span>Admin Extra</span></h2>
+
+ <div class="message-container">
+ <div class="message"></div>
+ </div>
+
+ <div class="content">
+
+ </div>
+
+ </div>
+
+ </div>
+
+
+</div>

Propchange: ofbiz/trunk/plugins/solr/webapp/solr/partials/core_overview.html
------------------------------------------------------------------------------
svn:eol-style = native