diff --git a/src/routes/main.cr b/src/routes/main.cr index 429b3b6..6f28032 100644 --- a/src/routes/main.cr +++ b/src/routes/main.cr @@ -4,7 +4,7 @@ class MainRouter < Router def initialize get "/login" do |env| base_url = Config.current.base_url - render "src/views/login.ecr" + render "src/views/login.html.ecr" end get "/logout" do |env| diff --git a/src/routes/opds.cr b/src/routes/opds.cr index 648bcac..567931e 100644 --- a/src/routes/opds.cr +++ b/src/routes/opds.cr @@ -4,13 +4,13 @@ class OPDSRouter < Router def initialize get "/opds" do |env| titles = @context.library.titles - render_xml "src/views/opds/index.ecr" + render_xml "src/views/opds/index.xml.ecr" end get "/opds/book/:title_id" do |env| begin title = @context.library.get_title(env.params.url["title_id"]).not_nil! - render_xml "src/views/opds/title.ecr" + render_xml "src/views/opds/title.xml.ecr" rescue e @context.error e env.response.status_code = 404 diff --git a/src/routes/reader.cr b/src/routes/reader.cr index c52e6e2..4e3bc06 100644 --- a/src/routes/reader.cr +++ b/src/routes/reader.cr @@ -56,7 +56,7 @@ class ReaderRouter < Router next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}" end - render "src/views/reader.ecr" + render "src/views/reader.html.ecr" rescue e @context.error e env.response.status_code = 404 diff --git a/src/util.cr b/src/util.cr index 921f281..c9dfa2b 100644 --- a/src/util.cr +++ b/src/util.cr @@ -16,11 +16,11 @@ macro layout(name) is_admin = @context.storage.verify_admin token end page = {{name}} - render "src/views/#{{{name}}}.ecr", "src/views/layout.ecr" + render "src/views/#{{{name}}}.html.ecr", "src/views/layout.html.ecr" rescue e message = e.to_s @context.error message - render "src/views/message.ecr", "src/views/layout.ecr" + render "src/views/message.html.ecr", "src/views/layout.html.ecr" end end @@ -139,7 +139,7 @@ macro render_xml(path) end macro render_component(filename) - render "src/views/components/#{{{filename}}}.ecr" + render "src/views/components/#{{{filename}}}.html.ecr" end # Works in all Unix systems. Follows https://github.com/crystal-lang/crystal/ diff --git a/src/views/admin.ecr b/src/views/admin.html.ecr similarity index 92% rename from src/views/admin.ecr rename to src/views/admin.html.ecr index 0d83181..b3e2d96 100644 --- a/src/views/admin.ecr +++ b/src/views/admin.html.ecr @@ -15,5 +15,5 @@ Log Out <% content_for "script" do %> - + <% end %> diff --git a/src/views/components/card.ecr b/src/views/components/card.ecr deleted file mode 100644 index 193c5e2..0000000 --- a/src/views/components/card.ecr +++ /dev/null @@ -1,49 +0,0 @@ -<% if item.is_a? NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) %> -<% grouped_count = item[:grouped_count] %> -<% if grouped_count == 1 %> -<% item = item[:entry] %> -<% else %> -<% item = item[:entry].book %> -<% end %> -<% else %> -<% grouped_count = 1 %> -<% end %> -
diff --git a/src/views/components/card.html.ecr b/src/views/components/card.html.ecr new file mode 100644 index 0000000..88ddd5f --- /dev/null +++ b/src/views/components/card.html.ecr @@ -0,0 +1,50 @@ +<% if item.is_a? NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) %> + <% grouped_count = item[:grouped_count] %> + <% if grouped_count == 1 %> + <% item = item[:entry] %> + <% else %> + <% item = item[:entry].book %> + <% end %> +<% else %> + <% grouped_count = 1 %> +<% end %> + + diff --git a/src/views/components/entry-modal.ecr b/src/views/components/entry-modal.html.ecr similarity index 61% rename from src/views/components/entry-modal.ecr rename to src/views/components/entry-modal.html.ecr index 7337960..672e5c3 100644 --- a/src/views/components/entry-modal.ecr +++ b/src/views/components/entry-modal.html.ecr @@ -4,14 +4,14 @@We can't find any files yet. Add some to your library and they'll appear here.
-<%= Config.current.library_path %>
config.yml
located at: <%= Config.current.path %>
Once you start reading, Mango will remember where you left off - and show your entries here.
- View library -We can't find any files yet. Add some to your library and they'll appear here.
+<%= Config.current.library_path %>
config.yml
located at: <%= Config.current.path %>
Once you start reading, Mango will remember where you left off + and show your entries here.
+ View library +<%= message %>
\ No newline at end of file diff --git a/src/views/message.html.ecr b/src/views/message.html.ecr new file mode 100644 index 0000000..1a5b8d8 --- /dev/null +++ b/src/views/message.html.ecr @@ -0,0 +1 @@ +<%= message %>
diff --git a/src/views/opds/index.ecr b/src/views/opds/index.xml.ecr similarity index 67% rename from src/views/opds/index.ecr rename to src/views/opds/index.xml.ecr index 16fe193..2d84b63 100644 --- a/src/views/opds/index.ecr +++ b/src/views/opds/index.xml.ecr @@ -13,10 +13,10 @@ <% titles.each do |t| %> -- - + +
Username | -Admin Access | -Actions | -
---|---|---|
<%= u[0] %> | -<%= u[1] %> | -- - <%- if u[0] != username %> - - <%- end %> - | -
Username | +Admin Access | +Actions | +
---|---|---|
<%= u[0] %> | +<%= u[1] %> | ++ + <%- if u[0] != username %> + + <%- end %> + | +