Simplifying the configuration menu

This commit is contained in:
Manuel Cillero 2017-10-07 13:12:10 +02:00
parent 9777b4c1ba
commit feb393faa4
11 changed files with 32 additions and 28 deletions

View file

@ -1167,9 +1167,9 @@ function storm_storm_dashboard_types() {
// URL: menu path which should be used, if omitted no menu item will be created // URL: menu path which should be used, if omitted no menu item will be created
'url' => '', 'url' => '',
// title: Required. Title of menu item, page title and title for the storm settings // title: Required. Title of menu item, page title and title for the storm settings
'title' => t('SuiteDesk'), 'title' => t('Home page'),
// description: Required. Description for the fieldset in the storm settings // description: Required. Description for the fieldset in the storm settings
'description' => t('You can disable or reorder the links from the !dashboard here', array('!dashboard' => l(t('dashboard'), 'dashboard'))), 'description' => t('You can disable or reorder the links from the home page here.'),
// theme: theme which should be used to display this dashboard. If omitted uses standard theme storm_dashboard // theme: theme which should be used to display this dashboard. If omitted uses standard theme storm_dashboard
'theme' => 'storm_dashboard', 'theme' => 'storm_dashboard',
// menu_options: This array will be merged into the default menu item array. If the menu should have special access arguments, title, it can be set here. // menu_options: This array will be merged into the default menu item array. If the menu should have special access arguments, title, it can be set here.
@ -1180,8 +1180,8 @@ function storm_storm_dashboard_types() {
), ),
), ),
'block' => array( 'block' => array(
'title' => 'Dashboard block', 'title' => 'Shortcuts block',
'description' => t('You can disable or reorder the links from the dashboard !block here', array('!block' => l(t('block'), 'admin/build/block'))), 'description' => t('You can disable or reorder the links from the shortcuts block here.'),
'theme' => 'storm_dashboard_block', 'theme' => 'storm_dashboard_block',
), ),
); );
@ -1846,7 +1846,7 @@ function storm_block_recent_nodes() {
function storm_admin_settings() { function storm_admin_settings() {
$form = array(); $form = array();
$w = -10; $w = -10;
/*
$form['icons'] = array( $form['icons'] = array(
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => t('Icons'), '#title' => t('Icons'),
@ -1871,7 +1871,7 @@ function storm_admin_settings() {
'#weight' => $w++, '#weight' => $w++,
'#element_validate' => array('storm_admin_settings_icons_path_validate'), '#element_validate' => array('storm_admin_settings_icons_path_validate'),
); );
*/
$form['lists'] = array( $form['lists'] = array(
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => t('Lists'), '#title' => t('Lists'),
@ -1884,7 +1884,7 @@ function storm_admin_settings() {
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Default Items per Page'), '#title' => t('Default Items per Page'),
'#default_value' => variable_get('storm_default_items_per_page', 10), '#default_value' => variable_get('storm_default_items_per_page', 10),
'#description' => t('Default items per page when viewing lists'), '#description' => t('Default items per page when viewing lists.'),
'#size' => 5, '#size' => 5,
'#weight' => $w++ '#weight' => $w++
); );
@ -1901,7 +1901,7 @@ function storm_admin_settings() {
'#type' => 'textarea', '#type' => 'textarea',
'#title' => t('Report header'), '#title' => t('Report header'),
'#default_value' => variable_get('storm_report_header', ''), '#default_value' => variable_get('storm_report_header', ''),
'#description' => t('The header that will appear on SuiteDesk reports'), '#description' => t('The header that will appear on reports.'),
'#weight' => $w++, '#weight' => $w++,
); );
@ -2028,10 +2028,10 @@ function storm_admin_settings() {
'#weight' => $w++, '#weight' => $w++,
); );
// DASHBOARD SETTINGS // OPTIONS SETTINGS
$form['storm_dashboard_settings'] = array( $form['storm_dashboard_settings'] = array(
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => t('Dashboard settings'), '#title' => t('Options settings'),
'#collapsible' => TRUE, '#collapsible' => TRUE,
'#collapsed' => TRUE, '#collapsed' => TRUE,
); );

View file

@ -841,7 +841,7 @@ function storminvoice_admin_settings() {
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Number of days for invoice payment'), '#title' => t('Number of days for invoice payment'),
'#default_value' => variable_get('storminvoice_payment_days', 30), '#default_value' => variable_get('storminvoice_payment_days', 30),
'#description' => t('Default number of days for invoice payment'), '#description' => t('Default number of days for invoice payment.'),
'#size' => 5, '#size' => 5,
); );
@ -857,14 +857,14 @@ function storminvoice_admin_settings() {
'#type' => 'textarea', '#type' => 'textarea',
'#title' => t('Modes for invoice payment'), '#title' => t('Modes for invoice payment'),
'#default_value' => variable_get('storminvoice_payment_modes', ''), '#default_value' => variable_get('storminvoice_payment_modes', ''),
'#description' => t('Modes for invoice payment'), '#description' => t('Modes for invoice payment.'),
); );
$form['storminvoice_cover_note_subject'] = array( $form['storminvoice_cover_note_subject'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Cover note subject'), '#title' => t('Cover note subject'),
'#default_value' => variable_get('storminvoice_cover_note_subject', t('Invoice from !site', array('!site' => variable_get('site_name', 'STORM')))), '#default_value' => variable_get('storminvoice_cover_note_subject', t('Invoice from !site', array('!site' => variable_get('site_name', 'STORM')))),
'#description' => t('Default subject for cover note'), '#description' => t('Default subject for cover note.'),
'#size' => 50, '#size' => 50,
); );
@ -872,14 +872,14 @@ function storminvoice_admin_settings() {
'#type' => 'textarea', '#type' => 'textarea',
'#title' => t('Cover note for invoice'), '#title' => t('Cover note for invoice'),
'#default_value' => variable_get('storminvoice_cover_note', 'Hope this comes easy to you.'), '#default_value' => variable_get('storminvoice_cover_note', 'Hope this comes easy to you.'),
'#description' => t('Default cover note for pdf invoice sent by email'), '#description' => t('Default cover note for pdf invoice sent by email.'),
); );
$form['storminvoice_payment_terms'] = array( $form['storminvoice_payment_terms'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Payment terms'), '#title' => t('Payment terms'),
'#default_value' => variable_get('storminvoice_payment_terms', t('Due on receipt')), '#default_value' => variable_get('storminvoice_payment_terms', t('Due on receipt')),
'#description' => t('Payment terms'), '#description' => t('Payment terms.'),
'#size' => 50, '#size' => 50,
); );

