diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php index b331bfa1b..017d164b3 100644 --- a/application/forms/Config/Authentication/DbBackendForm.php +++ b/application/forms/Config/Authentication/DbBackendForm.php @@ -78,7 +78,7 @@ class DbBackendForm extends BaseBackendForm array( 'required' => true, 'allowEmpty'=> false, - 'label' => 'Backend name', + 'label' => 'Backend Name', 'helptext' => 'The name of this authentication provider', 'value' => $this->getBackendName() ) @@ -88,7 +88,7 @@ class DbBackendForm extends BaseBackendForm 'select', 'backend_' . $name . '_resource', array( - 'label' => 'Database connection', + 'label' => 'Database Connection', 'required' => true, 'allowEmpty' => false, 'helptext' => 'The database connection to use for authenticating with this provider', diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php index 51d9bbb51..5b070025d 100644 --- a/application/forms/Config/Authentication/LdapBackendForm.php +++ b/application/forms/Config/Authentication/LdapBackendForm.php @@ -58,7 +58,7 @@ class LdapBackendForm extends BaseBackendForm array( 'required' => true, 'allowEmpty'=> false, - 'label' => 'Backend name', + 'label' => 'Backend Name', 'helptext' => 'The name of this authentication backend', 'value' => $this->getBackendName() ) @@ -68,7 +68,7 @@ class LdapBackendForm extends BaseBackendForm 'text', 'backend_' . $name . '_hostname', array( - 'label' => 'LDAP server host', + 'label' => 'LDAP Server Host', 'allowEmpty' => false, 'value' => $backend->get('hostname', 'localhost'), 'helptext' => 'The hostname or address of the LDAP server to use for authentication', @@ -80,7 +80,7 @@ class LdapBackendForm extends BaseBackendForm 'text', 'backend_' . $name . '_root_dn', array( - 'label' => 'LDAP root dn', + 'label' => 'LDAP Root DN', 'value' => $backend->get('root_dn', 'ou=people,dc=icinga,dc=org'), 'helptext' => 'The path where users can be found on the ldap server', 'required' => true @@ -91,7 +91,7 @@ class LdapBackendForm extends BaseBackendForm 'text', 'backend_' . $name . '_bind_dn', array( - 'label' => 'LDAP bind dn', + 'label' => 'LDAP Bind DN', 'value' => $backend->get('bind_dn', 'cn=admin,cn=config'), 'helptext' => 'The user dn to use for querying the ldap server', 'required' => true @@ -102,7 +102,7 @@ class LdapBackendForm extends BaseBackendForm 'password', 'backend_' . $name . '_bind_pw', array( - 'label' => 'LDAP bind password', + 'label' => 'LDAP Bind Password', 'renderPassword' => true, 'value' => $backend->get('bind_pw', 'admin'), 'helptext' => 'The password to use for querying the ldap server', @@ -114,7 +114,7 @@ class LdapBackendForm extends BaseBackendForm 'text', 'backend_' . $name . '_user_class', array( - 'label' => 'LDAP user object class', + 'label' => 'LDAP User Object Class', 'value' => $backend->get('user_class', 'inetOrgPerson'), 'helptext' => 'The object class used for storing users on the ldap server', 'required' => true @@ -125,14 +125,14 @@ class LdapBackendForm extends BaseBackendForm 'text', 'backend_' . $name . '_user_name_attribute', array( - 'label' => 'LDAP user name attribute', + 'label' => 'LDAP User Name Attribute', 'value' => $backend->get('user_name_attribute', 'uid'), 'helptext' => 'The attribute name used for storing the user name on the ldap server', 'required' => true ) ); - $this->setSubmitLabel('Save backend'); + $this->setSubmitLabel('Save Backend'); } /** diff --git a/application/forms/Config/AuthenticationForm.php b/application/forms/Config/AuthenticationForm.php index 93ad7d05d..68e0b3118 100644 --- a/application/forms/Config/AuthenticationForm.php +++ b/application/forms/Config/AuthenticationForm.php @@ -302,7 +302,7 @@ class AuthenticationForm extends Form $this->addPersistentState(); $this->enableConditionalDecorator(); - $this->setSubmitLabel('Save changes'); + $this->setSubmitLabel('Save Changes'); } /** diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php index dd71d7da8..b5dbc00fe 100644 --- a/application/forms/Config/GeneralForm.php +++ b/application/forms/Config/GeneralForm.php @@ -138,7 +138,7 @@ class GeneralForm extends Form 'checkbox', 'environment', array( - 'label' => 'Development mode', + 'label' => 'Development Mode', 'required' => true, 'helptext' => 'Set true to show more detailed errors ' . 'and disable certain optimizations ' @@ -170,7 +170,7 @@ class GeneralForm extends Form 'select', 'timezone', array( - 'label' => 'Default application timezone', + 'label' => 'Default Application Timezone', 'required' => true, 'multiOptions' => $tzList, 'helptext' => $helptext, @@ -190,7 +190,7 @@ class GeneralForm extends Form 'text', 'module_folder', array( - 'label' => 'Module folder', + 'label' => 'Module Folder', 'required' => true, 'helptext' => 'Use this folder to activate modules (must be writable by your webserver)', 'value' => $cfg->get('moduleFolder', $this->getConfigDir() . '/config/enabledModules') @@ -211,7 +211,7 @@ class GeneralForm extends Form $txtDefaultDateFormat = new Zend_Form_Element_Text( array( 'name' => 'date_format', - 'label' => 'Date format', + 'label' => 'Date Format', 'helptext' => 'Display dates according to this format. See ' . $phpUrl . ' for possible values', 'required' => true, 'value' => $cfg->get('dateFormat', 'd/m/Y') @@ -223,7 +223,7 @@ class GeneralForm extends Form $txtDefaultTimeFormat = new Zend_Form_Element_Text( array( 'name' => 'time_format', - 'label' => 'Time format', + 'label' => 'Time Format', 'required' => true, 'helptext' => 'Display times according to this format. See ' . $phpUrl . ' for possible values', 'value' => $cfg->get('timeFormat', 'g:i A') @@ -248,11 +248,11 @@ class GeneralForm extends Form 'select', 'preferences_type', array( - 'label' => 'User preference storage type', + 'label' => 'User Preference Storage Type', 'required' => true, 'value' => $backend, 'multiOptions' => array( - 'ini' => 'File system (ini files)', + 'ini' => 'File System (ini files)', 'db' => 'Database' ) ) @@ -261,7 +261,7 @@ class GeneralForm extends Form $txtPreferencesIniPath = new Zend_Form_Element_Text( array( 'name' => 'preferences_ini_path', - 'label' => 'Path to store user preference files', + 'label' => 'User Preference Filepath', 'required' => $backend === 'ini', 'condition' => $backend === 'ini', 'value' => $cfg->get('configPath') @@ -279,7 +279,7 @@ class GeneralForm extends Form $txtPreferencesDbResource = new Zend_Form_Element_Select( array( 'name' => 'preferences_db_resource', - 'label' => 'Database connection', + 'label' => 'Database Connection', 'required' => $backend === 'db', 'condition' => $backend === 'db', 'value' => $cfg->get('resource'), @@ -327,7 +327,7 @@ class GeneralForm extends Form $this->addDateFormatSettings($global); $this->addUserPreferencesDialog($preferences); - $this->setSubmitLabel('Save changes'); + $this->setSubmitLabel('Save Changes'); } /** diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php index 85d0c5c19..967c29155 100644 --- a/application/forms/Config/LoggingForm.php +++ b/application/forms/Config/LoggingForm.php @@ -141,7 +141,7 @@ class LoggingForm extends Form $txtLogPath = new Zend_Form_Element_Text( array( 'name' => 'logging_app_target', - 'label' => 'Application log path', + 'label' => 'Application Log Path', 'helptext' => 'The logfile to write the icingaweb debug logs to.' . 'The webserver must be able to write at this location', 'required' => true, @@ -155,7 +155,7 @@ class LoggingForm extends Form 'checkbox', 'logging_app_verbose', array( - 'label' => 'Verbose logging', + 'label' => 'Verbose Logging', 'required' => true, 'helptext' => 'Check to write more verbose output to the icinga log file', 'value' => intval($logging->get('verbose', 0)) === 1 @@ -166,7 +166,7 @@ class LoggingForm extends Form 'checkbox', 'logging_debug_enable', array( - 'label' => 'Use debug log', + 'label' => 'Use Debug Log', 'required' => true, 'helptext' => 'Check to write a seperate debug log (Warning: This file can grow very big)', 'value' => $this->shouldDisplayDebugLog($debug) @@ -176,7 +176,7 @@ class LoggingForm extends Form $textLoggingDebugPath = new Zend_Form_Element_Text( array( 'name' => 'logging_debug_target', - 'label' => 'Debug log path', + 'label' => 'Debug Log Path', 'required' => $this->shouldDisplayDebugLog($debug), 'condition' => $this->shouldDisplayDebugLog($debug), 'value' => $debug->get('target', $this->getBaseDir() . '/var/log/icinga2.debug.log'), @@ -192,7 +192,7 @@ class LoggingForm extends Form $this->enableAutoSubmit(array('logging_debug_enable')); - $this->setSubmitLabel('Save changes'); + $this->setSubmitLabel('Save Changes'); } /** diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php index 75b0527c0..3d0695873 100644 --- a/application/forms/Preference/GeneralForm.php +++ b/application/forms/Preference/GeneralForm.php @@ -84,7 +84,7 @@ class GeneralForm extends Form $selectTimezone = new Zend_Form_Element_Select( array( 'name' => 'timezone', - 'label' => 'Your current timezone', + 'label' => 'Your Current Timezone', 'required' => !$useGlobalTimezone, 'multiOptions' => $tzList, 'helptext' => $helptext, @@ -95,7 +95,7 @@ class GeneralForm extends Form 'checkbox', 'default_timezone', array( - 'label' => 'Use default timezone', + 'label' => 'Use Default Timezone', 'value' => !$prefs->has('app.timezone'), 'required' => true ) @@ -128,7 +128,7 @@ class GeneralForm extends Form 'checkbox', 'default_date_format', array( - 'label' => 'Use default date format', + 'label' => 'Use Default Date Format', 'value' => !$prefs->has('app.dateFormat'), 'required' => true ) @@ -136,7 +136,7 @@ class GeneralForm extends Form $txtDefaultDateFormat = new Zend_Form_Element_Text( array( 'name' => 'date_format', - 'label' => 'Preferred date format', + 'label' => 'Preferred Date Format', 'helptext' => 'Display dates according to this format. See ' . $phpUrl . ' for possible values', 'required' => !$useGlobalDateFormat, 'value' => $prefs->get('app.dateFormat', $cfg->get('dateFormat', 'd/m/Y')) @@ -153,7 +153,7 @@ class GeneralForm extends Form 'checkbox', 'default_time_format', array( - 'label' => 'Use default time format', + 'label' => 'Use Default Time Format', 'value' => !$prefs->has('app.timeFormat'), 'required' => !$useGlobalTimeFormat ) @@ -161,7 +161,7 @@ class GeneralForm extends Form $txtDefaultTimeFormat = new Zend_Form_Element_Text( array( 'name' => 'time_format', - 'label' => 'Preferred time format', + 'label' => 'Preferred Time Format', 'required' => !$useGlobalTimeFormat, 'helptext' => 'Display times according to this format. See ' . $phpUrl . ' for possible values', 'value' => $prefs->get('app.timeFormat', $cfg->get('timeFormat', 'g:i A')) @@ -196,7 +196,7 @@ class GeneralForm extends Form $this->addTimezoneSelection($global); $this->addDateFormatSettings($global); - $this->setSubmitLabel('Save changes'); + $this->setSubmitLabel('Save Changes'); } /**