diff --git a/app/views/shared/wikis/_sidebar.html.haml b/app/views/shared/wikis/_sidebar.html.haml index a1d531696c6ee8e53380c54ec31fb9ae068fb080..8c99d8048198e649725547cdca69de7b3ee0027f 100644 --- a/app/views/shared/wikis/_sidebar.html.haml +++ b/app/views/shared/wikis/_sidebar.html.haml @@ -1,22 +1,24 @@ -%aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } } - .sidebar-container - .block.wiki-sidebar-header.gl-mb-3.w-100 - %a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" } - = sprite_icon('chevron-double-lg-right', size: 16, css_class: 'gl-icon') - - - git_access_url = wiki_path(@wiki, action: :git_access) - = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do - = icon('cloud-download', class: 'append-right-5') - %span= _("Clone repository") - - .blocks-container - .block.block-first.w-100 - - if @sidebar_page - = render_wiki_content(@sidebar_page) - - else - %ul.wiki-pages - = render @sidebar_wiki_entries, context: 'sidebar' - .block.w-100 - - if @sidebar_limited - = link_to wiki_path(@wiki, action: :pages), class: 'btn btn-block' do - = s_("Wiki|View All Pages") +%aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } } + .sidebar-container + .block.wiki-sidebar-header.gl-mb-3.w-100 + %a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" } + = sprite_icon('chevron-double-lg-right', size: 16, css_class: 'gl-icon') + .gl-display-flex.gl-flex-wrap + - git_access_url = wiki_path(@wiki, action: :git_access) + = link_to git_access_url, class: 'gl-display-flex gl-align-items-center gl-white-space-nowrap gl-mr-5' + (active_nav_link?(path: 'wikis#git_access') ? ' active' : ''), data: { qa_selector: 'clone_repository_link' } do + = sprite_icon('download', size: 16, css_class: 'gl-mr-2') + %span= _("Clone repository") + = link_to git_access_url, class: 'gl-display-flex gl-align-items-center gl-white-space-nowrap' + (active_nav_link?(path: 'wikis#_sidebar#edit') ? ' active' : ''), data: { qa_selector: 'edit_sidebar_link' } do + = sprite_icon('pencil-square', size: 16, css_class: 'gl-mr-2') + %span= _("Edit sidebar") + .blocks-container + .block.block-first.w-100 + - if @sidebar_page + = render_wiki_content(@sidebar_page) + - else + %ul.wiki-pages + = render @sidebar_wiki_entries, context: 'sidebar' + .block.w-100 + - if @sidebar_limited + = link_to wiki_path(@wiki, action: :pages), class: 'btn btn-block' do + = s_("Wiki|View All Pages") diff --git a/app/views/shared/wikis/edit.html.haml b/app/views/shared/wikis/edit.html.haml index 11d0a105c74f9d7438952f9253f6be355229082a..7db4b6f5bde092072290db0ef5672a3e634216c6 100644 --- a/app/views/shared/wikis/edit.html.haml +++ b/app/views/shared/wikis/edit.html.haml @@ -1,31 +1,31 @@ -- @content_class = "limit-container-width" unless fluid_layout -- add_to_breadcrumbs _("Wiki"), wiki_page_path(@wiki, @page) -- breadcrumb_title @page.persisted? ? _("Edit") : _("New") -- page_title @page.persisted? ? _("Edit") : _("New"), @page.human_title, _("Wiki") - -= wiki_page_errors(@error) - -.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row - %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } - = sprite_icon('chevron-double-lg-left') - - .nav-text - %h2.wiki-page-title - - if @page.persisted? - = link_to @page.human_title, wiki_page_path(@wiki, @page) - %span.light - · - = s_("Wiki|Edit Page") - - else - = s_("Wiki|Create New Page") - - .nav-controls.pb-md-3.pb-lg-0 - - if @page.persisted? - = link_to wiki_page_path(@wiki, @page, action: :history), class: "btn" do - = s_("Wiki|Page history") - - if can?(current_user, :admin_wiki, @wiki.container) - #delete-wiki-modal-wrapper{ data: { delete_wiki_url: wiki_page_path(@wiki, @page), page_title: @page.human_title } } - -= render 'shared/wikis/form', uploads_path: wiki_attachment_upload_url - -= render 'shared/wikis/sidebar' +- @content_class = "limit-container-width" unless fluid_layout +- add_to_breadcrumbs _("Wiki"), wiki_page_path(@wiki, @page) +- breadcrumb_title @page.persisted? ? _("Edit") : _("New") +- page_title @page.persisted? ? _("Edit") : _("New"), @page.human_title, _("Wiki") + += wiki_page_errors(@error) + +.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row + %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } + = sprite_icon('chevron-double-lg-left') + + .nav-text + %h2.wiki-page-title + - if @page.persisted? + = link_to @page.human_title, wiki_page_path(@wiki, @page) + %span.light + · + = s_("Wiki|Edit Page") + - else + = s_("Wiki|Create New Page") + + .nav-controls.pb-md-3.pb-lg-0 + - if @page.persisted? + = link_to wiki_page_path(@wiki, @page, action: :history), class: "btn" do + = s_("Wiki|Page history") + - if can?(current_user, :admin_wiki, @wiki.container) + #delete-wiki-modal-wrapper{ data: { delete_wiki_url: wiki_page_path(@wiki, @page), page_title: @page.human_title } } + += render 'shared/wikis/form', uploads_path: wiki_attachment_upload_url + += render 'shared/wikis/sidebar'