Plenario Changes

config/EnvSettings.js

@@ -1,4 +1,15 @@
 //overrides for this specific environment
 //Defaults are still held in Config.js
 
-ogrid.Config.service.endpoint = 'http://localhost:8080/opengridservice/rest';
+ogrid.Config.service.endpoint = 'http://localhost:8080/opengridservice/rest';
+
+//http://chicago.opengrid.io/opengrid-service/rest
+//ogrid.Config.service.endpoint = 'http://chicago.opengrid.io/opengrid-service/rest';
+//ogrid.Config.service.autologin = true;
+//ogrid.Config.map.mapLibraryOptions.center = [40.7127, -74.0059];
+
+ogrid.Config.tileMapHide = false;
+
+ogrid.Config.helpButtonHide = true;
+ogrid.Config.help.configSectionTitle = 'Open Section';
+ogrid.Config.help.configSectionText = 'To be Configured';

config/integration/EnvSettings.js

@@ -1,4 +1,5 @@
 //overrides for this specific environment
 //Defaults are still held in Config.js
 
-ogrid.Config.service.endpoint = 'https://<INT hostname>/opengridservice/rest';
+ogrid.Config.service.endpoint = 'https://<INT hostname>/opengridservice/rest';
+ogrid.Config.service.autologin = true;

config/production/EnvSettings.js

@@ -1,4 +1,5 @@
 //overrides for this specific environment
 //Defaults are still held in Config.js
 
-ogrid.Config.service.endpoint = 'https://<PROD hostname>/opengridservice/rest';
+ogrid.Config.service.endpoint = 'https://<PROD hostname>/opengridservice/rest';
+ogrid.Config.service.autologin = true;

config/qa/EnvSettings.js

@@ -1,4 +1,5 @@
 //overrides for this specific environment
 //Defaults are still held in Config.js
 
-ogrid.Config.service.endpoint = 'https://<QA hostname>/opengridservice/rest';
+ogrid.Config.service.endpoint = 'https://<QA hostname>/opengridservice/rest';
+ogrid.Config.service.autologin = true;

gulpfile.js

@@ -84,6 +84,12 @@ gulp.task('templates-debug', function () {
         .pipe(gulp.dest('./debug/templates'));
 });
 
