Merge branch 'master' into jan-4-sug

nasa-jpl-memex · Jan 5, 2016 · fc8b176 · fc8b176
2 parents c0cd43a + d5fa1af
commit fc8b176
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/imagespace/README.md b/imagespace/README.md
@@ -1,4 +1,4 @@
-# Image Space Server
+# ImageSpace Server
 
 ImageSpace is a plugin for [Girder](https://girder.readthedocs.org/en/latest/).
 
@@ -97,13 +97,13 @@ The default Girder app should be visible at [https://localhost:8080](https://local
 Register for a new account, which will be the admin account. Go to the admin console and enter the
 plugin configuration. Find the imagespace plugin and enable it. Girder should prompt you to restart
 the server (or restart manually). One restarted, again visit [https://localhost:8080](https://localhost:8080).
-The application should be replaced with Image Space, with the full Girder app located at
+The application should be replaced with ImageSpace, with the full Girder app located at
 [https://localhost:8080/girder](https://localhost:8080/girder).
 
 ### Additional Plugins
-Image Space comes with additional plugins that may be enabled using the [Girder administration panel](https://girder.readthedocs.org/en/latest/installation.html#initial-setup). For each of these a symbolic link must be set so the plugin exists in Girder's `/plugins` directory.
+ImageSpace comes with additional plugins that may be enabled using the [Girder administration panel](https://girder.readthedocs.org/en/latest/installation.html#initial-setup). For each of these a symbolic link must be set so the plugin exists in Girder's `/plugins` directory.
 
-Individual plugins may require certain environment variables be set, for example the Image Space FLANN plugin requires `IMAGE_SPACE_FLANN_INDEX` be set to the URL of the flann_index. These plugins will warn you when starting Girder if they don't have the required environment variables to function properly.
+Individual plugins may require certain environment variables be set, for example the ImageSpace FLANN plugin requires `IMAGE_SPACE_FLANN_INDEX` be set to the URL of the flann_index. These plugins will warn you when starting Girder if they don't have the required environment variables to function properly.
 
 
 ## License

diff --git a/imagespace/plugin.json b/imagespace/plugin.json
@@ -1,5 +1,5 @@
 {
-    "name": "Image Space application",
+    "name": "ImageSpace application",
     "description": "Image exploration and query interface",
     "version": "0.1.0",
     "dependencies": [

diff --git a/imagespace/server/__init__.py b/imagespace/server/__init__.py
@@ -40,7 +40,7 @@ class CustomAppRoot(object):
     vars = {
         'apiRoot': 'api/v1',
         'staticRoot': 'static',
-        'title': 'Image Space',
+        'title': 'ImageSpace',
         'versionInfo': {
             'niceName': 'SUG v2.5',
             'sha': subprocess.check_output(

diff --git a/imagespace/web_external/templates/body/about.jade b/imagespace/web_external/templates/body/about.jade
@@ -1,10 +1,10 @@
 h2 About
-span.small Image Space #{imagespace.versionInfo.niceName} (#{imagespace.versionInfo.sha})
+span.small ImageSpace #{imagespace.versionInfo.niceName} (#{imagespace.versionInfo.sha})
 hr
 
 
 h3 Overview
-p Image Space is a DARPA Memex application for browsing large image collections based on image content (e.g. extractedtext from the image, image content similarity) or metadata (e.g. EXIF camera identifier, image encoding).
+p ImageSpace is a DARPA Memex application for browsing large image collections based on image content (e.g. extractedtext from the image, image content similarity) or metadata (e.g. EXIF camera identifier, image encoding).
 
 h3 Limitations
 p This app will function best on latest Chrome, Firefox, and Safari. Internet Explorer has not been tested.

diff --git a/imagespace/web_external/templates/body/help.jade b/imagespace/web_external/templates/body/help.jade
@@ -2,13 +2,13 @@
     .col-md-6
         h4 Overview
         p.
-            Image Space is a DARPA Memex application for browsing large image
+            ImageSpace is a DARPA Memex application for browsing large image
             collections based on image content (e.g. extracted text from the image,
             image content similarity) or metadata (e.g. EXIF camera identifier,
             image encoding).
         p.
             Return to these instructions
-            at any time by clicking the Image Space text in the upper left.
+            at any time by clicking the ImageSpace text in the upper left.
 
         h4 Starting with text search
         p.

diff --git a/imagespace/web_external/templates/layout/layoutHeader.jade b/imagespace/web_external/templates/layout/layoutHeader.jade
@@ -1,7 +1,7 @@
 .nav.navbar.navbar-inverse.navbar-fixed-top
     .container-fluid
         .navbar-header
-            a.navbar-brand(href="#") Image Space
+            a.navbar-brand(href="#") ImageSpace
         .collapse.navbar-collapse
             #header-search-bar
             ul.nav.navbar-nav.im-nav

diff --git a/imagespace/web_external/templates/widgets/instructionsWidget.jade b/imagespace/web_external/templates/widgets/instructionsWidget.jade
@@ -19,7 +19,7 @@
                 and allow you to refine your search by selecting items on the plots.
             p.
                 Return to the <a href="#search/*">full set of images</a> at any
-                time by clicking the Image Space text in the upper left.
+                time by clicking the ImageSpace text in the upper left.
             p.
                 Some images contain EXIF data that can link images to other images
                 taken with the same camera. For example, in this

diff --git a/imagespace/web_external/templates/widgets/searchBarWidget.jade b/imagespace/web_external/templates/widgets/searchBarWidget.jade
@@ -11,7 +11,7 @@ if mode
 else
     .im-search-form.navbar-form.navbar-left(id=(dropzone) ? 'im-upload' : '')
       if frontPage
-        h1(style='margin-left:100px') Image Space
+        h1(style='margin-left:100px') ImageSpace
       if dropzone
         .hide
            input#im-files(type="file", multiple="multiple")

diff --git a/imagespace_cmu/plugin.json b/imagespace_cmu/plugin.json
@@ -1,5 +1,5 @@
 {
-    "name": "Image Space CMU",
+    "name": "ImageSpace CMU",
     "version": "0.1.0",
     "dependencies": [
         "imagespace"

diff --git a/imagespace_columbia/plugin.json b/imagespace_columbia/plugin.json
@@ -1,5 +1,5 @@
 {
-    "name": "Image Space Columbia",
+    "name": "ImageSpace Columbia",
     "version": "0.1.0",
     "dependencies": [
         "imagespace"

diff --git a/imagespace_flann/plugin.json b/imagespace_flann/plugin.json
@@ -1,5 +1,5 @@
 {
-    "name": "Image Space FLANN",
+    "name": "ImageSpace FLANN",
     "version": "0.1.0",
     "dependencies": [
         "imagespace"

diff --git a/imagespace_georgetown/plugin.json b/imagespace_georgetown/plugin.json
@@ -1,5 +1,5 @@
 {
-    "name": "Image Space Georgetown",
+    "name": "ImageSpace Georgetown",
     "version": "0.1.0",
     "dependencies": [
         "imagespace"