View file

@ -730,7 +730,7 @@ function stormorganization_admin_settings() {
'#title' => t('Host organization'), '#title' => t('Host organization'),
'#options' => $organizations, '#options' => $organizations,
'#default_value' => variable_get('storm_organization_nid', 0), '#default_value' => variable_get('storm_organization_nid', 0),
'#description' => t('The organization that owns this system'), '#description' => t('The organization that owns this system.'),
'#weight' => -30, '#weight' => -30,
); );
} }

View file

@ -879,7 +879,7 @@ function stormproject_admin_settings() {
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Default Value for billable field.'), '#title' => t('Default Value for billable field.'),
'#default_value' => variable_get('stormproject_billable_default', FALSE), '#default_value' => variable_get('stormproject_billable_default', FALSE),
'#description' => t('When checked, SuiteDesk will set the project to billable by default'), '#description' => t('When checked, SuiteDesk will set the project to billable by default.'),
'#size' => 5, '#size' => 5,
); );

View file

@ -12,7 +12,7 @@ function stormquicktt_settings() {
'#title' => t('Default title'), '#title' => t('Default title'),
'#default_value' => variable_get('stormquicktt_default_title', 'Auto-created by QuickTT'), '#default_value' => variable_get('stormquicktt_default_title', 'Auto-created by QuickTT'),
); );
$status_option_prj = array('none' => '-none-'); $status_option_prj = array('none' => t('-none-'));
$project_status = storm_attributes_bydomain('Project status'); $project_status = storm_attributes_bydomain('Project status');
$status_option_prj = array_merge($status_option_prj, $project_status['values']); $status_option_prj = array_merge($status_option_prj, $project_status['values']);
@ -35,4 +35,4 @@ function stormquicktt_settings() {
); );
return system_settings_form($form); return system_settings_form($form);
} }

View file

@ -12,4 +12,3 @@ version = "6.x-2.x-dev"
core = "6.x" core = "6.x"
project = "stormquicktt" project = "stormquicktt"
datestamp = "1332637511" datestamp = "1332637511"

View file

