From 61b2f9df8d5d3fdc8fe36e576cde03ba03585143 Mon Sep 17 00:00:00 2001 From: Qun Huang Date: Wed, 1 Nov 2017 10:01:46 +0800 Subject: [PATCH] add support for mobile browsers --- src/app/addmembers/add.html | 2 +- src/app/admintool/admintool.html | 5 +- .../billingaccountresources.list.html | 3 +- .../billingaccounts.list.html | 3 +- src/app/clients/clients.list.html | 3 +- src/app/groupmembers/groupmembers.list.html | 93 ++++++++++--------- src/app/groups/groups.list.html | 3 +- src/app/less/base.less | 13 ++- src/app/less/buttons.less | 23 +++++ src/app/less/media.less | 55 ++++++++++- src/app/less/pages.less | 25 +++++ src/app/less/rtl.less | 3 +- .../permission_management.html | 3 +- src/app/rolemembers/rolemembers.list.html | 3 +- src/app/roles/roles.list.html | 3 +- src/app/sso/sso.html | 2 +- src/app/submissions/submissions.html | 43 +++++---- src/app/submissions/submissions.list.html | 1 + src/app/tags/tags.list.html | 3 +- src/app/users/groups-edit-dialog.html | 3 +- src/app/users/roles-edit-dialog.html | 3 +- src/app/users/status-history-dialog.html | 3 + src/app/users/users.html | 3 +- src/components/alert/alert.html | 2 +- .../common/navigation.controller.js | 8 ++ src/components/common/navigation.html | 3 +- src/index.html | 2 +- 27 files changed, 223 insertions(+), 93 deletions(-) mode change 100755 => 100644 src/app/less/base.less mode change 100755 => 100644 src/app/less/buttons.less mode change 100755 => 100644 src/app/less/media.less mode change 100755 => 100644 src/app/less/pages.less mode change 100755 => 100644 src/app/less/rtl.less mode change 100755 => 100644 src/app/tags/tags.list.html mode change 100755 => 100644 src/components/common/navigation.html mode change 100755 => 100644 src/index.html diff --git a/src/app/addmembers/add.html b/src/app/addmembers/add.html index cf7091a..dca2213 100644 --- a/src/app/addmembers/add.html +++ b/src/app/addmembers/add.html @@ -10,7 +10,7 @@

Import Users

-
+
diff --git a/src/app/admintool/admintool.html b/src/app/admintool/admintool.html index 8d1c6c0..ae9bfe2 100644 --- a/src/app/admintool/admintool.html +++ b/src/app/admintool/admintool.html @@ -84,10 +84,10 @@

Admins / Copilots / Reviewers

-
+

No users found.

-
+
@@ -135,6 +135,7 @@

Admins / Copilots / Reviewers

+
diff --git a/src/app/billing_account_resources/billingaccountresources.list.html b/src/app/billing_account_resources/billingaccountresources.list.html index f3cffbe..85d9619 100644 --- a/src/app/billing_account_resources/billingaccountresources.list.html +++ b/src/app/billing_account_resources/billingaccountresources.list.html @@ -18,7 +18,7 @@
-
+
@@ -46,6 +46,7 @@
+
diff --git a/src/app/billing_accounts/billingaccounts.list.html b/src/app/billing_accounts/billingaccounts.list.html index 1411f45..3e4c97d 100644 --- a/src/app/billing_accounts/billingaccounts.list.html +++ b/src/app/billing_accounts/billingaccounts.list.html @@ -64,7 +64,7 @@
-
+
@@ -131,6 +131,7 @@
+
diff --git a/src/app/clients/clients.list.html b/src/app/clients/clients.list.html index f668f79..d918bb9 100644 --- a/src/app/clients/clients.list.html +++ b/src/app/clients/clients.list.html @@ -59,7 +59,7 @@
-
+
@@ -116,6 +116,7 @@
+
diff --git a/src/app/groupmembers/groupmembers.list.html b/src/app/groupmembers/groupmembers.list.html index 1faa98a..644ec85 100644 --- a/src/app/groupmembers/groupmembers.list.html +++ b/src/app/groupmembers/groupmembers.list.html @@ -102,52 +102,55 @@

{{memberType === 'user' ? 'Users' : 'Groups'}}

- - - - - - - - - - - - - +
+
{{memberType === 'user' ? 'User Id' : 'Group Id'}}{{memberType === 'user' ? 'Handle' : 'Name'}}Created byCreated atModified byModified at 
+ + + + + + + + + + + + - - - - - - - - - - - - -
{{memberType === 'user' ? 'User Id' : 'Group Id'}}{{memberType === 'user' ? 'Handle' : 'Name'}}Created byCreated atModified byModified at 
{{membership.memberId}} - - {{users[membership.memberId]}} - loading... - - - {{groups[membership.memberId]}} - loading... - - - {{users[membership.createdBy]}} - loading... - {{membership.createdAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.createdAt ? 'EDT' : ''}} - {{users[membership.modifiedBy]}} - loading... - {{membership.modifiedAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.modifiedAt ? 'EDT' : ''}} - -
+ + + + {{membership.memberId}} + + + {{users[membership.memberId]}} + loading... + + + {{groups[membership.memberId]}} + loading... + + + + {{users[membership.createdBy]}} + loading... + + {{membership.createdAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.createdAt ? 'EDT' : ''}} + + {{users[membership.modifiedBy]}} + loading... + + {{membership.modifiedAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.modifiedAt ? 'EDT' : ''}} + + + + + + + +
No members

