From 66f29dd1038bfd921a8e1cb2f2a177ac86d5d132 Mon Sep 17 00:00:00 2001 From: "Herwono W. Wijaya" Date: Tue, 13 Mar 2018 12:36:53 +0700 Subject: [PATCH] style(app): upgrade to font awesome v5 --- .../configs-datatable/configsDatatable.html | 16 +++---- .../containerNetworksDatatable.html | 2 +- .../containersDatatable.html | 42 +++++++++---------- .../events-datatable/eventsDatatable.html | 12 +++--- .../images-datatable/imagesDatatable.html | 18 ++++---- .../networks-datatable/networksDatatable.html | 34 +++++++-------- .../nodeTasksDatatable.html | 20 ++++----- .../nodes-datatable/nodesDatatable.html | 30 ++++++------- .../nodes-ss-datatable/nodesSSDatatable.html | 26 ++++++------ .../secrets-datatable/secretsDatatable.html | 14 +++---- .../services-datatable/servicesDatatable.html | 38 ++++++++--------- .../tasks-datatable/tasksDatatable.html | 22 +++++----- .../volumes-datatable/volumesDatatable.html | 22 +++++----- .../dockerSidebarContent.html | 4 +- .../components/log-viewer/logViewer.html | 2 +- app/docker/views/configs/configs.html | 4 +- app/docker/views/configs/edit/config.html | 8 ++-- .../containers/console/containerconsole.html | 4 +- app/docker/views/containers/containers.html | 2 +- .../containers/create/createcontainer.html | 4 +- .../views/containers/edit/container.html | 16 +++---- .../containers/inspect/containerinspect.html | 2 +- .../containers/stats/containerstats.html | 6 +-- app/docker/views/dashboard/dashboard.html | 8 ++-- app/docker/views/engine/engine.html | 2 +- app/docker/views/events/events.html | 2 +- app/docker/views/images/build/buildimage.html | 2 +- app/docker/views/images/edit/image.html | 10 ++--- app/docker/views/images/images.html | 2 +- app/docker/views/networks/edit/network.html | 4 +- app/docker/views/networks/networks.html | 2 +- app/docker/views/nodes/edit/node.html | 2 +- app/docker/views/secrets/edit/secret.html | 4 +- app/docker/views/secrets/secrets.html | 2 +- .../views/services/create/createservice.html | 4 +- app/docker/views/services/edit/service.html | 8 ++-- app/docker/views/services/services.html | 2 +- app/docker/views/stacks/edit/stack.html | 4 +- app/docker/views/stacks/stacks.html | 2 +- app/docker/views/swarm/swarm.html | 6 +-- .../swarm/visualizer/swarmvisualizer.html | 6 +-- app/docker/views/tasks/edit/task.html | 2 +- app/docker/views/templates/templates.html | 14 +++---- app/docker/views/volumes/edit/volume.html | 2 +- app/docker/views/volumes/volumes.html | 2 +- .../storidgeClusterEventsDatatable.html | 16 +++---- .../storidgeNodesDatatable.html | 16 +++---- .../storidgeProfilesDatatable.html | 6 +-- .../storidge/views/cluster/cluster.html | 4 +- .../storidge/views/monitor/monitor.html | 8 ++-- .../storidge/views/profiles/profiles.html | 8 ++-- app/portainer/components/buttonSpinner.js | 2 +- .../endpointsDatatable.html | 10 ++--- .../registriesDatatable.html | 10 ++--- .../stackServicesDatatable.html | 22 +++++----- .../stacks-datatable/stacksDatatable.html | 10 ++--- .../teams-datatable/teamsDatatable.html | 6 +-- .../users-datatable/usersDatatable.html | 16 +++---- .../endpointSecurity/porEndpointSecurity.html | 14 +++---- app/portainer/components/header-content.js | 2 +- app/portainer/components/header-title.js | 2 +- app/portainer/views/about/about.html | 18 ++++---- app/portainer/views/auth/auth.html | 2 +- app/portainer/views/endpoints/endpoints.html | 2 +- .../views/init/endpoint/initEndpoint.html | 6 +-- .../views/registries/registries.html | 2 +- .../settingsAuthentication.html | 2 +- app/portainer/views/settings/settings.html | 2 +- app/portainer/views/teams/edit/team.html | 2 +- app/portainer/views/teams/teams.html | 2 +- app/portainer/views/users/edit/user.html | 2 +- app/portainer/views/users/users.html | 2 +- assets/css/app.css | 2 +- gruntfile.js | 11 ++++- package.json | 2 +- vendor.yml | 10 ++++- yarn.lock | 8 ++-- 77 files changed, 340 insertions(+), 327 deletions(-) diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html index 96a2dcc76..9ca9d1adc 100644 --- a/app/docker/components/datatables/configs-datatable/configsDatatable.html +++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html @@ -3,7 +3,7 @@
- {{ $ctrl.title }} + {{ $ctrl.title }}
@@ -14,7 +14,7 @@
diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html index f9e82b812..15421a656 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.html +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html @@ -67,7 +67,7 @@
+ diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html index 234797714..85b57a11c 100644 --- a/app/docker/views/volumes/volumes.html +++ b/app/docker/views/volumes/volumes.html @@ -1,7 +1,7 @@ - + Volumes diff --git a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html index 61800cb82..6ce9e3f1f 100644 --- a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html +++ b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html @@ -22,29 +22,29 @@ Date - - + + Category - - + + Module - - + + Content - - + + diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html index 7478e83d5..973b517d7 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html @@ -22,29 +22,29 @@ Name - - + + IP Address - - + + Role - - + + Status - - + + diff --git a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html index e2ab91dd0..642f69a03 100644 --- a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html +++ b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html @@ -14,7 +14,7 @@
@@ -32,8 +32,8 @@ Name - - + + diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html index da715f485..9f40e7035 100644 --- a/app/extensions/storidge/views/cluster/cluster.html +++ b/app/extensions/storidge/views/cluster/cluster.html @@ -1,7 +1,7 @@ - + @@ -41,7 +41,7 @@ Shutting down cluster...
diff --git a/app/extensions/storidge/views/monitor/monitor.html b/app/extensions/storidge/views/monitor/monitor.html index b4ce1bfc4..2101294ce 100644 --- a/app/extensions/storidge/views/monitor/monitor.html +++ b/app/extensions/storidge/views/monitor/monitor.html @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@
- +
@@ -45,7 +45,7 @@
- +
@@ -78,7 +78,7 @@
- +
diff --git a/app/extensions/storidge/views/profiles/profiles.html b/app/extensions/storidge/views/profiles/profiles.html index 5e5b054a8..d6a5dcfce 100644 --- a/app/extensions/storidge/views/profiles/profiles.html +++ b/app/extensions/storidge/views/profiles/profiles.html @@ -1,7 +1,7 @@ - + @@ -49,7 +49,7 @@
- +
Items per page: diff --git a/app/portainer/components/buttonSpinner.js b/app/portainer/components/buttonSpinner.js index ca82bf322..357f17bf2 100644 --- a/app/portainer/components/buttonSpinner.js +++ b/app/portainer/components/buttonSpinner.js @@ -6,7 +6,7 @@ angular.module('portainer.app') spinning: '=buttonSpinner' }, transclude: true, - template: ' ' + template: ' ' }; return directive; diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html index cee17d2eb..95dc16296 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html @@ -14,7 +14,7 @@
@@ -32,15 +32,15 @@ Name - - + + URL - - + + Actions diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html index 55dc943ba..d45e2bff3 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html @@ -14,7 +14,7 @@
@@ -32,8 +32,8 @@ Name - - + + diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.html b/app/portainer/components/datatables/users-datatable/usersDatatable.html index 0d6c0e1ea..5db9e58d1 100644 --- a/app/portainer/components/datatables/users-datatable/usersDatatable.html +++ b/app/portainer/components/datatables/users-datatable/usersDatatable.html @@ -14,7 +14,7 @@
@@ -32,22 +32,22 @@ Name - - + + Role - - + + Authentication - - + + @@ -63,7 +63,7 @@ - + {{ item.RoleName }} diff --git a/app/portainer/components/endpointSecurity/porEndpointSecurity.html b/app/portainer/components/endpointSecurity/porEndpointSecurity.html index ca86ce940..70c9551ed 100644 --- a/app/portainer/components/endpointSecurity/porEndpointSecurity.html +++ b/app/portainer/components/endpointSecurity/porEndpointSecurity.html @@ -31,7 +31,7 @@
@@ -100,7 +100,7 @@ {{ $ctrl.formData.TLSCert.name }} - +
@@ -114,7 +114,7 @@ {{ $ctrl.formData.TLSKey.name }} - +
diff --git a/app/portainer/components/header-content.js b/app/portainer/components/header-content.js index cb9de8f6e..638e78d50 100644 --- a/app/portainer/components/header-content.js +++ b/app/portainer/components/header-content.js @@ -6,7 +6,7 @@ angular.module('portainer.app') link: function (scope, iElement, iAttrs) { scope.username = Authentication.getUserDetails().username; }, - template: '
my account log out
', + template: '
my account log out
', restrict: 'E' }; return directive; diff --git a/app/portainer/components/header-title.js b/app/portainer/components/header-title.js index 3b4f88665..073410de6 100644 --- a/app/portainer/components/header-title.js +++ b/app/portainer/components/header-title.js @@ -10,7 +10,7 @@ angular.module('portainer.app') scope.displayDonationHeader = StateManager.getState().application.displayDonationHeader; }, transclude: true, - template: '
{{title}} {{username}} Help support portainer
', + template: '
{{title}} {{username}} Help support portainer
', restrict: 'E' }; return directive; diff --git a/app/portainer/views/about/about.html b/app/portainer/views/about/about.html index 918c8532a..c200ab24a 100644 --- a/app/portainer/views/about/about.html +++ b/app/portainer/views/about/about.html @@ -28,23 +28,23 @@