+//need to copy help html file
+gulp.task('copy-help-html', function () {
+    return gulp.src('./src/help.html')
+        .pipe(gulp.dest('./dist'));
+});
+
 gulp.task('html-debug', function(){
     return gulp.src('./src/index.html')
         .pipe(inject(
@@ -386,6 +392,7 @@ gulp.task('release',  function(cb) {
         'scripts',
         'env-settings',
         'html-release',
+        'copy-help-html',
         cb
     );
 });

lib/jquery-1.11.2/opengrid-query-builder.js

@@ -216,22 +216,14 @@
             {type: 'equal',            nb_inputs: 1, multiple: false, apply_to: ['string', 'number', 'datetime', 'boolean']},
             {type: 'not_equal',        nb_inputs: 1, multiple: false, apply_to: ['string', 'number', 'datetime', 'boolean']},
             {type: 'in',               nb_inputs: 1, multiple: true,  apply_to: ['string', 'number', 'datetime']},
-            {type: 'not_in',           nb_inputs: 1, multiple: true,  apply_to: ['string', 'number', 'datetime']},
             {type: 'less',             nb_inputs: 1, multiple: false, apply_to: ['number', 'datetime']},
             {type: 'less_or_equal',    nb_inputs: 1, multiple: false, apply_to: ['number', 'datetime']},
             {type: 'greater',          nb_inputs: 1, multiple: false, apply_to: ['number', 'datetime']},
             {type: 'greater_or_equal', nb_inputs: 1, multiple: false, apply_to: ['number', 'datetime']},
             {type: 'between',          nb_inputs: 2, multiple: false, apply_to: ['number', 'datetime']},
             {type: 'begins_with',      nb_inputs: 1, multiple: false, apply_to: ['string']},
-            {type: 'not_begins_with',  nb_inputs: 1, multiple: false, apply_to: ['string']},
             {type: 'contains',         nb_inputs: 1, multiple: false, apply_to: ['string']},
-            {type: 'not_contains',     nb_inputs: 1, multiple: false, apply_to: ['string']},
-            {type: 'ends_with',        nb_inputs: 1, multiple: false, apply_to: ['string']},
-            {type: 'not_ends_with',    nb_inputs: 1, multiple: false, apply_to: ['string']},
-            {type: 'is_empty',         nb_inputs: 0, multiple: false, apply_to: ['string']},
-            {type: 'is_not_empty',     nb_inputs: 0, multiple: false, apply_to: ['string']},
-            {type: 'is_null',          nb_inputs: 0, multiple: false, apply_to: ['string', 'number', 'datetime', 'boolean']},
-            {type: 'is_not_null',      nb_inputs: 0, multiple: false, apply_to: ['string', 'number', 'datetime', 'boolean']}
+            {type: 'ends_with',        nb_inputs: 1, multiple: false, apply_to: []}
         ],
 
         icons: {

src/css/help.css

@@ -0,0 +1,63 @@
+/*body {
+    font-family: "Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;
+    font-weight: normal;
+    color: #404040;
+    min-height: 100%;
+    width: 90%;
+    overflow-y: auto;
+}*/
+
+#container {
+    width:100%;
+    margin-top: 50px;
+}
+
+#uturn-logo {
+    float: left;
+    width: 5%;
+    background-image: url(../images/logo/uturn-logo.png);
+    display: block;
+    height: 60px;
+    background-size: 100% 60px;
+    background-repeat: no-repeat;
+}
+
+
+#smart-chicago-logo {
+    float: right;
+    width: 5%;
+    background-image: url(../images/logo/smart-chicago-logo.png);
+    background-size: 100% 60px;
+    height: 60px;
+    display: block;
+    background-repeat: no-repeat;
+}
+
+#help-content {
+    vertical-align: middle;
+    display: inline-block;
+    width: 90%;
+}
+
+h1,h2,h3,h4,h5,h6,legend {
+    margin-top: 0;
+    font-weight: 700;
+    font-family: "Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;
+    color: #2980b9;
+}
+
+#help-content h2 {
+    font-size: 30px !important;
+}
+
+#help-content p {
+    line-height: 24px;
+    margin: 0;
+    font-size: 16px;
+    margin-bottom: 14px
+}
+
+#main-content {
+    margin-left: 2%;
+    margin-right: 5%;
+}

src/css/ogrid-theme-blue.css

@@ -52,7 +52,7 @@ html, body {
 
 #ogrid-adv-content .panel-heading {
     cursor: pointer;
-    padding:5px 10px!important;
+    /*padding:5px 10px!important;*/
 }
 
 
@@ -129,6 +129,7 @@ html, body {
     /*font-size: 12px;*/
     /*font-weight: 300;*/
     /*font-family: 'Lato', sans-serif;*/
+    overflow-y: auto;;
 }
 
 .ogrid-task-pane .control-label {
@@ -273,6 +274,7 @@ html, body {
 .ogrid-task-pane .rule-value-container .form-control {
     font-weight: 300;
 }
+
 .ogrid-color-options {
     font-size: 12px !important;
     text-decoration: underline;
@@ -328,24 +330,6 @@ div#ogrid-dataset-filters.panel-body,  div#ogrid-geo-filters.panel-body {
     color: lightskyblue;
 }
 
-#ogrid-help-icon {
-    padding-top: 18px;
-    padding-right: 10px;
-    color: whitesmoke;
-}
-
-
-.no-underline-on-hover:hover { text-decoration: none; }
-.no-underline-on-hover { text-decoration: none; }
-
-/* mobile styles for help icon*/
-@media (max-width: 845px) {
-    #ogrid-help-icon {
-        padding-left: 10px;
-        font-size: 1.5em;
-    }
-}
-
 .header-center {
     display: flex;
     justify-content: center;

src/css/ogrid.css

@@ -36,12 +36,12 @@ html, body {
 @media (max-width: 450px) {
   #ogrid-search {
     /*width: 277px;*/
-    width: calc(100% - 120px);
-    margin-left: 10px;
+    width: calc(100% - 180px);
+    margin-left: 0px;
   }
   #ogrid-search.pull-left.col-xs-7 {
     padding: 0px;
-    width: calc(100% - 120px);
+    width: calc(100% - 180px);
   }
 }