Skip to content
Browse files

Merge pull request #891 from ddurnev/master

[RJA-2001][feature]: improve datetime picker UI.
  • Loading branch information...
2 parents 5c83d28 + 83fdd31 commit f55d12d224bccd7e577f65e613b3417d115a0e1f @rsvato rsvato committed Mar 20, 2013
View
8 ui/src/main/resources/genesis/app/modules/env_details/env_details.js
@@ -631,6 +631,14 @@ function (genesis, backend, poller, status, EnvHistory, variablesmodule, gtempla
}));
if(view.scheduling) {
+ var locale = genesis.app.currentConfiguration.locale;
+ $.timepicker.setDefaults({
+ controlType :"select",
+ showOn: "button", buttonText: "Select date & time",
+ buttonImage: "assets/img/date-picker.png", buttonImageOnly: true,
+ // TODO: provide timepicker localization file
+ timeFormat: locale == "en-US" ? "hh:mm tt" : "HH:mm"
+ });
var date = new Date();
date.setHours(0);
date.setMinutes(0);
View
7 ui/src/main/resources/genesis/assets/css/style.css
@@ -1896,6 +1896,13 @@ table.settings td.restart-required {
line-height: 1.5em;
}
+/* Fix jquery-ui datepicker 'Now' button to not look 'grayed' */
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+ float:left;
+ font-weight:bold;
+ opacity: 1.0
+}
+
/* Growl */
.ui-notify {
View
BIN ui/src/main/resources/genesis/assets/img/date-picker.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f55d12d

Please sign in to comment.
Something went wrong with that request. Please try again.