Standardised some naming of the icons to allow for other themes
This commit is contained in:
@@ -261,7 +261,7 @@ class AJAXTree extends HTMLTree {
|
||||
$output .= $this->get_indentation($level);
|
||||
$output .= sprintf('<img align="top" border="0" class="imgs" src="%s" alt="--" />',$img);
|
||||
$output .= sprintf('<a href="%s" title="%s">',htmlspecialchars($href),$entry->getDN());
|
||||
$output .= sprintf('<img align="top" border="0" class="imgs" src="%s/star.png" alt="->" />',IMGDIR);
|
||||
$output .= sprintf('<img align="top" border="0" class="imgs" src="%s/create.png" alt="->" />',IMGDIR);
|
||||
$output .= '</a>';
|
||||
$output .= ' ';
|
||||
|
||||
|
@@ -151,7 +151,7 @@ class HTMLTree extends Tree {
|
||||
if (! is_null($server->inactivityTime())) {
|
||||
$m = sprintf(_('Inactivity will log you off at %s'),
|
||||
strftime('%H:%M',$server->inactivityTime()));
|
||||
printf(' <img width=14 height=14 src="%s/timeout.png" title="%s" alt="%s"/>',IMGDIR,$m,$m);
|
||||
printf(' <img width=14 height=14 src="%s/timeout.png" title="%s" alt="%s"/>',IMGDIR,$m,'Timeout');
|
||||
}
|
||||
echo '</td></tr>';
|
||||
}
|
||||
@@ -193,7 +193,7 @@ class HTMLTree extends Tree {
|
||||
$menu['ajax'] = _('Loading Schema');
|
||||
$menu['div'] = 'BODY';
|
||||
$menu['title'] = _('View schema for');
|
||||
$menu['img'] = 'schema.png';
|
||||
$menu['img'] = 'schema-big.png';
|
||||
$menu['name'] = _('schema');
|
||||
break;
|
||||
|
||||
@@ -205,7 +205,7 @@ class HTMLTree extends Tree {
|
||||
$menu['ajax'] = _('Loading Search');
|
||||
$menu['div'] = 'BODY';
|
||||
$menu['title'] = _('Search');
|
||||
$menu['img'] = 'search.png';
|
||||
$menu['img'] = 'search-big.png';
|
||||
$menu['name'] = _('search');
|
||||
break;
|
||||
|
||||
@@ -230,7 +230,7 @@ class HTMLTree extends Tree {
|
||||
$menu['ajax'] = _('Loading Info');
|
||||
$menu['div'] = 'BODY';
|
||||
$menu['title'] = _('Info');
|
||||
$menu['img'] = 'info.png';
|
||||
$menu['img'] = 'info-big.png';
|
||||
$menu['name'] = _('info');
|
||||
break;
|
||||
|
||||
@@ -257,7 +257,7 @@ class HTMLTree extends Tree {
|
||||
$menu['ajax'] = _('Loading Monitor Info');
|
||||
$menu['div'] = 'BODY';
|
||||
$menu['title'] = _('Monitor');
|
||||
$menu['img'] = 'ldap-server.png';
|
||||
$menu['img'] = 'monitorserver-big.png';
|
||||
$menu['name'] = _('monitor');
|
||||
break;
|
||||
|
||||
@@ -269,7 +269,7 @@ class HTMLTree extends Tree {
|
||||
$menu['ajax'] = _('Loading Import');
|
||||
$menu['div'] = 'BODY';
|
||||
$menu['title'] = _('Import');
|
||||
$menu['img'] = 'import.png';
|
||||
$menu['img'] = 'import-big.png';
|
||||
$menu['name'] = _('import');
|
||||
break;
|
||||
|
||||
@@ -281,7 +281,7 @@ class HTMLTree extends Tree {
|
||||
$menu['ajax'] = _('Loading Export');
|
||||
$menu['div'] = 'BODY';
|
||||
$menu['title'] = _('Export');
|
||||
$menu['img'] = 'export.png';
|
||||
$menu['img'] = 'export-big.png';
|
||||
$menu['name'] = _('export');
|
||||
break;
|
||||
|
||||
@@ -292,7 +292,7 @@ class HTMLTree extends Tree {
|
||||
$href = sprintf('cmd.php?cmd=logout&server_id=%s',$server->getIndex());
|
||||
|
||||
return sprintf('<a href="%s" title="%s"><img src="%s/%s" alt="%s" /><br />%s</a>',
|
||||
htmlspecialchars($href),_('Logout of this server'),IMGDIR,'logout.png',_('logout'),_('logout'));
|
||||
htmlspecialchars($href),_('Logout of this server'),IMGDIR,'logout-big.png',_('logout'),_('logout'));
|
||||
|
||||
default:
|
||||
return false;
|
||||
@@ -465,7 +465,7 @@ class HTMLTree extends Tree {
|
||||
|
||||
echo '<tr>';
|
||||
printf('<td class="spacer" colspan=%s></td>',$level+3);
|
||||
printf('<td class="icon"><a href="%s"><img src="%s/star.png" alt="%s" /></a></td>',$href,IMGDIR,_('new'));
|
||||
printf('<td class="icon"><a href="%s"><img src="%s/create.png" alt="%s" /></a></td>',$href,IMGDIR,_('new'));
|
||||
printf('<td class="link" colspan="%s"><a href="%s" title="%s %s">%s</a></td>',
|
||||
$this->getDepth()+3-$level,$href,_('Create a new entry in'),$rdn,_('Create new entry here'));
|
||||
echo '</tr>';
|
||||
@@ -486,12 +486,12 @@ class HTMLTree extends Tree {
|
||||
|
||||
if (isAjaxEnabled()) {
|
||||
printf('<td class="icon"><a href="cmd.php?%s" onclick="return displayAJ(\'BODY\',\'%s\',\'%s\');" title="%s %s"><img src="%s/%s" alt="%s" /></a></td>',
|
||||
$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),IMGDIR,'uid.png',_('login'));
|
||||
$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),IMGDIR,'login.png',_('login'));
|
||||
printf('<td class="logged_in" colspan="%s"><a href="cmd.php?%s" onclick="return displayAJ(\'BODY\',\'%s\',\'%s\');" title="%s %s">%s</a></td>',
|
||||
$this->getDepth()+3-2,$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),_('login'));
|
||||
|
||||
} else {
|
||||
printf('<td class="icon"><a href="cmd.php?%s"><img src="%s/%s" alt="%s" /></a></td>',$href_parm,IMGDIR,'uid.png',_('login'));
|
||||
printf('<td class="icon"><a href="cmd.php?%s"><img src="%s/%s" alt="%s" /></a></td>',$href_parm,IMGDIR,'login.png',_('login'));
|
||||
printf('<td class="logged_in" colspan="%s"><a href="cmd.php?%s">%s...</a></td>',$this->getDepth()+3-2,$href_parm,_('Login'));
|
||||
}
|
||||
|
||||
|
@@ -623,7 +623,7 @@ class TemplateRender extends PageRender {
|
||||
echo '<tr>';
|
||||
|
||||
if ($isInValid)
|
||||
printf('<td class="icon"><img src="%s/disabled.png" alt="Error" /></td>',IMGDIR);
|
||||
printf('<td class="icon"><img src="%s/disabled.png" alt="Disabled" /></td>',IMGDIR);
|
||||
|
||||
else {
|
||||
if (isAjaxEnabled())
|
||||
@@ -669,7 +669,7 @@ class TemplateRender extends PageRender {
|
||||
else
|
||||
echo '<td><input type="radio" name="template" value="none" id="none" onclick="document.forms.template_choice_form.submit()" /></td>';
|
||||
|
||||
printf('<td class="icon"><label for="none"><img src="%s/object.png" alt="" /></label></td>',IMGDIR);
|
||||
printf('<td class="icon"><label for="none"><img src="%s/ldap-default.png" alt="" /></label></td>',IMGDIR);
|
||||
printf('<td class="label"><label for="none">%s</label></td>',_('Default'));
|
||||
echo '</tr>';
|
||||
}
|
||||
@@ -1114,10 +1114,10 @@ class TemplateRender extends PageRender {
|
||||
$href = sprintf('cmd=template_engine&%s&template=',$this->url_base);
|
||||
|
||||
if (isAjaxEnabled())
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'catalog.png',_('Switch Template'),
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'switch.png',_('Switch Template'),
|
||||
htmlspecialchars($href),_('Change to another template'),htmlspecialchars($href),_('Loading'),_('Switch Template'));
|
||||
else
|
||||
return sprintf($this->layout['action'],IMGDIR,'catalog.png',_('Switch Template'),
|
||||
return sprintf($this->layout['action'],IMGDIR,'switch.png',_('Switch Template'),
|
||||
htmlspecialchars($href),_('Change to another template'),_('Switch Template'));
|
||||
}
|
||||
|
||||
@@ -1127,10 +1127,10 @@ class TemplateRender extends PageRender {
|
||||
$href = sprintf('cmd=export_form&%s&scope=base',$this->url_base);
|
||||
|
||||
if (isAjaxEnabled())
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'save.png',_('Export'),
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'export.png',_('Export'),
|
||||
htmlspecialchars($href),_('Save a dump of this object'),htmlspecialchars($href),_('Loading'),_('Export'));
|
||||
else
|
||||
return sprintf($this->layout['action'],IMGDIR,'save.png',_('Export'),
|
||||
return sprintf($this->layout['action'],IMGDIR,'export.png',_('Export'),
|
||||
htmlspecialchars($href),_('Save a dump of this object'),_('Export'));
|
||||
}
|
||||
|
||||
@@ -1213,11 +1213,11 @@ class TemplateRender extends PageRender {
|
||||
$href = sprintf('cmd=template_engine&server_id=%s&container=%s',$this->getServerID(),rawurlencode($this->template->getDN()));
|
||||
|
||||
if (isAjaxEnabled())
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'star.png',_('Create'),
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'create.png',_('Create'),
|
||||
htmlspecialchars($href),_('Create a child entry'),
|
||||
htmlspecialchars($href),_('Loading'),_('Create a child entry'));
|
||||
else
|
||||
return sprintf($this->layout['action'],IMGDIR,'star.png',_('Create'),
|
||||
return sprintf($this->layout['action'],IMGDIR,'create.png',_('Create'),
|
||||
htmlspecialchars($href),_('Create a child entry'),_('Create a child entry'));
|
||||
}
|
||||
|
||||
@@ -1262,11 +1262,11 @@ class TemplateRender extends PageRender {
|
||||
$href = sprintf('cmd=export_form&%s&scope=%s',$this->url_base,'sub');
|
||||
|
||||
if (isAjaxEnabled())
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'save.png',_('Save'),
|
||||
return sprintf($this->layout['actionajax'],IMGDIR,'export.png',_('Save'),
|
||||
htmlspecialchars($href),_('Save a dump of this object and all of its children'),
|
||||
htmlspecialchars($href),_('Loading'),_('Export subtree'));
|
||||
else
|
||||
return sprintf($this->layout['action'],IMGDIR,'save.png',_('Save'),
|
||||
return sprintf($this->layout['action'],IMGDIR,'export.png',_('Save'),
|
||||
htmlspecialchars($href),_('Save a dump of this object and all of its children'),_('Export subtree'));
|
||||
}
|
||||
|
||||
@@ -1830,9 +1830,9 @@ function fillRec(id,value) {
|
||||
if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
|
||||
|
||||
if (strlen($val) <= 0)
|
||||
printf('<img src="%s/go.png" alt="Go" align="top" /> ',IMGDIR);
|
||||
printf('<img src="%s/ldap-alias.png" alt="Go" align="top" /> ',IMGDIR);
|
||||
elseif ($this->getServer()->dnExists($val))
|
||||
printf('<a href="cmd.php?cmd=template_engine&server_id=%s&dn=%s" title="%s %s"><img src="%s/go.png" alt="Go" /></a> ',
|
||||
printf('<a href="cmd.php?cmd=template_engine&server_id=%s&dn=%s" title="%s %s"><img src="%s/ldap-alias.png" alt="Go" /></a> ',
|
||||
$this->getServerID(),rawurlencode($val),_('Go to'),$val,IMGDIR);
|
||||
else
|
||||
printf('<a title="%s %s"><img src="%s/nogo.png" alt="Go" /></a> ',_('DN not available'),$val,IMGDIR);
|
||||
@@ -1852,7 +1852,7 @@ function fillRec(id,value) {
|
||||
protected function drawUrlValueIconAttribute($attribute,$val) {
|
||||
if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
|
||||
|
||||
$img = sprintf('<img src="%s/dc.png" alt="%s" align="top" />',IMGDIR,_('URL'));
|
||||
$img = sprintf('<img src="%s/ldap-dc.png" alt="%s" align="top" />',IMGDIR,_('URL'));
|
||||
$url = explode(' +',$val,2);
|
||||
|
||||
if (strlen($val) <= 0)
|
||||
|
@@ -384,12 +384,12 @@ function cmd_control_pane($type) {
|
||||
'external_links:forum'=>array(
|
||||
'title'=>_('Forum'),
|
||||
'link'=>sprintf('href="%s" title="%s" target="_blank"',get_href('forum'),_('Forum')),
|
||||
'image'=>sprintf('<img src="%s/help.png" alt="%s" />',IMGDIR,_('Forum'))),
|
||||
'image'=>sprintf('<img src="%s/forum-big.png" alt="%s" />',IMGDIR,_('Forum'))),
|
||||
|
||||
'external_links:feature'=>array(
|
||||
'title'=>_('Request feature'),
|
||||
'link'=>sprintf('href="%s" title="%s" target="_blank"',get_href('add_rfe'),_('Request feature')),
|
||||
'image'=>sprintf('<img src="%s/request-feature.png" alt="%s" />',IMGDIR,_('Request feature'))),
|
||||
'image'=>sprintf('<img src="%s/request-feature-big.png" alt="%s" />',IMGDIR,_('Request feature'))),
|
||||
|
||||
'external_links:bug'=>array(
|
||||
'title'=>_('Report a bug'),
|
||||
@@ -1579,26 +1579,26 @@ function get_icon($server_id,$dn,$object_classes=array()) {
|
||||
in_array('account',$object_classes) ||
|
||||
in_array('posixaccount',$object_classes))
|
||||
|
||||
return 'user.png';
|
||||
return 'ldap-user.png';
|
||||
|
||||
elseif (in_array('organization',$object_classes))
|
||||
return 'o.png';
|
||||
return 'ldap-o.png';
|
||||
|
||||
elseif (in_array('organizationalunit',$object_classes))
|
||||
return 'ou.png';
|
||||
return 'ldap-ou.png';
|
||||
|
||||
elseif (in_array('organizationalrole',$object_classes))
|
||||
return 'uid.png';
|
||||
return 'ldap-uid.png';
|
||||
|
||||
elseif (in_array('dcobject',$object_classes) ||
|
||||
in_array('domainrelatedobject',$object_classes) ||
|
||||
in_array('domain',$object_classes) ||
|
||||
in_array('builtindomain',$object_classes))
|
||||
|
||||
return 'dc.png';
|
||||
return 'ldap-dc.png';
|
||||
|
||||
elseif (in_array('alias',$object_classes))
|
||||
return 'go.png';
|
||||
return 'ldap-alias.png';
|
||||
|
||||
elseif (in_array('room',$object_classes))
|
||||
return 'door.png';
|
||||
@@ -1632,13 +1632,13 @@ function get_icon($server_id,$dn,$object_classes=array()) {
|
||||
in_array('groupofnames',$object_classes) ||
|
||||
in_array('group',$object_classes))
|
||||
|
||||
return 'ou.png';
|
||||
return 'ldap-ou.png';
|
||||
|
||||
elseif (in_array('applicationprocess',$object_classes))
|
||||
return 'process.png';
|
||||
|
||||
elseif (in_array('groupofuniquenames',$object_classes))
|
||||
return 'uniquegroup.png';
|
||||
return 'ldap-uniquegroup.png';
|
||||
|
||||
elseif (in_array('iphost',$object_classes))
|
||||
return 'host.png';
|
||||
@@ -1671,7 +1671,7 @@ function get_icon($server_id,$dn,$object_classes=array()) {
|
||||
return 'ldap-server.png';
|
||||
|
||||
elseif (in_array('rbscollection',$object_classes))
|
||||
return 'ou.png';
|
||||
return 'ldap-ou.png';
|
||||
|
||||
elseif (in_array('dfsconfiguration',$object_classes))
|
||||
return 'nt_machine.png';
|
||||
@@ -1713,11 +1713,11 @@ function get_icon($server_id,$dn,$object_classes=array()) {
|
||||
return 'lock.png';
|
||||
|
||||
elseif (strcasecmp($rdn_value,'MicrosoftDNS') == 0)
|
||||
return 'dc.png';
|
||||
return 'ldap-dc.png';
|
||||
|
||||
# Oh well, I don't know what it is. Use a generic icon.
|
||||
else
|
||||
return 'object.png';
|
||||
return 'ldap-default.png';
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user