AMBARI-7408. Slider View: Multiple small fixes to Create App wizard UI. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0255e5da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0255e5da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0255e5da Branch: refs/heads/branch-alerts-dev Commit: 0255e5dacf6ad02d262969d87edb9639c5bfb9ec Parents: 52d8c27 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Sep 19 16:58:39 2014 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Sep 19 17:01:10 2014 +0300 ---------------------------------------------------------------------- .../ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../ui-bg_glass_75_ffffff_1x400.png | Bin 0 -> 107 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../ui-bg_inset-soft_95_fef1ec_1x100.png | Bin 0 -> 123 bytes .../ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes .../ui-icons_f6cf3b_256x240.png | Bin 0 -> 8884 bytes .../resources/ui/app/styles/application.less | 37 +++++++++++++++++++ .../resources/ui/app/templates/slider_apps.hbs | 3 +- .../src/main/resources/ui/app/translations.js | 6 +-- 17 files changed, 41 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aaaaaa_40x100.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aaaaaa_40x100.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 0000000..5b5dab2 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aaaaaa_40x100.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 0000000..ad3d634 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ffffff_1x400.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ffffff_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ffffff_1x400.png new file mode 100644 index 0000000..42ccba2 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ffffff_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 0000000..5a46b47 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100644 index 0000000..86c2baa Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_ffffff_1x400.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_ffffff_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_ffffff_1x400.png new file mode 100644 index 0000000..e65ca12 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_ffffff_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_highlight-soft_75_cccccc_1x100.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_highlight-soft_75_cccccc_1x100.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_highlight-soft_75_cccccc_1x100.png new file mode 100644 index 0000000..7c9fa6c Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_highlight-soft_75_cccccc_1x100.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_inset-soft_95_fef1ec_1x100.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_inset-soft_95_fef1ec_1x100.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_inset-soft_95_fef1ec_1x100.png new file mode 100644 index 0000000..0e05810 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_inset-soft_95_fef1ec_1x100.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_222222_256x240.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_222222_256x240.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_222222_256x240.png new file mode 100644 index 0000000..b273ff1 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_222222_256x240.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_2e83ff_256x240.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_2e83ff_256x240.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_2e83ff_256x240.png new file mode 100644 index 0000000..09d1cdc Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_2e83ff_256x240.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_454545_256x240.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_454545_256x240.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_454545_256x240.png new file mode 100644 index 0000000..59bd45b Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_454545_256x240.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_888888_256x240.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_888888_256x240.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_888888_256x240.png new file mode 100644 index 0000000..6d02426 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_888888_256x240.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_cd0a0a_256x240.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_cd0a0a_256x240.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_cd0a0a_256x240.png new file mode 100644 index 0000000..2ab019b Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_cd0a0a_256x240.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_f6cf3b_256x240.png ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_f6cf3b_256x240.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_f6cf3b_256x240.png new file mode 100644 index 0000000..c986935 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-icons_f6cf3b_256x240.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/styles/application.less ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/application.less b/contrib/views/slider/src/main/resources/ui/app/styles/application.less index f8bded3..2ea4ed8 100644 --- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less +++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less @@ -44,6 +44,40 @@ a { cursor: pointer; } +select { + background-color: #ffffff; + border: 1px solid #cccccc; + color: #555555; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +.well { + border-radius: 0px; + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + +.nav-pills { + &>li { + &> a { + border-radius: 0px; + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + } + &.active { + &> a, &> a:hover, &> a:focus { + background-color: #666666; + + } + } + } +} + .slider-header { overflow: hidden; .box-header { @@ -126,12 +160,14 @@ a { font-size: 12px; label { font-size: 12px; + font-weight: normal; } div { display: inline-block; margin:0 10px; } .filtered-hosts-info, .selected-hosts-info { + float: left; text-align: left; margin-top: 8px; margin-left: 17px; @@ -146,6 +182,7 @@ a { width:70px; font-size: 12px; height: 27px; + padding: 4px 6px; } } .paging_two_button { http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs index ef72291..fc744d1 100644 --- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs @@ -62,8 +62,7 @@ {{/each}} {{else}} <tr> - <td class="first"></td> - <td colspan="11"> + <td colspan="6"> {{t tableView.filters.noItems}} </td> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/translations.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/translations.js b/contrib/views/slider/src/main/resources/ui/app/translations.js index b3bfa14..6c22176 100644 --- a/contrib/views/slider/src/main/resources/ui/app/translations.js +++ b/contrib/views/slider/src/main/resources/ui/app/translations.js @@ -66,7 +66,7 @@ Em.I18n.translations = { 'tableView.filters.clearAllFilters': 'clear filters', 'tableView.filters.showAll': 'Show All', 'tableView.filters.clearSelection': 'clear selection All', - 'tableView.filters.noItems' : 'There are no items to show', + 'tableView.filters.noItems' : 'No sliders to display', 'configs.add_property': 'Add Property', 'configs.add_property.invalid_name': 'Config name should consists only of letters, numbers, \'-\', \'_\', \'.\' and first character should be a letter.', @@ -96,9 +96,9 @@ Em.I18n.translations = { 'sliderApp.alerts.brLastCheck': "\nLast Checked {0}", 'sliderApp.alerts.occurredOn': 'Occurred on {0}, {1}', - 'wizard.name': 'Create Slider App', + 'wizard.name': 'Create App', 'wizard.step1.name': 'Select Type', - 'wizard.step1.header': 'Available Types', + 'wizard.step1.header': 'Available Applications', 'wizard.step1.description': 'Description', 'wizard.step1.typeDescription': 'Deploys {0} cluster on YARN.', 'wizard.step1.nameFormatError': 'App Name should consist only of letters, numbers, \'-\', \'_\' and first character should be a letter.',
