You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/07/31 21:10:46 UTC

lucene-solr:branch_6x: SOLR-9358: [AngularUI] In Cloud->Tree file view area, collapse metadata by default (cherry picked from commit d86c369)

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x e3de51be2 -> 0dc1cf5dd


SOLR-9358: [AngularUI] In Cloud->Tree file view area, collapse metadata by default
(cherry picked from commit d86c369)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0dc1cf5d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0dc1cf5d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0dc1cf5d

Branch: refs/heads/branch_6x
Commit: 0dc1cf5ddda83240ed05df86d414a1f7a0e8d44e
Parents: e3de51b
Author: Jan H�ydahl <ja...@apache.org>
Authored: Fri Jul 29 09:48:16 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Sun Jul 31 23:10:11 2016 +0200

----------------------------------------------------------------------
 solr/CHANGES.txt                      |  2 ++
 solr/webapp/web/css/angular/cloud.css | 14 ++++++++++++++
 solr/webapp/web/partials/cloud.html   |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0dc1cf5d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ece9d06..8f0b0b5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -185,6 +185,8 @@ Other Changes
 * SOLR-9340: Change ZooKeeper disconnect and session expiry related logging from INFO to WARN to
   make debugging easier (Varun Thacker)
 
+* SOLR-9358: [AngularUI] In Cloud->Tree file view area, collapse metadata by default (janhoy)
+
 ==================  6.1.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0dc1cf5d/solr/webapp/web/css/angular/cloud.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/cloud.css b/solr/webapp/web/css/angular/cloud.css
index bbb66ae..4017c22 100644
--- a/solr/webapp/web/css/angular/cloud.css
+++ b/solr/webapp/web/css/angular/cloud.css
@@ -184,6 +184,20 @@ limitations under the License.
   background-image: url( ../../img/ico/cross-1.png );
 }
 
+#content #cloud #file-content #toggle.plus
+{
+  font-style: italic;
+  padding-left: 17px;
+  background-image: url( ../../img/ico/toggle-small-expand.png );
+}
+
+#content #cloud #file-content #toggle.minus
+{
+  font-style: italic;
+  padding-left: 17px;
+  background-image: url( ../../img/ico/toggle-small.png );
+}
+
 #content #cloud #file-content #data
 {
   border-top: 1px solid #c0c0c0;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0dc1cf5d/solr/webapp/web/partials/cloud.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/cloud.html b/solr/webapp/web/partials/cloud.html
index ef39bb3..415e123 100644
--- a/solr/webapp/web/partials/cloud.html
+++ b/solr/webapp/web/partials/cloud.html
@@ -23,7 +23,8 @@ limitations under the License.
 
       <div id="file-content" class="clearfix">
 
-        <div id="prop" ng-show="znode.prop && showData">
+        <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">