You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2022/06/28 14:19:47 UTC
[solr] branch solr-paramset-impl updated (f604f9b514e -> 75684f86c24)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a change to branch solr-paramset-impl
in repository https://gitbox.apache.org/repos/asf/solr.git
from f604f9b514e Strip out overwrite parameter, turns out not to exist!
new b2c3d56f1e4 tweak pretty printing of sample json.
new 04b6b7838bb use checkbox instead of radio so you can hide the sample
new cd18fe9a71d add some seperation
new 75684f86c24 add syntax help link, tweak formatting
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/webapp/web/css/angular/paramsets.css | 5 +---
.../webapp/web/js/angular/controllers/paramsets.js | 18 +++++------
solr/webapp/web/partials/paramsets.html | 35 +++++++++++-----------
3 files changed, 27 insertions(+), 31 deletions(-)
[solr] 02/04: use checkbox instead of radio so you can hide the sample
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch solr-paramset-impl
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 04b6b7838bbd7850a1231e54ea3eafed22bb715c
Author: epugh@opensourceconnections.com <ep...@opensourceconnections.com>
AuthorDate: Tue Jun 28 08:12:37 2022 -0600
use checkbox instead of radio so you can hide the sample
---
solr/webapp/web/partials/paramsets.html | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/solr/webapp/web/partials/paramsets.html b/solr/webapp/web/partials/paramsets.html
index 62981c3355d..48a056690d4 100644
--- a/solr/webapp/web/partials/paramsets.html
+++ b/solr/webapp/web/partials/paramsets.html
@@ -39,19 +39,19 @@
<div>
<form>
<label>
- <input type="radio"
- value="sample"
- ng-model="switch.Data">
+ <input type="checkbox"
+ ng-model="switch.showSample">
Sample Paramset
</label>
</form>
- <div ng-switch="switch.Data">
- <div ng-switch-when="sample" id="just-line-break">
+ <div ng-switch="switch.showSample">
+ <div ng-switch-when="true">
<pre>
{{ placeholder | json }}
</pre>
</div>
</div>
+
<fieldset class="Update Paramset">
<legend>Update Paramset</legend>
<div class="fieldset" id="paramsetContent-container">
[solr] 01/04: tweak pretty printing of sample json.
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch solr-paramset-impl
in repository https://gitbox.apache.org/repos/asf/solr.git
commit b2c3d56f1e4a3a59e83eb00467f247193d2d94ac
Author: epugh@opensourceconnections.com <ep...@opensourceconnections.com>
AuthorDate: Tue Jun 28 07:56:43 2022 -0600
tweak pretty printing of sample json.
---
solr/webapp/web/js/angular/controllers/paramsets.js | 18 +++++++++---------
solr/webapp/web/partials/paramsets.html | 6 ++++--
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/solr/webapp/web/js/angular/controllers/paramsets.js b/solr/webapp/web/js/angular/controllers/paramsets.js
index eaf77e1cba8..58ea0fd1830 100644
--- a/solr/webapp/web/js/angular/controllers/paramsets.js
+++ b/solr/webapp/web/js/angular/controllers/paramsets.js
@@ -62,15 +62,15 @@ solrAdminApp.controller('ParamSetsController',
$scope.getParamsets();
$scope.refresh = function () {
$scope.paramsetContent = "";
- $scope.placeholder = "{\n" +
- " \"set\": {\n" +
- " \"myQueries\": {\n" +
- " \"defType\": \"edismax\",\n" +
- " \"rows\": \"5\",\n" +
- " \"df\": \"text_all\"\n" +
- " }\n" +
- " }\n" +
- "}"
+ $scope.placeholder = {
+ "set": {
+ "myQueries": {
+ "defType": "edismax",
+ "rows": "5",
+ "df": "text_all"
+ }
+ }
+ }
};
$scope.refresh();
diff --git a/solr/webapp/web/partials/paramsets.html b/solr/webapp/web/partials/paramsets.html
index 0138fe61f17..62981c3355d 100644
--- a/solr/webapp/web/partials/paramsets.html
+++ b/solr/webapp/web/partials/paramsets.html
@@ -42,12 +42,14 @@
<input type="radio"
value="sample"
ng-model="switch.Data">
- Show sample json!
+ Sample Paramset
</label>
</form>
<div ng-switch="switch.Data">
<div ng-switch-when="sample" id="just-line-break">
- {{placeholder}}
+ <pre>
+{{ placeholder | json }}
+ </pre>
</div>
</div>
<fieldset class="Update Paramset">
[solr] 04/04: add syntax help link, tweak formatting
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch solr-paramset-impl
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 75684f86c2489b445b2a5433d0f91a23cd448614
Author: epugh@opensourceconnections.com <ep...@opensourceconnections.com>
AuthorDate: Tue Jun 28 08:19:39 2022 -0600
add syntax help link, tweak formatting
---
solr/webapp/web/partials/paramsets.html | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/solr/webapp/web/partials/paramsets.html b/solr/webapp/web/partials/paramsets.html
index 48a056690d4..4a88aa4b596 100644
--- a/solr/webapp/web/partials/paramsets.html
+++ b/solr/webapp/web/partials/paramsets.html
@@ -52,32 +52,29 @@
</div>
</div>
+ <div>
<fieldset class="Update Paramset">
- <legend>Update Paramset</legend>
+ <legend>Update Paramset(s)</legend>
<div class="fieldset" id="paramsetContent-container">
<label for="paramset">
- <a rel="help">Paramset(s)</a>
+ Paramset(s) JSON
</label>
<textarea ng-model="paramsetContent" name="paramsets" id="paramset" title="The Paramset" rows="10"
cols="65"></textarea>
+ <p>
+ <a href="https://solr.apache.org/guide/solr/latest/configuration-guide/request-parameters-api.html" target="_out">syntax help</a>
+ </p>
</div>
<div id="advanced">
<div id="attribs">
<div id="general-attribs">
- <label for="overwrite2" class="checkbox" title="Overwrite?">Overwrite?</label>
- <a ng-click="showHelp('overwriteHelp')"><img class="help-ico" src="img/ico/question-white.png"/></a>
- <div id="overwriteHelp" class="help" ng-show="helpId === 'overwriteHelp'">
- <div class="help-wide">
- <p>Enabling overwriting allows you to update an existing Paramset.
- <div class="help-anchor"><a target="_blank" href="https://solr.apache.org/guide/dynamic-fields.html">Dynamic Fields</a></div>
- </p>
- </div>
- </div>
+
</div>
</div>
</div>
</fieldset>
+
</div>
<button type="submit" ng-click="submit()" id="submit">Submit Paramset</button>
[solr] 03/04: add some seperation
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch solr-paramset-impl
in repository https://gitbox.apache.org/repos/asf/solr.git
commit cd18fe9a71dabb7adab763ccc216b93e336e1998
Author: epugh@opensourceconnections.com <ep...@opensourceconnections.com>
AuthorDate: Tue Jun 28 08:12:48 2022 -0600
add some seperation
---
solr/webapp/web/css/angular/paramsets.css | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/solr/webapp/web/css/angular/paramsets.css b/solr/webapp/web/css/angular/paramsets.css
index d2796706631..1cf3a767fb0 100644
--- a/solr/webapp/web/css/angular/paramsets.css
+++ b/solr/webapp/web/css/angular/paramsets.css
@@ -17,10 +17,6 @@ limitations under the License.
*/
-#just-line-break {
- white-space: pre-line;
-}
-
#content #paramsets
{
background-image: url( ../../img/div.gif );
@@ -36,6 +32,7 @@ limitations under the License.
#content #paramsets #form fieldset legend, #content #paramsets #form .optional.expanded legend {
display: block;
margin-left: 10px;
+ margin-top: 15px;
padding: 0px 5px;
}