Commit 949f8e56 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier

Fixes: #2937 Using IconTheme in plugins

parent ef6144e1
......@@ -519,7 +519,7 @@ class addressbook extends plugin
$smarty->assign("depselect", $this->search_base);
$smarty->assign("global", $phonefilter['global']);
$smarty->assign("organizational", $phonefilter['organizational']);
$smarty->assign("search_image", get_template_path('images/lists/search.png'));
$smarty->assign("search_image", 'geticon.php?context=actions&icon=system-search&size=16');
$smarty->assign("obj_image", get_template_path('plugins/addressbook/images/objects.png'));
$smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info.png'));
......@@ -665,8 +665,8 @@ class addressbook extends plugin
$smarty->assign('personal_image', get_template_path('plugins/addressbook/images/addr_personal.png'));
$smarty->assign('home_image', get_template_path('plugins/addressbook/images/addr_home.png'));
$smarty->assign('company_image', get_template_path('plugins/addressbook/images/addr_company.png'));
$smarty->assign('add_image', get_template_path('images/lists/paste.png'));
$smarty->assign('edit_image', get_template_path('images/lists/edit.png'));
$smarty->assign('add_image', 'geticon.php?context=actions&icon=edit-paste&size=16');
$smarty->assign('edit_image', 'geticon.php?context=actions&icon=document-edit&size=16');
$smarty->assign('delete_image', get_template_path('images/lists/delete.png'));
return $smarty->fetch(get_template_path('contents.tpl', TRUE));
}
......
......@@ -12,7 +12,7 @@
<tr>
<td>
<label for="NAME">
<img src="images/lists/search.png" align=middle>&nbsp;{t}Name{/t}
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
</label>
</td>
<td>
......
......@@ -55,7 +55,7 @@
<action>
<type>sub</type>
<image>images/lists/new.png</image>
<image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
<label>Create</label>
<action>
......@@ -73,7 +73,7 @@
<action>
<name>remove</name>
<type>entry</type>
<image>images/lists/trash.png</image>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
</action>
......@@ -105,7 +105,7 @@
<action>
<name>edit</name>
<type>entry</type>
<image>images/lists/edit.png</image>
<image>geticon.php?context=actions&amp;icon=document-edit&amp;size=16</image>
<label>Edit host</label>
</action>
......@@ -117,7 +117,7 @@
<action>
<name>remove</name>
<type>entry</type>
<image>images/lists/trash.png</image>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<acl>apache/serviceApacheVhostEdit[d]</acl>
<label>Remove host</label>
</action>
......
......@@ -189,11 +189,11 @@ class argonautQueue extends management
$status = "<img class='center' src='plugins/systems/images/clock.png' alt=''>&nbsp;"._("Waiting");
}
if ($status == "error") {
$status = "<input class='center' type='image' src='images/false.png' title='"._("Show error")."' ".
$status = "<input class='center' type='image' src='geticon.php?context=status&icon=task-failure&size=16' title='"._("Show error")."' ".
"name='listing_showError_$row' style='padding:1px'>"._("Error");
}
if ($status == "processed") {
$status = "<img class='center' src='images/true.png' alt=''>&nbsp;"._("Processed");
$status = "<img class='center' src='geticon.php?context=status&icon=task-complete&size=16' alt=''>&nbsp;"._("Processed");
}
/* Special handling for all entries that have
......
......@@ -84,7 +84,7 @@
<action>
<type>sub</type>
<image>images/lists/new.png</image>
<image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
<label>Create</label>
</action>
......@@ -102,7 +102,7 @@
<action>
<name>remove</name>
<type>entry</type>
<image>images/lists/trash.png</image>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
</action>
......@@ -153,7 +153,7 @@
<name>edit</name>
<type>entry</type>
<objectclass>FAKE_OC__edit</objectclass>
<image>images/lists/edit.png</image>
<image>geticon.php?context=actions&amp;icon=document-edit&amp;size=16</image>
<label>Edit</label>
</action>
-->
......@@ -162,7 +162,7 @@
<name>remove</name>
<type>entry</type>
<objectclass>FAKE_OC__remove</objectclass>
<image>images/lists/trash.png</image>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
</action>
......
......@@ -255,7 +255,7 @@ class DaemonEvent
foreach ($this->a_targets as $key => $target) {
$divselectbox->AddEntry(array(
array("string" => $target),
array("html" => "<input type='image' src='images/lists/trash.png' title='"._("Remove")."' name='del_target_".$key."'>",
array("html" => "<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' title='"._("Remove")."' name='del_target_".$key."'>",
"attach" => "style='width:20px; border-right:0px;'")
));
}
......@@ -406,15 +406,15 @@ class DaemonEvent
return array(
'System.halt' => array(
'name' => _('Switch off'),
'img' => 'images/lists/off.png'
'img' => 'geticon.php?context=actions&icon=system-shutdown&size=16'
),
'Deployment.reboot' => array(
'name' => _('Reboot'),
'img' => 'images/lists/reload.png'
'img' => 'geticon.php?context=actions&icon=view-refresh&size=16'
),
'Deployment.wake' => array(
'name' => _('Wake up'),
'img' => 'images/lists/on.png'
'name' => _('Wake up'),w
'img' => 'geticon.php?context=status&icon=task-running&size=16'
),
'Deployment.update' => array(
'name' => _('Software update'),
......
......@@ -19,7 +19,7 @@
<tr>
<td>
<label for="NAME">
<img src="images/lists/search.png" align=middle>&nbsp;{t}Name{/t}
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
</label>
</td>
<td>
......@@ -29,7 +29,7 @@
<tr>
<td>
<label for="IPSTART">
<img src="images/lists/search.png" align=middle>&nbsp;IP Start
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;IP Start
</label>
</td>
<td>
......@@ -39,7 +39,7 @@
<tr>
<td>
<label for="IPSTOP">
<img src="images/lists/search.png" align=middle>&nbsp;IP Stop
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;IP Stop
</label>
</td>
<td>
......
......@@ -47,9 +47,9 @@ class dashboard extends simplePlugin
$nb_ogroups = $ldap->count();
$stats = array(
array('name' => 'Accounts', 'nb' => $nb_accounts, 'img' => get_template_path("plugins/users/images/iconMini.png")),
array('name' => 'Groups', 'nb' => $nb_groups, 'img' => get_template_path("plugins/groups/images/groups.png")),
array('name' => 'Object groups', 'nb' => $nb_ogroups, 'img' => get_template_path("plugins/ogroups/images/ogroup.png")),
array('name' => 'Accounts', 'nb' => $nb_accounts, 'img' => 'geticon.php?context=types&icon=user&size=16'),
array('name' => 'Groups', 'nb' => $nb_groups, 'img' => 'geticon.php?context=types&icon=user-group&size=16'),
array('name' => 'Object groups', 'nb' => $nb_ogroups, 'img' => 'geticon.php?context=types&icon=resource-group&size=16'),
);
if (class_available("systemManagement")) {
......
......@@ -60,8 +60,8 @@ class dashboardUsers extends simplePlugin
array('name' => 'samba', 'nb' => $nb_samba_accounts, 'img' => get_template_path("plugins/systems/images/select_winstation.png"))
),
'nb_accounts' => $nb_accounts,
'user_img' => get_template_path("plugins/users/images/iconMini.png"),
'locked_accounts' => array('nb' => $nb_locked_accounts, 'img' => get_template_path("images/lists/locked.png")),
'user_img' => 'geticon.php?context=types&icon=user&size=16',
'locked_accounts' => array('nb' => $nb_locked_accounts, 'img' => "geticon.php?context=status&icon=object-locked&size=16"),
);
}
......
......@@ -10,7 +10,7 @@
<tr>
<td>
<label for="NAME">
<img src="images/lists/search.png" align=middle>&nbsp;{t}Name{/t}
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
</label>
</td>
<td>
......
......@@ -10,9 +10,9 @@
</select>
<input type='image' src='images/lists/copy.png' title='{t}Copy menu{/t}' class='center' name='menu_copy'>
{if $copied}
<input type='image' src='images/lists/paste.png' title='{t}Paste menu from{/t}&nbsp;{$copy_source}' class='center' name='menu_paste'>
<input type='image' src='geticon.php?context=actions&icon=edit-paste&size=16' title='{t}Paste menu from{/t}&nbsp;{$copy_source}' class='center' name='menu_paste'>
{else}
<input type='image' src='images/lists/paste-grey.png' class='center'>
<input type='image' src='geticon.php?context=actions&icon=edit-paste&size=16$disabled=1' class='center'>
{/if}
<input type='image' src='images/lists/delete.png' title='{t}Delete menu{/t}' class='center' name='menu_delete'>
</td>
......@@ -71,7 +71,7 @@
</div>
{else}
<div style="height:20px;width:20px; overflow:hidden">
<img class="center" src='images/lists/folder.png' alt='{t}Folder{/t}'>
<img class="center" src='geticon.php?context=places&icon=folder&size=16' alt='{t}Folder{/t}'>
</div>
{/if}
</td>
......@@ -84,9 +84,9 @@
<input title="{t}Move down{/t}" class="center" type='image'
name='down_{$item.UNIQID}' src='images/move_object_down.png'>
<input title="{t}Remove{/t}" class="center" type='image'
name='del_{$item.UNIQID}' src='images/lists/trash.png'>
name='del_{$item.UNIQID}' src='geticon.php?context=actions&icon=edit-delete&size=16'>
<input title="{t}Edit{/t}" class="center" type='image'
name='app_entry_edit{$item.UNIQID}' src='images/lists/edit.png'>
name='app_entry_edit{$item.UNIQID}' src='geticon.php?context=actions&icon=document-edit&size=16'>
</td>
</tr>
{elseif $item.TYPE == "SEPERATOR"}
......@@ -105,7 +105,7 @@
<input title="{t}Move down{/t}" class="center" type='image'
name='down_{$item.UNIQID}' src='images/move_object_down.png'>
<input title="{t}Remove{/t}" class="center" type='image'
name='del_{$item.UNIQID}' src='images/lists/trash.png'>
name='del_{$item.UNIQID}' src='geticon.php?context=actions&icon=edit-delete&size=16'>
<img src="images/empty.png" style="width:16px;" alt=" ">
</td>
</tr>
......@@ -130,9 +130,9 @@
<input title="{t}Move down{/t}" class="center" type='image'
name='down_{$item.UNIQID}' src='images/move_object_down.png'>
<input title="{t}Remove{/t}" class="center" type='image'
name='del_{$item.UNIQID}' src='images/lists/trash.png'>
name='del_{$item.UNIQID}' src='geticon.php?context=actions&icon=edit-delete&size=16'>
<input title="{t}Edit{/t}" class="center" type='image'
name='app_entry_edit{$item.UNIQID}' src='images/lists/edit.png'>
name='app_entry_edit{$item.UNIQID}' src='geticon.php?context=actions&icon=document-edit&size=16'>
</td>
</tr>
{/if}
......
......@@ -498,7 +498,7 @@ class appgroup extends plugin
/* Append departments for current base */
foreach($departments as $key => $app){
$div->AddEntry(array(
array("html"=>"<img class='center' src='images/lists/folder.png' alt='"._("department")."'>&nbsp;".sprintf($linkopen,
array("html"=>"<img class='center' src='geticon.php?context=places&icon=folder&size=16' alt='"._("department")."'>&nbsp;".sprintf($linkopen,
base64_encode($key),$app),
"attach"=>"style='border:0px;'")
));
......
......@@ -292,7 +292,7 @@ class mimetype extends plugin
if($this->acl_is_writeable("gotoMimeFilePattern") && !preg_match("/freeze/i",$this->FAIstate)){
$Pattern_Actions= " <input type='image' src='images/lists/sort-up.png' class='center' name='Pattern_SortUp_%s' >&nbsp;
<input type='image' src='images/lists/sort-down.png' class='center' name='Pattern_SortDown_%s'>&nbsp;
<input type='image' src='images/lists/trash.png' class='center' name='Pattern_Remove_%s'>";
<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' class='center' name='Pattern_Remove_%s'>";
}else{
$Pattern_Actions= "";
}
......@@ -300,7 +300,7 @@ class mimetype extends plugin
if($this->acl_is_writeable("gotoMimeApplication") && !preg_match("/freeze/i",$this->FAIstate)){
$Apps_Actions = " <input type='image' src='images/lists/sort-up.png' class='center' name='Apps_SortUp_%s' >&nbsp;
<input type='image' src='images/lists/sort-down.png' class='center' name='Apps_SortDown_%s'>&nbsp;
<input type='image' src='images/lists/trash.png' class='center' name='Apps_Remove_%s'>";
<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' class='center' name='Apps_Remove_%s'>";
}else{
$Apps_Actions= "";
}
......@@ -308,7 +308,7 @@ class mimetype extends plugin
if($this->acl_is_writeable("gotoMimeEmbeddedApplication") && !preg_match("/freeze/i",$this->FAIstate)){
$EApps_Actions = " <input type='image' src='images/lists/sort-up.png' class='center' name='EApps_SortUp_%s' >&nbsp;
<input type='image' src='images/lists/sort-down.png' class='center' name='EApps_SortDown_%s'>&nbsp;
<input type='image' src='images/lists/trash.png' class='center' name='EApps_Remove_%s'>";
<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' class='center' name='EApps_Remove_%s'>";
}else{
$EApps_Actions= "";
}
......
......@@ -48,7 +48,7 @@
</select>
{/render}
{render acl=$baseACL disable_picture='images/lists/folder_grey.png'}
<input type="image" name="chooseBase" src="images/lists/folder.png" class="center" title="{t}Select a base{/t}">
<input type="image" name="chooseBase" src="geticon.php?context=places&icon=folder&size=16" class="center" title="{t}Select a base{/t}">
{/render}
</td>
</tr>
......
......@@ -336,13 +336,13 @@ class serviceDHCP extends goService
$DhcpList->SetHeight(400);
/* Add entries to DhcpList */
$editImgIns = "<input type='image' src='images/lists/new.png' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
"<input type='image' src='images/lists/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
"<input type='image' src='images/lists/trash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
$editImgInsNoDel = "<input type='image' src='images/lists/new.png' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
"<input type='image' src='images/lists/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>";
$editImg = "<input type='image' src='images/lists/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
"<input type='image' src='images/lists/trash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
$editImgIns = "<input type='image' src='geticon.php?context=actions&icon=document-new&size=16' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
"<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
"<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
$editImgInsNoDel = "<input type='image' src='geticon.php?context=actions&icon=document-new&size=16' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
"<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editDhcp_%s' title='"._("Edit DHCP section")."'>";
$editImg = "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
"<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
$subnetExpandImg = "<input style='padding:5px 6px 4px;vertical-align:middle;' type='image' src='images/lists/expand.png' name='expandDhcp_%s' title='"._("Expand DHCP subnet")."'/>";
$subnetExpandedImg = "<input style='padding:6px 5px 6px 4px;vertical-align:middle;' type='image' src='images/lists/sort-down.png' name='foldDhcp_%s' title='"._("Fold DHCP subnet")."'/>";
......
......@@ -281,11 +281,11 @@ class serviceDNS extends goService
$ZoneList->SetHeight(254);
/* Add entries to divselectbox */
$editImg = "<input type='image' src='images/lists/edit.png' name='editZone_%s' alt='edit' title='edit'>";
$editImg = "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editZone_%s' alt='edit' title='edit'>";
if ($this->acl_is_removeable()) {
$editImg .= "<input type='image' src='images/lists/trash.png' name='delZone_%s' alt='delete' title='delete'>";
$editImg .= "<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='delZone_%s' alt='delete' title='delete'>";
}
$editImg .= "<input type='image' src='images/lists/reload.png' name='ldap2Zone_%s' alt='ldap2zone' title='ldap2zone'>";
$editImg .= "<input type='image' src='geticon.php?context=actions&icon=view-refresh&size=16' name='ldap2Zone_%s' alt='ldap2zone' title='ldap2zone'>";
$link = "<a href='?plug=".$_GET['plug']."&act=edit&id=%s'>%s</a>";
foreach ($this->Zones as $zone => $values) {
......
......@@ -271,7 +271,7 @@ class servdnseditZone extends plugin
$div->setHeight(120);
$recs = $this->mXRecords;
ksort($recs);
$onedel = "<input name='MXdel_%s' type='image' src='images/lists/trash.png' title='"._("Delete")."' class='center'>";
$onedel = "<input name='MXdel_%s' type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' title='"._("Delete")."' class='center'>";
foreach ($recs as $key => $rec) {
list($prio,$value) = preg_split("/ /", $rec['value']);
$div->AddEntry(
......
......@@ -436,9 +436,9 @@ class servDNSeditZoneEntries extends plugin
$field3 = "<input type='text' $dis value='".$record['value']."' name='ValueSelection_".$name."' style='width:250px;'>";
if (preg_match("/w/", $this->acl)) {
$acl = "<input type='image' name='AddRecord_".$name."'
src='images/lists/new.png' alt='"._("Add")."' title='"._("Add")."'>
src='geticon.php?context=actions&icon=document-new&size=16' alt='"._("Add")."' title='"._("Add")."'>
<input type='image' name='RemoveRecord_".$name."'
src='images/lists/trash.png' alt='"._("Remove")."' title='"._("Remove")."'>";
src='geticon.php?context=actions&icon=edit-delete&size=16' alt='"._("Remove")."' title='"._("Remove")."'>";
}
/* Display settings backwards for CNAMERecords */
......
......@@ -31,7 +31,7 @@
{if $fai_release != $fai_base && $allow_remove}
<br>
<input class="center" type="image" name="remove_branch" src="images/lists/trash.png">
<input class="center" type="image" name="remove_branch" src="geticon.php?context=actions&icon=edit-delete&size=16">
<a href="?plug={$plug_id}&act=remove_branch">{t}Delete current release{/t}</a>
{/if}
</td>
......
......@@ -10,7 +10,7 @@
<tr>
<td>
<label for="NAME">
<img src="images/lists/search.png" align=middle>&nbsp;{t}Name{/t}
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
</label>
</td>
<td>
......
......@@ -558,12 +558,12 @@ class faiDiskEntry extends plugin
// We can't remove freezed branches -> Hide remove button.
if(!preg_match("/freeze/", $this->FAIstate)){
$action =array(
"html" => "<input type='image' src='images/lists/edit.png' name='EditPartition_".$key."'>".
"<input type='image' src='images/lists/trash.png' name='RemovePartition_".$key."'>",
"html" => "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='EditPartition_".$key."'>".
"<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='RemovePartition_".$key."'>",
"attach" => "style='width:40px; border-right: 0px;'");
}else{
$action =array(
"html" => "<input type='image' src='images/lists/edit.png' name='EditPartition_".$key."'>",
"html" => "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='EditPartition_".$key."'>",
"attach" => "style='width:40px; border-right: 0px;'");
}
......
......@@ -329,11 +329,11 @@ class faiHook extends faiPluginClass
/* Check if this object is freezed, in this case hide the delete icon */
if(preg_match("/^freeze/", $this->FAIstate)){
$act .= "<input type='image' src='images/lists/edit.png' name='editscript_%s' title='"._("Edit")."' alt='"._("Edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editscript_%s' title='"._("Edit")."' alt='"._("Edit")."'>";
}else{
$act .= "<input type='image' src='images/lists/edit.png' name='editscript_%s' title='"._("Edit")."' alt='"._("Edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editscript_%s' title='"._("Edit")."' alt='"._("Edit")."'>";
if(preg_match("/d/",$acl)){
$act .="<input type='image' src='images/lists/trash.png' name='deletescript_%s' title='"._("Delete")."' alt='"._("Delete")."'>";
$act .="<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='deletescript_%s' title='"._("Delete")."' alt='"._("Delete")."'>";
}
}
......
......@@ -452,7 +452,7 @@ class faiPackage extends faiPluginClass
}
if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
$actions.= "&nbsp;<input type='image' class='center' title='"._("Remove this package")."'
src='images/lists/trash.png' name='remove_package_".base64_encode($usedName)."' >";
src='geticon.php?context=actions&icon=edit-delete&size=16' name='remove_package_".base64_encode($usedName)."' >";
}
$field1 = array("html" => $configured."&nbsp;".$removal,"attach" => "style='width:40px;'");
......
......@@ -413,9 +413,9 @@ class faiPartitionTable extends faiPluginClass
$acl = $this->ui->get_permissions($dn,"fai/faiPartitionTableEntry");
if(preg_match("/(r|w)/",$acl)) {
$act .= "<input type='image' src='images/lists/edit.png' name='edit_%s' title='"._("edit")."' alt='"._("edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='edit_%s' title='"._("edit")."' alt='"._("edit")."'>";
if(preg_match("/d/",$acl) && !preg_match("/freeze/", $this->FAIstate)){
$act .="<input type='image' src='images/lists/trash.png' name='delete_%s' title='"._("delete")."' alt='"._("delete")."'>";
$act .="<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='delete_%s' title='"._("delete")."' alt='"._("delete")."'>";
}
$cnt= count($disk['partitions']);
......
......@@ -318,7 +318,7 @@ class faiProfile extends faiPluginClass
$objTypes['FAIpartitionTable'] = "<img src='plugins/fai/images/fai_partitionTable.png' title='"._("Partition table")."' alt=''>";
/* Delete button */
$actions = "<input type='image' src='images/lists/trash.png' title='"._("Remove class from profile")."' name='DEL_%KEY%'>";
$actions = "<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' title='"._("Remove class from profile")."' name='DEL_%KEY%'>";
/* Up down buttons */
$linkupdown = "&nbsp;<input type='image' name='sortup_%s' alt='up' title='"._("Up")."' src='images/lists/sort-up.png' align='top' >";
......
......@@ -247,7 +247,7 @@ class faiProfileEntry extends plugin
$smarty->assign("launchimage" , get_template_path('images/lists/action.png'));
$smarty->assign("alphabet" , generate_alphabet());
$smarty->assign("apply" , apply_filter(TRUE));
$smarty->assign("search_image" , get_template_path('images/lists/search.png'));
$smarty->assign("search_image" , 'geticon.php?context=actions&icon=system-search&size=16');
$display .= $smarty->fetch(get_template_path('faiProfileEntry.tpl', TRUE));
return $display;
......
......@@ -357,11 +357,11 @@ class faiScript extends faiPluginClass
/* Hide delete icon if this object is freezed */
if(preg_match("/freeze/", $this->FAIstate)){
$act .= "<input type='image' src='images/lists/edit.png' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
}else{
$act .= "<input type='image' src='images/lists/edit.png' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
if(preg_match("/d/",$acl)){
$act .="<input type='image' src='images/lists/trash.png' name='deletescript_%s' title='"._("delete")."' alt='"._("delete")."'>";
$act .="<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='deletescript_%s' title='"._("delete")."' alt='"._("delete")."'>";
}
}
......
......@@ -303,11 +303,11 @@ class faiTemplate extends faiPluginClass
/* Hide delete icon if this object is freezed */
if(preg_match("/freeze/",$this->FAIstate)){
$act .= "<input type='image' src='images/lists/edit.png' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
}else{
$act .= "<input type='image' src='images/lists/edit.png' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
$act .= "<input type='image' src='geticon.php?context=actions&icon=document-edit&size=16' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
if(preg_match("/d/",$acl)){
$act .="<input type='image' src='images/lists/trash.png' name='deletescript_%s' title='"._("delete")."' alt='"._("delete")."'>";
$act .="<input type='image' src='geticon.php?context=actions&icon=edit-delete&size=16' name='deletescript_%s' title='"._("delete")."' alt='"._("delete")."'>";
}
}
......
......@@ -32,7 +32,7 @@
{if $fai_release != $fai_base && $allow_remove}
<br>
<input class="center" type="image" name="remove_branch" src="images/lists/trash.png">
<input class="center" type="image" name="remove_branch" src="geticon.php?context=actions&icon=edit-delete&size=16">
<a href="{$plug}&act=remove_branch">{t}Delete current release{/t}</a>
{/if}
......@@ -52,7 +52,7 @@
<tr>
<td>
<label for="NAME">
<img src="images/lists/search.png" align=middle>&nbsp;{t}Name{/t}
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
</label>
</td>
<td>
......
......@@ -18,7 +18,7 @@
<class>partitionTable</class>
<image>plugins/fai/images/fai_partitionTable.png</image>
</objectType>
<objectType>
<label>packagelist</label>
<objectClass>FAIpackageList</objectClass>
......@@ -26,7 +26,7 @@
<class>packageList</class>
<image>plugins/fai/images/fai_packages.png</image>
</objectType>
<objectType>
<label>script</label>
<objectClass>FAIscript</objectClass>
......@@ -34,7 +34,7 @@
<class>script</class>
<image>plugins/fai/images/fai_script.png</image>
</objectType>
<objectType>
<label>variable</label>
<objectClass>FAIvariable</objectClass>
......@@ -42,7 +42,7 @@
<class>variable</class>
<image>plugins/fai/images/fai_variable.png</image>
</objectType>
<objectType>
<label>hook</label>
<objectClass>FAIhook</objectClass>
......@@ -50,7 +50,7 @@
<class>hook</class>
<image>plugins/fai/images/fai_hook.png</image>
</objectType>
<objectType>
<label>profile</label>
<objectClass>FAIprofile</objectClass>
......@@ -58,7 +58,7 @@
<class>profile</class>
<image>plugins/fai/images/fai_profile.png</image>
</objectType>
<objectType>
<label>template</label>
<objectClass>FAItemplate</objectClass>
......@@ -75,7 +75,7 @@
<column>
<value>%{filter:objectTypes(dn,TYPES)}</value>
</column>
<column>
<label>Name</label>
<sortAttribute>cn</sortAttribute>
......@@ -100,7 +100,7 @@
<action>
<type>sub</type>
<image>images/lists/new.png</image>
<image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
<label>Create</label>
<action>
......@@ -155,7 +155,7 @@
<action>
<name>remove_multiple</name>
<type>entry</type>
<image>images/lists/trash.png</image>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
</action>
......@@ -186,7 +186,7 @@
<action>
<name>edit</name>
<type>entry</type>
<image>images/lists/edit.png</image>
<image>geticon.php?context=actions&amp;icon=document-edit&amp;size=16</image>
<label>Edit</label>
</action>
......@@ -194,7 +194,7 @@
<name>remove</name>
<type>entry</type>
<objectclass>FAKE_OC_IsBranch</objectclass>
<image>images/lists/trash.png</image>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
</action>
......
......@@ -87,7 +87,7 @@
{/if}
<p class="seperator">&nbsp;</p>
<br>
<h2><img class="center" alt="" src="images/lists/paste.png" title="{t}Partition entries{/t}">&nbsp;{t}Partition entries{/t}</h2>
<h2><img class="center" alt="" src="geticon.php?context=actions&icon=edit-paste&size=16" title="{t}Partition entries{/t}">&nbsp;{t}Partition entries{/t}</h2>
{$setup}
<br>
{if !$freeze}
......
......@@ -8,7 +8,7 @@
<tr>
<td>
{if $item.freezed}
<img src="images/lists/locked.png" class='center'>
<img src="geticon.php?context=status&icon=object-locked&size=16" class='center'>
{else}
<input type='checkbox' name='{$mode}_{$key}'
{if $item.selected} checked {/if}>
......
......@@ -21,7 +21,7 @@
<br>
<p class="seperator">&nbsp;</p>
<br>
<h2><img class="center" alt="" src="images/lists/paste.png" title="{t}Partition entries{/t}">&nbsp;{t}Partition entries{/t}</h2>
<h2><img class="center" alt="" src="geticon.php?context=actions&icon=edit-paste&size=16" title="{t}Partition entries{/t}">&nbsp;{t}Partition entries{/t}</h2>
{$setup}
<br>
{if !$freeze}
......
......@@ -74,7 +74,7 @@
</a>
<a href="{$plug}&amp;editFAItemplate">
<img class="center" alt="{t}Edit template{/t}..."
title="{t}Edit template{/t}..." src="images/lists/edit.png"/>
title="{t}Edit template{/t}..." src="geticon.php?context=actions&icon=document-edit&size=16"/>
</a>
{/if}
</td>
......
......@@ -21,7 +21,7 @@
<tr>
<td>
<label for="NAME">
<img src="images/lists/search.png" align=middle>&nbsp;{t}Name{/t}
<img src="geticon.php?context=actions&icon=system-search&size=16" align=middle>&nbsp;{t}Name{/t}
</label>
</td>
<td>
......
......@@ -110,7 +110,7 @@ class faxreport extends plugin
$smarty= get_smarty();
$smarty->assign("launchimage", get_template_path('images/launch.png'));
$smarty->assign("search_image", get_template_path('images/lists/search.png'));
$smarty->assign("search_image", 'geticon.php?context=actions&icon=system-search&size=16');
$smarty->assign("search_for", $this->search_for);
$smarty->assign("bases",