diff options
| -rw-r--r-- | app/notes/admin.py | 2 | ||||
| -rw-r--r-- | app/notes/models.py | 2 | ||||
| -rw-r--r-- | app/notes/static/count.js | 4 | ||||
| -rw-r--r-- | config/base_urls.py | 2 | ||||
| -rw-r--r-- | design/sass/_notes.scss | 7 | ||||
| -rw-r--r-- | design/templates/archives/notes.html | 12 |
6 files changed, 18 insertions, 11 deletions
diff --git a/app/notes/admin.py b/app/notes/admin.py index 17660c9..3bbdc8d 100644 --- a/app/notes/admin.py +++ b/app/notes/admin.py @@ -5,7 +5,7 @@ from django import forms class NoteModelForm(forms.ModelForm): - body_markdown = forms.CharField(widget=forms.Textarea(attrs={'maxlength': 400, 'rows': 5, 'cols': 65}), label='Note') + body_markdown = forms.CharField(widget=forms.Textarea(attrs={'maxlength': 40000, 'rows': 20, 'cols': 75}), label='Note') class Meta: model = Note diff --git a/app/notes/models.py b/app/notes/models.py index 62b8992..a7ff599 100644 --- a/app/notes/models.py +++ b/app/notes/models.py @@ -37,7 +37,7 @@ class Note(models.Model): state_name = models.CharField(max_length=250, null=True, blank=True) country_name = models.CharField(max_length=150, null=True, blank=True) body_html = models.TextField(blank=True) - body_markdown = models.CharField('Note', max_length=450) + body_markdown = models.TextField('Note') twitter_text = models.CharField('Twitter text', max_length=450, null=True, blank=True) twitter_id = models.CharField('twitter_id', max_length=450) twitter_send = models.BooleanField("send to twitter?", default=False) diff --git a/app/notes/static/count.js b/app/notes/static/count.js index d75d870..6d1b5a0 100644 --- a/app/notes/static/count.js +++ b/app/notes/static/count.js @@ -1,12 +1,12 @@ var jQuery = django.jQuery; var $ = jQuery; $(document).ready(function () { - $('#id_body_markdown').after('<span style="display: inline-block; margin-left: 2em;"><span id="counter">400</span> chars used </span>'); + $('#id_body_markdown').after('<span style="display: inline-block; margin-left: 2em;"><span id="counter">40000</span> chars used </span>'); $('#id_body_markdown').simplyCountable({ counter: '#counter', countType: 'characters', - maxCount: 400, + maxCount: 40000, strictMax: false, countDirection: 'up', safeClass: 'safe', diff --git a/config/base_urls.py b/config/base_urls.py index d01eddc..2aa6bf0 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -53,7 +53,7 @@ urlpatterns += patterns('', # locations (r'^locations/', include('locations.urls')), (r'^photos/', include('photos.urls')), - (r'^notes/', include('notes.urls')), + (r'^field-notes/', include('notes.urls')), (r'^photo/', include('photos.detail_urls')), (r'^travel-guide/', include('guide.urls')), # map diff --git a/design/sass/_notes.scss b/design/sass/_notes.scss index 8add4e5..cdfdb42 100644 --- a/design/sass/_notes.scss +++ b/design/sass/_notes.scss @@ -31,6 +31,13 @@ } } } +.note--title { + text-align: left; + font-weight: 400; + font-size: 1.5em; + letter-spacing: 0px; + font-style: italic; +} .note--date { @include smcaps; @include fontsize(11); diff --git a/design/templates/archives/notes.html b/design/templates/archives/notes.html index c6c6e34..4ee5269 100644 --- a/design/templates/archives/notes.html +++ b/design/templates/archives/notes.html @@ -14,7 +14,7 @@ <h1>Field Notes</h1> {% for object in object_list %} <article class="h-entry"> - <h2 class="p-name note--title hide">{{object.title|safe|amp|smartypants}}</h2> + <h2 class="p-name note--title">{{object.title|safe|amp|smartypants}}</h2> <div class="e-content"> {{object.render|safe|amp|smartypants|urlizetrunc:45 }} </div> @@ -36,17 +36,17 @@ <ul class="note--actions"> <li><a rel="syndication" class="u-syndication" href="https://twitter.com/luxagraf/status/{{object.twitter_id}}">View on Twitter</a></li> <li> - <action do="reply" with="{{SITE_URL}}{{object.get_absolute_url}}"><a href="https://twitter.com/intent/tweet?in_reply_to={{object.twitter_id}}">Reply</a></action> + <indie-action do="reply" with="{{SITE_URL}}{{object.get_absolute_url}}"><a href="https://twitter.com/intent/tweet?in_reply_to={{object.twitter_id}}">Reply</a></indie-action> </li> <li> - <action do="post" with="{{SITE_URL}}{{object.get_absolute_url}}"> + <indie-action do="post" with="{{SITE_URL}}{{object.get_absolute_url}}"> <a href="https://twitter.com/intent/retweet?tweet_id={{object.twitter_id}}">Retweet</a> - </action> + </indie-action> </li> <li> - <action do="bookmark" with="{{SITE_URL}}{{object.get_absolute_url}}"> + <indie-action do="bookmark" with="{{SITE_URL}}{{object.get_absolute_url}}"> <a href="https://twitter.com/intent/favorite?tweet_id={{object.twitter_id}}">Favourite</a> - </action> + </indie-action> </li> </ul>{% endif %} </footer> |