post-detail page #93

kamaulynder · 2013-08-18T19:47:26Z

@rjmackay pushed the post-detail stuff, need help with css before I can do anything else. Added the latest global.css file from the UI repo and that affected the post-listing too, argghhhh!!

rjmackay · 2013-08-19T09:37:41Z

I think the best way to handle this might be to do HTML/CSS updates on their own branch. The rest of the time just wire things in and don't worry too much if the CSS isn't perfect on the feature branches.
Either that or we tag the UI repo each time we sync the HTML/CSS and build new UI based on those tags.
I think the last update I did was based on https://github.com/ushahidi/Lamu-UI/commits/ed164de .. so maybe revert your CSS update and base the HTML on UI @ that commit?

Also - when you update the CSS - grab scss/ files from the UI repo and run grunt compass rather than copying the built CSS. This will build the CSS uncompressed (for debugging), rather than compressed like Seth is doing.

rjmackay · 2013-08-19T09:40:11Z

modules/UshahidiUI/media/js/app/controllers/Controller.js

@@ -1,9 +1,11 @@
 define(['App', 'backbone', 'marionette',
 	'views/AppLayout', 'views/HomeLayout', 'views/HeaderView', 'views/FooterView', 'views/WorkspacePanelView', 'views/SearchBarView', 'views/MapView',
-	'views/PostListView', 'views/PostDetailView','collections/PostCollection','collections/TagCollection','collections/FormCollection'],
+	'views/PostListView',
+	'views/PostDetailView','collections/PostCollection','collections/TagCollection','collections/FormCollection','views/PostDetailLayout', 'views/RelatedPostsView'],


Can you break this up and try and avoid the really long line? I've been doing something like
a line of layouts, then views, the collections.. etc

little pedantic I know.. but just thinking readability

whoah, so moving around this as per the suggestion breaks the whole app, not sure I'm getting it right but put all layouts on one line, views on another and collections on one line. Breaks whole UI.

You have to match the ordering to the function params below.. as long as ordering matches you should be fine.

done and works

kamaulynder · 2013-08-19T21:31:45Z

And I ended up creating more problems to myself logs off 1am commits are not the best

kamaulynder · 2013-08-21T23:25:54Z

@rjmackay - for the css I think it can wait till its updated, running away from revert madness :-).
Did some edits as per your review.

rjmackay · 2013-08-21T23:35:49Z

Some git madness will revert it:
git rebase -i
then set 3c0ceca to edit.. and use git commit --amend to remove the css from that commit..

or slightly simpler

git diff 3c0ceca..e4080ba -- modules/UshahidiUI/media/css/ | git apply
git add modules/UshahidiUI/media/css
git commit

which basically diff's the commit with css against the previous one (reverse order so you get a reversed diff), filters it to just the css directory.. and then pipes it into git apply to patch it.

kamaulynder · 2013-08-21T23:40:26Z

Done!

On Thu, Aug 22, 2013 at 2:35 AM, Robbie MacKay notifications@github.comwrote:

Some git madness will revert it:
git rebase -i
then set 3c0ceca 3c0ceca to
edit.. and use git commit --amend to remove the css from that commit..

or slightly simpler
git diff 3c0ceca..e4080ba -- modules/UshahidiUI/media/css/ | git apply
git add modules/UshahidiUI/media/css
git commit
which basically diff's the commit with css against the previous one
(reverse order so you get a reversed diff), filters it to just the css
directory.. and then pipes it into git apply to patch it.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/93#issuecomment-23058764
.

Too brief? Here's why! http://emailcharter.org
Regards
Linda Kamau
Coder and Tech Enthusiast!!

rjmackay · 2013-08-21T23:46:57Z

@kamaulynder Git-fu: +1
!

kamaulynder · 2013-08-21T23:51:08Z

hahahaha

* Remove wrapping elements from templates (provided by layout) * Update some HTML from UI repo * Fix indenting

* Make sure model gets loaded even if its not in the collection * Don't keep postDetailLayout around after we go somewhere else * Fix ID of postDetailRegion * Fix camelCase on postDetailLayout regions *

* Move post tags mapping code to post model * Copy PostItemView.serializeData() to PostDetailView * Replace dummy html with real data * Only add color style if needed (postDetailView and postItemView)

This is a rough hack for when the page renders before its model is loaded

rjmackay · 2013-09-16T03:43:19Z

I've merged some UI updates into this branch, synced up the post-detail UI with the latest, fixed some CSS glitches, and wired up a few more fields with real data.

Outstanding things

Pull a real location
Pull a real author name
Use real location data on the map
Get real data into related posts .. just any posts until Related Posts #94 is done
Get real images .. can't do this till media works in the API.

Conflicts: modules/UshahidiUI/media/js/app/controllers/Controller.js modules/UshahidiUI/media/js/app/models/PostModel.js modules/UshahidiUI/media/js/app/views/PostDetailView.js

