Ted camera

Author: YuanyeZ

.idea/workspace.xml

@@ -1,14 +1,21 @@
 from django.contrib import admin
 
 # Register your models here.
-from .models import Camera
+from .models import Camera, Review
+
+class ReviewInline(admin.TabularInline):
+    model = Review
+    extra = 1
 
 class CameraAdim(admin.ModelAdmin):
+
     fieldsets = [
         (None, {'fields': ['brand', 'camera_model']}),
         ('stars', {'fields': ['stars']}),
-        ('review', {'fields': ['review'], 'classes': ['collapse']}),
-
+        ('comments', {'fields': ['comment'], 'classes': ['collapse']}),
     ]
+    inlines = [ReviewInline]
+    list_display = ('brand', 'camera_model', 'comment')
+    search_fields = ['camera_model']
 
 admin.site.register(Camera, CameraAdim)

cam/admin.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.core.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cam', '0002_auto_20150809_0500'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Review',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('review_date', models.DateField(auto_now=True)),
+                ('writer', models.CharField(max_length=20)),
+                ('review', models.TextField(default=b'no reviews')),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='camera',
+            name='review',
+        ),
+        migrations.AddField(
+            model_name='camera',
+            name='comment',
+            field=models.CharField(default=b'Nice DLSR Camera', max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='camera',
+            name='camera_picture',
+            field=models.ImageField(upload_to=b''),
+        ),
+        migrations.AlterField(
+            model_name='camera',
+            name='stars',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
+        ),
+        migrations.AddField(
+            model_name='review',
+            name='camera',
+            field=models.ForeignKey(to='cam.Camera'),
+        ),
+    ]

cam/admin.pyc

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cam', '0003_auto_20150809_1514'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='review',
+            name='writer',
+            field=models.CharField(default=b'Ted', max_length=20),
+        ),
+    ]

cam/migrations/0003_auto_20150809_1514.py

@@ -12,12 +12,23 @@ class Camera(models.Model):
                                                        MaxValueValidator(5)])
 
     #release_date = models.DateField(auto_now=False, auto_now_add=False)
-    review = models.TextField(default="no review")
+    comment = models.CharField(max_length=500, default='Nice DLSR Camera')
 
 
     def __unicode__(self):
         return ': '.join([self.brand, self.camera_model])
 
+
+class Review(models.Model):
+
+    camera = models.ForeignKey(Camera)
+    review_date = models.DateField(auto_now=True, auto_now_add=False)
+    writer = models.CharField(max_length=20, default='Ted')
+
+    review = models.TextField(default="no reviews")
+
+    def __unicode__(self):
+        return ': '.join([self.writer, self.review])
 # class Lens(models.Model):
 #
 #     Camera = models.ForeignKey(Camera)

cam/migrations/0003_auto_20150809_1514.pyc

@@ -39,8 +39,8 @@ body {
 
 /* Carousel base class */
 .carousel {
-  height: 500px;
-  margin-bottom: 60px;
+  height: 400px;
+  margin-bottom: 10px;
 }
 /* Since positioning the image, we need to help out the caption */
 .carousel-caption {
@@ -66,7 +66,7 @@ body {
 
 /* Center align the text within the three columns below the carousel */
 .marketing .col-lg-4 {
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   text-align: center;
 }
 .marketing h2 {
@@ -82,7 +82,7 @@ body {
 ------------------------- */
 
 .featurette-divider {
-  margin: 80px 0; /* Space out the Bootstrap <hr> more */
+  margin: 10px 0; /* Space out the Bootstrap <hr> more */
 }
 
 /* Thin out the marketing headings */