Commit ad64e75b authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3213 Using icons from theme in setup

parent 39be32c4
...@@ -227,6 +227,10 @@ class IconTheme ...@@ -227,6 +227,10 @@ class IconTheme
array('applications','os-windows'), array('applications','os-windows'),
array('applications','windows'), array('applications','windows'),
), ),
'applications/config-language' => array(
array('applications','locale'),
array('applications','preferences-desktop-locale'),
),
'mimetypes/text-csv' => array( 'mimetypes/text-csv' => array(
array('mimetypes','x-office-spreadsheet'), array('mimetypes','x-office-spreadsheet'),
array('mimetypes','text-x-generic'), array('mimetypes','text-x-generic'),
...@@ -286,6 +290,12 @@ class IconTheme ...@@ -286,6 +290,12 @@ class IconTheme
array('categories','preferences-other'), array('categories','preferences-other'),
array('categories','preferences-system'), array('categories','preferences-system'),
), ),
'categories/checks' => array(
array('actions','view-task'),
array('actions','view-calendar-tasks'),
array('actions','checkbox'),
array('status','task-complete'),
),
'devices/server' => array( 'devices/server' => array(
array('places','server'), array('places','server'),
array('places','network-server'), array('places','network-server'),
......
...@@ -25,7 +25,7 @@ class Step_Checks extends setup_step ...@@ -25,7 +25,7 @@ class Step_Checks extends setup_step
var $basic_checks = array(); var $basic_checks = array();
var $config_checks = array(); var $config_checks = array();
var $is_writeable = array(); var $is_writeable = array();
var $header_image = "images/setup/system.png"; var $header_image = 'geticon.php?context=categories&icon=checks&size=48';
function __construct() function __construct()
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
class Step_Finish extends setup_step class Step_Finish extends setup_step
{ {
var $cfg_file_written = FALSE; var $cfg_file_written = FALSE;
var $header_image = "images/setup/server.png"; var $header_image = 'geticon.php?context=devices&icon=server&size=48';
function __construct() function __construct()
{ {
......
...@@ -27,7 +27,7 @@ class Step_Language extends setup_step ...@@ -27,7 +27,7 @@ class Step_Language extends setup_step
var $lang = "en_EN"; /* Detected language */ var $lang = "en_EN"; /* Detected language */
var $languages = array(); var $languages = array();
var $attributes = array("lang","lang_selected"); var $attributes = array("lang","lang_selected");
var $header_image = "images/setup/locale.png"; var $header_image = 'geticon.php?context=applications&icon=config-language&size=48';
function __construct() function __construct()
{ {
......
...@@ -42,7 +42,7 @@ class Step_Ldap extends setup_step ...@@ -42,7 +42,7 @@ class Step_Ldap extends setup_step
var $attributes = array("connection","location","admin","password","base","admin_given", var $attributes = array("connection","location","admin","password","base","admin_given",
"append_base_to_admin_dn","tls","rfc2307bis"); "append_base_to_admin_dn","tls","rfc2307bis");
var $header_image = "images/setup/ldap.png"; var $header_image = 'geticon.php?context=places&icon=network-server&size=48';
function __construct() function __construct()
{ {
......
...@@ -49,7 +49,7 @@ class Step_Migrate extends setup_step ...@@ -49,7 +49,7 @@ class Step_Migrate extends setup_step
{ {
var $languages = array(); var $languages = array();
var $attributes = array('valid_admin'); var $attributes = array('valid_admin');
var $header_image = "images/setup/migrate.png"; var $header_image = 'geticon.php?context=applications&icon=utilities-system-monitor&size=48';
var $checks = array(); var $checks = array();
/* Department migration attributes */ /* Department migration attributes */
......
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
<!-- Inforamtion popup --> <!-- Inforamtion popup -->
<div class='solution_visible' id='sol_{$key}'> <div class='solution_visible' id='sol_{$key}'>
{if $basic[$key].MUST} {if $basic[$key].MUST}
<div class='step2_failed_text' style="background-image: url('images/small_error.png')"> <div class='step2_failed_text' style="background-image: url('geticon.php?context=status&icon=dialog-error&size=16')">
{$basic[$key].SOLUTION}<br/> {$basic[$key].SOLUTION}<br/>
<b>{t}FusionDirectory will NOT run without fixing this.{/t}</b> <b>{t}FusionDirectory will NOT run without fixing this.{/t}</b>
{else} {else}
<div class="step2_warning_text" style="background-image: url('images/small_warning.png')"> <div class="step2_warning_text" style="background-image: url('geticon.php?context=status&icon=dialog-warning&size=16')">
{$basic[$key].SOLUTION}<br/> {$basic[$key].SOLUTION}<br/>
<b>{t}FusionDirectory will run without fixing this.{/t}</b> <b>{t}FusionDirectory will run without fixing this.{/t}</b>
{/if} {/if}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment