Skip to content

E
edx-platform
Commit 8886b596 by marco
Options

basic shell for discussion home page with both profile information and email notification settings

parent 17f4579f
Showing with 104 additions and 49 deletions
lms/static/sass/_discussion.scss
...@@ -90,10 +90,6 @@ ...@@ -90,10 +90,6 @@
} }
body.discussion { body.discussion {
.new-post-form-errors { .new-post-form-errors {
...@@ -739,14 +735,9 @@ body.discussion { ...@@ -739,14 +735,9 @@ body.discussion {
width: 25px; width: 25px;
height: 25px; height: 25px;
//margin-left: -17px; //margin-left: -17px;
background: url(../images/home-discussion-icon.png) no-repeat;
opacity: 1; opacity: 1;
@include transition(none); @include transition(none);
} }
.home-btn {
//nothing here yet
}
} }
.browse { .browse {
...@@ -827,7 +818,6 @@ body.discussion { ...@@ -827,7 +818,6 @@ body.discussion {
z-index: 50; z-index: 50;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 0 0 0 0;
border: 1px solid transparent; border: 1px solid transparent;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
...@@ -847,7 +837,7 @@ body.discussion { ...@@ -847,7 +837,7 @@ body.discussion {
@include transition(opacity .2s linear 0s); @include transition(opacity .2s linear 0s);
} }
.drop-arrow { .drop-arrow {
font-size:16px; font-size: 16px;
} }
} }
...@@ -881,13 +871,6 @@ body.discussion { ...@@ -881,13 +871,6 @@ body.discussion {
.browse-topic-drop-menu { .browse-topic-drop-menu {
max-height: 400px; max-height: 400px;
overflow-y: scroll; overflow-y: scroll;
.drop-menu-meta-category span,
.drop-menu-parent-category span {
margin: 10px 0;
font-size: 14px;
font-weight: 700;
}
} }
...@@ -922,7 +905,7 @@ body.discussion { ...@@ -922,7 +905,7 @@ body.discussion {
.board-name { .board-name {
float: left; float: left;
width: 80%; width: 80%;
margin: 5px 0; margin: 13px 0;
color: #fff; color: #fff;
} }
...@@ -940,14 +923,14 @@ body.discussion { ...@@ -940,14 +923,14 @@ body.discussion {
li li { li li {
a { a {
padding-left: 44px; padding-left: 44px;
background: url(../images/nested-icon.png) no-repeat 22px 5px; background: url(../images/nested-icon.png) no-repeat 22px 14px;
} }
} }
li li li { li li li {
a { a {
padding-left: 68px; padding-left: 68px;
background: url(../images/nested-icon.png) no-repeat 46px 5px; background: url(../images/nested-icon.png) no-repeat 46px 14px;
} }
} }
} }
...@@ -1275,9 +1258,6 @@ body.discussion { ...@@ -1275,9 +1258,6 @@ body.discussion {
} }
} }
.bottom-post-status { .bottom-post-status {
padding: 30px; padding: 30px;
font-size: 20px; font-size: 20px;
...@@ -1286,9 +1266,6 @@ body.discussion { ...@@ -1286,9 +1266,6 @@ body.discussion {
text-align: center; text-align: center;
} }
.discussion-column { .discussion-column {
float: right; float: right;
@include box-sizing(border-box); @include box-sizing(border-box);
...@@ -1306,34 +1283,85 @@ body.discussion { ...@@ -1306,34 +1283,85 @@ body.discussion {
} }
.blank-slate { .blank-slate {
//nothing here
.section { section {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
margin-top: 15px;
} }
.label {
font-size: 12px;
}
.home-header { .home-header {
//nothing here //nothing here
} }
.home-title { .home-title {
font-size: 18px; font-size: 18px;
color: #000; color: $black;
margin-bottom: 5px; margin-bottom: 5px;
} }
.home-description { .home-description {
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 1;
margin-bottom: 10px; margin-bottom: $baseline/2;
} }
.home-stats { .home-stats {
//nothing
.label-area {
display: inline-block;
min-width: $baseline*5;
width: 20%;
vertical-align: middle;
.profile-link {
//something
}
}
.stats-grouping {
display: inline-block;
width: 70%;
.profile-stat {
display: inline-block;
padding: $baseline;
vertical-align: middle;
}
}
} }
.home-emailsettings {
//nothing here .home-helpgrid {
border-bottom: none;
border-radius: 3px;
border: 1px solid #b2b2b2;
box-shadow: 0 1px 3px rgba(0, 0, 0, .15);
}
}
.helpgrid-list {
list-style-type: none;
padding: 0;
margin: 0;
.helpgrid-row {
border-bottom: 1px solid #b2b2b2;
.row-title {
padding: $baseline;
display: inline-block;
width: 20%;
background-color: $light-gray;
}
.row-item {
display: inline-block;
width: 20%;
}
} }
} }
.blank-slate,
.discussion-article { .discussion-article {
position: relative; position: relative;
padding: 40px; padding: 40px;
...@@ -1442,7 +1470,7 @@ body.discussion { ...@@ -1442,7 +1470,7 @@ body.discussion {
.responses { .responses {
list-style: none; list-style: none;
margin-top: 40px; margin-top: $baseline;
padding: 0; padding: 0;
> li { > li {
......
lms/templates/discussion/_thread_list_template.html
<script type="text/template" id="thread-list-template"> <script type="text/template" id="thread-list-template">
<div class="browse-search"> <div class="browse-search">
<div class="home"> <div class="home">
<a href="#" class="home-icon"></a> <a href="#" class="home-icon">
<a href="#" class="home-btn"></a> <i class="icon-home"></i>
</a>
</div> </div>
<div class="browse is-open"> <div class="browse is-open">
<a href="#" class="browse-topic-drop-icon"></a> <a href="#" class="browse-topic-drop-icon"></a>
......
lms/templates/discussion/index.html
...@@ -26,22 +26,48 @@ ...@@ -26,22 +26,48 @@
<div class="sidebar"></div> <div class="sidebar"></div>
<div class="discussion-column"> <div class="discussion-column">
<div class="discussion-article blank-slate"> <div class="discussion-article blank-slate">
<div class="home-header section"> <section class="home-header">
<h1 class="home-title">${course.display_name_with_default} Discussion Home</h1> <span class="label">DISCUSSION HOME:</span>
<h1 class="home-title">${course.display_name_with_default}</h1>
<p class="home-description">Welcome to ${course.display_name_with_default}'s Discussion Home. Select a discussion from the left, or review your profile, participation and email notification settings below. <p class="home-description">Welcome to ${course.display_name_with_default}'s Discussion Home. Select a discussion from the left, or review your profile, participation and email notification settings below.
</p> </p>
</div> </section>
<div class="home-stats section"> <section class="home-stats">
The home-stats <div class="label-area">
</div> <span class="label"> PROFILE, PARTICIPATION</span>
<div class="home-emailsettings section"> <a href="#" class="profile-link">Your profile Name</a>
The home-emailsettings </div>
</div> <div class="stats-grouping">
<div class="profile-stat profile-stat-posts">5 POSTS</div>
<div class="profile-stat profile-stat-comments">12 COMMENTS</div>
<div class="profile-stat profile-stat-following">9 POSTS I'M FOLLOWING</div>
</div>
</section>
<span class="label">HOW TO USE EDX DISCUSSIONS</span>
<section class="home-helpgrid">
<ul class="helpgrid-list">
<li class="helpgrid-row helpgrid-row-navigation">
<span class="row-title">Navigation</span>
<div class="row-item">Focus in on specific topics</div>
<div class="row-item">Search for specific posts</div>
<div class="row-item">Sort by date, vote, or comments</div>
</li>
<li class="helpgrid-row helpgrid-row-participation">
<span class="row-title">Participation</span>
<div class="row-item">Upvote posts and good responses</div>
<div class="row-item">Report Forum Misuse</div>
<div class="row-item">Follow posts for updates</div>
</li>
<li class="helpgrid-row helpgrid-row-notification">
<span class="row-title">Notification</span>
</li>
</ul>
</section>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<%include file="_underscore_templates.html" /> <%include file="_underscore_templates.html" />
<%include file="_thread_list_template.html" /> <%include file="_thread_list_template.html" />
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment