diff --git a/app/views/wiki_menu_items/edit.rhtml b/app/views/wiki_menu_items/edit.rhtml index 7b8d5d2d7a..31a470b322 100644 --- a/app/views/wiki_menu_items/edit.rhtml +++ b/app/views/wiki_menu_items/edit.rhtml @@ -27,6 +27,8 @@ <%= form.check_box 'new_wiki_page' %> <%= form.label 'new_wiki_page', l(:label_wiki_show_new_page_link) %> + + <%= form.check_box 'index_page' %> <%= form.label 'index_page', l(:label_wiki_show_index_page_link) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index aa5e1f0540..34bafa45a7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2956,25 +2956,30 @@ form.wiki_menu_item_form p { padding-left: 0px; } form.wiki_menu_item_form label { - display: block; + display: inline-block; margin-bottom: 10px; margin-left: 0px; width: auto; font-weight: bold; } + +form.wiki_menu_item_form select#parent_wiki_menu_item { + margin-left: 7px; + margin-top: -1px; +} form.wiki_menu_item_form label#name_of_item { float: left; padding-left: 3px; + margin-right: 4px; + line-height: 21px; } form.wiki_menu_item_form label#with-select { - float: left; margin-left: 0px; } form.wiki_menu_item_form select#parent_wiki_menu_item_wiki_page { margin-bottom: 10px; } form.wiki_menu_item_form p input { - float: left; } form.wiki_menu_item_form fieldset#wiki_menu_item_setting { margin-top: 10px;