From d1c779f8c99488428adab8db0cfc2e59286ef7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@opensides.be>
Date: Tue, 29 Jul 2014 11:41:37 +0200
Subject: [PATCH] Fixes #2919 Using icons from theme in setup
Conflicts:
setup/class_setupStep_Checks.inc
setup/class_setupStep_Finish.inc
setup/class_setupStep_Language.inc
setup/class_setupStep_Ldap.inc
setup/class_setupStep_Migrate.inc
---
setup/class_setupStep.inc | 2 +-
setup/class_setupStep_Checks.inc | 2 +-
setup/class_setupStep_Finish.inc | 4 +---
setup/class_setupStep_Language.inc | 2 +-
setup/class_setupStep_Migrate.inc | 2 +-
setup/setup_checks.tpl | 4 ++--
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 51cb65c56..21af134c9 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()
{
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index b1a2f7493..b850af6b2 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 = 'geticon.php?context=categories&icon=checks&size=48';
+ 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 b727b2a4e..1a52e0806 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 = 'geticon.php?context=devices&icon=server&size=48';
+ 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 e2852c553..54293b2b5 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 = 'geticon.php?context=applications&icon=config-language&size=48';
+ var $header_image = 'geticon.php?context=applications&icon=config-language&size=48';
static function getAttributesInfo()
{
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index e6e81b691..fef8071d0 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 = 'geticon.php?context=applications&icon=utilities-system-monitor&size=48';
var $checks = array();
/* Department migration attributes */
diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 6cd4c6a31..2479df2fd 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}
--
GitLab