cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [49/50] [abbrv] Merge branch 'master' into ui-restyle
Date Thu, 30 Jan 2014 22:41:40 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/index.jsp
----------------------------------------------------------------------
diff --cc ui/index.jsp
index 8e3062b,096747b..ca5b950
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@@ -62,9 -69,9 +62,9 @@@
                          <!-- Select language -->
                          <div class="select-language">
                              <select name="language">
 -                                <option value=""></option> <!-- when this
blank option is selected, browser's default language will be used -->
 +                                <option value=""><fmt:message key="label.use.default.language"/></option>
<!-- when this blank option is selected, browser's default language will be used -->
                                  <option value="en"><fmt:message key="label.lang.english"/></option>
-                                 <option value="ja"><fmt:message key="label.lang.japanese"/></option>
+                                 <option value="ja_JP"><fmt:message key="label.lang.japanese"/></option>
                                  <option value="zh_CN"><fmt:message key="label.lang.chinese"/></option>
                                  <option value="ru_RU"><fmt:message key="label.lang.russian"/></option>
                                  <option value="fr_FR"><fmt:message key="label.lang.french"/></option>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui-custom/accountsWizard.js
----------------------------------------------------------------------
diff --cc ui/scripts/ui-custom/accountsWizard.js
index 56064a6,f2017f8..f94173c
--- a/ui/scripts/ui-custom/accountsWizard.js
+++ b/ui/scripts/ui-custom/accountsWizard.js
@@@ -25,7 -25,11 +25,10 @@@
                  var $form = $wizard.find('form');
  
                  var close = function() {
--                    $wizard.dialog('destroy');
+                     $wizard.remove();
+                     $('div.overlay').fadeOut(function() {
+                         $('div.overlay').remove();
+                     });
                  };
  
                  var completeAction = function() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------


Mime
View raw message