diff --git a/html/images/setup/fai.png b/html/images/setup/fai.png
deleted file mode 100644
index 3bd55d28e3825143cb7c1dd70ee15dcafcb483d1..0000000000000000000000000000000000000000
Binary files a/html/images/setup/fai.png and /dev/null differ
diff --git a/html/images/setup/ldap.png b/html/images/setup/ldap.png
deleted file mode 100644
index 63800057f692e93182b5f8a822c81ae31467e48e..0000000000000000000000000000000000000000
Binary files a/html/images/setup/ldap.png and /dev/null differ
diff --git a/html/images/setup/license.png b/html/images/setup/license.png
deleted file mode 100644
index d7bcd7877d0dba816140103fd4826e6f1d89bf92..0000000000000000000000000000000000000000
Binary files a/html/images/setup/license.png and /dev/null differ
diff --git a/html/images/setup/migrate.png b/html/images/setup/migrate.png
deleted file mode 100644
index b636ff0e63d6eafa5864387d44848a632cf7561c..0000000000000000000000000000000000000000
Binary files a/html/images/setup/migrate.png and /dev/null differ
diff --git a/html/images/setup/server.png b/html/images/setup/server.png
deleted file mode 100644
index 313a66152b98589fc5ae888a8381231646403e21..0000000000000000000000000000000000000000
Binary files a/html/images/setup/server.png and /dev/null differ
diff --git a/html/images/setup/system.png b/html/images/setup/system.png
deleted file mode 100644
index b1505729e12a10336b9c2d7fd4adfec74e3c7455..0000000000000000000000000000000000000000
Binary files a/html/images/setup/system.png and /dev/null differ
diff --git a/html/images/setup/user.png b/html/images/setup/user.png
deleted file mode 100644
index 4a5332b5a6107e201b0ebceeaf6388da7145cbe4..0000000000000000000000000000000000000000
Binary files a/html/images/setup/user.png and /dev/null differ
diff --git a/html/images/setup/welcome.png b/html/images/setup/welcome.png
deleted file mode 100644
index 0964749c5744cf725dc46a3d202a9671195a917a..0000000000000000000000000000000000000000
Binary files a/html/images/setup/welcome.png and /dev/null differ
diff --git a/html/images/setup/locale.png b/html/themes/default/icons/48/apps/config-language.png
similarity index 100%
rename from html/images/setup/locale.png
rename to html/themes/default/icons/48/apps/config-language.png
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index bdf77bcf27e228536e91707568909768d37cfa33..37f99ffc59992d482a6e99531f58158dc4953f0d 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -227,6 +227,10 @@ class IconTheme
array('applications','os-windows'),
array('applications','windows'),
),
+ 'applications/config-language' => array(
+ array('applications','locale'),
+ array('applications','preferences-desktop-locale'),
+ ),
'mimetypes/text-csv' => array(
array('mimetypes','x-office-spreadsheet'),
array('mimetypes','text-x-generic'),
@@ -286,6 +290,12 @@ class IconTheme
array('categories','preferences-other'),
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(
array('places','server'),
array('places','network-server'),
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index c3b78b7ee4dcfb2c5f9e0e2adbe9462906f92748..6b77761f0c6af14a8398f6e78c0409d970877af1 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -28,7 +28,7 @@ class setupStep extends simplePlugin
var $is_enabled = FALSE;
var $is_completed = FALSE;
- var $header_image = "images/setup/user.png";
+ var $header_image = "";
static function getAttributesInfo()
{
@@ -169,7 +169,7 @@ class setup_step extends plugin
var $is_enabled = FALSE;
var $is_completed = FALSE;
- var $header_image = "images/setup/user.png";
+ var $header_image = "";
var $attributes = array();
var $parent = NULL;
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index 57ed2314dbb1692196647478d7f4c69614b55400..644e0ccbefc54289e2c1220e299340b0464edc2c 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -21,7 +21,7 @@
class Step_Checks extends setupStep
{
- var $header_image = "images/setup/system.png";
+ var $header_image = "geticon.php?context=categories&icon=checks&size=48";
static function getAttributesInfo()
{
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index 33da3d284fe390915300723c8f9862a75c4e3294..55651b2664b1a4e4ad0d8fcdfc6ae5a4f90075ec 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -21,14 +21,13 @@
class Step_Finish extends setup_step
{
- var $header_image = "images/setup/server.png";
+ var $header_image = "geticon.php?context=devices&icon=server&size=48";
function __construct()
{
$this->update_strings();
}
-
function update_strings()
{
$this->s_title = _("Finish");
@@ -36,7 +35,6 @@ class Step_Finish extends setup_step
$this->s_title_long = _("Finish - write the configuration file");
}
-
function get_conf_data()
{
$smarty = get_smarty();
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 638d457721dd3d4e8ba85319d1a4f9d4df93448a..8fe4f602c4b209f3f8243c137971b946691145d2 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -21,7 +21,7 @@
class Step_Language extends setupStep
{
- var $header_image = "images/setup/locale.png";
+ var $header_image = "geticon.php?context=applications&icon=config-language&size=48";
static function getAttributesInfo()
{
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 8b7a61256c5ed8b772addb29728fafd8dc671d9c..42fa7c52a3a14441a28de3fbf9da98117ab3a4fa 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -21,7 +21,7 @@
class Step_Ldap extends setupStep
{
- var $header_image = "images/setup/ldap.png";
+ var $header_image = "geticon.php?context=places&icon=network-server&size=48";
var $connect_id = FALSE;
var $bind_id = FALSE;
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index bfc4b6d10fd3fd16904a166cda37bb05d2f20fa4..5dacc19874f2a31a79d665c667243ab7ccae6e57 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -46,9 +46,9 @@ array_to_ldif - Create ldif output of an ldap result array
class Step_Migrate extends setup_step
{
+ var $header_image = "geticon.php?context=applications&icon=utilities-system-monitor&size=48";
var $languages = array();
var $attributes = array('valid_admin');
- var $header_image = "images/setup/migrate.png";
var $checks = array();
/* Department migration attributes */
diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 6cd4c6a314765d393d9d8ae20696fb93c932cf1e..2479df2fd4ea4f90dd2ceb20ca07e9150e4d7a31 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -33,11 +33,11 @@
<!-- Information popup -->
<div class='solution_visible' id='sol_{$key}'>
{if $val.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')">
{$val.SOLUTION}<br/>
<b>{t}FusionDirectory will NOT run without fixing this.{/t}</b>
{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')">
{$val.SOLUTION}<br/>
<b>{t}FusionDirectory will run without fixing this.{/t}</b>
{/if}