Skip to content

Created grid, removed posts. #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
55 merged 6 commits into from
Jun 25, 2015
Merged

Created grid, removed posts. #154

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b481be
Created grid, removed posts.
JuusoV Jun 23, 2015
67d30b1
Merge remote-tracking branch 'origin/develop' into feature/grid
JuusoV Jun 25, 2015
a078b48
Made proposed changes.
JuusoV Jun 25, 2015
9fa23cb
Cleaned up the favoritessidebar
JuusoV Jun 25, 2015
dd3cdcf
added neccessary classes for medium and small devices. Added containe…
JuusoV Jun 25, 2015
3d99956
changed two .col row .sm to 12
Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 37 additions & 76 deletions client/views/dashboard/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,95 +3,56 @@
<div class="container">
<div class="row" id="champion-messages">
<div class="col-md-3">
{{> addPost}}
{{> favoritesSidebar}}
</div>
<div class="col-md-9">
{{> posts}}

<div class="container-fluid">
Copy link
Copy Markdown
Contributor

@brylie brylie Jun 25, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one container is necessary (see line 3). Remove extra container div. Also, clean up the indentation, so that it is consistent with the rest of the file.

Copy link
Copy Markdown
Contributor

@brylie brylie Jun 25, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is likely a syntactic error in the markup here. Make sure to check the nesting of your divs, including the closing tags. Specifically, the hierarchy should look like:

  • container
    • row
      • col
      • col
    • row
      • col
      • col

<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<p>
Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>. Aliquam eget sapien sapien. Curabitur in metus urna. In hac habitasse platea dictumst. Phasellus eu sem sapien, sed vestibulum velit. Nam purus nibh, lacinia non faucibus et, pharetra in dolor. Sed iaculis posuere diam ut cursus. <em>Morbi commodo sodales nisi id sodales. Proin consectetur, nisi id commodo imperdiet, metus nunc consequat lectus, id bibendum diam velit et dui.</em> Proin massa magna, vulputate nec bibendum nec, posuere nec lacus. <small>Aliquam mi erat, aliquam vel luctus eu, pharetra quis elit. Nulla euismod ultrices massa, et feugiat ipsum consequat eu.</small>
</p>
</div>
</div>
</div>
</div>
</template>

