about summary refs log tree commit diff stats
path: root/app
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-05-12 14:01:39 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-05-12 14:01:39 -0400
commit1d78ba374d5fa61ddba63db7a1c4c159e3e6a7af (patch)
treebda6326830ab28f393fac6b8ac5215e207e37c36 /app
parent782df588c95e2c998081ca5bb65d2302bb5ba155 (diff)
downloadthoughts-1d78ba374d5fa61ddba63db7a1c4c159e3e6a7af.tar.gz
thoughts-1d78ba374d5fa61ddba63db7a1c4c159e3e6a7af.tar.bz2
thoughts-1d78ba374d5fa61ddba63db7a1c4c159e3e6a7af.zip
Markdownify streams & updates
Also added an edit link to updates.
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/main/entries.scss11
-rw-r--r--app/views/streams/_stream.html.haml2
-rw-r--r--app/views/updates/_update.html.haml7
3 files changed, 16 insertions, 4 deletions
diff --git a/app/assets/stylesheets/main/entries.scss b/app/assets/stylesheets/main/entries.scss index 4afd15d..6ccaf7e 100644 --- a/app/assets/stylesheets/main/entries.scss +++ b/app/assets/stylesheets/main/entries.scss
@@ -153,7 +153,6 @@
153 153
154 .update-posted { 154 .update-posted {
155 display: block; 155 display: block;
156 font-style: italic;
157 background-color: #EAADEA; 156 background-color: #EAADEA;
158 font-size: 16px; 157 font-size: 16px;
159 margin: .5em -20px; 158 margin: .5em -20px;
@@ -161,6 +160,16 @@
161 border-width: 1px 0 1px 0; 160 border-width: 1px 0 1px 0;
162 border-style: solid; 161 border-style: solid;
163 border-color: #DB70DB; 162 border-color: #DB70DB;
163
164 time {
165 font-style: italic;
166 }
167
168 .update-edit-link {
169 float: right;
170 color: blue;
171 font-weight: normal;
172 }
164 } 173 }
165 } 174 }
166} 175}
diff --git a/app/views/streams/_stream.html.haml b/app/views/streams/_stream.html.haml index 84a6478..74e8a19 100644 --- a/app/views/streams/_stream.html.haml +++ b/app/views/streams/_stream.html.haml
@@ -1,6 +1,6 @@
1%article#stream-post 1%article#stream-post
2 %h2#stream-title= stream.title 2 %h2#stream-title= stream.title
3 - unless stream.body.blank? 3 - unless stream.body.blank?
4 %header#stream-intro.entry-content= stream.body.html_safe 4 %header#stream-intro.entry-content= markdown(stream.body)
5 - unless stream.updates.empty? 5 - unless stream.updates.empty?
6 = render stream.updates 6 = render stream.updates
diff --git a/app/views/updates/_update.html.haml b/app/views/updates/_update.html.haml index 57f4158..3647ca2 100644 --- a/app/views/updates/_update.html.haml +++ b/app/views/updates/_update.html.haml
@@ -1,3 +1,6 @@
1%section.stream-update.entry-content{ id: "update-#{update.id}" } 1%section.stream-update.entry-content{ id: "update-#{update.id}" }
2 %time.update-posted= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P") 2 %header.update-posted
3 = update.body.html_safe 3 %time= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
4 - if user_signed_in? and !update.new_record?
5 = link_to "Edit", edit_admin_stream_update_path(update.stream, update), :class => "update-edit-link"
6 = markdown(update.body)