display HomeOrgName instead of displayname in entities list

Edugate · Mar 20, 2014 · a0aa8a4 · a0aa8a4
1 parent d351367
commit a0aa8a4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/application/controllers/providers/Idp_list.php b/application/controllers/providers/Idp_list.php
@@ -109,19 +109,19 @@ function show($limit=null)
             {
                $iconsblock .= $hiddenicon .' ';
             }
-            $displayname = $i->getDisplayName();
+            $displayname = $i->getName();
             if(empty($displayname))
             {
                 $displayname = $i->getEntityId();
             }
 
             if ($i->getAvailable())
             {
-                $col1 = anchor($i_link, $displayname) . "<br />(" . $i->getEntityId() . ")";
+                $col1 = anchor($i_link, $displayname) . '<div class="s2">' . $i->getEntityId() . '</div>';
             }
             else
             {
-                $col1 = '<span class="additions"><span class="alert" title="'.$linktitlediexp.'">'.anchor($i_link, $displayname).'</span><br />'. $i->getEntityId().'</span>';
+                $col1 = '<span class="additions"><span class="alert" title="'.$linktitlediexp.'">'.anchor($i_link, $displayname).'</span><div class="s2">'. $i->getEntityId().'</div></span>';
             }
             $regdate = $i->getRegistrationDate();
             if(isset($regdate))
@@ -141,7 +141,7 @@ function show($limit=null)
             {
                 $col3 = '';
             }
-            $idprows[] = array('data' => array('data' =>  $col1 ),$iconsblock, $col2,'<div class="squiz">'.$col3.'</div>');
+            $idprows[] = array('data' => array('data' =>  $col1 ),$iconsblock, $col2,'<div class="squiz s2">'.$col3.'</div>');
         }
         $data['idprows'] = $idprows;
         $data['content_view'] = 'providers/idp_list_view';

diff --git a/application/controllers/providers/Sp_list.php b/application/controllers/providers/Sp_list.php
@@ -119,17 +119,17 @@ function show($limit=null)
             }
             $i_link = base_url() . "providers/detail/show/" . $i->getId();
             $is_available = $i->getAvailable();
-            $displayname = $i->getDisplayName(50);
+            $displayname = $i->getName(50);
             if(empty($displayname))
             {
                 $displayname = $i->getEntityId();
             }
             if ($is_available)
             {
-                $sprows[] = array(anchor($i_link, $displayname . '', 'title="' . $displayname . '"') . '<span class="additions">' . $i->getEntityId() . '</span>',$iconsblock,$regcol, '<div class="squiz"><a href="' . $i->getHelpdeskUrl() . '" title="' . $i->getHelpdeskUrl() . '">' .$i->getHelpdeskUrl().'</a></div>');
+                $sprows[] = array(anchor($i_link, $displayname . '', 'title="' . $displayname . '"') . '<span class="additions s2">' . $i->getEntityId() . '</span>',$iconsblock,$regcol, '<div class="squiz s2"><a href="' . $i->getHelpdeskUrl() . '" title="' . $i->getHelpdeskUrl() . '">' .$i->getHelpdeskUrl().'</a></div>');
             } else
             {
-                $sprows[] = array('<span class="alert" title="'.$linktitle_disexp.'">' . anchor($i_link, $displayname , 'title="' . $displayname . '"') . '</span><span class="additions">' . $i->getEntityId() . '</span>',$iconsblock,$regcol, '<div class="squiz"><a href="' . $i->getHelpdeskUrl() . '" title="' . $i->getHelpdeskUrl() . '">'.$i->getHelpdeskUrl().'</a></div>');
+                $sprows[] = array('<span class="alert" title="'.$linktitle_disexp.'">' . anchor($i_link, $displayname , 'title="' . $displayname . '"') . '</span><span class="additions s2">' . $i->getEntityId() . '</span>',$iconsblock,$regcol, '<div class="squiz s2"><a href="' . $i->getHelpdeskUrl() . '" title="' . $i->getHelpdeskUrl() . '">'.$i->getHelpdeskUrl().'</a></div>');
             }
         }
         $data['sprows'] = $sprows;

diff --git a/styles/default.css b/styles/default.css
@@ -2678,6 +2678,10 @@ ol.group li {
   font-size: small;
 }
 
+.s2 {
+  font-size: smaller;
+}
+
 form {
   counter-reset: fieldsets;
   background: #93aedf;

diff --git a/styles/orange.css b/styles/orange.css
@@ -2678,6 +2678,10 @@ ol.group li {
   font-size: small;
 }
 
+.s2 {
+  font-size: smaller;
+}
+
 form {
   counter-reset: fieldsets;
   background: #ffe90d;

diff --git a/styles/red.css b/styles/red.css
@@ -2678,6 +2678,10 @@ ol.group li {
   font-size: small;
 }
 
+.s2 {
+  font-size: smaller;
+}
+
 form {
   counter-reset: fieldsets;
   background: #6b90d4;

diff --git a/theme3/sass/partials/_page.scss b/theme3/sass/partials/_page.scss
@@ -2307,3 +2307,7 @@ ol.group {
   font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
   font-size: small;
 }
+.s2 {
+  font-size: smaller;
+
+}