@ -316,16 +316,16 @@ function stormtask_admin_settings() {
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Default Value for billable field.'), '#title' => t('Default Value for billable field.'),
'#default_value' => variable_get('stormtask_billable_default', FALSE), '#default_value' => variable_get('stormtask_billable_default', FALSE),
'#description' => t('When checked, SuiteDesk will set the task to billable by default'), '#description' => t('When checked, SuiteDesk will set the task to billable by default.'),
'#size' => 5, '#size' => 5,
); );
/*
$form['stormtask_enable_ganttchart'] = array( $form['stormtask_enable_ganttchart'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Enable Gantt Charts (experimental feature)'), '#title' => t('Enable Gantt Charts (experimental feature)'),
'#default_value' => variable_get('stormtask_enable_ganttchart', False), '#default_value' => variable_get('stormtask_enable_ganttchart', False),
); );
/*
$form['stormtask_jsgantt_options'] = array( $form['stormtask_jsgantt_options'] = array(
'#type' => 'checkboxes', '#type' => 'checkboxes',
'#title' => t('Chart display options'), '#title' => t('Chart display options'),
@ -337,7 +337,7 @@ function stormtask_admin_settings() {
), ),
'#description' => t('Choose display options for gantt chart.'), '#description' => t('Choose display options for gantt chart.'),
); );
*/
$form['stormtask_jsgantt_color'] = array( $form['stormtask_jsgantt_color'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Gantt chart default color'), '#title' => t('Gantt chart default color'),
@ -373,7 +373,7 @@ function stormtask_admin_settings() {
'#description' => t('Enter "overdue" color for gantt chart bars.'), '#description' => t('Enter "overdue" color for gantt chart bars.'),
'#size' => 6, '#size' => 6,
); );
*/
return system_settings_form($form); return system_settings_form($form);
} }

View file

@ -904,7 +904,7 @@ function stormticket_admin_settings() {
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Default Value for billable field.'), '#title' => t('Default Value for billable field.'),
'#default_value' => variable_get('stormticket_billable_default', FALSE), '#default_value' => variable_get('stormticket_billable_default', FALSE),
'#description' => t('When checked, SuiteDesk will set the ticket to billable by default'), '#description' => t('When checked, SuiteDesk will set the ticket to billable by default.'),
'#size' => 5, '#size' => 5,
); );

View file

@ -691,7 +691,7 @@ function stormtimetracking_admin_settings() {
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Always set billing duration to duration value.'), '#title' => t('Always set billing duration to duration value.'),
'#default_value' => variable_get('stormtimetracking_auto_duration', TRUE), '#default_value' => variable_get('stormtimetracking_auto_duration', TRUE),
'#description' => t('When checked, Storm will set the billing duration equal to the duration each time the node is saved. The duration is always calculated from the start and end times.'), '#description' => t('When checked, SuiteDesk will set the billing duration equal to the duration each time the node is saved. The duration is always calculated from the start and end times.'),
'#size' => 5, '#size' => 5,
); );
@ -699,7 +699,7 @@ function stormtimetracking_admin_settings() {
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Default Value for billable field.'), '#title' => t('Default Value for billable field.'),
'#default_value' => variable_get('stormtimetracking_billable_default', FALSE), '#default_value' => variable_get('stormtimetracking_billable_default', FALSE),
'#description' => t('When checked, Storm will set the timetracking to billable by default'), '#description' => t('When checked, SuiteDesk will set the timetracking to billable by default.'),
'#size' => 5, '#size' => 5,
); );

View file

@ -13,6 +13,9 @@ label {
max-width: 100% !important; max-width: 100% !important;
white-space: nowrap; white-space: nowrap;
} }
#locale-translate-edit-form .form-item {
white-space: normal;
}
/* Form items styles exceptions */ /* Form items styles exceptions */
.container-inline-date label { .container-inline-date label {
display: block; display: block;
@ -73,6 +76,7 @@ form#diff-node-revisions table.table td {
} }
body.section-admin form table.table td { body.section-admin form table.table td {
padding: 5px !important; padding: 5px !important;
border-top: 0;
} /* } /*
.form-item .description { .form-item .description {
font-size: 75%; font-size: 75%;

View file

@ -48,6 +48,7 @@ ul.tabs-menu li.active {
} }
ul.tabs li a { ul.tabs li a {
color: #fff; color: #fff;
white-space: nowrap;
} }
ul.tabs li:hover a, ul.tabs li:hover a,
ul.tabs li a:hover { ul.tabs li a:hover {