Update to JS API 3.19 and other updates/bug fixes

- Update the default portal appId for Portal 10.5 - Update README with Portal 10.5 and 10.4 deployment - Fix toolbar style so that components (queries/reports/createJob) can be viewed in low resolution or smaller displays - Added links for configuring locator sources
Esri · Feb 22, 2017 · a53d004 · a53d004
1 parent b956c15
commit a53d004
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 40 deletions.
diff --git a/README.pdf b/README.pdf
diff --git a/css/main.css b/css/main.css
@@ -10,7 +10,7 @@
 }
 .arcgisSearch .searchClear {
     top: 4px;
-    height: 26px;    
+    height: 26px;
 }
 .arcgisSearch .searchGroup .searchInput {
     margin-top: 2.880px;
@@ -28,35 +28,35 @@
 }
 
 html, body {
-	height: 100%; 
-	width: 100%; 
-	margin: 0; 
-	padding: 0; 
+	height: 100%;
+	width: 100%;
+	margin: 0;
+	padding: 0;
 }
 body{
-	background-color: #FFF; 
-	overflow:hidden; 
+	background-color: #FFF;
+	overflow:hidden;
 	font-family: "Trebuchet MS";
     font-size: .9em;
 }
 
 h2 {
 	font-size: 1.2em;
 	font-weight: normal;
-	margin: 0.3em 0;	
+	margin: 0.3em 0;
 
 }
 
 h3 {
 	font-size: 1.1em;
 	font-weight: normal;
-	margin: 0.2em 0;	
+	margin: 0.2em 0;
 }
 
 .hint {
 	color: #999;
 	font-style: italic;
-	font-size: 0.9em;	
+	font-size: 0.9em;
 }
 
 .floating-panel {
@@ -72,11 +72,11 @@ h3 {
 /* Bootstrap */
 
 .control-group {
-	margin: 0.5em 0;	
+	margin: 0.5em 0;
 }
 
 .control-label {
-	vertical-align: top;	
+	vertical-align: top;
 	display: block;
 }
 
@@ -111,7 +111,7 @@ h3 {
 }
 #processing-inner h2 {
 	color: #000;
-	font-size: 2.5em;	
+	font-size: 2.5em;
 }
 @-webkit-keyframes progress-bar-stripes {
   from {
@@ -330,7 +330,7 @@ h3 {
 	-webkit-transition: top .5s; /* Safari */
 }
 #loading-inner h1 {
-    color: #F1F1F1; 
+    color: #F1F1F1;
 	font-size: 36px;
 	line-height: 45px;
 	font-weight:700;
@@ -586,7 +586,7 @@ h3 {
 }
 #header .headerLinks {
 	float: right;
-	margin: 10px;	
+	margin: 10px;
 }
 #header .customContainer {
 	position: absolute;
@@ -605,7 +605,7 @@ h3 {
 /****************************************************************************************/
 /* RIGHT CONTAINER */
 #rightContainer {
-	/* custom 
+	/* custom
 	width: 300px;
 	*/
 }
@@ -678,4 +678,67 @@ h3 {
 
 .claro .dijitSplitContainer-child, .claro .dijitBorderContainer-child {
     border: 0;
-}
+}
+
+/****************************************************************************************/
+/* FIX ISSUE ON JS API 3.19*/
+
+
+/* dijit datepicker */
+.dijitCalendarContainer>table{
+  width: 100%;
+}
+
+.dijitCalendarContainer .dijitCalendarArrow{
+  padding: 1px 6px 2px 6px;
+  border: 1px solid white;
+  height: 25px;
+  width: 18px;
+  line-height: 23px!important;
+}
+
+.dijitCalendarContainer .dijitCalendarArrow.dijitCalendarIncrementArrow{
+  float:right;
+}
+
+.dijitCalendarContainer .dijitCalendarArrow.dijitCalendarDecrementArrow{
+  float:left;
+}
+
+
+
+/****************************************************************************************/
+/* FIX REPORT BUTTON STYLE */
+
+.reportTreeBtnContainer{
+  float:right;
+}
+
+.reportTreeBtn .dijitDropDownButton .dijitButtonNode{
+  width: 120px!important;
+  background-color: #2f96b4!important;
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4)!important;
+  background-repeat: repeat-x!important;
+  border: 1px solid #3b9ebb!important;
+  color: #fff!important;
+  text-shadow: 0 -1px 0 rgba(0,0,0,0.25)!important;
+}
+
+.reportTreeBtn .dijitDropDownButton .dijitButtonNode .dijitButtonText{
+  width: 100px!important;
+}
+
+.reportTreeBtn .dijitDropDownButton .dijitButtonNode .dijitArrowButtonInner{
+  border-top: 4px solid #fff;
+}
+
+/****************************************************************************************/
+/* FIX QUERY BUTTON STYLE */
+
+.queryTreeBtn .dijitDropDownButton .dijitButtonNode{
+  width: 300px!important;
+}
+
+.queryTreeBtn .dijitDropDownButton .dijitButtonNode .dijitButtonText{
+  width: 280px!important;
+}
diff --git a/index.html b/index.html
@@ -7,13 +7,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <title>ArcGIS Workflow Manager</title>
-    <link rel="stylesheet" href="//js.arcgis.com/3.15/esri/css/esri.css">
+    <link rel="stylesheet" href="//js.arcgis.com/3.19/esri/css/esri.css">
     <link rel="stylesheet" type="text/css" href="css/main.css">
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css">
 
 </head>
-  
+
 <body class="bootstrap">
 
     <div id="processing-outer">
@@ -40,7 +40,7 @@ <h3 id="loadingMessage">loading...</h3>
                 <li></li>
                 <li></li>
                 <li></li>
-            </ul>                    
+            </ul>
             <div id="loginContainer"></div>
             <!--
             <div class="progress progress-striped active">
@@ -63,7 +63,7 @@ <h3 id="loadingMessage">loading...</h3>
         //locale: "tr",
         //locale: "zh-cn",
         //isDebug: true,
-        packages: [ 
+        packages: [
             {
                 name: "widget",
                 location: path + "js/widget"
@@ -83,12 +83,12 @@ <h3 id="loadingMessage">loading...</h3>
         ]
     };
 </script>
-<script type="text/javascript" src="//js.arcgis.com/3.15/"></script>
+<script type="text/javascript" src="//js.arcgis.com/3.19/"></script>
 <script type="text/javascript">
     if (window.attachEvent && !window.addEventListener) {
         // unsupported browsers (IE8 or older)
         var loadingMsgElem = document.getElementById("loadingMessage");
-        loadingMsgElem.innerHTML = "Unsupported Browser" + "<br>" + 
+        loadingMsgElem.innerHTML = "Unsupported Browser" + "<br>" +
             "The browser you are using is not supported by ArcGIS Workflow Manager. Please download the latest version of Internet Explorer.";
         loadingMsgElem.className = "loading-error";
     }
@@ -97,26 +97,26 @@ <h3 id="loadingMessage">loading...</h3>
     require([
         "app/WorkflowManager",
         "dojo/parser"
-    ], 
+    ],
     function(Controller, parser) {
         parser.parse();
-        
+
         // Use Windows authenticated user to log into the application.  Select the user with or without
         // domain authentication depending on how your Workflow Manager repository is set up.
         // (Use only when windows authentication is enabled through IIS)
         //var user = "<%= User.Identity.Name.Replace("MyDomain\","") %>";  // user without domain authentication
         //var user = "<%= User.Identity.Name.Replace("\","*") %>";     // user with domain authentication
         //Controller.startup( {user: user} );
-        
+
         // Windows authetication not used
         Controller.startup();
-        
-        //Uncomment out the following lines for testing purposes only.  
+
+        //Uncomment out the following lines for testing purposes only.
         //Use this to determine the organization's domain when using windows authentication.
         //var windowsUser = "<%= User.Identity.Name %>";     // get the username from Windows
         //var loadingMsgElem = document.getElementById("loadingMessage");
-        //loadingMsgElem.innerHTML = "windowsUser = " + windowsUser;        
+        //loadingMsgElem.innerHTML = "windowsUser = " + windowsUser;
     });
 </script>
 
-</html>
+</html>
diff --git a/js/app/WorkflowManager/config/AppConfig.js b/js/app/WorkflowManager/config/AppConfig.js
@@ -18,7 +18,9 @@ define( function() {
             TokenService: "https://your-server/arcgis/tokens",
             // Portal URL and AppId only apply if using portal authentication
             PortalURL: "https://your-server/arcgis",
-            AppId: "your-application-id",
+            // The default appId for the Workflow Manager web application in Portal 10.5 and later versions is "wmxweb".
+            // Update the appId to the appropriate value as needed.
+            AppId: "wmxweb",
             // When specifying a domain with the default user, use "\\" to separate domain and username
             // e.g.  DefaultUser: "myDomain\\username"
             DefaultUser: "demo",
@@ -128,6 +130,7 @@ define( function() {
 
                 // An array of locator sources used to find search results. Only applicable if using custom locator sources.
                 // Refer to the esri/dijit/Search widget documentation for customizing locator sources.
+                // https://developers.arcgis.com/javascript/3/jsapi/search-amd.html#sources
                 locatorSources: []
             },
 

diff --git a/js/app/WorkflowManager/templates/Filter.html b/js/app/WorkflowManager/templates/Filter.html
@@ -6,13 +6,13 @@
         <input type="radio" data-dojo-type="dijit/form/RadioButton" name="queryType" value="userQuery" disabled="true" data-dojo-attach-point="queryTypeUser" data-dojo-attach-event="onClick: toggleQueryType" />
         <label for="userQuery" style="width: 100px; font-weight: normal;">${i18n_QueryTypeUser}</label>
     </span>
-    
+
     <span style="display: none;">
         <input data-dojo-attach-point="cboJobQueries">
     </span>
-    
+
     <span class="header-text">${i18n_Queries}</span>:
-    <div class="query-dropDown-container" data-dojo-attach-point="queryTreeBtn"></div>
+    <div class="query-dropDown-container queryTreeBtn" data-dojo-attach-point="queryTreeBtn"></div>
     <span class="header-text">${i18n_OrFindJob}</span>:
 
     <!--
@@ -26,12 +26,14 @@
         <button type="submit" data-dojo-attach-point="btnJobSearch"></button>
         <!--<button type="button" data-dojo-attach-point="btnClearSearch" class="text-button neg-button"></button>-->
     </form>
-    <span class="filter-bar-item">
-        <span class="header-text report-label">${i18n_Reports}</span>:
-        <div class="query-dropDown-container" data-dojo-attach-point="reportTreeBtn"></div>
-    </span>
+
     <!-- Create job dialog -->
     <button type="button" data-dojo-attach-point="btnCreateNewJob"></button>
+    <!-- Create Report Dropdown -->
+    <span class="filter-bar-item reportTreeBtnContainer">
+        <!-- <span class="header-text report-label">${i18n_Reports}</span>: -->
+        <div class="query-dropDown-container reportTreeBtn" data-dojo-attach-point="reportTreeBtn"></div>
+    </span>
     <!--<button type="button" data-dojo-type="dijit.form.Button" onclick="createJobDialog.show();" data-dojo-attach-point="btnCreateNewJob" style="float: right;">Create New Job</button>-->
     <div data-dojo-type="dijit.Dialog" data-dojo-attach-point="createJobDialog" data-dojo-id="createJobDialog" title="${i18n_CreateNewJob}" style="width: 800px">
         <div class="dijitDialogPaneContentArea">
@@ -96,5 +98,5 @@
             <button data-dojo-type="dijit/form/Button" type="button" data-dojo-props="class: 'dojo-btn-danger', onClick:function(){createJobDialog.hide();}">${i18n_Cancel}</button>
         </div>
     </div>
-    
-</div>
+
+</div>