bump version, breadcrumbs

asifpy · Apr 11, 2016 · 9b088f3 · 9b088f3
1 parent 05b9d18
commit 9b088f3
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 46 deletions.
diff --git a/README.rst b/README.rst
@@ -41,6 +41,7 @@ Features:
 - Separate CREATE and UPDATE forms
 - Define your own custom queryset for list view
 - Inline Formset support for parent child models
+- Default Bootstrap3 CSS
 
 Prerequisites
 -------------
@@ -70,6 +71,7 @@ Usage
 
 	LOGIN_REQUIRED_FOR_CRUD = True/False
 	PERMISSION_REQUIRED_FOR_CRUD = True/False
+	PROJECT_NAME = 'YOUR PROJECT NAME'
 
 **Create models in yourapp/models.py**
 
@@ -194,41 +196,5 @@ Added mixin which allows access to additional template variables like app lable
 	PLURIZED MODEL : {{pluralized_model_name}}
 
 
-EXTENDABLE
-----------
-All the generated views/tables/forms/url are extendable.
-
-.. code-block:: python
-	
-	# GENERATE CRUD CLASSES
-	from crudbuilder.views import ViewBuilder
-	builder = ViewBuilder('example', 'person', crudclass)
-	builder.generate_crud()
-	builder.classes
-
-	{'PersonCreateView': <class 'django.views.generic.edit.PersonCreateView'>,
- 	'PersonDeleteView': <class 'crudbuilder.views.PersonDeleteView'>,
- 	'PersonListView': <class 'crudbuilder.views.PersonListView'>, 
- 	'PersonUpdateView': <class 'django.views.generic.edit.PersonUpdateView'>,
- 	'PersonDetailView': <class 'crudbuilder.views.PersonDetailView'>
-	}
-
-	# OVERRIDE AUTO GENERATED VIEWS
-	from crudbuilder.views import ViewBuilder
-	builder = ViewBuilder('example', 'person')
-	builder.generate_crud()
-	PersonListView = builder.classes['PersonListView']
-	class CustomPersonListView(PersonListView):
-    	    def get_context_data(self, **kwargs):
-        	context = super(CustomPersonListView, self).get_context_data(**kwargs)
-        	context['your_template_variable'] = 'Your new template variable'
-        	return context
-
-	# OVERRIDE AUTO GENERATED TABLE (from django_tables2)
-	from crudbuilder.tables import TableBuilder
-	builder = TableBuilder('example', 'person')
-	PersonTable = builder.generate_table()
-	class CustomPersonTable(PersonTable):
-    	    # add your custom implementation here
 
 
diff --git a/crudbuilder/__init__.py b/crudbuilder/__init__.py
@@ -5,4 +5,4 @@
     registry
     )
 
-VERSION = '0.1.9'
+VERSION = '0.1.10'
diff --git a/crudbuilder/templates/inline/create.html b/crudbuilder/templates/inline/create.html
@@ -2,6 +2,13 @@
 {% load tags %}
 {% load staticfiles %}
 
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-list' %}">{{pluralized_model_name|title}}</a></li>
+    <li class="active">Create {{actual_model_name}}</li>
+</ul>
+{% endblock %}
+
 
 {% block js %}
 	<script type="text/javascript" src="{% static 'crudbuilder/js/jquery.formset.js' %}"></script>

diff --git a/crudbuilder/templates/inline/detail.html b/crudbuilder/templates/inline/detail.html
@@ -2,12 +2,27 @@
 
 {% load tags %}
 
+{% block css %}
+<style>
+    .btn{
+        margin-right:10px;
+    }   
+</style>
+{% endblock %}
+
+
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-list' %}">{{pluralized_model_name|title}}</a></li>
+    <li class="active">{{object}}</li>
+</ul>
+{% endblock %}
+
 {% block main_content %}
-	{% block actions %}
-		<a class="btn btn-primary" href="{% url app_label|add:'-'|add:actual_model_name|add:'-update' object.id %}"><i class="glyphicon glyphicon-pencil"></i> Update</a>
-		<a class="btn btn-primary" href="{% url app_label|add:'-'|add:actual_model_name|add:'-delete' object.id %}"><i class="glyphicon glyphicon-remove-sign"></i> Delete</a>
-	{% endblock %}
-<hr/>
+    {% block actions %}
+        <a class="btn btn-primary pull-right" href="{% url app_label|add:'-'|add:actual_model_name|add:'-update' object.id %}"><i class="glyphicon glyphicon-pencil"></i> Update</a>
+        <a class="btn btn-primary pull-right" href="{% url app_label|add:'-'|add:actual_model_name|add:'-delete' object.id %}"><i class="glyphicon glyphicon-remove-sign"></i> Delete</a>
+    {% endblock %}
 
 <div class='container'>
     <h3>{{object}}</h3>

