incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [26/50] [abbrv] git commit: Packaging changes
Date Sat, 31 May 2014 14:21:59 GMT
Packaging changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/38a56fe1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/38a56fe1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/38a56fe1

Branch: refs/heads/apache-blur-0.2
Commit: 38a56fe16ee7f408f3dbbe2fcd4d788a6959863c
Parents: a253842
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue May 27 14:35:11 2014 -0400
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Tue May 27 14:35:11 2014 -0400

----------------------------------------------------------------------
 contrib/blur-console/pom.xml                           |  6 ++++++
 contrib/blur-console/src/assemble/bin.xml              | 11 ++++++++++-
 contrib/blur-console/src/main/webapp/Gruntfile.js      |  2 +-
 .../src/main/webapp/js/blurconsole.search.js           | 13 +++++++++++--
 contrib/blur-console/src/main/webapp/sass/_colors.scss |  3 ++-
 .../src/main/webapp/sass/blurconsole.search.scss       |  8 ++++++--
 .../blur-console/src/main/webapp/views/search.tpl.html |  3 ++-
 7 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-console/pom.xml b/contrib/blur-console/pom.xml
index b1ed6c9..2a3a502 100644
--- a/contrib/blur-console/pom.xml
+++ b/contrib/blur-console/pom.xml
@@ -196,6 +196,12 @@
 			</dependencies>
         </profile>
         <profile>
+            <id>web-war</id>
+            <properties>
+                <grunt.target>production</grunt.target>
+            </properties>
+        </profile>
+        <profile>
             <id>grunt</id>
             <activation><os><family>!windows</family></os></activation>
             <build>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/assemble/bin.xml b/contrib/blur-console/src/assemble/bin.xml
index 8b7ce78..6337148 100644
--- a/contrib/blur-console/src/assemble/bin.xml
+++ b/contrib/blur-console/src/assemble/bin.xml
@@ -44,8 +44,17 @@ under the License.
       <directory>src/main/webapp</directory>
       <outputDirectory>webapp</outputDirectory>
       <!-- Remove unneccessary web files -->
+      <includes>
+          <include>*/**/.css</include>
+          <include>*/**/.js</include>
+          <include>*/**/.gif</include>
+      </includes>
       <excludes>
