diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml index ed5a2426c..01fc1c48d 100644 --- a/application/views/scripts/config/modules.phtml +++ b/application/views/scripts/config/modules.phtml @@ -10,17 +10,24 @@ - enabled): ?> - icon('thumbs-up', $this->translate('Module is enabled')) ?> - - icon('thumbs-down', $this->translate('Module is disabled')) ?> - - escape($module->name); ?> (enabled ? ($module->loaded ? $this->translate('enabled') : $this->translate('failed')) : $this->translate('disabled') - ?>) + enabled && $module->loaded) { + $icon = $this->icon('thumbs-up'); + $title = sprintf($this->translate('Module %s is enabled'), $module->name); + } elseif (! $module->enabled) { + $icon = $this->icon('thumbs-down'); + $title = sprintf($this->translate('Module %s is disabled'), $module->name); + } else { // ! $module->loaded + $icon = $this->icon('thumbs-down'); + $title = sprintf($this->translate('Module %s has failed to load'), $module->name); + } + + echo $this->qlink( + $icon . $this->escape($module->name), + 'config/module/', + array('name' => $module->name), + array('title' => $title), + false + ); ?> diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml index 12c9cf6ce..8b58ea15a 100644 --- a/application/views/scripts/config/resource.phtml +++ b/application/views/scripts/config/resource.phtml @@ -36,14 +36,24 @@ resources as $name): ?> - - icon('edit'); ?> escape($name); ?> - + qlink( + $this->icon('edit') . ' ' . $this->escape($name), + 'config/editresource', + array('resource' => $name), + array('title' => sprintf($this->translate('Edit resource %s'), $name)), + false + ); ?> - - - icon('cancel'); ?> - + +
+ qlink( + $this->icon('cancel'), + 'config/removeresource', + array('resource' => $name), + array('title' => sprintf($this->translate('Remove resource %s'), $name)), + false + ); ?> +
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml index 19a846ace..2ac9a1dfa 100644 --- a/application/views/scripts/dashboard/settings.phtml +++ b/application/views/scripts/dashboard/settings.phtml @@ -1,5 +1,3 @@ -
tabs ?>
@@ -25,9 +23,13 @@ getName(); ?> - - icon('cancel'); ?> - + qlink( + $this->icon('cancel'), + 'dashboard/remove-pane', + array('pane' => $pane->getName()), + array('title' => sprintf($this->translate('Remove pane %s'), $pane->getName())), + false + ); ?> getDashlets(); ?> @@ -50,9 +52,13 @@ getUrl(); ?> - - icon('cancel'); ?> - + qlink( + $this->icon('cancel'), + 'dashboard/remove-dashlet', + array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()), + array('title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getName())), + false + ); ?> diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml index 90319e0ad..8cfe62cc4 100644 --- a/application/views/scripts/form/reorder-authbackend.phtml +++ b/application/views/scripts/form/reorder-authbackend.phtml @@ -10,24 +10,50 @@ - - icon('edit'); ?> escape($backendNames[$i]); ?> - + qlink( + $this->icon('edit') . ' ' . $this->escape($backendNames[$i]), + 'config/editAuthenticationBackend', + array('auth_backend' => $backendNames[$i]), + array('title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])), + false + ); ?> - - icon('cancel', $this->translate('Remove')); ?> - + qlink( + $this->icon('cancel'), + 'config/removeAuthenticationBackend', + array('auth_backend' => $backendNames[$i]), + array('title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])), + false + ); ?> 0): ?> - - diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml index c08a0b6a4..ea70bbe3f 100644 --- a/application/views/scripts/roles/index.phtml +++ b/application/views/scripts/roles/index.phtml @@ -51,13 +51,13 @@ escape($role->users) ?> escape($role->groups) ?> - - icon('cancel') ?> - + qlink( + $this->icon('cancel'), + 'roles/remove', + array('role' => $name), + array('title' => sprintf($this->translate('Remove role %s'), $name)), + false + ); ?> diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml index b1729f9b1..0fdb5f8c3 100644 --- a/modules/monitoring/application/views/scripts/config/index.phtml +++ b/modules/monitoring/application/views/scripts/config/index.phtml @@ -18,18 +18,26 @@ backendsConfig as $backendName => $config): ?> - - icon('edit'); ?> escape($backendName); ?> - + qlink( + $this->icon('edit') . ' ' . $this->escape($backendName), + '/monitoring/config/editbackend', + array('backend' => $backendName), + array('title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)), + false + ); ?> (translate('Type: %s'), $this->escape($config->type === 'ido' ? 'IDO' : ucfirst($config->type)) ); ?>) - - icon('cancel'); ?> - + qlink( + $this->icon('cancel'), + '/monitoring/config/removebackend', + array('backend' => $backendName), + array('title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)), + false + ); ?> @@ -50,18 +58,26 @@ instancesConfig as $instanceName => $config): ?> - - icon('edit'); ?> escape($instanceName); ?> - + qlink( + $this->icon('edit') . ' ' . $this->escape($instanceName), + '/monitoring/config/editinstance', + array('instance' => $instanceName), + array('title' => sprintf($this->translate('Edit monitoring instance %s'), $instanceName)), + false + ); ?> (translate('Type: %s'), $config->host !== null ? $this->translate('Remote') : $this->translate('Local') ); ?>) - - icon('cancel'); ?> - + qlink( + $this->icon('cancel'), + '/monitoring/config/removeinstance', + array('instance' => $instanceName), + array('title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)), + false + ); ?>