diff options
| -rw-r--r-- | app/projects/models/base.py | 4 | ||||
| -rw-r--r-- | design/sass/_projects.scss | 1 | ||||
| -rw-r--r-- | design/templates/archives/projects.html | 7 | ||||
| -rw-r--r-- | design/templates/base.html | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/projects/models/base.py b/app/projects/models/base.py index 44c413e..a45fe04 100644 --- a/app/projects/models/base.py +++ b/app/projects/models/base.py @@ -13,7 +13,7 @@ def get_upload_path(self, filename): class Project(models.Model): title = models.CharField(max_length=200) subtitle = models.CharField(max_length=200, null=True, blank=True) - slug = models.SlugField(unique_for_date='pub_date') + slug = models.CharField(max_length=50) lede = models.TextField(blank=True) pub_date = models.DateTimeField('Date published') PUB_STATUS = ( @@ -48,7 +48,7 @@ class Project(models.Model): return self.title def get_absolute_url(self): - return "/%s/%s/" % ('projects', self.slug) + return "/%s/" % (self.slug) def get_previous_published(self): return self.get_previous_by_pub_date(status__exact=1) diff --git a/design/sass/_projects.scss b/design/sass/_projects.scss index e7cdf09..7461137 100644 --- a/design/sass/_projects.scss +++ b/design/sass/_projects.scss @@ -38,6 +38,7 @@ float: right; margin-left: 30px; } + li { margin-bottom: 4em } p { @include constrain_wide; @include fontsize(17); diff --git a/design/templates/archives/projects.html b/design/templates/archives/projects.html index cd0543a..62cca22 100644 --- a/design/templates/archives/projects.html +++ b/design/templates/archives/projects.html @@ -11,9 +11,8 @@ </ul> <main role="main" class="projects"> <div class="projects--intro"> - <p>These projects are all designed to get my body and mind moving. Theories are interesting, goals are good, but ultimately talk is just talk. Your life – that thing you get maybe 76 or so years of, if you're lucky – is made up of what you do, not what you say.</p> - - <p>Some people, including me some days, think these sorts of goals, lists and self-experiments are silly and contrived. They are. But they also help me <em>do</em> more and remind me that <a href="http://www.youtube.com/watch?v=8r1CZTLk-Gk" title="Louis CK talking about how everything is amazing">everything is amazing</a> provided you remember that everything is amazing.</p> + <p>Luxagraf has become a bit like an iceberg over the years. I keep adding things to it, but never actually make them public. So I decided to try making some of it more public. </p> + <p>This will lead you to some of the previously submerged stuff that doesn't always neatly fit in with the travel narrative portion of luxagraf. </p> </div> <ul id="projects-archive" class="projects--list">{%for object in object_list %} <li> @@ -22,7 +21,7 @@ <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_project_image}}" alt="{{ object.title }}" class="post-image" /></a> </div> <div class="hyphenate">{{object.lede|safe|smartypants}}</div> - <p class="projects--button"><a href="{{project.get_absolute_url}}">View Project ⇢</a></p> + <p class="projects--button"><a href="{{object.get_absolute_url}}">Explore ⇢</a></p> </li> {% endfor %} </ul> </main> diff --git a/design/templates/base.html b/design/templates/base.html index dc773ed..b59b41e 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -39,8 +39,8 @@ <!--<li id="nota"><a href="/field-notes/" title="Our past and current adventures">Notes</a></li>--> <li id="fotos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li> <li id="maps"><a href="/map" title="Maps">Map</a></li> - <li id="projects" ><a href="/projects/" title="Projects">Projects</a></li> - <li id="etc" class="last"><a href="/about" title="About Luxagraf">About</a></li> + <li id="about"><a href="/about" title="About Luxagraf">About</a></li> + <li id="etc" class="last"><a href="/projects/" title="the less visible portions of the iceberg">Etc</a></li> </ul> </nav> </div> |