diff --git a/config/local_info.xml b/config/local_info.xml index ee3cdb787..cac9dbeef 100755 --- a/config/local_info.xml +++ b/config/local_info.xml @@ -123,31 +123,6 @@ show - - - to bottom left - #F7F9FE - #DEE9FB - #D0DFF9 - #00AC00 - - - - - - - - - - - diff --git a/htdocs/landing/home.css b/htdocs/landing/home.css deleted file mode 100644 index 3c13d7e9f..000000000 --- a/htdocs/landing/home.css +++ /dev/null @@ -1,174 +0,0 @@ -body { - background: linear-gradient(to bottom left,#F7F9FE, #DEE9FB, #D0DFF9); - background-repeat: no-repeat; - color: #272A4B; - font-family: 'PT Sans', sans-serif; - font-size: 0.8em; - text-align: center; - text-align: left; - background-attachment: fixed; - margin: 0; - height: 100%; -} - -.button { - background: #48D249; /* backstop for (IE) compatibility mode view setting */ - background: linear-gradient(#48D249, #B0EBB1); - color: white; - text-align: center; - display: block; - font-size: 2.3em; - border-radius: 0.4em; - padding: 0.4em 1em; - width: 50%; - margin-left: auto; - margin-right: auto; - margin-top: 4%; - margin-bottom: 4%; -} - -html { - height: 100%; -} - -h1,h2,h3 { - color: #00AC00; - text-decoration: none; - font-weight:normal; - margin-top: 0em; - margin-bottom: 0.2em; - text-shadow: 1px 1px 1px #D5DDD5; - font-size: 2.5em; -} - -/* h2-4 are only used in the Privacy and AUP policy notices */ - -h2 { - font-size: 2.0em; -} - -h3 { - font-size: 1.5em; - line-height: 1; -} - -h4 { - line-height: 1; -} - -a { - color: #103C7A; - text-decoration: none; - margin-top: 1.5em; - margin-bottom: 0em; -} - -.page_container,.wide_page_container { - position: relative; - margin-left: auto; - margin-right: auto; - width: 50em; - min-width: 45em; - overflow: hidden; - z-index: 1; - background-color: transparent; -} - -/* wide_page_container is only used in Privacy and AUP policy */ - -.wide_page_container { - width: 70em; -} - -.centre_box { - position: relative; - padding: 0.5em 1em 0.0em 1em; -} - -div.Copyright_Text { - font-size: 0.8em; - text-align: center; - margin: 1em auto; - width: 80%; -} - -a.docLink { - color: #00AC00; -} - -a:hover { - text-decoration: underline; -} - -a.Sponsor_Link img.Sponsor_Logo { - display:inline-block; - vertical-align: bottom; - height: 100%; -} - -a.Sponsor_Link:hover { - text-decoration: none; -} - -/* Put a small gap between the clickable area of the sponsor logos */ -a.Sponsor_Link { - margin-left: 3px; - margin-right: 3px; -} - -h1.Landing_Welcome { - display: inline-block; -} - -/* The GOCDB cloverleaf */ - -img.Landing_Logo { - display: inline-block; - vertical-align:top; - margin-right: 1em; -} - - -/* Opens in new window icon, padded from image description */ -img.new_window{ - height: 1em; - padding-left: 0.15em; - vertical-align: baseline; - } - -.leftFloat { - float: left; - margin-right:auto; -} - -div.centrePageContainer { - background: white; - background-image: url('contentBackground.jpg'); - background-position: top right; - background-repeat: no-repeat; - overflow: hidden; - margin-bottom: 3em; - border: 1px solid grey; - padding: 1em; - border-radius: 0.4em; -} - -div.policyText { - margin-right: 5%; - margin-left: 5%; - margin-top: 3em; - margin-bottom: auto; - text-align: justify; -} - -div.Left_Logo_Row { - text-align: center; - margin-bottom: 5px; -} - -a.Sponsor_Link img.Sponsor_Logo { - display:inline-block; - vertical-align: bottom; - height: 28px; - margin: 2px; -} diff --git a/htdocs/landing/index.php b/htdocs/landing/index.php index 3c9303797..0cd0a07d7 100644 --- a/htdocs/landing/index.php +++ b/htdocs/landing/index.php @@ -2,13 +2,22 @@ require_once __DIR__.'/../../lib/Gocdb_Services/Factory.php'; $configServ = \Factory::getConfigService(); $configServ->setLocalInfoOverride($_SERVER['SERVER_NAME']); + $origin = 'https://' . $_SERVER['HTTP_HOST']; + $brandingFilePAth = __DIR__ . '/../web_portal/css/branding.css'; ?> GOCDB - + + '; + } + ?> @@ -39,7 +48,7 @@ ?>
- Access GOCDB using your IGTF X.509 Certificate + Access GOCDB using your IGTF X.509 Certificate