diff --git a/src/app/groups/groups.list.html b/src/app/groups/groups.list.html index 544320e..a800759 100644 --- a/src/app/groups/groups.list.html +++ b/src/app/groups/groups.list.html @@ -6,7 +6,7 @@
-
+
@@ -53,6 +53,7 @@
No records found
+
diff --git a/src/app/less/base.less b/src/app/less/base.less old mode 100755 new mode 100644 index 83c4d0c..05913c1 --- a/src/app/less/base.less +++ b/src/app/less/base.less @@ -8,8 +8,11 @@ body { } html,body { - height: 100%; + min-height: 100%; +} +.app-wrapper { + height: inherit; } body.full-height-layout #wrapper, @@ -18,7 +21,7 @@ body.full-height-layout #page-wrapper { } #page-wrapper { - min-height: auto; + height: 100%; } body.boxed-layout { @@ -171,6 +174,7 @@ video { #wrapper { width: 100%; overflow-x: hidden; + height: inherit; } .wrapper { @@ -183,16 +187,17 @@ video { #page-wrapper { padding: 0 15px; - min-height: 568px; + min-height: 667px; position: relative !important; } @media (min-width: 768px) { #page-wrapper { position: inherit; + min-height: 959px; margin: 0 0 0 240px; - min-height: 1000px; } + } .title-action { diff --git a/src/app/less/buttons.less b/src/app/less/buttons.less old mode 100755 new mode 100644 index 246b24a..b9dd815 --- a/src/app/less/buttons.less +++ b/src/app/less/buttons.less @@ -7,6 +7,29 @@ margin-bottom: 5px; } +@media (max-width: 768px) { + + .float-e-margins .btn { + margin: 15px 0 0 14px; + } + + .float-e-margins .col-md-2 .btn, + .float-e-margins .col-sm-3 .btn { + margin-left: 0; + } + + .float-e-margins table .btn { + margin: 0; + width: 100%; + display: block; + + &:first-child { + margin-bottom: 15px; + } + } +} + + .btn-w-m { min-width: 120px; } diff --git a/src/app/less/media.less b/src/app/less/media.less old mode 100755 new mode 100644 index 5c27f41..795d265 --- a/src/app/less/media.less +++ b/src/app/less/media.less @@ -2,7 +2,11 @@ #page-wrapper { position: inherit; margin: 0 0 0 @sidebar-width; - min-height: 1200px; + height: 100%; + } + + .m-menu { + display: none; } .navbar-static-side { @@ -23,14 +27,57 @@ #page-wrapper { position: inherit; margin: 0 0 0 0px; - min-height: 1000px; + } + + .m-menu { + display: block; + position: absolute; + top: 5px; + right: 10px; + z-index: 2; + &.menu-open { + color: #fff; + } + } + + .table-responsive { + overflow-y: auto; + border: none; + padding-bottom: 49px; + margin: 0; + } + + // Now at mobile, paignation will be position absolute and display 0 left + .table-responsive .pagination { + position: absolute; + left: 34px; + bottom: 42px; + } + + .roles-table .pagination { + bottom: 22px; + } + + .dropdown-menu { + right: 0; + left: auto; + top: 30px; } .body-small .navbar-static-side { - display: none; z-index: 2001; position: absolute; - width: 70px; + width: 100%; + top: 0; + } + + .metismenu { + display: none; + } + + .metismenu.menu-open { + background: rgb(47, 64, 80); + display: block; } .body-small.mini-navbar .navbar-static-side { diff --git a/src/app/less/pages.less b/src/app/less/pages.less old mode 100755 new mode 100644 index 057dc4b..cbec701 --- a/src/app/less/pages.less +++ b/src/app/less/pages.less @@ -610,6 +610,10 @@ a.compose-mail { margin-bottom: 20px; } +.word-wrap { + word-break: break-all; +} + .mail-box-header { background-color: #ffffff; border: 1px solid @border-color; @@ -1319,3 +1323,24 @@ body.body-small .vote-icon { display: none; } +// Mobile new style +@media (max-width: 768px) { + + .float-e-margins { + &.import-form { + .row { + margin-left: 0; + margin-right: 0; + } + + .block { + word-break: break-all; + } + } + } + + .float-e-margins table .btn-group { + width: 100%; + } + +} diff --git a/src/app/less/rtl.less b/src/app/less/rtl.less old mode 100755 new mode 100644 index 3aaf4e8..ad63b00 --- a/src/app/less/rtl.less +++ b/src/app/less/rtl.less @@ -233,8 +233,7 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed .body-small.rtls #page-wrapper { position: inherit; - margin: 0 0 0 0px; - min-height: 1000px; + margin: 0; } .body-small.rtls .navbar-static-side { diff --git a/src/app/permission_management/permission_management.html b/src/app/permission_management/permission_management.html index 9bb00bf..0c0dc59 100644 --- a/src/app/permission_management/permission_management.html +++ b/src/app/permission_management/permission_management.html @@ -73,7 +73,7 @@

