Fixed body field in organization content type
This commit is contained in:
parent
7d5864b347
commit
f919b88f58
7 changed files with 25 additions and 31 deletions
|
@ -192,7 +192,6 @@ function stormorganization_node_info() {
|
||||||
'module' => 'stormorganization',
|
'module' => 'stormorganization',
|
||||||
'description' => t("An organization for SuiteDesk."),
|
'description' => t("An organization for SuiteDesk."),
|
||||||
'title_label' => t("Name"),
|
'title_label' => t("Name"),
|
||||||
'body_label' => t("Note"),
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -377,10 +376,6 @@ function stormorganization_form(&$node) {
|
||||||
'#default_value' => isset($node->taxid) ? $node->taxid : NULL,
|
'#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(
|
$form['title_old'] = array(
|
||||||
'#type' => 'hidden',
|
'#type' => 'hidden',
|
||||||
'#default_value' => isset($node->title_old) ? $node->title_old : NULL,
|
'#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['group3']['#access'] = FALSE;
|
||||||
$form['group4']['#access'] = FALSE;
|
$form['group4']['#access'] = FALSE;
|
||||||
$form['group5']['taxid']['#access'] = FALSE;
|
$form['group5']['taxid']['#access'] = FALSE;
|
||||||
$form['body_field']['#access'] = FALSE;
|
|
||||||
|
|
||||||
if (!empty($form['#node']->nid)) {
|
if (!empty($form['#node']->nid)) {
|
||||||
$form['#after_build'][] = 'stormorganization_node_form_after_build';
|
$form['#after_build'][] = 'stormorganization_node_form_after_build';
|
||||||
|
|
|
@ -179,15 +179,5 @@ function theme_stormorganization_view($node, $teaser = FALSE, $page = FALSE) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
$node->content['body_field'] = array(
|
|
||||||
'#prefix' => '<div class="stormbody">',
|
|
||||||
'#suffix' => '</div>',
|
|
||||||
'#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;
|
return $node;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,22 +9,21 @@ label {
|
||||||
white-space: normal;
|
white-space: normal;
|
||||||
}
|
}
|
||||||
.form-item {
|
.form-item {
|
||||||
margin-top: .6em; /*
|
margin-top: .6em;
|
||||||
margin: .45em 0 0; */
|
|
||||||
max-width: 100% !important;
|
max-width: 100% !important;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
} /*
|
}
|
||||||
.container-inline div.container-inline-date,
|
/* Form items styles exceptions */
|
||||||
.container-inline .container-inline-date div,
|
|
||||||
.container-inline .container-inline-date input {
|
|
||||||
display: block;
|
|
||||||
} */
|
|
||||||
.container-inline-date label {
|
.container-inline-date label {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
.container-inline-date.form-item {
|
#book-outline .form-item,
|
||||||
margin-top: 0 !important;
|
#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 input.error,
|
||||||
.form-item textarea.error,
|
.form-item textarea.error,
|
||||||
.form-item select.error {
|
.form-item select.error {
|
||||||
|
@ -58,8 +57,8 @@ label {
|
||||||
/*
|
/*
|
||||||
* Forms and fieldsets with inner tables.
|
* Forms and fieldsets with inner tables.
|
||||||
*/
|
*/
|
||||||
form table.table td,
|
body[class*=" section-node-"] form table.table td,
|
||||||
fieldset table.table td {
|
form[id$="-list-filter"] fieldset table.table td {
|
||||||
border-width: 0 !important;
|
border-width: 0 !important;
|
||||||
padding: 0 1em 0 0 !important;
|
padding: 0 1em 0 0 !important;
|
||||||
float: left;
|
float: left;
|
||||||
|
@ -74,7 +73,6 @@ 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;
|
||||||
float: none;
|
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
.form-item .description {
|
.form-item .description {
|
||||||
|
|
|
@ -153,6 +153,7 @@ form#book-admin-edit .draggable > td:first-child .form-control {
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
}
|
}
|
||||||
form#book-admin-edit .draggable > td {
|
form#book-admin-edit .draggable > td {
|
||||||
|
border-top: 0;
|
||||||
padding-top: 2px !important;
|
padding-top: 2px !important;
|
||||||
padding-bottom: 2px !important;
|
padding-bottom: 2px !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1088,6 +1088,16 @@ table#stormexpenses td .expense-title {
|
||||||
font-weight: bold;
|
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.
|
* "SuiteDesk" node.
|
||||||
*/
|
*/
|
||||||
|
@ -1537,6 +1547,7 @@ table.formgroup tr td {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
|
border-top: 0;
|
||||||
}
|
}
|
||||||
table.formgroup-submit {
|
table.formgroup-submit {
|
||||||
margin-top: 1.4em;
|
margin-top: 1.4em;
|
||||||
|
|
|
@ -490,7 +490,7 @@ function zuitedesk_table($header, $rows, $attributes = array(), $caption = NULL)
|
||||||
if (!in_array($attributes['id'], array('tasks'))) {
|
if (!in_array($attributes['id'], array('tasks'))) {
|
||||||
$attributes['class'] = 'table table-condensed' . (!empty($attributes['class']) ? ' ' . $attributes['class'] : '');
|
$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';
|
$attributes['class'] .= ' table-hover';
|
||||||
return '<div class="table-responsive">' . theme_table($header, $rows, $attributes, $caption) . '</div>';
|
return '<div class="table-responsive">' . theme_table($header, $rows, $attributes, $caption) . '</div>';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
name = SuiteDesk Theme
|
name = SuiteDesk Theme
|
||||||
description = SuiteDesk Theme Zen.
|
description = SuiteDesk Theme Zen.
|
||||||
version = 0.2.50
|
version = 0.2.53
|
||||||
|
|
||||||
screenshot = screenshot.png
|
screenshot = screenshot.png
|
||||||
|
|
||||||
|
|
Reference in a new issue