app/views/wiki/pages/compare.html.haml in tawork-0.0.38 vs app/views/wiki/pages/compare.html.haml in tawork-0.0.39

- old
+ new

@@ -1,6 +1,21 @@ -.col-md-12 +.col-md-3.sidebar + %br/ + %ul.nav.nav-pills{style: "margin-left: 10px"} + %li + %a{href: "#version-previous"} Previous Version + %li.active + %a{href: "#version-diff"} Diff + %li + %a{href: "#version-new"} Applied Changes + + %ul.nav.nav-list.nav-list-panel.compare-change-list + %li.nav-header + Change List + + +.col-md-9.col-md-offset-3 - page_title = title "Comparing version #{params[:version]} for #{@page.title}" = render 'breadcrumb', link_last: true = link_to "Back to History", history_wiki_page_path(@page), class: "btn btn-primary" @@ -8,11 +23,18 @@ #{@page.title} %small= params[:version] %hr/ --# .col-md-6.compare-column --# #wiki-content.wiki-content.content-description --# = raw @old_html -.col-md-12.compare-column +.col-md-9.col-md-offset-3 + + %hr/ + +.col-md-9.col-md-offset-3.compare-column #wiki-content.wiki-content.content-description - = raw @diff_html + .tab-content + #version-previous.tab-pane.fade + = raw @old_html + #version-diff.tab-pane.fade.active.in + = raw @diff_html + #version-new.tab-pane.fade + = raw @new_html