diff --git a/modules/storm/stormorganization/stormorganization.module b/modules/storm/stormorganization/stormorganization.module index ac57571..f1c8c5f 100644 --- a/modules/storm/stormorganization/stormorganization.module +++ b/modules/storm/stormorganization/stormorganization.module @@ -192,7 +192,6 @@ function stormorganization_node_info() { 'module' => 'stormorganization', 'description' => t("An organization for SuiteDesk."), 'title_label' => t("Name"), - 'body_label' => t("Note"), ) ); } @@ -377,10 +376,6 @@ function stormorganization_form(&$node) { '#default_value' => isset($node->taxid) ? $node->taxid : NULL, ); - if ($type->has_body) { - $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count); - } - $form['title_old'] = array( '#type' => 'hidden', '#default_value' => isset($node->title_old) ? $node->title_old : NULL, @@ -397,7 +392,6 @@ function stormorganization_form_stormorganization_node_form_alter(&$form, &$form $form['group3']['#access'] = FALSE; $form['group4']['#access'] = FALSE; $form['group5']['taxid']['#access'] = FALSE; - $form['body_field']['#access'] = FALSE; if (!empty($form['#node']->nid)) { $form['#after_build'][] = 'stormorganization_node_form_after_build'; diff --git a/modules/storm/stormorganization/stormorganization.theme.inc b/modules/storm/stormorganization/stormorganization.theme.inc index f8f1755..61e63d6 100644 --- a/modules/storm/stormorganization/stormorganization.theme.inc +++ b/modules/storm/stormorganization/stormorganization.theme.inc @@ -179,15 +179,5 @@ function theme_stormorganization_view($node, $teaser = FALSE, $page = FALSE) { ); } -/* - $node->content['body_field'] = array( - '#prefix' => '
', - '#suffix' => '
', - '#value' => theme('storm_view_item', t('Note'), $node->content['body']['#value']), - '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'body_field') : 0, - ); -*/ - unset($node->content['body']); - return $node; } diff --git a/themes/zuitedesk/css/forms.css b/themes/zuitedesk/css/forms.css index 0070724..ea9e40b 100644 --- a/themes/zuitedesk/css/forms.css +++ b/themes/zuitedesk/css/forms.css @@ -9,22 +9,21 @@ label { white-space: normal; } .form-item { - margin-top: .6em; /* - margin: .45em 0 0; */ + margin-top: .6em; max-width: 100% !important; white-space: nowrap; -} /* -.container-inline div.container-inline-date, -.container-inline .container-inline-date div, -.container-inline .container-inline-date input { - display: block; -} */ +} +/* Form items styles exceptions */ .container-inline-date label { display: block; } -.container-inline-date.form-item { - margin-top: 0 !important; +#book-outline .form-item, +#storm-attribute-list-form .form-item, +form[id="node-form"] div.container-inline .form-item, +form[id$="-list-filter"] div.container-inline .form-item { + margin-top: 0; } + .form-item input.error, .form-item textarea.error, .form-item select.error { @@ -58,8 +57,8 @@ label { /* * Forms and fieldsets with inner tables. */ -form table.table td, -fieldset table.table td { +body[class*=" section-node-"] form table.table td, +form[id$="-list-filter"] fieldset table.table td { border-width: 0 !important; padding: 0 1em 0 0 !important; float: left; @@ -74,7 +73,6 @@ form#diff-node-revisions table.table td { } body.section-admin form table.table td { padding: 5px !important; - float: none; } /* .form-item .description { diff --git a/themes/zuitedesk/css/global.css b/themes/zuitedesk/css/global.css index b85613b..ebfaa2d 100644 --- a/themes/zuitedesk/css/global.css +++ b/themes/zuitedesk/css/global.css @@ -153,6 +153,7 @@ form#book-admin-edit .draggable > td:first-child .form-control { font-weight: 300; } form#book-admin-edit .draggable > td { + border-top: 0; padding-top: 2px !important; padding-bottom: 2px !important; } diff --git a/themes/zuitedesk/css/suitedesk.css b/themes/zuitedesk/css/suitedesk.css index bf6d913..02ecf58 100644 --- a/themes/zuitedesk/css/suitedesk.css +++ b/themes/zuitedesk/css/suitedesk.css @@ -1088,6 +1088,16 @@ table#stormexpenses td .expense-title { font-weight: bold; } +/* + * "SuiteDesk Invoices" list & filter. + */ +table#storminvoices td .invoice-number, +table#storminvoices td .invoice-title { + line-height: 1em; + font-size: 1.2em; + font-weight: bold; +} + /* * "SuiteDesk" node. */ @@ -1537,6 +1547,7 @@ table.formgroup tr td { font-size: 1em; padding-left: 0; padding-right: 5px; + border-top: 0; } table.formgroup-submit { margin-top: 1.4em; diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index f7d7530..f090e2f 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -490,7 +490,7 @@ function zuitedesk_table($header, $rows, $attributes = array(), $caption = NULL) if (!in_array($attributes['id'], array('tasks'))) { $attributes['class'] = 'table table-condensed' . (!empty($attributes['class']) ? ' ' . $attributes['class'] : ''); } - if (arg(0) == 'admin' || in_array($attributes['id'], array('stormorganizations', 'stormpeople', 'stormteams', 'stormprojects', 'tasks', 'stormtasks', 'stormtickets', 'stormnotes', 'stormideas', 'stormdoks', 'stormtimetrackings', 'stormevents', 'stormtrash', 'twatcher'))) { + if (arg(0) == 'admin' || in_array($attributes['id'], array('attributes', 'stormorganizations', 'stormpeople', 'stormteams', 'stormprojects', 'tasks', 'stormtasks', 'stormtickets', 'stormnotes', 'stormideas', 'stormdoks', 'stormtimetrackings', 'stormevents', 'stormtrash', 'twatcher'))) { $attributes['class'] .= ' table-hover'; return '
' . theme_table($header, $rows, $attributes, $caption) . '
'; } diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info index 0734a50..1c02328 100644 --- a/themes/zuitedesk/zuitedesk.info +++ b/themes/zuitedesk/zuitedesk.info @@ -1,6 +1,6 @@ name = SuiteDesk Theme description = SuiteDesk Theme Zen. -version = 0.2.50 +version = 0.2.53 screenshot = screenshot.png