Skip to content
Snippets Groups Projects
Commit 4954bf54 authored by gnaegi's avatar gnaegi
Browse files

OO-2057 fix padding in ep home, visually mark course related binders

parent 0069c2ad
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 97 deletions
src/main/java/org/olat/modules/portfolio/ui/_content/binder_row.html
+ 7
− 6
View file @ 4954bf54
...@@ -9,15 +9,16 @@ ...@@ -9,15 +9,16 @@
</div> </div>
</div> </div>
#else #else
<div class="panel panel-default #if($row.background) panel-imagebg" style="background-image:url('$mapperThumbnailUrl/$row.key/${row.imageName}');" #else " #end> <div class="panel panel-default o_binder #if($r.isNotNull($row.referenceEntryName)) o_assignment #end #if($row.background) panel-imagebg" style="background-image:url('$mapperThumbnailUrl/$row.key/${row.imageName}');" #else " #end>
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title">$r.escapeHtml($row.title)</h4> <h4 class="panel-title">$r.escapeHtml($row.title)
#if($r.isNotNull($row.referenceEntryName))
<small class="text-muted"><br /><i class="o_icon o_CourseModule_icon"> </i> $r.translate("binder.entry.name"): $r.escapeHtml($row.referenceEntryName)</small>
#end
</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<ul> <ul>
#if($r.isNotNull($row.referenceEntryName))
<li><span> <i class="o_icon o_CourseModule_icon"> </i> $r.translate("binder.entry.name"): $r.escapeHtml($row.referenceEntryName)</span></li>
#end
<li><span>$r.translate("binder.last.update"): $r.formatDateAndTime($row.lastUpdate)</span></li> <li><span>$r.translate("binder.last.update"): $r.formatDateAndTime($row.lastUpdate)</span></li>
<li><span>$r.translate("binder.num.sections.pages", $row.numOfSectionsAndPages)</span></li> <li><span>$r.translate("binder.num.sections.pages", $row.numOfSectionsAndPages)</span></li>
<li><span>$r.translate("binder.num.comments", $row.numOfComments)</span></li> <li><span>$r.translate("binder.num.comments", $row.numOfComments)</span></li>
...@@ -25,4 +26,4 @@ ...@@ -25,4 +26,4 @@
<div class="pull-right">$r.render($row.openLink)</div> <div class="pull-right">$r.render($row.openLink)</div>
</div> </div>
</div> </div>
#end #end
\ No newline at end of file
src/main/java/org/olat/modules/portfolio/ui/_content/home.html
+ 88
− 83
View file @ 4954bf54
<div class="col-sm-6"> <div class="row">
<div class="panel panel-default"> <div class="col-sm-6">
<div class="panel-heading"> <div class="panel panel-default">
<h4 class="panel-title"> <div class="panel-heading">
<i class="o_icon o_icon_mediacenter o_icon-fw"> </i> <h4 class="panel-title">
$r.translate("media.center") <i class="o_icon o_icon_mediacenter o_icon-fw"> </i>
</h4> $r.translate("media.center")
</div> </h4>
<div class="panel-body"> </div>
$r.translate("media.center.text") <div class="panel-body">
<div class="o_button_group o_button_group_right"> $r.translate("media.center.text")
$r.render("goto.media.center") <div class="o_button_group o_button_group_right">
$r.render("goto.media.center")
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-sm-6">
<div class="col-sm-6"> <div class="panel panel-default">
<div class="panel panel-default"> <div class="panel-heading">
<div class="panel-heading"> <h4 class="panel-title">
<h4 class="panel-title"> <i class="o_icon o_icon_pf_quick_links o_icon-fw"> </i>
<i class="o_icon o_icon_pf_quick_links o_icon-fw"> </i> $r.translate("quick.links")
$r.translate("quick.links") </h4>
</h4> </div>
</div> <div class="panel-body">
<div class="panel-body"> <div class="o_button_group o_button_group_right">
<div class="o_button_group o_button_group_right"> <ul class="list-unstyled">
<ul class="list-unstyled"> <li>$r.render("edit.last.entry")</li>
<li>$r.render("edit.last.entry")</li> <li>$r.render("new.entry")</li>
<li>$r.render("new.entry")</li> <li>$r.render("edit.last.binder")</li>
<li>$r.render("edit.last.binder")</li> <li>$r.render("go.to.trash")</li>
<li>$r.render("go.to.trash")</li> </ul>
</ul> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="row">
<div class="panel panel-default"> <div class="col-sm-6">
<div class="panel-heading"> <div class="panel panel-default">
<h4 class="panel-title"> <div class="panel-heading">
<i class="o_icon o_icon_pf_entry o_icon-fw"> </i> <h4 class="panel-title">
$r.translate("my.portfolio.binders") <i class="o_icon o_icon_pf_entry o_icon-fw"> </i>
</h4> $r.translate("my.portfolio.binders")
</div> </h4>
<div class="panel-body"> </div>
$r.translate("my.portfolio.binders.text") <div class="panel-body">
<div class="o_button_group o_button_group_right"> $r.translate("my.portfolio.binders.text")
$r.render("goto.my.binders") <div class="o_button_group o_button_group_right">
$r.render("goto.my.binders")
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-sm-6">
<div class="col-sm-6"> <div class="panel panel-default">
<div class="panel panel-default"> <div class="panel-heading">
<div class="panel-heading"> <h4 class="panel-title">
<h4 class="panel-title"> <i class="o_icon o_icon_pf_entry o_icon-fw"> </i>
<i class="o_icon o_icon_pf_entry o_icon-fw"> </i> $r.translate("my.entries")
$r.translate("my.entries") </h4>
</h4> </div>
</div> <div class="panel-body">
<div class="panel-body"> $r.translate("my.entries.text")
$r.translate("my.entries.text") <div class="o_button_group o_button_group_right">
<div class="o_button_group o_button_group_right"> $r.render("goto.my.pages")
$r.render("goto.my.pages") </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="row">
<div class="panel panel-default"> <div class="col-sm-6">
<div class="panel-heading"> <div class="panel panel-default">
<h4 class="panel-title"> <div class="panel-heading">
<i class="o_icon o_icon_pf_my_shares o_icon-fw"> </i> <h4 class="panel-title">
$r.translate("my.shared.items") <i class="o_icon o_icon_pf_my_shares o_icon-fw"> </i>
</h4> $r.translate("my.shared.items")
</div> </h4>
<div class="panel-body"> </div>
$r.translate("my.shared.items.text") <div class="panel-body">
<div class="o_button_group o_button_group_right"> $r.translate("my.shared.items.text")
$r.render("goto.my.shared.items") <div class="o_button_group o_button_group_right">
$r.render("goto.my.shared.items")
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-sm-6">
<div class="col-sm-6"> <div class="panel panel-default">
<div class="panel panel-default"> <div class="panel-heading">
<div class="panel-heading"> <h4 class="panel-title">
<h4 class="panel-title"> <i class="o_icon o_icon_pf_shared_with_me o_icon-fw"> </i>
<i class="o_icon o_icon_pf_shared_with_me o_icon-fw"> </i> $r.translate("shared.with.me")
$r.translate("shared.with.me") </h4>
</h4> </div>
</div> <div class="panel-body">
<div class="panel-body"> $r.translate("shared.with.me.text")
$r.translate("shared.with.me.text") <div class="o_button_group o_button_group_right">
<div class="o_button_group o_button_group_right"> $r.render("goto.shared.with.me")
$r.render("goto.shared.with.me") </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
src/main/webapp/static/themes/light/_config.scss
+ 1
− 0
View file @ 4954bf54
...@@ -329,6 +329,7 @@ $o-course-node-deleted : $badge-bg !default; ...@@ -329,6 +329,7 @@ $o-course-node-deleted : $badge-bg !default;
/* Portfolio v2 */ /* Portfolio v2 */
$o-portfolio-assignment-color : $brand-warning !default;
$o-portfolio-media-browser-space : $padding-large-vertical * 2 !default; $o-portfolio-media-browser-space : $padding-large-vertical * 2 !default;
$o-portfolio-media-browser-space-sm : $padding-large-vertical !default; $o-portfolio-media-browser-space-sm : $padding-large-vertical !default;
$o-portfolio-media-browser-space-xs : $padding-xs-vertical !default; $o-portfolio-media-browser-space-xs : $padding-xs-vertical !default;
......
src/main/webapp/static/themes/light/content.css
+ 1
− 1
View file @ 4954bf54
This diff is collapsed.
src/main/webapp/static/themes/light/content.css.map
+ 2
− 2
View file @ 4954bf54
This diff is collapsed.
src/main/webapp/static/themes/light/modules/_portfolio_v2.scss
+ 10
− 1
View file @ 4954bf54
...@@ -30,7 +30,7 @@ div#o_main_toolbar.o_toolbar.o_portfolio { ...@@ -30,7 +30,7 @@ div#o_main_toolbar.o_toolbar.o_portfolio {
ul { ul {
padding-left: 2em; padding-left: 2em;
} }
} }
.panel-imagebg .panel-body ul { .panel-imagebg .panel-body ul {
margin: 0; margin: 0;
...@@ -42,6 +42,15 @@ div#o_main_toolbar.o_toolbar.o_portfolio { ...@@ -42,6 +42,15 @@ div#o_main_toolbar.o_toolbar.o_portfolio {
} }
} }
.o_binder {
&.o_assignment {
.panel-heading,
.panel-body {
border-left: 3px solid $o-portfolio-assignment-color;
}
}
}
.o_rendertype_classic { .o_rendertype_classic {
.o_pf_page, .o_pf_assignment { .o_pf_page, .o_pf_assignment {
padding-left: 1em; padding-left: 1em;
......
src/main/webapp/static/themes/light/theme.css
+ 1
− 1
View file @ 4954bf54
This diff is collapsed.
src/main/webapp/static/themes/light/theme.css.map
+ 2
− 2
View file @ 4954bf54
source diff could not be displayed: it is too large. Options to address this: view the blob.
src/main/webapp/static/themes/light/theme_ie_completions.css
+ 1
− 1
View file @ 4954bf54
source diff could not be displayed: it is too large. Options to address this: view the blob.
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