diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-10-29 17:55:04 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-10-29 17:55:04 +0000 |
| commit | 6719be3e85a16e5d6a0db45776acc8dca8f29efc (patch) | |
| tree | cf567c3cf970b12ac06fd0f26107cda84c7a71a3 | |
| parent | e106202a73d09e960fd562573bcf673de7a4ded1 (diff) | |
| download | nexus-6719be3e85a16e5d6a0db45776acc8dca8f29efc.tar.gz nexus-6719be3e85a16e5d6a0db45776acc8dca8f29efc.tar.bz2 nexus-6719be3e85a16e5d6a0db45776acc8dca8f29efc.zip | |
merge recent changes into HEAD
| -rw-r--r-- | admin/schema_inc.php | 42 | ||||
| -rw-r--r-- | templates/menu_items_edit_inc.tpl | 2 | ||||
| -rw-r--r-- | templates/menu_sort.tpl | 6 | ||||
| -rw-r--r-- | templates/menus.tpl | 2 |
4 files changed, 27 insertions, 25 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index ce72042..e28824a 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -2,33 +2,33 @@ $tables = array( 'tiki_nexus_plugins' => " - plugin_guid C(16) PRIMARY, - plugin_type C(16) NOTNULL, - is_active C(1) NOTNULL DEFAULT 'y', - plugin_description C(250), - maintainer_url C(250) + plugin_guid C(16) PRIMARY, + plugin_type C(16) NOTNULL, + is_active C(1) NOTNULL DEFAULT 'y', + plugin_description C(250), + maintainer_url C(250) ", 'tiki_nexus_menus' => " - menu_id I4 AUTO PRIMARY, - plugin_guid C(16) NOTNULL, - title C(128), - description C(255), - type C(16), - editable I4 DEFAULT 0 + menu_id I4 AUTO PRIMARY, + plugin_guid C(16) NOTNULL, + title C(128), + description C(255), + type C(16), + editable I4 DEFAULT 0 ", 'tiki_nexus_menu_items' => " - item_id I4 AUTO PRIMARY, - menu_id I4 DEFAULT 0, - parent_id I4, - ext_menu I4, - pos I4, - title C(128), - hint C(255), - rsrc C(255), - rsrc_type C(16), - perm C(128) + item_id I4 AUTO PRIMARY, + menu_id I4 DEFAULT 0, + parent_id I4, + ext_menu I4, + pos I4, + title C(128), + hint C(255), + rsrc C(255), + rsrc_type C(16), + perm C(128) ", ); diff --git a/templates/menu_items_edit_inc.tpl b/templates/menu_items_edit_inc.tpl index 472ff2f..4937693 100644 --- a/templates/menu_items_edit_inc.tpl +++ b/templates/menu_items_edit_inc.tpl @@ -53,7 +53,7 @@ <div class="row"> {formlabel label="Hint" for="hint"} {forminput} - <textarea name="hint" id="hint" cols="80" rows="2">{$editItem.hint}</textarea> + <textarea name="hint" id="hint" cols="50" rows="2">{$editItem.hint}</textarea> {formhelp note="A hint for this item. This hint is visible when you hover over the menu item - hint is set as 'title' attribute for link (for menu plugins that support this feature)."} {/forminput} </div> diff --git a/templates/menu_sort.tpl b/templates/menu_sort.tpl index 57c67a2..195bdbb 100644 --- a/templates/menu_sort.tpl +++ b/templates/menu_sort.tpl @@ -9,7 +9,9 @@ </div> <div class="body"> - {jstabs} + {include file="bitpackage:nexus/menu_items_organise_inc.tpl"} + + {*jstabs} {jstab title="Organise Items"} {include file="bitpackage:nexus/menu_items_organise_inc.tpl"} {/jstab} @@ -17,7 +19,7 @@ {jstab title="Preview Menu"} {include file="bitpackage:nexus/menu_items_preview_inc.tpl"} {/jstab} - {/jstabs} + {/jstabs*} </div><!-- end .body --> </div><!-- end .nexus --> {/strip} diff --git a/templates/menus.tpl b/templates/menus.tpl index a4ab8f1..6e822da 100644 --- a/templates/menus.tpl +++ b/templates/menus.tpl @@ -30,7 +30,7 @@ <div class="row"> {formlabel label="Description" for="description"} {forminput} - <textarea name="description" id="description" cols="80" rows="3">{$editMenu.description}</textarea> + <textarea name="description" id="description" cols="50" rows="3">{$editMenu.description}</textarea> {formhelp note="A description of this menu. This description is visible to users that can add items to this menu."} {/forminput} </div> |