Merge pull request #501 from Esri/develop

Sync Master with Develop after AGOL 9.1 release
Esri · Apr 23, 2021 · 7c1969d · 7c1969d
2 parents 41794c9 + 1b82491
commit 7c1969d
Show file tree

Hide file tree

Showing 53 changed files with 20,295 additions and 480 deletions.
diff --git a/css/main.css b/css/main.css
@@ -887,6 +887,21 @@ html, body
     float: right;
 }
 
+/** Css referred for webmaplist 
+    As this classes are removed from bootstrap 4.5.3 **/
+
+.media-body, .media-left, .media-right 
+{
+    display: table-cell;
+    vertical-align: top;
+}
+
+.media-heading
+{
+    margin-top: 0;
+    margin-bottom: 5px;
+}
+
 /* End of Web Map List */
 
 /* Mobile Menu*/
@@ -1067,6 +1082,11 @@ label
     resize: none !important;
 }
 
+.form-control-lg
+{
+    height: calc(1.5em + 1rem + 4px);
+}
+
 .btn, .input-group-addon
 {
     border-radius: 0px !important;
@@ -1415,7 +1435,7 @@ label
     position: absolute;
     right: 66px;
     top: 6px;
-    z-index: 2;
+    z-index: 3;
 }
 
 .esriCTLocatorSearchButton
@@ -1767,6 +1787,14 @@ label
     padding: 4px 6px;
 }
 
+/* Added css for button as it is removed from bootstrap 4.5.3 */
+
+.btn-default 
+{
+    border-color: #ccc;
+    color: #137DB9;
+}
+
 .btn-default:hover, .btn-default:focus, .btn-default:focus {
     border-color: #007ac2 !important;
 }
@@ -2004,8 +2032,12 @@ label
 {
     margin: 0 5px 5px 0;
     float: left;
+    width: auto;
+    flex-basis: auto;
+    flex-grow: 0;
     max-width: 100px;
     max-height: 80px;
+    padding: 0px;
     overflow: hidden;
     border: 1px solid;
     border-color: #ddd;
@@ -2379,6 +2411,8 @@ margin-top: -2px !important;
 
 .modal-header .close
 {
+    padding: 0px;
+    margin: 0px;
     margin-top: 5px;
 }
 
@@ -2547,3 +2581,73 @@ margin-top: -2px !important;
     float: left;
 }
 /** Basemap gallery section ends **/
+
+/** DateTimepicker calender table section
+   This css is removed from bootstrap 4.5.2 css */
+
+
+.table-condensed>tbody>tr>td, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>td, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>thead>tr>th 
+{
+    padding: 5px;
+}
+
+
+/** DateTimepicker calender table section ends **/
+
+
+/** Input group addon css 
+   This css is removed from bootstrap 4.5.3 css **/
+
+.input-group 
+{
+    display: table;
+    border-collapse: separate;
+}
+
+.input-group[class*="col-"] 
+{
+    float: none;
+    padding-left: 0;
+    padding-right: 0;
+}
+
+.input-group .form-control 
+{
+    position: relative;
+    z-index: 2;
+    float: left;
+    width: 100%;
+    margin-bottom: 0;
+}
+
+.input-group-addon,
+.input-group-btn 
+{
+    display: table-cell;
+}
+
+.input-group-addon,
+.input-group-btn 
+{
+    width: 1%;
+    vertical-align: middle;
+}
+
+.input-group-addon 
+{
+    padding: 4px 9px;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 1;
+    color: #4c4c4c;
+    background-color: #efefef;
+    border: 1px solid #959595;
+    border-radius: 0;
+}
+
+.input-group-btn:first-child>.btn, .input-group-btn:first-child>.btn-group 
+{
+    margin-right: -1px;
+}
+
+/* Input group addon css ends */
diff --git a/css/mediaqueries.css b/css/mediaqueries.css
@@ -142,6 +142,7 @@
 
     .modal-dialog
     {
+        max-width:none;
         margin:0px;
     }
 
@@ -331,6 +332,12 @@
     {
         margin-right: 24px;
     }
+
+    .modal-dialog 
+    {
+       width: 600px;
+       margin: 30px auto;
+    }
 }
 
 /* CSS for retina images for retina devices like ipad / tablets etc. */

