Change work with IdP entities with tags 'social' and 'preferred' on DS

* Width of entities is now counted automatically
* Social IdP has 'Sign in with' before name, Preferred IdP hasn't
* Added possibility to change display name in attribute 'fullDisplayName' in metadata

Author: vyskocilpavel

CHANGELOG.md

@@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 #### Changed
-- Remove star which was shown on items on Discovery Service. Now the star will be shown only at previously selected IdP. 
+- Remove star which was shown on items on Discovery Service. Now the star will be shown only at previously selected IdP.
+- Change work with IdP entities with tags 'social' and  'preferred' on DS
+    - Width of entities is now counted automatically
+    - Social IdP has 'Sign in with' before name, Preferred IdP hasn't
+    - Added possibility to change display name in attribute 'fullDisplayName' in metadata
 
 #### Fixed
 - Fixed the bug in 'getEntitylesAttribute' function to return correct value of Entityless attribute 

dictionaries/disco.definition.json

@@ -19,6 +19,10 @@
       "en": "your previous selection",
       "cs": "vaše předchozí volba"
   },
+  "sign_in_with": {
+    "en": "Sign in with ",
+    "cs": "Přihlásit se pomocí "
+  },
   "type_name_institution": {
     "en": "Type the name of your institution",
     "cs": "Zadejte název instituce"

themes/perun/perun/disco-tpl.php

@@ -125,29 +125,10 @@
             echo showEntry($this, $this->getPreferredIdp(), true);
             echo '</div>';
 
-
             echo getOr();
         }
 
-        echo '<div class="row">';
-        foreach ($this->getIdps('preferred') as $idpentry) {
-            echo '<div class="col-md-4">';
-            echo '<div class="metalist list-group">';
-            echo showEntry($this, $idpentry, false);
-            echo '</div>';
-            echo '</div>';
-        }
-        echo '</div>';
-
-        echo '<div class="row">';
-        foreach ($this->getIdps('social') as $idpentry) {
-            echo '<div class="col-md-4">';
-            echo '<div class="metalist list-group">';
-            echo showEntry($this, $idpentry, false);
-            echo '</div>';
-            echo '</div>';
-        }
-        echo '</div>';
+        echo showAllTaggedIdPs($this);
 
         echo getOr();
 
@@ -188,6 +169,11 @@
             $this->t('{perun:disco:add_institution}') .
             '</a>';
     }
+
+    if (!empty($this->getPreferredIdp())) {
+        echo '</div>';
+    }
+
     echo '</div>';
 }
 
@@ -237,9 +223,11 @@ function showEntry($t, $metadata, $favourite = false)
 /**
  * @param DiscoTemplate $t
  * @param array $metadata
+ * @param bool $showSignInWith
+ *
  * @return string html
  */
-function showTaggedEntry($t, $metadata)
+function showTaggedEntry($t, $metadata, $showSignInWith = false)
 {
 
     $bck = 'white';
@@ -252,7 +240,14 @@ function showTaggedEntry($t, $metadata)
 
     $html .= '<img src="' . $metadata['icon'] . '">';
 
-    $html .= '<strong>Sign in with ' . $t->getTranslatedEntityName($metadata) . '</strong>';
+    if (isset($metadata['fullDisplayName'])) {
+        $html .= '<strong>' . $metadata['fullDisplayName'] . '</strong>';
+    } elseif ($showSignInWith) {
+        $html .= '<strong>' . $t->t('{perun:disco:sign_in_with}') . $t->getTranslatedEntityName($metadata) .
+                 '</strong>';
+    } else {
+        $html .= '<strong>' . $t->getTranslatedEntityName($metadata) . '</strong>';
+    }
 
     $html .= '</a>';
 
@@ -285,3 +280,48 @@ function getOr()
     $or .= '</div>';
     return $or;
 }
+
+function showAllTaggedIdPs($t)
+{
+    $html = '';
+    $html .= showTaggedIdPs($t, 'preferred');
+    $html .= showTaggedIdPs($t, 'social', true);
+    return $html;
+}
+
+
+function showTaggedIdPs($t, $tag, $showSignInWith = false)
+{
+    $html = '';
+    $idps = $t->getIdPs($tag);
+    $idpCount = count($idps);
+    $counter = 0;
+
+    $fullRowCount = floor($idpCount / 3);
+    for ($i = 0; $i < $fullRowCount; $i++ ) {
+        $html .= '<div class="row">';
+        for ($j = 0; $j < 3; $j++) {
+            $html .= '<div class="col-md-4">';
+            $html .= '<div class="metalist list-group">';
+            $html .= showTaggedEntry($t, $idps[array_keys($idps)[$counter]], $showSignInWith);
+            $html .= '</div>';
+            $html .= '</div>';
+            $counter++;
+        }
+        $html .= '</div>';
+    }
+    if (($idpCount % 3) !== 0) {
+        $html .= '<div class="row">';
+        for ($i = 0; $i < $idpCount % 3; $i++) {
+            $html .= '<div class="col-md-' . (12 / ($idpCount % 3))  . '">';
+            $html .= '<div class="metalist list-group">';
+            $html .= showTaggedEntry($t, $idps[array_keys($idps)[$counter]], $showSignInWith);
+            $html .= '</div>';
+            $html .= '</div>';
+            $counter++;
+        }
+        $html .= '</div>';
+    }
+
+    return $html;
+}