Removed some inline CSS. Removed footer from preview pages.

This commit is contained in:
Bart Kamphorst
2019-08-14 16:39:55 +02:00
parent 2dc527b60f
commit 92b17f9053
6 changed files with 9 additions and 4 deletions
+1
View File
@@ -374,6 +374,7 @@ module Precious
@bar_side = wiki.bar_side @bar_side = wiki.bar_side
@allow_uploads = wiki.allow_uploads @allow_uploads = wiki.allow_uploads
@navbar = false @navbar = false
@preview = true
mustache :page mustache :page
end end
@@ -7,7 +7,9 @@
margin-bottom: 7em; margin-bottom: 7em;
} }
.overview {
border:none;
}
/* @section compare */ /* @section compare */
.compare { .compare {
+1 -1
View File
@@ -1,5 +1,5 @@
<div id="wiki-wrapper" class="results"> <div id="wiki-wrapper" class="results">
<div id="head" style="border:none;"> <div id="head" class="overview">
{{>navbar}} {{>navbar}}
<h1 class="py-4">{{title}}</h1> <h1 class="py-4">{{title}}</h1>
</div> </div>
@@ -40,6 +40,7 @@
</div> </div>
{{^preview}}
<div id="footer" class="pt-4"> <div id="footer" class="pt-4">
<p id="last-edit"><a id="page-info-toggle" data-pagepath="{{escaped_url_path}}">When was this page last modified?</a></p> <p id="last-edit"><a id="page-info-toggle" data-pagepath="{{escaped_url_path}}">When was this page last modified?</a></p>
{{#allow_editing}} {{#allow_editing}}
@@ -48,5 +49,6 @@
</p> </p>
{{/allow_editing}} {{/allow_editing}}
</div> </div>
{{/preview}}
</div> </div>
+1 -1
View File
@@ -3,7 +3,7 @@ module Precious
class Page < Layout class Page < Layout
include HasPage include HasPage
attr_reader :content, :page, :header, :footer attr_reader :content, :page, :header, :footer, :preview
VALID_COUNTER_STYLES = ['decimal', 'decimal-leading-zero', 'arabic-indic', 'armenian', 'upper-armenian', VALID_COUNTER_STYLES = ['decimal', 'decimal-leading-zero', 'arabic-indic', 'armenian', 'upper-armenian',
'lower-armenian', 'bengali', 'cambodian', 'khmer', 'cjk-decimal', 'devanagari', 'georgian', 'gujarati', 'gurmukhi', 'lower-armenian', 'bengali', 'cambodian', 'khmer', 'cjk-decimal', 'devanagari', 'georgian', 'gujarati', 'gurmukhi',
+1 -1
View File
@@ -117,7 +117,7 @@ EOS
@view = Precious::Views::Page.new @view = Precious::Views::Page.new
@view.instance_variable_set :@page, page @view.instance_variable_set :@page, page
@view.instance_variable_set :@content, page.formatted_data @view.instance_variable_set :@content, page.formatted_data
assert_equal @view.breadcrumb, '<a href="/gollum/pages/subdir/">subdir</a> /' assert_equal @view.breadcrumb, '<a href="/gollum/overview/subdir/">subdir</a> /'
# No breadcrumb on unnested page # No breadcrumb on unnested page
@wiki.write_page('BC Test 2', :markdown, 'Test', commit_details) @wiki.write_page('BC Test 2', :markdown, 'Test', commit_details)