-      
+      	<exclude>*/node_modules/*</exclude>
+      	<exclude>/src/main/webapp/.sass-cache</exclude>
+      	<exclude>**/libs/chai/*</exclude>
+      	<exclude>**/libs/flot/examples/*</exclude>
+      	<exclude>**/libs/jquery/src/*</exclude>
       </excludes>
     </fileSet>
   </fileSets>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/src/main/webapp/Gruntfile.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/Gruntfile.js b/contrib/blur-console/src/main/webapp/Gruntfile.js
index 2b450f5..801082d 100644
--- a/contrib/blur-console/src/main/webapp/Gruntfile.js
+++ b/contrib/blur-console/src/main/webapp/Gruntfile.js
@@ -70,7 +70,7 @@ module.exports = function (grunt) {
                     'css/blurconsole.css': 'sass/blurconsole.scss'
                 },
                 options: {
-                    compress: true
+                    style: 'compressed'
                 }
             }
         },

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/src/main/webapp/js/blurconsole.search.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.search.js b/contrib/blur-console/src/main/webapp/js/blurconsole.search.js
index 9654262..64f6a79 100644
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.search.js
+++ b/contrib/blur-console/src/main/webapp/js/blurconsole.search.js
@@ -47,7 +47,7 @@ blurconsole.search = (function () {
 	jqueryMap = {},
 	setJqueryMap, initModule, unloadModule, drawResultHolders, drawResults, registerPageEvents,
unregisterPageEvents,
 	sendSearch, showOptions, reviewTables, loadTableList, getMoreData, fixPanelWidths, updateOptionPopover,
updateOptionDisplay,
-	persistOptions, getColList;
+	persistOptions, getColList, popupFacetDialog;
 
 	setJqueryMap = function() {
 		var $container = stateMap.$container;
@@ -59,7 +59,8 @@ blurconsole.search = (function () {
 			$tableWarning : $('#tableGoneWarning'),
 			$resultsHolder : $('#results'),
 			$optionsDisplay : $('#searchOptionsDisplay'),
-			$countHolder : $('#resultCount')
+			$countHolder : $('#resultCount'),
+			$facetTrigger : $('#facetTrigger')
 		};
 	};
 
@@ -76,6 +77,7 @@ blurconsole.search = (function () {
 		});
 		$('#searchOptionsTrigger').on('shown.bs.popover', updateOptionPopover);
 		$(document).on('change', '.popover select', persistOptions);
+		jqueryMap.$facetTrigger.on('click', popupFacetDialog);
 	};
 
 	unregisterPageEvents = function() {
@@ -85,6 +87,7 @@ blurconsole.search = (function () {
 		$('#searchOptionsTrigger').popover('destroy');
 		$('#searchOptionsTrigger').off('shown.bs.popover');
 		$(document).off('change');
+		//jqueryMap.$facetTrigger.off('click');
 	};
 
 	updateOptionDisplay = function() {
@@ -207,6 +210,7 @@ blurconsole.search = (function () {
 	drawResults = function(evt, families) {
 		var results = blurconsole.model.search.getResults();
 		jqueryMap.$countHolder.html('<small>Found ' + blurconsole.model.search.getTotal()
+ ' total results</small>');
+		//jqueryMap.$facetTrigger.show();
 
 		$.each(families, function(i, fam) {
 			var famResults = results[fam],
@@ -300,6 +304,11 @@ blurconsole.search = (function () {
 		jqueryMap.$tableSelectorStatusOption.html('Choose Table');
 	};
 
+	popupFacetDialog = function() {
+		jqueryMap.facetModal = $(blurconsole.browserUtils.modal('facetDialog', 'Facets for Current
Search', 'TBD', null, 'large'));
+		jqueryMap.facetModal.modal();
+	};
+
 	initModule = function($container) {
 		$container.load(configMap.view, function() {
 			stateMap.$container = $container;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/src/main/webapp/sass/_colors.scss
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/sass/_colors.scss b/contrib/blur-console/src/main/webapp/sass/_colors.scss
index fe5ed23..48e136c 100644
--- a/contrib/blur-console/src/main/webapp/sass/_colors.scss
+++ b/contrib/blur-console/src/main/webapp/sass/_colors.scss
@@ -21,4 +21,5 @@ under the License.
 $silver: #CCC;
 $black: #000;
 $san-marino: #4c66a4;
-$white: #FFF;
\ No newline at end of file
+$white: #FFF;
+$dusty-gray: #999;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/src/main/webapp/sass/blurconsole.search.scss
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/sass/blurconsole.search.scss b/contrib/blur-console/src/main/webapp/sass/blurconsole.search.scss
index da53b29..65e0369 100644
--- a/contrib/blur-console/src/main/webapp/sass/blurconsole.search.scss
+++ b/contrib/blur-console/src/main/webapp/sass/blurconsole.search.scss
@@ -30,11 +30,15 @@ under the License.
 	font-style: italic;
 }
 
+#resultInfo {
+	margin-top: 3px;
+}
+
 tr.row-separator {
 	td {
-		background-color: #999;
+		background-color: $dusty-gray;
 	}
 	&:hover td {
-		background-color: #999 !important;
+		background-color: $dusty-gray !important;
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/38a56fe1/contrib/blur-console/src/main/webapp/views/search.tpl.html
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/views/search.tpl.html b/contrib/blur-console/src/main/webapp/views/search.tpl.html
index 3a58fe4..82495cc 100644
--- a/contrib/blur-console/src/main/webapp/views/search.tpl.html
+++ b/contrib/blur-console/src/main/webapp/views/search.tpl.html
@@ -40,8 +40,9 @@ under the License.
 			</button>
 			<span id="searchOptionsDisplay"></span>
 		</div>
-		<div class="row">
+		<div id="resultInfo" class="row">
 			<div id="resultCount" class="col-xs-2"></div>
+			<div class="col-xs-2"><button type="button" id="facetTrigger" class="btn btn-default
btn-xs" style="display:none">Run Facets</button></div>
 		</div>
 	</div>
 </div>


Mime
View raw message