From a18f55854d6fbfbc8f546c1aac3749b5b363fa7f Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 14 Jul 2017 21:23:40 -0500 Subject: [PATCH] Refactor master2/index => master/index template --- tailbone/templates/datasync/changes/index.mako | 2 +- tailbone/templates/{master2 => master}/index.mako | 1 - tailbone/templates/messages/index.mako | 2 +- tailbone/templates/newbatch/index.mako | 2 +- tailbone/templates/principal/index.mako | 2 +- tailbone/templates/products/index.mako | 2 +- tailbone/templates/purchases/batches/index.mako | 2 +- tailbone/templates/purchases/index.mako | 2 +- tailbone/templates/themes/better/{master2 => master}/index.mako | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) rename tailbone/templates/{master2 => master}/index.mako (99%) rename tailbone/templates/themes/better/{master2 => master}/index.mako (58%) diff --git a/tailbone/templates/datasync/changes/index.mako b/tailbone/templates/datasync/changes/index.mako index 90aba61a..44033370 100644 --- a/tailbone/templates/datasync/changes/index.mako +++ b/tailbone/templates/datasync/changes/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> <%def name="extra_javascript()"> ${parent.extra_javascript()} diff --git a/tailbone/templates/master2/index.mako b/tailbone/templates/master/index.mako similarity index 99% rename from tailbone/templates/master2/index.mako rename to tailbone/templates/master/index.mako index 1de0dca4..c7d1802f 100644 --- a/tailbone/templates/master2/index.mako +++ b/tailbone/templates/master/index.mako @@ -124,4 +124,3 @@ ${grid.render_grid()|n} - diff --git a/tailbone/templates/messages/index.mako b/tailbone/templates/messages/index.mako index 6f055132..d948593d 100644 --- a/tailbone/templates/messages/index.mako +++ b/tailbone/templates/messages/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> <%def name="extra_javascript()"> ${parent.extra_javascript()} diff --git a/tailbone/templates/newbatch/index.mako b/tailbone/templates/newbatch/index.mako index a0ccbd8f..9fe16c87 100644 --- a/tailbone/templates/newbatch/index.mako +++ b/tailbone/templates/newbatch/index.mako @@ -1,4 +1,4 @@ ## -*- coding: utf-8; -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> ${parent.body()} diff --git a/tailbone/templates/principal/index.mako b/tailbone/templates/principal/index.mako index 79f5fa1c..4ed3ba5b 100644 --- a/tailbone/templates/principal/index.mako +++ b/tailbone/templates/principal/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> <%def name="context_menu_items()"> ${parent.context_menu_items()} diff --git a/tailbone/templates/products/index.mako b/tailbone/templates/products/index.mako index 8c6a73e3..06b1e7e0 100644 --- a/tailbone/templates/products/index.mako +++ b/tailbone/templates/products/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> <%def name="extra_styles()"> ${parent.extra_styles()} diff --git a/tailbone/templates/purchases/batches/index.mako b/tailbone/templates/purchases/batches/index.mako index 47f89819..52617583 100644 --- a/tailbone/templates/purchases/batches/index.mako +++ b/tailbone/templates/purchases/batches/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> <%def name="context_menu_items()"> ${parent.context_menu_items()} diff --git a/tailbone/templates/purchases/index.mako b/tailbone/templates/purchases/index.mako index eceef3bb..38a665ee 100644 --- a/tailbone/templates/purchases/index.mako +++ b/tailbone/templates/purchases/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -<%inherit file="/master2/index.mako" /> +<%inherit file="/master/index.mako" /> <%def name="context_menu_items()"> ${parent.context_menu_items()} diff --git a/tailbone/templates/themes/better/master2/index.mako b/tailbone/templates/themes/better/master/index.mako similarity index 58% rename from tailbone/templates/themes/better/master2/index.mako rename to tailbone/templates/themes/better/master/index.mako index b63ee11d..81c292f9 100644 --- a/tailbone/templates/themes/better/master2/index.mako +++ b/tailbone/templates/themes/better/master/index.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -<%inherit file="tailbone:templates/master2/index.mako" /> +<%inherit file="tailbone:templates/master/index.mako" /> <%def name="content_title()">