From: Stephen Burrows Date: Mon, 10 Jan 2011 16:03:40 +0000 (-0500) Subject: Renamed navigation to shipherd. X-Git-Tag: philo-0.9~22^2~17^2 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/0d560fdc9e0351ebe039dcc9d9d14b6b560ba00c?ds=sidebyside;hp=--cc Renamed navigation to shipherd. --- 0d560fdc9e0351ebe039dcc9d9d14b6b560ba00c diff --git a/contrib/navigation/migrations/0001_initial.py b/contrib/navigation/migrations/0001_initial.py deleted file mode 100644 index d60c123..0000000 --- a/contrib/navigation/migrations/0001_initial.py +++ /dev/null @@ -1,85 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'Navigation' - db.create_table('navigation_navigation', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, to=orm['navigation.Navigation'])), - ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)), - ('lft', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('rght', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('tree_id', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('level', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('hosting_node', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='hosted_navigation_set', null=True, to=orm['philo.Node'])), - ('target_node', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='targeting_navigation_set', null=True, to=orm['philo.Node'])), - ('url_or_subpath', self.gf('django.db.models.fields.CharField')(max_length=200, blank=True)), - ('reversing_parameters', self.gf('philo.models.fields.JSONField')(blank=True)), - ('text', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)), - ('order', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True)), - ('depth', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=3, null=True, blank=True)), - )) - db.send_create_signal('navigation', ['Navigation']) - - - def backwards(self, orm): - - # Deleting model 'Navigation' - db.delete_table('navigation_navigation') - - - models = { - 'contenttypes.contenttype': { - 'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'navigation.navigation': { - 'Meta': {'object_name': 'Navigation'}, - 'depth': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '3', 'null': 'True', 'blank': 'True'}), - 'hosting_node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'hosted_navigation_set'", 'null': 'True', 'to': "orm['philo.Node']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['navigation.Navigation']"}), - 'reversing_parameters': ('philo.models.fields.JSONField', [], {'blank': 'True'}), - 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}), - 'target_node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'targeting_navigation_set'", 'null': 'True', 'to': "orm['philo.Node']"}), - 'text': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), - 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'url_or_subpath': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}) - }, - 'philo.attribute': { - 'Meta': {'unique_together': "(('key', 'entity_content_type', 'entity_object_id'), ('value_content_type', 'value_object_id'))", 'object_name': 'Attribute'}, - 'entity_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_entity_set'", 'to': "orm['contenttypes.ContentType']"}), - 'entity_object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'value_content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attribute_value_set'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}), - 'value_object_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'philo.node': { - 'Meta': {'object_name': 'Node'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['philo.Node']"}), - 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}), - 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'view_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'node_view_set'", 'to': "orm['contenttypes.ContentType']"}), - 'view_object_id': ('django.db.models.fields.PositiveIntegerField', [], {}) - } - } - - complete_apps = ['navigation'] diff --git a/contrib/navigation/migrations/0002_auto__chg_field_navigation_text.py b/contrib/navigation/migrations/0002_auto__chg_field_navigation_text.py deleted file mode 100644 index c7f4189..0000000 --- a/contrib/navigation/migrations/0002_auto__chg_field_navigation_text.py +++ /dev/null @@ -1,69 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Navigation.text' - db.alter_column('navigation_navigation', 'text', self.gf('django.db.models.fields.CharField')(max_length=50)) - - - def backwards(self, orm): - - # Changing field 'Navigation.text' - db.alter_column('navigation_navigation', 'text', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)) - - - models = { - 'contenttypes.contenttype': { - 'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'navigation.navigation': { - 'Meta': {'object_name': 'Navigation'}, - 'depth': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '3', 'null': 'True', 'blank': 'True'}), - 'hosting_node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'hosted_navigation_set'", 'null': 'True', 'to': "orm['philo.Node']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['navigation.Navigation']"}), - 'reversing_parameters': ('philo.models.fields.JSONField', [], {'blank': 'True'}), - 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}), - 'target_node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'targeting_navigation_set'", 'null': 'True', 'to': "orm['philo.Node']"}), - 'text': ('django.db.models.fields.CharField', [], {'max_length': '50'}), - 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'url_or_subpath': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}) - }, - 'philo.attribute': { - 'Meta': {'unique_together': "(('key', 'entity_content_type', 'entity_object_id'), ('value_content_type', 'value_object_id'))", 'object_name': 'Attribute'}, - 'entity_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_entity_set'", 'to': "orm['contenttypes.ContentType']"}), - 'entity_object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'value_content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attribute_value_set'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}), - 'value_object_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'philo.node': { - 'Meta': {'object_name': 'Node'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['philo.Node']"}), - 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}), - 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'view_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'node_view_set'", 'to': "orm['contenttypes.ContentType']"}), - 'view_object_id': ('django.db.models.fields.PositiveIntegerField', [], {}) - } - } - - complete_apps = ['navigation'] diff --git a/contrib/navigation/templatetags/__init__.py b/contrib/navigation/templatetags/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/contrib/navigation/__init__.py b/contrib/shipherd/__init__.py similarity index 100% rename from contrib/navigation/__init__.py rename to contrib/shipherd/__init__.py diff --git a/contrib/navigation/admin.py b/contrib/shipherd/admin.py similarity index 93% rename from contrib/navigation/admin.py rename to contrib/shipherd/admin.py index ec073c6..606971d 100644 --- a/contrib/navigation/admin.py +++ b/contrib/shipherd/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from philo.admin import TreeEntityAdmin, COLLAPSE_CLASSES, NodeAdmin -from philo.contrib.navigation.models import Navigation +from philo.contrib.shipherd.models import Navigation NAVIGATION_RAW_ID_FIELDS = ('hosting_node', 'parent', 'target_node') diff --git a/contrib/navigation/models.py b/contrib/shipherd/models.py similarity index 100% rename from contrib/navigation/models.py rename to contrib/shipherd/models.py diff --git a/contrib/navigation/migrations/__init__.py b/contrib/shipherd/templatetags/__init__.py similarity index 100% rename from contrib/navigation/migrations/__init__.py rename to contrib/shipherd/templatetags/__init__.py diff --git a/contrib/navigation/templatetags/navigation.py b/contrib/shipherd/templatetags/shipherd.py similarity index 94% rename from contrib/navigation/templatetags/navigation.py rename to contrib/shipherd/templatetags/shipherd.py index 4510f15..fec700b 100644 --- a/contrib/navigation/templatetags/navigation.py +++ b/contrib/shipherd/templatetags/shipherd.py @@ -1,7 +1,7 @@ from django import template from django.conf import settings from django.utils.safestring import mark_safe -from philo.contrib.navigation.models import Navigation +from philo.contrib.shipherd.models import Navigation from mptt.templatetags.mptt_tags import RecurseTreeNode, cache_tree_children