<template name="addPost">
<div class="template-add-post">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{_ "add_post"}}</h3>
<div class="row">
<div class="col-md-6">
<p>
Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>. Aliquam eget sapien sapien. Curabitur in metus urna. In hac habitasse platea dictumst. Phasellus eu sem sapien, sed vestibulum velit. Nam purus nibh, lacinia non faucibus et, pharetra in dolor. Sed iaculis posuere diam ut cursus. <em>Morbi commodo sodales nisi id sodales. Proin consectetur, nisi id commodo imperdiet, metus nunc consequat lectus, id bibendum diam velit et dui.</em> Proin massa magna, vulputate nec bibendum nec, posuere nec lacus. <small>Aliquam mi erat, aliquam vel luctus eu, pharetra quis elit. Nulla euismod ultrices massa, et feugiat ipsum consequat eu.</small>
</p>
</div>
<div class="panel-body">
{{#autoForm id="add" collection="Posts" type="insert"}}
{{> afQuickField name="title"}}
{{> afQuickField name="content"}}
{{> afQuickField name="picture"}}
<button type="submit" class="btn btn-success">{{_ "add_post_btn"}}</button>
{{/autoForm}}
<div class="col-md-6">
<p>
Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>. Aliquam eget sapien sapien. Curabitur in metus urna. In hac habitasse platea dictumst. Phasellus eu sem sapien, sed vestibulum velit. Nam purus nibh, lacinia non faucibus et, pharetra in dolor. Sed iaculis posuere diam ut cursus. <em>Morbi commodo sodales nisi id sodales. Proin consectetur, nisi id commodo imperdiet, metus nunc consequat lectus, id bibendum diam velit et dui.</em> Proin massa magna, vulputate nec bibendum nec, posuere nec lacus. <small>Aliquam mi erat, aliquam vel luctus eu, pharetra quis elit. Nulla euismod ultrices massa, et feugiat ipsum consequat eu.</small>
</p>
</div>
</div>
</div>
</template>

<!--
<template name="posts">
<div class="template-posts">
{{#each posts}}
{{> post}}
{{else}}
{{> noData}}
{{/each}}
</div>
</template>
-->

<!--
<template name="post">
<div class="template-post">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{title}}
<span class="pull-right">
<i class="fa fa-thumbs-up"></i> {{#with favoritesByDoc _id}}{{count}}{{/with}}
<i class="fa fa-comments"></i> {{commentCount _id}}
</span>
</h3>
</div>
<div class="row">
<div class="col-md-4">
<p>
Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>. Aliquam eget sapien sapien. Curabitur in metus urna. In hac habitasse platea dictumst. Phasellus eu sem sapien, sed vestibulum velit. Nam purus nibh, lacinia non faucibus et, pharetra in dolor. Sed iaculis posuere diam ut cursus. <em>Morbi commodo sodales nisi id sodales. Proin consectetur, nisi id commodo imperdiet, metus nunc consequat lectus, id bibendum diam velit et dui.</em> Proin massa magna, vulputate nec bibendum nec, posuere nec lacus. <small>Aliquam mi erat, aliquam vel luctus eu, pharetra quis elit. Nulla euismod ultrices massa, et feugiat ipsum consequat eu.</small>
</p>
</div>
<div class="panel-body">
<p class="text-center">
{{#with getDoc picture 'Attachments'}}
<img src="{{url}}" class="img-thumbnail img-rounded">
{{/with}}
<div class="col-md-4">
<p>
Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>. Aliquam eget sapien sapien. Curabitur in metus urna. In hac habitasse platea dictumst. Phasellus eu sem sapien, sed vestibulum velit. Nam purus nibh, lacinia non faucibus et, pharetra in dolor. Sed iaculis posuere diam ut cursus. <em>Morbi commodo sodales nisi id sodales. Proin consectetur, nisi id commodo imperdiet, metus nunc consequat lectus, id bibendum diam velit et dui.</em> Proin massa magna, vulputate nec bibendum nec, posuere nec lacus. <small>Aliquam mi erat, aliquam vel luctus eu, pharetra quis elit. Nulla euismod ultrices massa, et feugiat ipsum consequat eu.</small>
</p>
<div class="media">
<a class="pull-left" href="#">
{{> profileThumb _id=owner}}
</a>
<div class="media-body">
<p>{{content}}</p>
{{#if $eq owner User._id}}
<small>
{{#afModal title="Update post" omitFields="createdAt,updatedAt,owner" class="text-primary" collection="Posts" operation="update" doc=_id}}
<i class="fa fa-pencil" buttonContent="Edit post"></i> {{_ "edit_post"}}
{{/afModal}}
{{#afModal title="Delete post" class="text-danger" collection="Posts" operation="remove" doc=_id}}
<i class="fa fa-times" buttonContent="Edit post"></i> {{_ "delete"}}
{{/afModal}}
</small>
{{/if}}
</div>
</div>
</div>
<div class="panel-footer">
{{> favoriteButton _id=_id}}
{{> commentFormToggle }}
{{> comments}}
<div class="col-md-4">
<p>
Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>. Aliquam eget sapien sapien. Curabitur in metus urna. In hac habitasse platea dictumst. Phasellus eu sem sapien, sed vestibulum velit. Nam purus nibh, lacinia non faucibus et, pharetra in dolor. Sed iaculis posuere diam ut cursus. <em>Morbi commodo sodales nisi id sodales. Proin consectetur, nisi id commodo imperdiet, metus nunc consequat lectus, id bibendum diam velit et dui.</em> Proin massa magna, vulputate nec bibendum nec, posuere nec lacus. <small>Aliquam mi erat, aliquam vel luctus eu, pharetra quis elit. Nulla euismod ultrices massa, et feugiat ipsum consequat eu.</small>
</p>
</div>
</div>
</div>
</div>
</template>
-->
</div>

</div>
</div>
</div>
</template>
<template name="favoritesSidebar">
<div class="template-favorites-sidebar">
{{#if myFavorites.count}}
Expand Down