* Use deferreds to ensure post, user and form models all load before we render post details * Store form and user models attached to the post * Fix template logic to show user * Fix accessor names on PostModel: getTags isPublished()

* Split out RelatedPostItem template * Update RelatedPostsView to use PostItemView as item view. Use custom options to change the template and class name, but same view code. * Make item container a <ul> and update CSS to remove left margin

rjmackay · 2013-09-20T22:44:11Z

Go related posts working (with dummy post models. However I think the HTML itself needs some work.. theres nothing standard between the main listing and side lists.. which will be a bit rough for the themers.

* Grabbing first location we find - since no primary location * Currently just lat/lon since locations don't have a name

… API

rjmackay · 2013-09-23T01:08:31Z

@kamaulynder I've built a lot on this - it should be pretty much done excluding the post images which are still placeholders. Care to give this a quick review?

rjmackay · 2013-09-23T02:02:36Z

Also: started writing up a code review checklist: https://wiki.ushahidi.com/display/WIKI/Code+review+checklist
I'll start using this and tweaking as needed..

kamaulynder · 2013-09-23T04:31:18Z

reviewing, thanks.

On Mon, Sep 23, 2013 at 4:08 AM, Robbie MacKay notifications@github.comwrote:

@kamaulynder https://github.com/kamaulynder I've built a lot on this -
it should be pretty much done excluding the post images which are still
placeholders. Care to give this a quick review?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/93#issuecomment-24894890
.

Too brief? Here's why! http://emailcharter.org
Regards
Linda Kamau
Coder and Tech Enthusiast!!

rjmackay · 2013-09-23T05:53:59Z

Ping @middle8media I've made a few changes to the UI during implementing..

Prototype

App

Remove the category icon beside post title, we don't have a way to establish which is the primary category yet
Moved author to the left along with other meta info.. saying "DUDE BRO ADDED A POST" makes sense on a new item, but not several weeks later
Location is just lat/lon till I have better info from the API.

No longer needed no we're used deferreds to ensure the model is loaded

rjmackay · 2013-09-23T07:32:28Z

random thought: should there be a delete button on post details page? I think yes..

kamaulynder · 2013-09-23T07:34:32Z

Yes, I think it should be there. An admin might be going through posts and
find it irrelevant so a quick delete button is necessary
On 23 Sep 2013 10:32, "Robbie MacKay" notifications@github.com wrote:

random thought: should there be a delete button on post details page? I
think yes..

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/93#issuecomment-24902871
.

sethburtonhall · 2013-09-23T13:50:36Z

ok, those changes look good. Except for the paragraph styling and the buttons (they need to be float to line up on the right edge.)

Yes to delete button.

I guess, I just need to jump into the application repo

rjmackay · 2013-09-23T23:49:35Z

Thanks Seth - not sure what's going on with the paragraph styling.. might be an issue with how I'm formatting the text (I just did a quick new line to br script, until I had time to build in markdown)
The other fixes should be quick..

rjmackay · 2013-09-26T22:20:06Z

@middle8media am I right that the Post title should also sit in-line with the photo below it?

* Fix column sizes on post title and actions now that category icon is hidden * Wrap post content in paragraph

rjmackay · 2013-09-26T22:37:28Z

Added the delete and unpublish buttons.. but it doesn't leave a lot of space for the post title now. Maybe these would be better moved down, just above the post text? or a 2nd 'action bar'?

Screenshot: https://dl.dropboxusercontent.com/u/123897/Screen%20Shot%202013-09-27%20at%2010.33.22%20AM.png

rjmackay · 2013-09-26T23:49:22Z

I'm going to go ahead an merge this in now anyway. I'll handle further iterations on a new branch. For now it'd like to move on to post search or create

post-detail page

sethburtonhall · 2013-09-27T13:21:33Z

I will pull in changes and take a look at this. A 2nd action bar may be our best choice.

* badges for filters location

post-detail page

3c0ceca

rjmackay reviewed Aug 19, 2013
View reviewed changes

More edits

1338bf8

reverted css changes

16a0076

rjmackay added 10 commits September 16, 2013 13:30

Merge branch 'ui-update-sep-11' into post-detail

3e90fb8

Fix indenting on PostDetailLayout.html

7d28f62

Clean up PostDetail and RelatedPosts templates

dd63ee9

* Remove wrapping elements from templates (provided by layout) * Update some HTML from UI repo * Fix indenting

Fix loading of views/models in postDetail router

1ce49b7

* Make sure model gets loaded even if its not in the collection * Don't keep postDetailLayout around after we go somewhere else * Fix ID of postDetailRegion * Fix camelCase on postDetailLayout regions *

Kill logging overkill from jso2

1322989

Update related posts dummy code from UI repo

2a1e5d2

Update PostDetail html

df7ce4a

Wire up category list in PostDetail with real data

6ca1418

* Move post tags mapping code to post model * Copy PostItemView.serializeData() to PostDetailView * Replace dummy html with real data * Only add color style if needed (postDetailView and postItemView)

Make sure post detail page re-renders when model changes

5550049

This is a rough hack for when the page renders before its model is loaded

Wire up posts status to UI

9e9dbb1

rjmackay added 3 commits September 20, 2013 10:18

Merge branch 'coding-style' into post-detail

22c2bb4

Conflicts: modules/UshahidiUI/media/js/app/controllers/Controller.js modules/UshahidiUI/media/js/app/models/PostModel.js modules/UshahidiUI/media/js/app/views/PostDetailView.js

Fix jshint errors after merge

577ca78

Don't load jquery for tag model since its not used

624659d

rjmackay added 6 commits September 20, 2013 20:08

Set urlRoot in Form and Tag models

efb4145

Fix jso2 so Oauth.ajax returns an jqXhr object

014d029

Fix user loading for post detail view.

b7b9f6c

* Use deferreds to ensure post, user and form models all load before we render post details * Store form and user models attached to the post * Fix template logic to show user * Fix accessor names on PostModel: getTags isPublished()

Fix post list view for new accessor names

9c599dd

Fix relation loading when post doesn't have form or user

3f1b70a

rjmackay added 5 commits September 23, 2013 12:00

Show location lat/lon values on post detail page

929cc01

* Grabbing first location we find - since no primary location * Currently just lat/lon since locations don't have a name

Remove whitespace between user icon and user name

a8ec34b

Rough post content filtering: convert new lines to <br>

0fe7878

Make related posts link to actual post url

5aa9758

Remove primary post category icon since we have no way to get this in…

3631afa

… API

Remove model change listening from PostDetailView

c939330

No longer needed no we're used deferreds to ensure the model is loaded

rjmackay added 2 commits September 27, 2013 10:35

Fix minor UI issues with post detail page

ccc7d1e

* Fix column sizes on post title and actions now that category icon is hidden * Wrap post content in paragraph

Add post delete and unpublish buttons

f34f801

rjmackay added a commit that referenced this pull request Sep 26, 2013

Merge pull request #93 from ushahidi/post-detail

08dd01c

post-detail page

rjmackay merged commit 08dd01c into master Sep 26, 2013

nimishmedatwal pushed a commit to nimishmedatwal/platform that referenced this pull request Mar 11, 2024

[Mzi-40] Badges for location (ushahidi#93)

57aba53

* badges for filters location

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

post-detail page #93

post-detail page #93

kamaulynder commented Aug 18, 2013

rjmackay commented Aug 19, 2013

rjmackay Aug 19, 2013

kamaulynder Aug 20, 2013

rjmackay Aug 20, 2013

kamaulynder Aug 21, 2013

kamaulynder commented Aug 19, 2013

kamaulynder commented Aug 21, 2013

rjmackay commented Aug 21, 2013

kamaulynder commented Aug 21, 2013

rjmackay commented Aug 21, 2013

kamaulynder commented Aug 21, 2013

rjmackay commented Sep 16, 2013

rjmackay commented Sep 20, 2013

rjmackay commented Sep 23, 2013

rjmackay commented Sep 23, 2013

kamaulynder commented Sep 23, 2013

rjmackay commented Sep 23, 2013

rjmackay commented Sep 23, 2013

kamaulynder commented Sep 23, 2013

sethburtonhall commented Sep 23, 2013

rjmackay commented Sep 23, 2013

rjmackay commented Sep 26, 2013

rjmackay commented Sep 26, 2013

rjmackay commented Sep 26, 2013

sethburtonhall commented Sep 27, 2013

post-detail page #93

post-detail page #93

Conversation

kamaulynder commented Aug 18, 2013

rjmackay commented Aug 19, 2013

rjmackay Aug 19, 2013

Choose a reason for hiding this comment

kamaulynder Aug 20, 2013

Choose a reason for hiding this comment

rjmackay Aug 20, 2013

Choose a reason for hiding this comment

kamaulynder Aug 21, 2013

Choose a reason for hiding this comment

kamaulynder commented Aug 19, 2013

kamaulynder commented Aug 21, 2013

rjmackay commented Aug 21, 2013

kamaulynder commented Aug 21, 2013

rjmackay commented Aug 21, 2013

kamaulynder commented Aug 21, 2013

rjmackay commented Sep 16, 2013

rjmackay commented Sep 20, 2013

rjmackay commented Sep 23, 2013

rjmackay commented Sep 23, 2013

kamaulynder commented Sep 23, 2013

rjmackay commented Sep 23, 2013

rjmackay commented Sep 23, 2013

kamaulynder commented Sep 23, 2013

sethburtonhall commented Sep 23, 2013

rjmackay commented Sep 23, 2013

rjmackay commented Sep 26, 2013

rjmackay commented Sep 26, 2013

rjmackay commented Sep 26, 2013

sethburtonhall commented Sep 27, 2013