or

Access GOCDB using one of the following:

@@ -48,7 +57,7 @@ $egi_target = urlencode("https://" . $hostname . "/portal/"); $egi_redirect = "https://" . $hostname . "/Shibboleth.sso/Login?target=" . $egi_target; ?> - EGI Check-In + EGI Check-In

Browse the GOCDB documentation index on the EGI wiki.

diff --git a/htdocs/web_portal/components/Draw_Components/draw_page_components.php b/htdocs/web_portal/components/Draw_Components/draw_page_components.php index cb98c32c1..e02a2ecaa 100644 --- a/htdocs/web_portal/components/Draw_Components/draw_page_components.php +++ b/htdocs/web_portal/components/Draw_Components/draw_page_components.php @@ -63,7 +63,7 @@ function Get_Standard_Top_Section_HTML($title = null) if (!empty(\Factory::$properties['LOGOUTURL'])) { $html .= "
"; $html .= 'Logout'; + '">Logout'; $html .= "
"; } @@ -106,7 +106,8 @@ function Get_Search_Form_HTML() $html .= '
'; $html .= ''; - $html .= ''; + $html .= 'setLocalInfoOverride($_SERVER['SERVER_NAME']); - - $background_direction = \Factory::getConfigService()->getBackgroundDirection(); - $background_colour1 = \Factory::getConfigService()->getBackgroundColour1(); - $background_colour2 = \Factory::getConfigService()->getBackgroundColour2(); - $background_colour3 = \Factory::getConfigService()->getBackgroundColour3(); - $header_text_colour = \Factory::getConfigService()->getHeadingTextColour(); ?> /* table.sorter plugin, http://tablesorter.com/docs/ */ table.tablesorter { @@ -52,24 +46,7 @@ body { - background: linear-gradient( - - ); + background: linear-gradient(to bottom left,#F7F9FE, #DEE9FB, #D0DFF9); color: #272A4B; font-family: 'PT Sans', sans-serif; font-size: 10pt; @@ -90,16 +67,14 @@ } h1,th,h2,h3,h4 { - color: ; + color: #ac0000; text-decoration: none; font-weight:normal; margin-top: 0em; margin-bottom: 0.2em; - font-family: 'PT Sans', sans-serif; } a { - color: #103C7A; text-decoration: none; margin-top: 0em; margin-bottom: 0em; @@ -208,6 +183,8 @@ vertical-align: bottom; height: 28px; margin: 2px; + margin-left: 3px; + margin-right: 3px; } a.Sponsor_Link:hover { @@ -254,11 +231,6 @@ display: inline; } -.input_button { - margin-top: 0.5em; - font-size: 0.7em; -} - .input_name { display: block; font-size: 0.9em; @@ -390,12 +362,11 @@ } div.Copyright_Text { - margin-top: 2em; - font-size: 0.8em; - margin-left: -2em; + text-align: center; + margin: 1em auto; + width: 80%; } - .add_edit_form { margin-left: 2em; margin-bottom: 1em; @@ -535,7 +506,7 @@ } .header { - color: ; + color: #00AC00; padding:0.9em; } @@ -780,6 +751,147 @@ float: right; } -img.trash { +img.trash { margin-right: 0.4em; } + +.button { + background: #48D249; /* backstop for (IE) compatibility mode view setting */ + background: linear-gradient(#48D249, #B0EBB1); + color: white; + text-align: center; + display: block; + font-size: 2.3em; + border-radius: 0.4em; + padding: 0.4em 1em; + width: 50%; + margin-left: auto; + margin-right: auto; + margin-top: 4%; + margin-bottom: 4%; +} + +div.centrePageContainer { + background: white; + background-image: url('contentBackground.jpg'); + background-position: top right; + background-repeat: no-repeat; + overflow: hidden; + margin-bottom: 3em; + border: 1px solid grey; + padding: 1em; + border-radius: 0.4em; +} + +div.policyText { + margin-right: 5%; + margin-left: 5%; + margin-top: 3em; + margin-bottom: auto; + text-align: justify; +} + +/* The GOCDB cloverleaf */ + +img.Landing_Logo { + display: inline-block; + vertical-align:top; + margin-right: 1em; +} + +/* wide_page_container is only used in Privacy and AUP policy */ + +.wide_page_container { + width: 70em; +} + +.centre_box { + position: relative; + padding: 0.5em 1em 0.0em 1em; +} + +a.docLink { + color: #00AC00; +} + +a:hover { + text-decoration: underline; +} + +h1.Landing_Welcome { + display: inline-block; +} + +.gocdb_btn, +.btn-success { + background: linear-gradient(#3b58b9, #2c62b4); + border-color: linear-gradient(#3b58b9, #2c62b4); + color: white; + position: relative; + transition: all 0.3s ease-in-out; +} + +.gocdb_btn:hover, +.btn-success:hover, +.btn.clicked { + background: linear-gradient(#4c6bcc, #3d74cc); + border-color: linear-gradient(#4c6bcc, #3d74cc); + color: white; + box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2); +} + +.gocdb_btn_props { + min-width: 6em; + padding: 4px; + font-size: 12px; + border-radius: 5px; +} + +.gocdb_btn_danger { + background: #FF000E; + border-color: #FF000E; + color: white; +} + +.has-success .input-group-addon, +.has-success .form-control { + background: #ffffff; + border-color: blue; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} + +/* Remove active state styles */ +.btn-success:active, +.btn-success:focus { + background-color: inherit !important; + border-color: inherit !important; + box-shadow: none !important; +} + + +/* Secondary button style for both links */ +.gocdb_btn_secondary { + display: inline-flex; + align-items: center; + padding: 0.9em 1.2em; + color: #ef8200; + text-decoration: none; + border: 1px solid transparent; + transition: background 0.3s ease, border-color 0.3s ease; +} + +.gocdb_btn_secondary_icon { + margin-right: 10px; + height: 29px; +} + +.gocdb_btn_secondary_text { + vertical-align: middle; +} + +/* Hover effect */ +.gocdb_btn_secondary:hover { + background: #f0f0f0; + border-color: #ef8200; + border-radius: 5px; +} diff --git a/htdocs/web_portal/static_php/standard_header.php b/htdocs/web_portal/static_php/standard_header.php index 2de2b97f4..32d278023 100644 --- a/htdocs/web_portal/static_php/standard_header.php +++ b/htdocs/web_portal/static_php/standard_header.php @@ -26,8 +26,14 @@ function get_standard_header($title = null) { - - + '; + + if (file_exists(GocContextPath::getPath() . 'css/branding.css')) { + $header .= ''; + } + + $header .= ' '; return $header; diff --git a/htdocs/web_portal/views/admin/add_ngi.php b/htdocs/web_portal/views/admin/add_ngi.php index 534d1e92f..927d576fe 100644 --- a/htdocs/web_portal/views/admin/add_ngi.php +++ b/htdocs/web_portal/views/admin/add_ngi.php @@ -49,7 +49,7 @@ ?>
- +
diff --git a/htdocs/web_portal/views/admin/add_project.php b/htdocs/web_portal/views/admin/add_project.php index 039288498..637c5d5c6 100644 --- a/htdocs/web_portal/views/admin/add_project.php +++ b/htdocs/web_portal/views/admin/add_project.php @@ -8,6 +8,6 @@
- + diff --git a/htdocs/web_portal/views/admin/add_scope.php b/htdocs/web_portal/views/admin/add_scope.php index b460ddf7d..0613c9cce 100644 --- a/htdocs/web_portal/views/admin/add_scope.php +++ b/htdocs/web_portal/views/admin/add_scope.php @@ -9,6 +9,6 @@ Reserved - check to create a reserved scope name="Reserved" class="input_input_checkbox">
- + diff --git a/htdocs/web_portal/views/admin/add_service_type.php b/htdocs/web_portal/views/admin/add_service_type.php index a9cc34a1a..46b270264 100644 --- a/htdocs/web_portal/views/admin/add_service_type.php +++ b/htdocs/web_portal/views/admin/add_service_type.php @@ -13,7 +13,7 @@
- + " name="RemoveScope"> - + diff --git a/htdocs/web_portal/views/admin/delete_scope_denied.php b/htdocs/web_portal/views/admin/delete_scope_denied.php index 5acfb70fa..0089aa466 100644 --- a/htdocs/web_portal/views/admin/delete_scope_denied.php +++ b/htdocs/web_portal/views/admin/delete_scope_denied.php @@ -61,7 +61,7 @@
- +
diff --git a/htdocs/web_portal/views/admin/edit_scope.php b/htdocs/web_portal/views/admin/edit_scope.php index 2881c2ee9..a1ff9de38 100644 --- a/htdocs/web_portal/views/admin/edit_scope.php +++ b/htdocs/web_portal/views/admin/edit_scope.php @@ -11,6 +11,6 @@

- + diff --git a/htdocs/web_portal/views/admin/edit_service_type.php b/htdocs/web_portal/views/admin/edit_service_type.php index a2ca48f9e..6dbc67038 100644 --- a/htdocs/web_portal/views/admin/edit_service_type.php +++ b/htdocs/web_portal/views/admin/edit_service_type.php @@ -22,6 +22,6 @@
- + diff --git a/htdocs/web_portal/views/admin/edit_user_identifier.php b/htdocs/web_portal/views/admin/edit_user_identifier.php index 95169c873..1a0cfe11e 100644 --- a/htdocs/web_portal/views/admin/edit_user_identifier.php +++ b/htdocs/web_portal/views/admin/edit_user_identifier.php @@ -39,6 +39,6 @@ - + diff --git a/htdocs/web_portal/views/admin/edit_user_isadmin.php b/htdocs/web_portal/views/admin/edit_user_isadmin.php index d12776cdd..412b4687b 100644 --- a/htdocs/web_portal/views/admin/edit_user_isadmin.php +++ b/htdocs/web_portal/views/admin/edit_user_isadmin.php @@ -14,14 +14,14 @@
- +
- +
diff --git a/htdocs/web_portal/views/admin/move_service_end_point.php b/htdocs/web_portal/views/admin/move_service_end_point.php index 32ca79c46..9ed5958f4 100644 --- a/htdocs/web_portal/views/admin/move_service_end_point.php +++ b/htdocs/web_portal/views/admin/move_service_end_point.php @@ -24,6 +24,6 @@
- + diff --git a/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php b/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php index 23634b512..ef4af765a 100644 --- a/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php +++ b/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php @@ -12,6 +12,6 @@ ?> - + diff --git a/htdocs/web_portal/views/admin/move_site.php b/htdocs/web_portal/views/admin/move_site.php index 0f30ae81e..2e289f94c 100644 --- a/htdocs/web_portal/views/admin/move_site.php +++ b/htdocs/web_portal/views/admin/move_site.php @@ -24,6 +24,6 @@
- + diff --git a/htdocs/web_portal/views/admin/move_site_select_old_ngi.php b/htdocs/web_portal/views/admin/move_site_select_old_ngi.php index 432c3c734..d34c7a322 100644 --- a/htdocs/web_portal/views/admin/move_site_select_old_ngi.php +++ b/htdocs/web_portal/views/admin/move_site_select_old_ngi.php @@ -12,6 +12,6 @@ ?> - + diff --git a/htdocs/web_portal/views/downtime/confirm_add_downtime.php b/htdocs/web_portal/views/downtime/confirm_add_downtime.php index 84583afb1..308743763 100644 --- a/htdocs/web_portal/views/downtime/confirm_add_downtime.php +++ b/htdocs/web_portal/views/downtime/confirm_add_downtime.php @@ -93,9 +93,9 @@ - + - + diff --git a/htdocs/web_portal/views/downtime/downtimes_calendar.php b/htdocs/web_portal/views/downtime/downtimes_calendar.php index e46196e55..6c47da64d 100644 --- a/htdocs/web_portal/views/downtime/downtimes_calendar.php +++ b/htdocs/web_portal/views/downtime/downtimes_calendar.php @@ -281,7 +281,7 @@
-
@@ -309,17 +309,17 @@
- - + +
- - - +
diff --git a/htdocs/web_portal/views/fragments/addPropertiesConfirmation.php b/htdocs/web_portal/views/fragments/addPropertiesConfirmation.php index b3c4986d1..4948e9bef 100644 --- a/htdocs/web_portal/views/fragments/addPropertiesConfirmation.php +++ b/htdocs/web_portal/views/fragments/addPropertiesConfirmation.php @@ -40,7 +40,7 @@
- +