Roles

-
+

Press on a role row to assign/unassign users.

Roles
+
\ No newline at end of file diff --git a/src/app/rolemembers/rolemembers.list.html b/src/app/rolemembers/rolemembers.list.html index 0a67a13..346d80a 100644 --- a/src/app/rolemembers/rolemembers.list.html +++ b/src/app/rolemembers/rolemembers.list.html @@ -49,7 +49,7 @@

-
+
@@ -88,6 +88,7 @@

+ diff --git a/src/app/roles/roles.list.html b/src/app/roles/roles.list.html index 85f6c5c..ac0ead3 100644 --- a/src/app/roles/roles.list.html +++ b/src/app/roles/roles.list.html @@ -65,7 +65,7 @@ -
+

+
diff --git a/src/app/sso/sso.html b/src/app/sso/sso.html index 98fcca0..a7ab50c 100644 --- a/src/app/sso/sso.html +++ b/src/app/sso/sso.html @@ -10,7 +10,7 @@

Import SSO Users

-
+
diff --git a/src/app/submissions/submissions.html b/src/app/submissions/submissions.html index 906c46b..93f9bfd 100644 --- a/src/app/submissions/submissions.html +++ b/src/app/submissions/submissions.html @@ -20,7 +20,7 @@

Submissions

-
@@ -38,25 +38,28 @@

Submissions

{{challengeObj.subTrack}}
(Submittable) Phases
- - - - - - - - - - - - - - - - - - -
IdTypeStatusActual / Schedule End Time
{{p.value.id}}{{p.name}}{{p.value.phaseStatus}}{{p.value.actualEndTime|amFromUnix| amTimezone:'America/New_York'| amDateFormat:'MM.DD.YYYY HH:mm z'}} (A){{p.value.scheduledEndTime|amFromUnix| amTimezone:'America/New_York'| amDateFormat:'MM.DD.YYYY HH:mm z'}} (S)
+
+ + + + + + + + + + + + + + + + + + +
IdTypeStatusActual / Schedule End Time
{{p.value.id}}{{p.name}}{{p.value.phaseStatus}}{{p.value.actualEndTime|amFromUnix| amTimezone:'America/New_York'| amDateFormat:'MM.DD.YYYY HH:mm z'}} (A){{p.value.scheduledEndTime|amFromUnix| amTimezone:'America/New_York'| amDateFormat:'MM.DD.YYYY HH:mm z'}} (S)
+
+
diff --git a/src/app/submissions/submissions.list.html b/src/app/submissions/submissions.list.html index c123ecc..ba8efe6 100644 --- a/src/app/submissions/submissions.list.html +++ b/src/app/submissions/submissions.list.html @@ -58,6 +58,7 @@

Submissions for Challenge # {{challengeObj.name}}

+
diff --git a/src/app/tags/tags.list.html b/src/app/tags/tags.list.html old mode 100755 new mode 100644 index d40d51d..57c91df --- a/src/app/tags/tags.list.html +++ b/src/app/tags/tags.list.html @@ -45,7 +45,7 @@

No Tags found.

-
+
@@ -100,6 +100,7 @@
+
diff --git a/src/app/users/groups-edit-dialog.html b/src/app/users/groups-edit-dialog.html index c7d7200..3e1d57d 100644 --- a/src/app/users/groups-edit-dialog.html +++ b/src/app/users/groups-edit-dialog.html @@ -9,7 +9,7 @@
-
+
@@ -34,6 +34,7 @@
No groups

+
diff --git a/src/app/users/roles-edit-dialog.html b/src/app/users/roles-edit-dialog.html index 718d310..fa43692 100644 --- a/src/app/users/roles-edit-dialog.html +++ b/src/app/users/roles-edit-dialog.html @@ -9,7 +9,7 @@
-
+
@@ -34,6 +34,7 @@
No roles

+
diff --git a/src/app/users/status-history-dialog.html b/src/app/users/status-history-dialog.html index 0c8e4a4..7788825 100644 --- a/src/app/users/status-history-dialog.html +++ b/src/app/users/status-history-dialog.html @@ -5,6 +5,7 @@
+
@@ -19,6 +20,8 @@
+
+
diff --git a/src/app/users/users.html b/src/app/users/users.html index 093d281..32766e7 100644 --- a/src/app/users/users.html +++ b/src/app/users/users.html @@ -54,7 +54,7 @@

Users

-
+
@@ -135,6 +135,7 @@

Users

+
diff --git a/src/components/alert/alert.html b/src/components/alert/alert.html index e888b0f..4e564f4 100644 --- a/src/components/alert/alert.html +++ b/src/components/alert/alert.html @@ -1,5 +1,5 @@
-