diff --git a/modules/storm/stormdok/stormdok.info b/modules/storm/stormdok/stormdok.info index 1f77565..4d9342c 100644 --- a/modules/storm/stormdok/stormdok.info +++ b/modules/storm/stormdok/stormdok.info @@ -1,5 +1,6 @@ name = Storm Dok description = "Allows creation of documents about organizations, projects or tasks." +dependencies[] = book dependencies[] = storm dependencies[] = stormorganization dependencies[] = stormproject diff --git a/modules/storm/stormdok/stormdok.module b/modules/storm/stormdok/stormdok.module index d8f4f59..d7f2651 100644 --- a/modules/storm/stormdok/stormdok.module +++ b/modules/storm/stormdok/stormdok.module @@ -355,6 +355,24 @@ function stormdok_form(&$node) { drupal_set_breadcrumb($breadcrumb); if (arg(1)=='add') { + if (array_key_exists('parent', $_GET)) { + $book_parent = book_link_load($_GET['parent']); + if (isset($book_parent)) { + $parent = node_load($book_parent['nid']); + if (!empty($parent->organization_nid)) { + $_GET['organization_nid'] = $parent->organization_nid; + } + if (!empty($parent->project_nid)) { + $_GET['project_nid'] = $parent->project_nid; + } + elseif ($parent->type == 'stormproject') { + $_GET['project_nid'] = $parent->nid; + } + if (!empty($parent->task_nid)) { + $_GET['task_nid'] = $parent->task_nid; + } + } + } if (array_key_exists('organization_nid', $_GET) && !$node->organization_nid) { $node->organization_nid = $_GET['organization_nid']; } diff --git a/modules/storm/stormnote/stormnote.info b/modules/storm/stormnote/stormnote.info index 31af21a..cad546e 100644 --- a/modules/storm/stormnote/stormnote.info +++ b/modules/storm/stormnote/stormnote.info @@ -1,5 +1,6 @@ name = Storm Note description = "Allows creation of notes about organizations, projects or tasks." +dependencies[] = book dependencies[] = storm dependencies[] = stormorganization dependencies[] = stormproject diff --git a/modules/storm/stormnote/stormnote.module b/modules/storm/stormnote/stormnote.module index 31fe9d4..6fbaef1 100644 --- a/modules/storm/stormnote/stormnote.module +++ b/modules/storm/stormnote/stormnote.module @@ -221,6 +221,21 @@ function stormnote_form(&$node) { drupal_set_breadcrumb($breadcrumb); if (arg(1)=='add') { + if (array_key_exists('parent', $_GET)) { + $book_parent = book_link_load($_GET['parent']); + if (isset($book_parent)) { + $parent = node_load($book_parent['nid']); + if (!empty($parent->organization_nid)) { + $_GET['organization_nid'] = $parent->organization_nid; + } + if (!empty($parent->project_nid)) { + $_GET['project_nid'] = $parent->project_nid; + } + if (!empty($parent->task_nid)) { + $_GET['task_nid'] = $parent->task_nid; + } + } + } if (array_key_exists('organization_nid', $_GET) && !$node->organization_nid) { $node->organization_nid = $_GET['organization_nid']; } diff --git a/themes/zuitedesk/css/global.css b/themes/zuitedesk/css/global.css index e79730f..26490c6 100644 --- a/themes/zuitedesk/css/global.css +++ b/themes/zuitedesk/css/global.css @@ -36,8 +36,8 @@ ul.inline li { list-style: none; } @media (max-width: 529px) { /* MINW = 530px */ - .node .content ul, .node .content ol { - padding-left: 10% !important; + .node .content td > ul, .node .content td > ol { + padding-left: 10%; } } diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info index da245f4..af96246 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.55 +version = 0.2.56 screenshot = screenshot.png