Merge pull request #37 from ebertti/package-templatetags

Change templatetags to crudbuilder to prevent conflicts

Author: asifpy

crudbuilder/templates/base.html renamed to crudbuilder/templates/crudbuilder/base.html

@@ -1,6 +1,5 @@
-{% extends "base.html" %}
-{% load tags %}
-{% load staticfiles %}
+{% extends "crudbuilder/base.html" %}
+{% load staticfiles crudbuilder %}
 
 {% block breadcrumb %}
 <ul class="breadcrumb">

crudbuilder/templates/inline/create.html renamed to crudbuilder/templates/crudbuilder/inline/create.html

@@ -0,0 +1 @@
+{% extends "crudbuilder/instance/delete.html" %}

crudbuilder/templates/crudbuilder/inline/delete.html

@@ -1,6 +1,6 @@
-{% extends "base.html" %}
+{% extends "crudbuilder/base.html" %}
 
-{% load tags %}
+{% load crudbuilder.py %}
 
 {% block css %}
 <style>

crudbuilder/templates/inline/detail.html renamed to crudbuilder/templates/crudbuilder/inline/detail.html

@@ -0,0 +1 @@
+{% extends "crudbuilder/instance/list.html" %}

crudbuilder/templates/crudbuilder/inline/list.html

@@ -0,0 +1 @@
+{% extends "crudbuilder/inline/create.html" %}

crudbuilder/templates/crudbuilder/inline/update.html

@@ -1,5 +1,5 @@
-{% extends "base.html" %}
-{% load tags %}
+{% extends "crudbuilder/base.html" %}
+{% load crudbuilder %}
 
 {% block breadcrumb %}
 <ul class="breadcrumb">
@@ -14,7 +14,7 @@
 <div class='container'>
 <h3>Create {{actual_model_name|title}}</h3>
 <hr/>
-{% include "widgets/form.html" %}
+{% include "crudbuilder/widgets/form.html" %}
 </div>
 
 {% endblock %}

crudbuilder/templates/instance/create.html renamed to crudbuilder/templates/crudbuilder/instance/create.html

@@ -1,5 +1,5 @@
-{% extends "base.html" %}
-{% load tags %}
+{% extends "crudbuilder/base.html" %}
+{% load crudbuilder %}
 
 {% block breadcrumb %}
 <ul class="breadcrumb">

crudbuilder/templates/instance/delete.html renamed to crudbuilder/templates/crudbuilder/instance/delete.html

@@ -1,6 +1,6 @@
-{% extends "base.html" %}
+{% extends "crudbuilder/base.html" %}
 
-{% load tags %}
+{% load crudbuilder %}
 
 {% block css %}
 <style>

crudbuilder/templates/instance/detail.html renamed to crudbuilder/templates/crudbuilder/instance/detail.html

@@ -1,5 +1,5 @@
-{% extends "base.html" %}
-{% load tags %}
+{% extends "crudbuilder/base.html" %}
+{% load crudbuilder %}
 {% load render_table from django_tables2 %}
 
 {% block breadcrumb %}
@@ -27,7 +27,7 @@ <h3>{{pluralized_model_name|title}}</h3>
 <br/>
 <br/>
 
-{% render_table table_objects "widgets/tables/tables.html" %}
+{% render_table table_objects "crudbuilder/widgets/tables/tables.html" %}
 
 </div>