diff --git a/crudbuilder/templates/instance/create.html b/crudbuilder/templates/instance/create.html
@@ -1,6 +1,14 @@
 {% extends "base.html" %}
 {% load tags %}
 
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-list' %}">{{pluralized_model_name|title}}</a></li>
+    <li class="active">Create {{actual_model_name}}</li>
+</ul>
+{% endblock %}
+
+
 {% block main_content %}
 
 <div class='container'>

diff --git a/crudbuilder/templates/instance/delete.html b/crudbuilder/templates/instance/delete.html
@@ -1,6 +1,15 @@
 {% extends "base.html" %}
 {% load tags %}
 
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-list' %}">{{pluralized_model_name|title}}</a></li>
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-detail' object.id %}">{{object}}</a></li>
+    <li class="active">Delete {{object}}</li>
+</ul>
+{% endblock %}
+
+
 {% block main_content %}
 <h3>Delete {{actual_model_name}}</h3>
 

diff --git a/crudbuilder/templates/instance/detail.html b/crudbuilder/templates/instance/detail.html
@@ -2,10 +2,27 @@
 
 {% load tags %}
 
+{% block css %}
+<style>
+    .btn{
+        margin-right:10px;
+    }   
+</style>
+{% endblock %}
+
+
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-list' %}">{{pluralized_model_name|title}}</a></li>
+    <li class="active">{{object}}</li>
+</ul>
+{% endblock %}
+
+
 {% block main_content %}
     {% block actions %}
-        <a class="btn btn-primary" href="{% url app_label|add:'-'|add:actual_model_name|add:'-update' object.id %}"><i class="glyphicon glyphicon-pencil"></i> Update</a>
-        <a class="btn btn-primary" href="{% url app_label|add:'-'|add:actual_model_name|add:'-delete' object.id %}"><i class="glyphicon glyphicon-remove-sign"></i> Delete</a>
+        <a class="btn btn-primary pull-right" href="{% url app_label|add:'-'|add:actual_model_name|add:'-update' object.id %}"><i class="glyphicon glyphicon-pencil"></i> Update</a>
+        <a class="btn btn-primary pull-right" href="{% url app_label|add:'-'|add:actual_model_name|add:'-delete' object.id %}"><i class="glyphicon glyphicon-remove-sign"></i> Delete</a>
     {% endblock %}
 <hr/>
 

diff --git a/crudbuilder/templates/instance/list.html b/crudbuilder/templates/instance/list.html
@@ -2,12 +2,17 @@
 {% load tags %}
 {% load render_table from django_tables2 %}
 
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li class="active">{{pluralized_model_name|title}}</li>
+</ul>
+{% endblock %}
+
 {% block main_content %}
 
 {% block actions %}
-	<a class="btn btn-primary" href="{% url app_label|add:'-'|add:actual_model_name|add:'-create' %}"><i class="glyphicon glyphicon-plus-sign"></i> Add {{actual_model_name|title}}</a>
+	<a class="btn btn-primary pull-right" href="{% url app_label|add:'-'|add:actual_model_name|add:'-create' %}"><i class="glyphicon glyphicon-plus-sign"></i> Add {{actual_model_name|title}}</a>
 {% endblock %}
-<hr/>
 
 <div class='container'>
 

diff --git a/crudbuilder/templates/instance/update.html b/crudbuilder/templates/instance/update.html
@@ -1,6 +1,15 @@
 {% extends "base.html" %}
 {% load tags %}
 
+{% block breadcrumb %}
+<ul class="breadcrumb">
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-list' %}">{{pluralized_model_name|title}}</a></li>
+    <li><a href="{% url app_label|add:'-'|add:actual_model_name|add:'-detail' object.id %}">{{object}}</a></li>
+    <li class="active">Update {{object}}</li>
+</ul>
+{% endblock %}
+
+
 {% block main_content %}
 
 <div class='container'>

diff --git a/docs/source/overview.rst b/docs/source/overview.rst
@@ -16,6 +16,8 @@ Features
 - Add your own templates for List/Create/Detail/Update/Delete views
 - Separate CREATE and UPDATE forms
 - Define your own custom queryset for list view
+- Inline Formset support for parent child models
+- Default Bootstrap3 CSS
 
 
 Requirements and Compatibility