Fund our work

Contribute

Spread the word

  • Talk to your friends and colleagues about how awesome Portainer is!
    • -
  • Follow us on Twitter
    • +
  • Follow us on Twitter

@@ -56,7 +56,7 @@
- +

@@ -69,15 +69,15 @@

Community support

Services

diff --git a/app/portainer/views/auth/auth.html b/app/portainer/views/auth/auth.html index f58276395..6cde5c633 100644 --- a/app/portainer/views/auth/auth.html +++ b/app/portainer/views/auth/auth.html @@ -28,7 +28,7 @@
- + {{ state.AuthenticationError }} diff --git a/app/portainer/views/endpoints/endpoints.html b/app/portainer/views/endpoints/endpoints.html index b27569673..7b6eb9205 100644 --- a/app/portainer/views/endpoints/endpoints.html +++ b/app/portainer/views/endpoints/endpoints.html @@ -1,7 +1,7 @@ - + Endpoint management diff --git a/app/portainer/views/init/endpoint/initEndpoint.html b/app/portainer/views/init/endpoint/initEndpoint.html index c526d2ec8..5849c9b27 100644 --- a/app/portainer/views/init/endpoint/initEndpoint.html +++ b/app/portainer/views/init/endpoint/initEndpoint.html @@ -148,7 +148,7 @@ {{ formValues.TLSCACert.name }} - +
@@ -162,7 +162,7 @@ {{ formValues.TLSCert.name }} - +
@@ -175,7 +175,7 @@ {{ formValues.TLSKey.name }} - +
diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html index e432c300b..8c822d8ee 100644 --- a/app/portainer/views/registries/registries.html +++ b/app/portainer/views/registries/registries.html @@ -1,7 +1,7 @@ - + Registry management diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html index 2d655dea3..ce5b6798d 100644 --- a/app/portainer/views/settings/authentication/settingsAuthentication.html +++ b/app/portainer/views/settings/authentication/settingsAuthentication.html @@ -162,7 +162,7 @@ {{ formValues.TLSCACert.name }} - +
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html index a12aa4f0c..ed1e5ba74 100644 --- a/app/portainer/views/settings/settings.html +++ b/app/portainer/views/settings/settings.html @@ -168,7 +168,7 @@ {{ label.name }} {{ label.value }} - + No filter available. diff --git a/app/portainer/views/teams/edit/team.html b/app/portainer/views/teams/edit/team.html index a2942b38e..f0b4ca3be 100644 --- a/app/portainer/views/teams/edit/team.html +++ b/app/portainer/views/teams/edit/team.html @@ -16,7 +16,7 @@ Name {{ team.Name }} - + diff --git a/app/portainer/views/teams/teams.html b/app/portainer/views/teams/teams.html index 6da96c691..66c4b6e54 100644 --- a/app/portainer/views/teams/teams.html +++ b/app/portainer/views/teams/teams.html @@ -1,7 +1,7 @@ - + Teams management diff --git a/app/portainer/views/users/edit/user.html b/app/portainer/views/users/edit/user.html index e8a417461..5c8ab61a6 100644 --- a/app/portainer/views/users/edit/user.html +++ b/app/portainer/views/users/edit/user.html @@ -16,7 +16,7 @@ {{ user.Username }} - + diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html index b1801f1db..047721771 100644 --- a/app/portainer/views/users/users.html +++ b/app/portainer/views/users/users.html @@ -1,7 +1,7 @@ - + User management diff --git a/assets/css/app.css b/assets/css/app.css index 3df9b6f5b..f5ec6b79c 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -586,7 +586,7 @@ ul.sidebar .sidebar-list .sidebar-sublist a.active { .boxselector_wrapper input[type="radio"]:checked + label::after { color: #337ab7; - font-family: FontAwesome; + font-family: "Font Awesome 5 Free"; border: 2px solid #337ab7; content: "\f00c"; font-size: 16px; diff --git a/gruntfile.js b/gruntfile.js index c957b3eb7..15c1fd81e 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -159,7 +159,7 @@ gruntfile_cfg.copy = { assets: { files: [ {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/bootstrap/fonts/'}, - {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/font-awesome/fonts/'}, + {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,eot,svg}', expand: true, cwd: 'node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/'}, {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/rdash-ui/dist/fonts/'}, {dest: '<%= distdir %>/images/', src: '**', expand: true, cwd: 'assets/images/'}, {dest: '<%= distdir %>/ico', src: '**', expand: true, cwd: 'assets/ico'} @@ -235,7 +235,8 @@ gruntfile_cfg.replace = { options: { patterns: [ { match: 'ENVIRONMENT', replacement: '<%= grunt.config.get("environment") %>' }, - { match: 'CONFIG_GA_ID', replacement: '<%= pkg.config.GA_ID %>' } + { match: 'CONFIG_GA_ID', replacement: '<%= pkg.config.GA_ID %>' }, + { match: /..\/webfonts\//g, replacement: '../fonts/'} ] }, files: [ @@ -244,6 +245,12 @@ gruntfile_cfg.replace = { flatten: true, src: ['.tmp/concat/js/app.js'], dest: '.tmp/concat/js' + }, + { + expand: true, + flatten: true, + src: ['.tmp/concat/css/app.css'], + dest: '.tmp/concat/css' } ] } diff --git a/package.json b/package.json index babf2346a..bd35b3e5d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "node": ">= 0.8.4" }, "dependencies": { + "@fortawesome/fontawesome-free-webfonts": "^1.0.4", "@uirouter/angularjs": "~1.0.6", "angular": "~1.5.0", "angular-clipboard": "^1.6.2", @@ -45,7 +46,6 @@ "chart.js": "~2.6.0", "codemirror": "~5.30.0", "filesize": "~3.3.0", - "font-awesome": "~4.7.0", "isteven-angular-multiselect": "~4.0.0", "jquery": "^3.3.1", "js-yaml": "~3.10.0", diff --git a/vendor.yml b/vendor.yml index a38cb34a0..251050659 100644 --- a/vendor.yml +++ b/vendor.yml @@ -42,7 +42,10 @@ css: - node_modules/rdash-ui/dist/css/rdash.css - node_modules/isteven-angular-multiselect/isteven-multi-select.css - node_modules/ui-select/dist/select.css - - node_modules/font-awesome/css/font-awesome.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fa-brands.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fa-regular.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fa-solid.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fontawesome.css - node_modules/toastr/build/toastr.css - node_modules/xterm/dist/xterm.css - node_modules/angularjs-slider/dist/rzslider.css @@ -55,7 +58,10 @@ css: - node_modules/rdash-ui/dist/css/rdash.min.css - node_modules/isteven-angular-multiselect/isteven-multi-select.css - node_modules/ui-select/dist/select.min.css - - node_modules/font-awesome/css/font-awesome.min.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fa-brands.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fa-regular.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fa-solid.css + - node_modules/@fortawesome/fontawesome-free-webfonts/css/fontawesome.css - node_modules/toastr/build/toastr.min.css - node_modules/xterm/dist/xterm.css - node_modules/angularjs-slider/dist/rzslider.min.css diff --git a/yarn.lock b/yarn.lock index 0ecbadb85..e64420e5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,10 @@ # yarn lockfile v1 +"@fortawesome/fontawesome-free-webfonts@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f" + "@uirouter/angularjs@~1.0.6": version "1.0.11" resolved "https://registry.yarnpkg.com/@uirouter/angularjs/-/angularjs-1.0.11.tgz#ced1ec8bea68a5db7dcfd77a43b7b8b9a2953540" @@ -1482,10 +1486,6 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -font-awesome@~4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - for-in@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"