From feb393faa44b4a50c99ff20a99f54680c3a20d0e Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sat, 7 Oct 2017 13:12:10 +0200 Subject: [PATCH] Simplifying the configuration menu --- modules/storm/storm.module | 20 +++++++++---------- .../storm/storminvoice/storminvoice.module | 10 +++++----- .../stormorganization.module | 2 +- .../storm/stormproject/stormproject.module | 2 +- .../storm/stormquicktt/stormquicktt.admin.inc | 4 ++-- modules/storm/stormquicktt/stormquicktt.info | 1 - modules/storm/stormtask/stormtask.module | 10 +++++----- modules/storm/stormticket/stormticket.module | 2 +- .../stormtimetracking.module | 4 ++-- themes/zuitedesk/css/forms.css | 4 ++++ themes/zuitedesk/css/tabs.css | 1 + 11 files changed, 32 insertions(+), 28 deletions(-) diff --git a/modules/storm/storm.module b/modules/storm/storm.module index 3271779..66e801f 100644 --- a/modules/storm/storm.module +++ b/modules/storm/storm.module @@ -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' => '', // 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' => 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' => '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. @@ -1180,8 +1180,8 @@ function storm_storm_dashboard_types() { ), ), 'block' => array( - 'title' => 'Dashboard block', - 'description' => t('You can disable or reorder the links from the dashboard !block here', array('!block' => l(t('block'), 'admin/build/block'))), + 'title' => 'Shortcuts block', + 'description' => t('You can disable or reorder the links from the shortcuts block here.'), 'theme' => 'storm_dashboard_block', ), ); @@ -1846,7 +1846,7 @@ function storm_block_recent_nodes() { function storm_admin_settings() { $form = array(); $w = -10; - +/* $form['icons'] = array( '#type' => 'fieldset', '#title' => t('Icons'), @@ -1871,7 +1871,7 @@ function storm_admin_settings() { '#weight' => $w++, '#element_validate' => array('storm_admin_settings_icons_path_validate'), ); - +*/ $form['lists'] = array( '#type' => 'fieldset', '#title' => t('Lists'), @@ -1884,7 +1884,7 @@ function storm_admin_settings() { '#type' => 'textfield', '#title' => t('Default Items per Page'), '#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, '#weight' => $w++ ); @@ -1901,7 +1901,7 @@ function storm_admin_settings() { '#type' => 'textarea', '#title' => t('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++, ); @@ -2028,10 +2028,10 @@ function storm_admin_settings() { '#weight' => $w++, ); - // DASHBOARD SETTINGS + // OPTIONS SETTINGS $form['storm_dashboard_settings'] = array( '#type' => 'fieldset', - '#title' => t('Dashboard settings'), + '#title' => t('Options settings'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); diff --git a/modules/storm/storminvoice/storminvoice.module b/modules/storm/storminvoice/storminvoice.module index 21d183e..4a06941 100644 --- a/modules/storm/storminvoice/storminvoice.module +++ b/modules/storm/storminvoice/storminvoice.module @@ -841,7 +841,7 @@ function storminvoice_admin_settings() { '#type' => 'textfield', '#title' => t('Number of days for invoice payment'), '#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, ); @@ -857,14 +857,14 @@ function storminvoice_admin_settings() { '#type' => 'textarea', '#title' => t('Modes for invoice payment'), '#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( '#type' => 'textfield', '#title' => t('Cover note subject'), '#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, ); @@ -872,14 +872,14 @@ function storminvoice_admin_settings() { '#type' => 'textarea', '#title' => t('Cover note for invoice'), '#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( '#type' => 'textfield', '#title' => t('Payment terms'), '#default_value' => variable_get('storminvoice_payment_terms', t('Due on receipt')), - '#description' => t('Payment terms'), + '#description' => t('Payment terms.'), '#size' => 50, ); diff --git a/modules/storm/stormorganization/stormorganization.module b/modules/storm/stormorganization/stormorganization.module index c999301..2d6fd61 100644 --- a/modules/storm/stormorganization/stormorganization.module +++ b/modules/storm/stormorganization/stormorganization.module @@ -730,7 +730,7 @@ function stormorganization_admin_settings() { '#title' => t('Host organization'), '#options' => $organizations, '#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, ); } diff --git a/modules/storm/stormproject/stormproject.module b/modules/storm/stormproject/stormproject.module index 131777d..44120b0 100644 --- a/modules/storm/stormproject/stormproject.module +++ b/modules/storm/stormproject/stormproject.module @@ -879,7 +879,7 @@ function stormproject_admin_settings() { '#type' => 'checkbox', '#title' => t('Default Value for billable field.'), '#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, ); diff --git a/modules/storm/stormquicktt/stormquicktt.admin.inc b/modules/storm/stormquicktt/stormquicktt.admin.inc index 6a30eb1..c653eda 100644 --- a/modules/storm/stormquicktt/stormquicktt.admin.inc +++ b/modules/storm/stormquicktt/stormquicktt.admin.inc @@ -12,7 +12,7 @@ function stormquicktt_settings() { '#title' => t('Default title'), '#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'); $status_option_prj = array_merge($status_option_prj, $project_status['values']); @@ -35,4 +35,4 @@ function stormquicktt_settings() { ); return system_settings_form($form); -} \ No newline at end of file +} diff --git a/modules/storm/stormquicktt/stormquicktt.info b/modules/storm/stormquicktt/stormquicktt.info index 8d3c5b3..3283a71 100644 --- a/modules/storm/stormquicktt/stormquicktt.info +++ b/modules/storm/stormquicktt/stormquicktt.info @@ -12,4 +12,3 @@ version = "6.x-2.x-dev" core = "6.x" project = "stormquicktt" datestamp = "1332637511" - diff --git a/modules/storm/stormtask/stormtask.module b/modules/storm/stormtask/stormtask.module index cf60160..39d6970 100644 --- a/modules/storm/stormtask/stormtask.module +++ b/modules/storm/stormtask/stormtask.module @@ -316,16 +316,16 @@ function stormtask_admin_settings() { '#type' => 'checkbox', '#title' => t('Default Value for billable field.'), '#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, ); - +/* $form['stormtask_enable_ganttchart'] = array( '#type' => 'checkbox', '#title' => t('Enable Gantt Charts (experimental feature)'), '#default_value' => variable_get('stormtask_enable_ganttchart', False), ); -/* + $form['stormtask_jsgantt_options'] = array( '#type' => 'checkboxes', '#title' => t('Chart display options'), @@ -337,7 +337,7 @@ function stormtask_admin_settings() { ), '#description' => t('Choose display options for gantt chart.'), ); -*/ + $form['stormtask_jsgantt_color'] = array( '#type' => 'textfield', '#title' => t('Gantt chart default color'), @@ -373,7 +373,7 @@ function stormtask_admin_settings() { '#description' => t('Enter "overdue" color for gantt chart bars.'), '#size' => 6, ); - +*/ return system_settings_form($form); } diff --git a/modules/storm/stormticket/stormticket.module b/modules/storm/stormticket/stormticket.module index 5447590..ed5f639 100644 --- a/modules/storm/stormticket/stormticket.module +++ b/modules/storm/stormticket/stormticket.module @@ -904,7 +904,7 @@ function stormticket_admin_settings() { '#type' => 'checkbox', '#title' => t('Default Value for billable field.'), '#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, ); diff --git a/modules/storm/stormtimetracking/stormtimetracking.module b/modules/storm/stormtimetracking/stormtimetracking.module index ccf0b19..df57d5c 100644 --- a/modules/storm/stormtimetracking/stormtimetracking.module +++ b/modules/storm/stormtimetracking/stormtimetracking.module @@ -691,7 +691,7 @@ function stormtimetracking_admin_settings() { '#type' => 'checkbox', '#title' => t('Always set billing duration to duration value.'), '#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, ); @@ -699,7 +699,7 @@ function stormtimetracking_admin_settings() { '#type' => 'checkbox', '#title' => t('Default Value for billable field.'), '#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, ); diff --git a/themes/zuitedesk/css/forms.css b/themes/zuitedesk/css/forms.css index 70c7d71..36c65e6 100644 --- a/themes/zuitedesk/css/forms.css +++ b/themes/zuitedesk/css/forms.css @@ -13,6 +13,9 @@ label { max-width: 100% !important; white-space: nowrap; } +#locale-translate-edit-form .form-item { + white-space: normal; +} /* Form items styles exceptions */ .container-inline-date label { display: block; @@ -73,6 +76,7 @@ form#diff-node-revisions table.table td { } body.section-admin form table.table td { padding: 5px !important; + border-top: 0; } /* .form-item .description { font-size: 75%; diff --git a/themes/zuitedesk/css/tabs.css b/themes/zuitedesk/css/tabs.css index e15c0c7..9c72c86 100644 --- a/themes/zuitedesk/css/tabs.css +++ b/themes/zuitedesk/css/tabs.css @@ -48,6 +48,7 @@ ul.tabs-menu li.active { } ul.tabs li a { color: #fff; + white-space: nowrap; } ul.tabs li:hover a, ul.tabs li a:hover {