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

Fixes #2919 Using icons from theme in setup

parent 57c7ea51
...@@ -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'),
......
...@@ -28,7 +28,7 @@ class setupStep extends simplePlugin ...@@ -28,7 +28,7 @@ class setupStep extends simplePlugin
var $is_enabled = FALSE; var $is_enabled = FALSE;
var $is_completed = FALSE; var $is_completed = FALSE;
var $header_image = "images/setup/user.png"; var $header_image = "";
static function getAttributesInfo() static function getAttributesInfo()
{ {
...@@ -169,7 +169,7 @@ class setup_step extends plugin ...@@ -169,7 +169,7 @@ class setup_step extends plugin
var $is_enabled = FALSE; var $is_enabled = FALSE;
var $is_completed = FALSE; var $is_completed = FALSE;
var $header_image = "images/setup/user.png"; var $header_image = "";
var $attributes = array(); var $attributes = array();
var $parent = NULL; var $parent = NULL;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
class Step_Checks extends setupStep 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() static function getAttributesInfo()
{ {
......
...@@ -21,14 +21,13 @@ ...@@ -21,14 +21,13 @@
class Step_Finish extends setup_step 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() function __construct()
{ {
$this->update_strings(); $this->update_strings();
} }
function update_strings() function update_strings()
{ {
$this->s_title = _("Finish"); $this->s_title = _("Finish");
...@@ -36,7 +35,6 @@ class Step_Finish extends setup_step ...@@ -36,7 +35,6 @@ class Step_Finish extends setup_step
$this->s_title_long = _("Finish - write the configuration file"); $this->s_title_long = _("Finish - write the configuration file");
} }
function get_conf_data() function get_conf_data()
{ {
$smarty = get_smarty(); $smarty = get_smarty();
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
class Step_Language extends setupStep 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() static function getAttributesInfo()
{ {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
class Step_Ldap extends setupStep 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 $connect_id = FALSE;
var $bind_id = FALSE; var $bind_id = FALSE;
......
...@@ -46,9 +46,9 @@ array_to_ldif - Create ldif output of an ldap result array ...@@ -46,9 +46,9 @@ array_to_ldif - Create ldif output of an ldap result array
class Step_Migrate extends setup_step class Step_Migrate extends setup_step
{ {
var $header_image = "geticon.php?context=applications&icon=utilities-system-monitor&size=48";
var $languages = array(); var $languages = array();
var $attributes = array('valid_admin'); var $attributes = array('valid_admin');
var $header_image = "images/setup/migrate.png";
var $checks = array(); var $checks = array();
/* Department migration attributes */ /* Department migration attributes */
......
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<!-- Information popup --> <!-- Information popup -->
<div class='solution_visible' id='sol_{$key}'> <div class='solution_visible' id='sol_{$key}'>
{if $val.MUST} {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/> {$val.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')">
{$val.SOLUTION}<br/> {$val.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