From d7c5dfd20b46b342720a2f2b5d3e021d6ad5f5b1 Mon Sep 17 00:00:00 2001 From: Dan Theisen Date: Mar 25 2017 11:58:27 +0000 Subject: [PATCH 1/3] Update Ipsilon icon Signed-off-by: Dan Theisen --- diff --git a/less/styles.less b/less/styles.less index 8f2a151..ca94ca7 100644 --- a/less/styles.less +++ b/less/styles.less @@ -2547,6 +2547,8 @@ table.datatable th:active { } .navbar-pf .navbar-brand img { display: block; + margin: -9px 0; + height: 28px; } .navbar-pf .navbar-collapse { border-top: 0; @@ -3494,8 +3496,3 @@ table.datatable th:active { .ipsilon-user .list-group{ border-top: 1px solid rgba(255,255,255,0.01); } -.ipsilon-logotext{ - margin-top: 2em; - height: 18px; - padding-left: 1em; -} diff --git a/templates/index.html b/templates/index.html index 62e36f2..ccc6fa5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -18,7 +18,7 @@ - Ipsilon + Ipsilon
diff --git a/templates/master-admin.html b/templates/master-admin.html index 9885036..4020182 100644 --- a/templates/master-admin.html +++ b/templates/master-admin.html @@ -36,7 +36,7 @@ - Ipsilon + Ipsilon
diff --git a/templates/master-portal.html b/templates/master-portal.html index cb41d2e..adbded2 100644 --- a/templates/master-portal.html +++ b/templates/master-portal.html @@ -17,7 +17,7 @@ - Ipsilon + Ipsilon
diff --git a/templates/master-user.html b/templates/master-user.html index a8139af..670d72c 100644 --- a/templates/master-user.html +++ b/templates/master-user.html @@ -22,7 +22,7 @@
- Ipsilon + Ipsilon
diff --git a/templates/master.html b/templates/master.html index 49103d0..e269d1e 100644 --- a/templates/master.html +++ b/templates/master.html @@ -25,7 +25,7 @@
- Ipsilon + Ipsilon
{% block main %} diff --git a/ui/css/admin.css b/ui/css/admin.css index cf8fafa..090e4ca 100644 --- a/ui/css/admin.css +++ b/ui/css/admin.css @@ -6204,6 +6204,8 @@ fieldset[disabled] .btn-primary.active { } .navbar-pf .navbar-brand img { display: block; + margin: -9px 0; + height: 28px; } .navbar-pf .navbar-collapse { border-top: 0; diff --git a/ui/css/ipsilon.css b/ui/css/ipsilon.css index 9a8c501..fee0a13 100644 --- a/ui/css/ipsilon.css +++ b/ui/css/ipsilon.css @@ -3074,7 +3074,7 @@ fieldset[disabled] .btn-primary.active { } .login-pf #brand img { display: block; - height: 18px; + height: 40px; margin: 0 auto; max-width: 100%; } diff --git a/ui/css/styles.css b/ui/css/styles.css index d46e235..8595171 100644 --- a/ui/css/styles.css +++ b/ui/css/styles.css @@ -2439,7 +2439,7 @@ table.datatable th:active { } .login-pf #brand img { display: block; - height: 18px; + height: 40px; margin: 0 auto; max-width: 100%; } @@ -2547,6 +2547,8 @@ table.datatable th:active { } .navbar-pf .navbar-brand img { display: block; + margin: -9px 0; + height: 28px; } .navbar-pf .navbar-collapse { border-top: 0; @@ -3494,8 +3496,3 @@ table.datatable th:active { .ipsilon-user .list-group { border-top: 1px solid rgba(255, 255, 255, 0.01); } -.ipsilon-logotext { - margin-top: 2em; - height: 18px; - padding-left: 1em; -} diff --git a/ui/img/brand-lg.png b/ui/img/brand-lg.png deleted file mode 100644 index 93e34ee..0000000 Binary files a/ui/img/brand-lg.png and /dev/null differ diff --git a/ui/img/brand.png b/ui/img/brand.png deleted file mode 100644 index d7ef51e..0000000 Binary files a/ui/img/brand.png and /dev/null differ diff --git a/ui/img/ipsilon.svg b/ui/img/ipsilon.svg new file mode 100644 index 0000000..3dc5632 --- /dev/null +++ b/ui/img/ipsilon.svg @@ -0,0 +1,132 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c721c78ae1ba2b3e48f2453cbcc334cfd967991d Mon Sep 17 00:00:00 2001 From: Dan Theisen Date: Mar 25 2017 12:22:00 +0000 Subject: [PATCH 2/3] Fix image size recommendations for new SAML SP Signed-off-by: Dan Theisen --- diff --git a/ipsilon/providers/saml2/provider.py b/ipsilon/providers/saml2/provider.py index 8635b00..1ba8ec0 100644 --- a/ipsilon/providers/saml2/provider.py +++ b/ipsilon/providers/saml2/provider.py @@ -127,7 +127,7 @@ class ServiceProvider(ServiceProviderConfig): pconfig.Image( 'Image File', 'Image to display for this SP in the Portal. Scale to ' - '100x200 for best results.', + '200x100 pixels for best results.', self.imagefile), pconfig.Pick( 'Default NameID', diff --git a/templates/admin/providers/saml2_sp_new.html b/templates/admin/providers/saml2_sp_new.html index 13f1a9e..f4786e5 100644 --- a/templates/admin/providers/saml2_sp_new.html +++ b/templates/admin/providers/saml2_sp_new.html @@ -31,7 +31,7 @@
From 4a7d987b384e2e367a806b14fde9f89b858a2668 Mon Sep 17 00:00:00 2001 From: Dan Theisen Date: Mar 25 2017 13:37:09 +0000 Subject: [PATCH 3/3] Add favicons, cleanup whitespace, fix img tags from previous commit, remove period from index Signed-off-by: Dan Theisen --- diff --git a/templates/index.html b/templates/index.html index ccc6fa5..18c5168 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,8 +2,11 @@ Ipsilon - + + + + @@ -18,7 +21,7 @@ - Ipsilon + Ipsilon
@@ -54,7 +57,7 @@ or go to the Administration Console {% endif %} - .

+

{% endif %}
@@ -70,9 +73,9 @@
{% if user.name %}
- +
- +
@@ -114,7 +117,7 @@
- +
{% endif %} @@ -146,14 +149,14 @@ $(this).prev('.form-control').val('').focus(); $(this).hide(); }); - }); - + }); + $(function () { $('[data-toggle="tooltip"]').tooltip() }) - + })(jQuery); - + diff --git a/templates/master-admin.html b/templates/master-admin.html index 4020182..9a17850 100644 --- a/templates/master-admin.html +++ b/templates/master-admin.html @@ -5,6 +5,9 @@ {{ title }} + + + @@ -36,7 +39,7 @@ - Ipsilon + Ipsilon
diff --git a/templates/master-portal.html b/templates/master-portal.html index adbded2..014056a 100644 --- a/templates/master-portal.html +++ b/templates/master-portal.html @@ -2,8 +2,11 @@ {{ title }} - + + + + @@ -17,7 +20,7 @@ - Ipsilon + Ipsilon
diff --git a/templates/master-user.html b/templates/master-user.html index 670d72c..f504732 100644 --- a/templates/master-user.html +++ b/templates/master-user.html @@ -7,6 +7,9 @@ {{ title }} + + + {%- if heads %} @@ -22,7 +25,7 @@
- Ipsilon + Ipsilon
diff --git a/templates/master.html b/templates/master.html index e269d1e..18b9b67 100644 --- a/templates/master.html +++ b/templates/master.html @@ -7,6 +7,9 @@ {{ title }} + + + {%- if heads %} @@ -25,7 +28,7 @@
- Ipsilon + Ipsilon
{% block main %} diff --git a/ui/img/favicon-16x16.png b/ui/img/favicon-16x16.png new file mode 100644 index 0000000..78f267b Binary files /dev/null and b/ui/img/favicon-16x16.png differ diff --git a/ui/img/favicon-32x32.png b/ui/img/favicon-32x32.png new file mode 100644 index 0000000..db3f349 Binary files /dev/null and b/ui/img/favicon-32x32.png differ diff --git a/ui/img/favicon.ico b/ui/img/favicon.ico new file mode 100644 index 0000000..8447298 Binary files /dev/null and b/ui/img/favicon.ico differ