diff --git a/index.html b/index.html
@@ -30,12 +30,19 @@
     <!-- google plus -->
     <!-- Latest compiled and minified CSS -->
     <!-- Bootstrap core CSS -->
-    <link rel="stylesheet" type="text/css" href="js/vendor/bootstrap-3.3.0-dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" type="text/css" href="js/vendor/bootstrap-4.5.3-dist/css/bootstrap.min.css" />
+    <!-- Bootstrap RTL CSS -->
+    <link rel="stylesheet" type="text/css" id="bootstrapRtl" />
+    <!-- Fontawsome icons -->
+    <link rel="stylesheet" type="text/css" href="js/vendor/font-awsome-5.15.1/font-awsome.min.css" />
+    <!-- Bootstrap DateTimePicker CSS  -->
     <link rel="stylesheet" type="text/css" href="js/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css" />
+    <link rel="stylesheet" type="text/css" href="js/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker-standalone.min.css" />
+    <!-- Bootstrap TouchSpinner CSS -->
     <link rel="stylesheet" type="text/css" href="js/vendor/touch-spinner/jquery.bootstrap-touchspin.min.css" />
     <!--Dojo and Esri CSS-->
-    <link rel="stylesheet" href="https://js.arcgis.com/3.35/dijit/themes/claro/claro.css" />
-    <link rel="stylesheet" href="https://js.arcgis.com/3.35/esri/css/esri.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.36/dijit/themes/claro/claro.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.36/esri/css/esri.css" />
     <!-- Load any application specific styles -->
     <link rel="stylesheet" href="css/main.css" type="text/css" />
     <link rel="stylesheet" href="css/common.css" type="text/css" />
@@ -99,13 +106,14 @@
     <!-- Load dojo configuration -->
     <script src="js/dojo-configuration.js" type="text/javascript"></script>
     <!-- Load Different API's(Vendor)-->
-    <script type="text/javascript" src="js/vendor/jquery.min.js"></script>
-    <script type="text/javascript" src="js/vendor/moment-with-langs.min.js"></script>
-    <script type="text/javascript" src="js/vendor/bootstrap-3.3.0-dist/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="js/vendor/jquery-3.5.1.min.js"></script>
+    <script type="text/javascript" src="js/vendor/bootstrap-4.5.3-dist/js/popper.min.js"></script>
+    <script type="text/javascript" src="js/vendor/bootstrap-4.5.3-dist/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="js/vendor/moment/moment-with-locales.js"></script>
     <script type="text/javascript" src="js/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"></script>
     <script type="text/javascript" src="js/vendor/touch-spinner/jquery.bootstrap-touchspin.min.js"></script>
     <script type="text/javascript" src="js/vendor/exif/exif.js"></script>
-    <script type="text/javascript" src="https://js.arcgis.com/3.35"></script>
+    <script type="text/javascript" src="https://js.arcgis.com/3.36"></script>
     <script type="text/javascript">
         require([
                 "application/bootstrapper"

diff --git a/js/bootstrapper.js b/js/bootstrapper.js
@@ -66,6 +66,13 @@ define([
                 "config": this.boilerPlateTemplateObject
             });
             this.boilerPlateTemplateObject.startup().then(lang.hitch(this, function (config) {
+                //If application is loaded in RTL mode, change styles of required nodes
+                link = document.getElementById("bootstrapRtl");
+                if (config.i18n.direction === "rtl") {
+                    link.href = "./js/vendor/bootstrap-rtl/bootstrap-rtl.min.css";
+                } else {
+                    link.parentNode.removeChild(link);
+                }
                 //set lan attribute to HTML
                 if(dojoConfig.locale) {
                 domAttr.set(document.getElementsByTagName("html")[0], "lang",

diff --git a/js/vendor/bootstrap-3.3.0-dist/css/bootstrap.min.css b/js/vendor/bootstrap-3.3.0-dist/css/bootstrap.min.css
diff --git a/js/vendor/bootstrap-3.3.0-dist/fonts/glyphicons-halflings-regular.eot b/js/vendor/bootstrap-3.3.0-dist/fonts/glyphicons-halflings-regular.eot