Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified components/ILIAS/UI/resources/fonts/Iconfont/il-icons.eot
Binary file not shown.
470 changes: 254 additions & 216 deletions components/ILIAS/UI/resources/fonts/Iconfont/il-icons.json

Large diffs are not rendered by default.

413 changes: 208 additions & 205 deletions components/ILIAS/UI/resources/fonts/Iconfont/il-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified components/ILIAS/UI/resources/fonts/Iconfont/il-icons.ttf
Binary file not shown.
Binary file modified components/ILIAS/UI/resources/fonts/Iconfont/il-icons.woff
Binary file not shown.
483 changes: 341 additions & 142 deletions components/ILIAS/UI/src/Component/Symbol/Glyph/Factory.php

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions components/ILIAS/UI/src/Component/Symbol/Glyph/Glyph.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ interface Glyph extends Symbol, Clickable
public const COLUMN_SELECTION = "columnSelection";
public const TILE_VIEW = "tileView";
public const DRAG_HANDLE = "dragHandle";
public const PRESENTER = "presenter";
public const OWNER = "owner";
public const DATE = "date";
public const LOCATION = "location";

/**
* Get the type of the glyph.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,4 +313,24 @@ public function dragHandle(string $action = null): G\Glyph
{
return new Glyph(G\Glyph::DRAG_HANDLE, "drag_handle", $action);
}

public function presenter(string $action = null): G\Glyph
{
return new Glyph(G\Glyph::PRESENTER, "presenter", $action);
}

public function owner(string $action = null): G\Glyph
{
return new Glyph(G\Glyph::OWNER, "owner", $action);
}

public function date(string $action = null): G\Glyph
{
return new Glyph(G\Glyph::DATE, "date", $action);
}

public function location(string $action = null): G\Glyph
{
return new Glyph(G\Glyph::LOCATION, "location", $action);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ class Glyph implements C\Symbol\Glyph\Glyph
self::COLUMN_SELECTION,
self::TILE_VIEW,
self::DRAG_HANDLE,
self::PRESENTER,
self::OWNER,
self::DATE,
self::LOCATION,
];

private string $type;
Expand Down
41 changes: 41 additions & 0 deletions components/ILIAS/UI/src/examples/Symbol/Glyph/Date/date.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace ILIAS\UI\examples\Symbol\Glyph\Date;

/**
* ---
* description: >
* Example for rendering a Date Glyph.
*
* expected output: >
* Active:
* ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
* color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
*
* Inactive:
* ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
*
* Highlighted:
* ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
* above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
* ---
*/
function date()
{
global $DIC;
$f = $DIC->ui()->factory();
$renderer = $DIC->ui()->renderer();

$glyph = $f->symbol()->glyph()->date("#");

//Showcase the various states of this Glyph
$list = $f->listing()->descriptive([
"Active" => $glyph,
"Inactive" => $glyph->withUnavailableAction(),
"Highlighted" => $glyph->withHighlight()
]);

return $renderer->render($list);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace ILIAS\UI\examples\Symbol\Glyph\Location;

/**
* ---
* description: >
* Example for rendering a Owner Glyph.
*
* expected output: >
* Active:
* ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
* color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
*
* Inactive:
* ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
*
* Highlighted:
* ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
* above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
* ---
*/
function location()
{
global $DIC;
$f = $DIC->ui()->factory();
$renderer = $DIC->ui()->renderer();

$glyph = $f->symbol()->glyph()->location("#");

//Showcase the various states of this Glyph
$list = $f->listing()->descriptive([
"Active" => $glyph,
"Inactive" => $glyph->withUnavailableAction(),
"Highlighted" => $glyph->withHighlight()
]);

return $renderer->render($list);
}
41 changes: 41 additions & 0 deletions components/ILIAS/UI/src/examples/Symbol/Glyph/Owner/owner.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace ILIAS\UI\examples\Symbol\Glyph\Owner;

/**
* ---
* description: >
* Example for rendering a Owner Glyph.
*
* expected output: >
* Active:
* ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
* color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
*
* Inactive:
* ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
*
* Highlighted:
* ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
* above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
* ---
*/
function owner()
{
global $DIC;
$f = $DIC->ui()->factory();
$renderer = $DIC->ui()->renderer();

$glyph = $f->symbol()->glyph()->owner("#");

//Showcase the various states of this Glyph
$list = $f->listing()->descriptive([
"Active" => $glyph,
"Inactive" => $glyph->withUnavailableAction(),
"Highlighted" => $glyph->withHighlight()
]);

return $renderer->render($list);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace ILIAS\UI\examples\Symbol\Glyph\Presenter;

/**
* ---
* description: >
* Example for rendering a Presenter Glyph.
*
* expected output: >
* Active:
* ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
* color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
*
* Inactive:
* ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
*
* Highlighted:
* ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
* above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
* ---
*/
function presenter()
{
global $DIC;
$f = $DIC->ui()->factory();
$renderer = $DIC->ui()->renderer();

$glyph = $f->symbol()->glyph()->presenter("#");

//Showcase the various states of this Glyph
$list = $f->listing()->descriptive([
"Active" => $glyph,
"Inactive" => $glyph->withUnavailableAction(),
"Highlighted" => $glyph->withHighlight()
]);

return $renderer->render($list);
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
<!-- BEGIN columnSelection --> glyphicon-columnSelection<!-- END columnSelection -->
<!-- BEGIN tileView --> glyphicon-tileView<!-- END tileView -->
<!-- BEGIN dragHandle --> glyphicon-dragHandle<!-- END dragHandle -->
<!-- BEGIN owner --> glyphicon-owner<!-- END owner -->
<!-- BEGIN presenter --> glyphicon-presenter<!-- END presenter -->
<!-- BEGIN date --> glyphicon-date<!-- END date -->
<!-- BEGIN location --> glyphicon-location<!-- END location -->
" aria-hidden="true"></span>

<!-- BEGIN counter_status -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ class GlyphFactoryTest extends AbstractFactoryTestCase
"close" => ["context" => false],
"settings" => ["context" => false],
"sort" => ["context" => false],
"listView" => ["context" => false]
"listView" => ["context" => false],
"presenter" => ["context" => false],
"owner" => ["context" => false],
"date" => ["context" => false],
"location" => ["context" => false],
];

public static string $factory_title = 'ILIAS\\UI\\Component\\Symbol\\Glyph\\Factory';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ public function getCounterFactory(): C\Factory
G\Glyph::COLUMN_SELECTION => "glyphicon glyphicon-columnSelection",
G\Glyph::TILE_VIEW => "glyphicon glyphicon-tileView",
G\Glyph::DRAG_HANDLE => "glyphicon glyphicon-dragHandle",
G\Glyph::PRESENTER => "glyphicon glyphicon-presenter",
G\Glyph::OWNER => "glyphicon glyphicon-owner",
G\Glyph::DATE => "glyphicon glyphicon-date",
G\Glyph::LOCATION => "glyphicon glyphicon-location",
);

public static array $aria_labels = array(
Expand Down Expand Up @@ -164,6 +168,10 @@ public function getCounterFactory(): C\Factory
G\Glyph::COLUMN_SELECTION => "column_selection",
G\Glyph::TILE_VIEW => "tile_view",
G\Glyph::DRAG_HANDLE => "drag_handle",
G\Glyph::PRESENTER => "presenter",
G\Glyph::OWNER => "owner",
G\Glyph::DATE => "date",
G\Glyph::LOCATION => "location",
);

/**
Expand Down
1 change: 1 addition & 0 deletions lang/ilias_de.lang
Original file line number Diff line number Diff line change
Expand Up @@ -5372,6 +5372,7 @@ common#:#preconditions_optional_hint#:#Bitte erfüllen Sie mindestens <b>%s</b>
common#:#predefined_template#:#Vordefinierte Rollenvorlage
common#:#preferences#:#Benutzerdefinierte Einstellungen
common#:#presentation_table_more#:#Mehr anzeigen
common#:#presenter#:#Präsentiert von
common#:#preview#:#Vorschau
common#:#preview_create#:#Vorschau erstellen
common#:#preview_delete#:#Vorschau löschen
Expand Down
3 changes: 2 additions & 1 deletion lang/ilias_en.lang
Original file line number Diff line number Diff line change
Expand Up @@ -5373,6 +5373,7 @@ common#:#preconditions_optional_hint#:#You have to fulfill <b>%s</b> of the foll
common#:#predefined_template#:#Predefined role template
common#:#preferences#:#Preferences
common#:#presentation_table_more#:#Show More
common#:#presenter#:#Presenter
common#:#preview#:#Preview
common#:#preview_create#:#Create Preview
common#:#preview_delete#:#Delete Preview
Expand Down Expand Up @@ -8657,7 +8658,7 @@ dcl#:#dcl_detailed_view#:#Detailed View
dcl#:#dcl_display_action_menu#:#Copy
dcl#:#dcl_display_action_menu_desc#:#The object can be copied from the entry.
dcl#:#dcl_display_record_alt#:#Display this entry
dcl#:#dcl_duplicate_non_unique_entries_exist#:#Some of the existing values for this field are identical. Please make sure that all existing entries are unique in order to change this setting.
dcl#:#dcl_duplicate_non_unique_entries_exist#:#Some of the existing values for this field are identical. Please make sure that all existing entries are unique in order to change this setting.
dcl#:#dcl_edit#:#Settings for This Data Collection
dcl#:#dcl_edit_entry_rules#:#Entry Editing
dcl#:#dcl_edit_field#:#Edit Field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ $icon-font-svg-id: "glyphicons_halflingsregular" !default;
.glyphicon-eye-close { &:before { content: "\e106"; } }
.glyphicon-warning-sign { &:before { content: "\e107"; } }
.glyphicon-plane { &:before { content: "\e108"; } }
.glyphicon-calendar { &:before { content: "\e109"; } }
.glyphicon-random { &:before { content: "\e110"; } }
.glyphicon-comment { &:before { content: "\e111"; } }
.glyphicon-magnet { &:before { content: "\e112"; } }
Expand Down Expand Up @@ -528,3 +527,23 @@ $icon-font-svg-id: "glyphicons_halflingsregular" !default;
content: "\e90d";
cursor: grab;
}
.glyphicon-presenter:before {
font-family: il-icons;
content: "\e90e";
}
.glyphicon-owner:before {
font-family: il-icons;
content: "\e90f";
}
.glyphicon-date:before {
font-family: il-icons;
content: "\e619";
}
.glyphicon-calendar:before {
font-family: il-icons;
content: "\e075";
}
.glyphicon-location:before {
font-family: il-icons;
content: "\e096";
}