Merge branch 'feature-ui-fixes' into devel

3310e353 · Olga Brani · 17b3e2a5 · 5e93a0e5 · 3310e353 · 3310e353
Commit 3310e353 authored 6 years ago by Olga Brani
Hide whitespace changes
Inline Side-by-side

Showing

with 48 additions and 7 deletions
+48 -7
--- a/dictionaries/default.definition.json
+++ b/dictionaries/default.definition.json
 {
+  "browser_tab_title": {
+    "en": "EGI"
+  },
+  "link_title": {
+    "en": "EGI"
+  },
  "header_title": {
-    "en": "Advanced Computing for Research"
+    "en": "Check-in"
  },
  "header_subtitle": {
-    "en": "Use the same credentials for all our services"
+    "en": ""
+  },
+  "logo_link_url": {
+    "en": "https://www.egi.eu/"
+  },
+  "ribbon_text": {
+    "en": "Demo"
  }
 }
--- a/themes/ssp/default/includes/header.php
+++ b/themes/ssp/default/includes/header.php
@@ -39,15 +39,21 @@ if (array_key_exists('pageid', $this->data)) {
 */
 header('X-Frame-Options: SAMEORIGIN');

-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+?>
+<!DOCTYPE html>
+<html lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0" />
 <script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
 <title>
-  EGI
-  <?php if(array_key_exists('header', $this->data)) { echo (' | ' . $this->data['header']); } ?>
+  <?php
+  if (strpos($this->t('{themeegi:default:browser_tab_title}'), 'not translated') === FALSE) {
+    echo $this->t('{themeegi:default:browser_tab_title}');
+  }
+  if(array_key_exists('header', $this->data)) { echo (' | ' . $this->data['header']); } 
+  ?>
 </title>

 <link rel="stylesheet" type="text/css" href="<?php echo htmlspecialchars(SimpleSAML_Module::getModuleURL('themeegi/resources/css/app.css')); ?>" />
@@ -122,8 +128,15 @@ if($onLoad !== '') {
 <body<?php echo $onLoad; ?>>

 <div class="header">
+<?php
+  if ($this->t('{themeegi:default:ribbon_text}')) {
+    echo '<div class="corner-ribbon red">';
+    echo $this->t('{themeegi:default:ribbon_text}');
+    echo '</div>';
+  }
+  ?>
  <div class="text-center ssp-logo">
-    <a href="https://egi.eu/">
+    <a href="<?php echo $this->t('{themeegi:default:logo_link_url}'); ?>" title="<?php echo $this->t('{themeegi:default:header_title}'); ?>">
      <img src="<?php echo SimpleSAML_Module::getModuleURL('themeegi/resources/images/logo.svg'); ?>" alt="EGI" />
    </a>
  </div>

--- a/www/resources/images/EGI_Logo-50x50.png
+++ b/www/resources/images/EGI_Logo-50x50.png
--- a/www/resources/images/EGI_Logo-80x60.png
+++ b/www/resources/images/EGI_Logo-80x60.png
--- a/www/resources/sass/_extra.scss
+++ b/www/resources/sass/_extra.scss
@@ -519,3 +519,19 @@ body .ssp-modal-body {
    }
 }

+// #ribbon
+
+.corner-ribbon {
+    width: 200px;
+    background: #e43;
+    position: absolute;
+    top: 25px;
+    left: -50px;
+    text-align: center;
+    line-height: 40px;
+    letter-spacing: 1px;
+    color: #f0f0f0;
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg);
+    z-index: 1000;
+}