Cherry-pick changes from release-0.2.

* Placeholder emulation added in IE
  So optional fieleds are marked in IE now
  Ibaff1fd6b1e60ff7431f1eb763e449070b94247e
* Fix MRN-937 (regression issue)
  I762dfad99cecb8eed63c4b2b8c89bcbe8ee1c2d0

Change-Id: Ie09c253af9af0b06e5a1278e33f5b73eb11f2daf

muranodashboard/panel/tables.py

@@ -37,7 +37,7 @@ class CreateService(tables.LinkAction):
 
     def allowed(self, request, environment):
         environment_id = self.table.kwargs['environment_id']
-        status = api.get_environment_data(request, environment_id, 'status')
+        status, = api.get_environment_data(request, environment_id, 'status')
         if status not in [STATUS_ID_DEPLOYING]:
             return True
         return False

muranodashboard/services/ActiveDirectory.yaml

@@ -89,6 +89,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
       validators:
         # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
         - expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}

muranodashboard/services/AspNetApp.yaml

@@ -71,6 +71,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
   - instanceConfiguration:
       fields:
         - name: title

muranodashboard/services/AspNetAppFarm.yaml

@@ -92,6 +92,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
       validators:
         # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
         - expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}

muranodashboard/services/MsSqlClusterServer.yaml

@@ -152,6 +152,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
       validators:
         # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
         - expr: {YAQL: not $.clusterConfiguration.unitNamingPattern.bool() or '#' in $.clusterConfiguration.unitNamingPattern}

muranodashboard/services/MsSqlServer.yaml

@@ -81,6 +81,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
   - instanceConfiguration:
       fields:
         - name: title

muranodashboard/services/WebServer.yaml

@@ -62,6 +62,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
   - instanceConfiguration:
       fields:
         - name: title

muranodashboard/services/WebServerFarm.yaml

@@ -79,6 +79,10 @@ forms:
           required: false
           regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
           helpText: Optional field for a machine hostname template
+          # temporaryHack
+          widgetMedia:
+            js: [muranodashboard/js/support_placeholder.js]
+            css: {all: [muranodashboard/css/support_placeholder.css]}
       validators:
         # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
         - expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}

muranodashboard/static/muranodashboard/css/support_placeholder.css

@@ -0,0 +1,4 @@
+.placeholder {
+    color: #999999;
+    font-style: italic;
+}

muranodashboard/static/muranodashboard/js/support_placeholder.js

@@ -0,0 +1,37 @@
+/*    Copyright (c) 2013 Mirantis, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you may
+    not use this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and limitations
+    under the License.
+*/
+$(function() {
+    var get_IE_version = function() {
+        if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) { //test for MSIE x.x;
+            var IE_version = new Number(RegExp.$1) // capture x.x portion and store as a number
+            return IE_version
+        }
+    }
+    if (get_IE_version() < 10) {
+        $('[placeholder]').focus(function() {
+              var input = $(this);
+              if (input.val() == input.attr('placeholder')) {
+                input.val('');
+                input.removeClass('placeholder');
+              }
+            }).blur(function() {
+              var input = $(this);
+              if (input.val() == '' || input.val() == input.attr('placeholder')) {
+                input.addClass('placeholder');
+                input.val(input.attr('placeholder'));
+              }
+            }).blur();
+        }
+});