diff --git a/FrxMenu.inc b/FrxMenu.inc index 0233baa029f40f6f78681bb6b8eddd36e7beaeb8..84230a531c2accea45aa40093c503200cc748e88 100755 --- a/FrxMenu.inc +++ b/FrxMenu.inc @@ -147,8 +147,9 @@ class FrxMenu { $cache = unserialize($cache); // Load menu item defaults - $menu = $cache['menu']; + $menu = @$cache['menu']; $path = $menu['path']; + $path_args = @$menu['args']; $type = @$menu['type']; $title = @$menu['title'] ? $menu['title']: $row->title; if (module_exists('locale')) { @@ -180,7 +181,8 @@ class FrxMenu { // Now generate the callback arguments $parts = explode( '/', $new_path); $page_args = array_keys($parts, '%'); - $page_args = array_merge(array($path, $row->report_name), $page_args); + $path_args = $path_args ? rtrim($path,'/') . '/' . ltrim($path_args, '/') : $path; + $page_args = array_merge(array($path_args, $row->report_name), $page_args); // Set the access callback $access_callback = isset($cache['access']) ? 'forena_check_all_access' : TRUE; diff --git a/forena.admin.inc b/forena.admin.inc index 1746aa674ecd58b2f203ded0d9f140cc464ea7b2..5649ed4edb2628f75fe0c69263c764e4331b851b 100755 --- a/forena.admin.inc +++ b/forena.admin.inc @@ -452,10 +452,17 @@ function forena_layout_form($form, $form_state, $report_name) { $form['menu']['path'] = array( '#type' => 'textfield', '#title' => t('Menu Path'), - '#description' => t('Indicate site reletive path to menu. Paramters may be embedded in the url using a :parm syntax (e.g. states/:state)'), + '#description' => t('Indicate site reletive path to menu. Parameters may be embedded in the url using a :parm syntax (e.g. states/:state)'), '#default_value' => @$menu['path'], ); + $form['menu']['args'] = array( + '#type' => 'textfield', + '#title' => t('Additional Arguments'), + '#description' => t('Indicate additonal parameters that should be extracted after the menu path using a :parm syntax (e.g. :parma/:parmb)'), + '#default_value' => @$menu['args'], + ); + $form['menu']['title'] = array( '#type' => 'textfield', '#title' => t('Menu Title'), diff --git a/repos/forena_help/design_topics.xml b/repos/forena_help/design_topics.xml index 8970562038d2d004990592ada8fa10e80aa78769..7fb69a5bc518e6fde0e5f0d638a14373a1110940 100755 --- a/repos/forena_help/design_topics.xml +++ b/repos/forena_help/design_topics.xml @@ -30,7 +30,7 @@ help.design - Reort Skins + Report Skins help.skins diff --git a/repos/reports/help/layout.frx b/repos/reports/help/layout.frx index c4edd7a9ed04f6d25ac0a16c6c1b35dc4ce6d42d..59c6546d428bbaf38c8504fa61cdc18e5ed69e61 100755 --- a/repos/reports/help/layout.frx +++ b/repos/reports/help/layout.frx @@ -21,23 +21,23 @@ available.  Explanation of the opions on this form are as follows:

- Body -  The html body of the + Body -; The html body of the report. 

Category - This controls under which group the report appears under the My Reports link.

-

Form - The form determines the look and feel of the report. +

+ Menu - Specify configuration options for a drupal menu + here. +

+

Skin - The skin determines the look and feel of the report.  In conventional report writers this can be thought of as what kinid of paper form the report printed on.  In the modern days of the web most layout is controlled by Cascacding - Style Sheets (CSS).  Specify the form of the report and any - css or js files of the same name in your reports directory will - automatically get added to the report.  In this way you can - establish common styles that get used by reports that have the - same form name.  If you leave this blank, the default form, - specified in the Forena configuration menu is used. 

+ Style Sheets (CSS) and Javascript Libraries. See the section on + Report Skins for additional information on creating report skins.

Hidden - Checking this box will cause the report not to be listed in the My Reports list regardless of the Category