Skip to content
Snippets Groups Projects
Commit 2e437977 authored by gnaegi's avatar gnaegi
Browse files

OO-2057 beautify EP layout

parent c8943407
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 100 additions and 85 deletions
src/main/java/org/olat/modules/portfolio/ui/BinderPageListController.java
+ 1
− 1
View file @ 2e437977
......@@ -280,7 +280,7 @@ public class BinderPageListController extends AbstractPageListController {
if(rows.isEmpty()) {
flc.add("create.new.section", newSectionButton);
} else {
} else if (newSectionButton != null) {
flc.remove(newSectionButton);
}
......
src/main/java/org/olat/modules/portfolio/ui/_content/binder_row.html
+ 1
− 1
View file @ 2e437977
......@@ -9,7 +9,7 @@
</div>
</div>
#else
<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 panel-default o_binder #if($r.isNotNull($row.referenceEntryName)) o_portfolio_assignments #end #if($row.background) panel-imagebg" style="background-image:url('$mapperThumbnailUrl/$row.key/${row.imageName}');" #else " #end>
<div class="panel-heading">
<h4 class="panel-title">$r.escapeHtml($row.title)
#if($r.isNotNull($row.referenceEntryName))
......
src/main/java/org/olat/modules/portfolio/ui/_content/portfolio_element_row.html
+ 71
− 70
View file @ 2e437977
......@@ -14,48 +14,46 @@
#if(${row.isSection()})
<div class="o_portfolio_section">
<h3>$r.escapeHtml($row.sectionLongTitle) <small><i class="o_icon $row.sectionCssClassStatus"> </i></small></h3>
<div class="o_portfolio_section_meta">
<div class="clearfix">
#if($r.notNull($row.sectionBeginDate))
<span><strong>$r.translate("begin.date"): </strong> $r.formatDate($row.sectionBeginDate)</span>
#end
#if($r.notNull($row.sectionEndDate))
<span><strong>$r.translate("end.date"): </strong> $r.formatDate($row.sectionEndDate)</span>
#end
#if($row.assessable && ${row.hasScore()})
<span><strong>$r.translate("section.score"): </strong> $row.score</span>
#end
</div>
#if($r.isNotEmpty($row.sectionDescription))
<div class="o_section_lead o_block_large_bottom">
<div class="o_desc o_user_content_block">
$r.xssScan($row.sectionDescription)
<div class="o_section_lead o_block_large_bottom">
<div class="o_portfolio_section_meta o_small">
<div class="o_portfolio_dates clearfix">
#if($r.notNull($row.sectionBeginDate))
<span><strong>$r.translate("begin.date"): </strong> $r.formatDate($row.sectionBeginDate)</span>
#end
#if($r.notNull($row.sectionEndDate))
<span><strong>$r.translate("end.date"): </strong> $r.formatDate($row.sectionEndDate)</span>
#end
#if($row.assessable && ${row.hasScore()})
<span><strong>$r.translate("section.score"): </strong> $row.score</span>
#end
</div>
<div class="o_portfolio_status_block">
<span><strong>$r.translate("section.status"): </strong> $r.translate(${row.getSectionStatusI18nKey()})</span>
#if($r.isNotNull($row.closeSectionLink))
$r.render($row.closeSectionLink)
#end
#if($r.isNotNull($row.reopenSectionLink))
$r.render($row.reopenSectionLink)
#end
</div>
</div>
#end
#if($r.isNotEmpty($row.sectionCategories))
<div class="o_block_large_bottom">
<div class="o_portfolio_page_meta text-muted o_small">
$r.translate("meta.section.categories") <i class="o_icon o_icon_tags"> </i>
#foreach($category in $row.sectionCategories)
#if(${foreach.count} > 1), #end
<a class="o_pf_tag" href="javascript:${f.ffXHREvent("tag_select","$category")}">$category</a>
#end
</div>
#if($r.isNotEmpty($row.sectionDescription))
<div class="o_desc o_user_content_block o_block">
$r.xssScan($row.sectionDescription)
</div>
#end
<div class="o_portfolio_status_block o_block">
<span><strong>$r.translate("section.status"): </strong> $r.translate(${row.getSectionStatusI18nKey()})</span>
#if($r.isNotNull($row.closeSectionLink))
$r.render($row.closeSectionLink)
#end
#if($r.isNotNull($row.reopenSectionLink))
$r.render($row.reopenSectionLink)
#end
#if($r.isNotEmpty($row.sectionCategories))
<div class="o_portfolio_page_meta text-muted o_small">
$r.translate("meta.section.categories") <i class="o_icon o_icon_tags"> </i>
#foreach($category in $row.sectionCategories)
#if(${foreach.count} > 1), #end
<a class="o_pf_tag" href="javascript:${f.ffXHREvent("tag_select","$category")}">$category</a>
#end
</div>
#end
</div>
......@@ -75,7 +73,7 @@
</div>
#end
#if(${row.isPendingAssignment()})
<div class="panel panel-placeholder o_portfolio_assignments">
<div class="panel #if($r.isNotNull($row.editAssignmentLink)) panel-default #else panel-placeholder #end o_portfolio_assignments">
<div class="panel-heading">
<h4 class="panel-title"><i class="o_icon o_icon_assignment"> </i>$r.translate("assignment"): $row.assignmentTitle</h4>
</div>
......@@ -101,39 +99,42 @@
</div>
#end
#if(${row.isPage()})
<div class="o_portfolio_page o_block_large_bottom">
<h4><i class="o_icon ${row.getCssClassStatus()} o_icon-fw"> </i> $r.escapeHtml($row.title)</h4>
#if($r.isNotNull($row.assignment))
<i class="o_icon o_icon_assignment"> </i> <strong>$r.translate("meta.assignment", $row.assignmentTitle)</strong>
#end
#if($r.isNotEmpty($row.pageCategories))
<span class="o_portfolio_page_meta text-muted o_small">
#if($r.isNotNull($row.assignment)), #end
<strong>$r.translate("meta.categories")</strong> <i class="o_icon o_icon_tags"> </i>
#foreach($category in $row.pageCategories)
#if(${foreach.count} > 1), #end
<a class="o_pf_tag" href="javascript:${f.ffXHREvent("tag_select","$category")}">$category</a>
#end
</span>
#end
#if($r.isNotNull($row.lastPublicationDate))
<span class="o_portfolio_page_meta text-muted o_small">
#if($r.isNotNull($row.assignment) || $r.isNotEmpty($row.pageCategories)), #end
$r.translate("meta.last.publication", $r.formatDateAndTime($row.lastPublicationDate))
</span>
#end
<span class="o_portfolio_page_meta text-muted o_small">
#if($r.isNotNull($row.assignment) || $r.isNotNull($row.lastPublicationDate) or $r.isNotEmpty($row.pageCategories)), #end
$r.translate("meta.last.modified", $r.formatDateAndTime($row.lastModified))
</span>
#if($r.isNotNull(${r.row.getMetaBinderAndSectionTitles()}))
<div class="o_portfolio_page_meta text-muted o_small">
$r.translate("meta.binder.section.titles", ${row.getMetaBinderAndSectionTitles()})
</div>
#end
<div class="o_portfolio_page_summary o_block">
$r.xssScan($row.summary)
<div class="o_portfolio_page o_block_large">
<div class="#if($r.isNotNull($row.assignment)) o_portfolio_assignments #end ">
<h4><i class="o_icon ${row.getCssClassStatus()} o_icon-fw"> </i> $r.escapeHtml($row.title)</h4>
<div class="o_portfolio_page_meta_wrapper">
#if($r.isNotNull($row.assignment))
<i class="o_icon o_icon_assignment"> </i> <strong>$r.translate("meta.assignment", $row.assignmentTitle)</strong>
#end
#if($r.isNotEmpty($row.pageCategories))
<span class="o_portfolio_page_meta text-muted o_small">
#if($r.isNotNull($row.assignment)), #end
<strong>$r.translate("meta.categories")</strong> <i class="o_icon o_icon_tags"> </i>
#foreach($category in $row.pageCategories)
#if(${foreach.count} > 1), #end
<a class="o_pf_tag" href="javascript:${f.ffXHREvent("tag_select","$category")}">$category</a>
#end
</span>
#end
#if($r.isNotNull($row.lastPublicationDate))
<span class="o_portfolio_page_meta text-muted o_small">
#if($r.isNotNull($row.assignment) || $r.isNotEmpty($row.pageCategories)), #end
$r.translate("meta.last.publication", $r.formatDateAndTime($row.lastPublicationDate))
</span>
#end
<span class="o_portfolio_page_meta text-muted o_small">
#if($r.isNotNull($row.assignment) || $r.isNotNull($row.lastPublicationDate) or $r.isNotEmpty($row.pageCategories)), #end
$r.translate("meta.last.modified", $r.formatDateAndTime($row.lastModified))
</span>
#if($r.isNotNull(${r.row.getMetaBinderAndSectionTitles()}))
<div class="o_portfolio_page_meta text-muted o_small">
$r.translate("meta.binder.section.titles", ${row.getMetaBinderAndSectionTitles()})
</div>
#end
</div>
<div class="o_portfolio_page_summary o_block">
$r.xssScan($row.summary)
</div>
</div>
<div class="o_portfolio_page_links">
$r.render($row.openFormItem)
......
src/main/webapp/static/themes/light/_config.scss
+ 1
− 1
View file @ 2e437977
......@@ -329,7 +329,7 @@ $o-course-node-deleted : $badge-bg !default;
/* Portfolio v2 */
$o-portfolio-assignment-color : $brand-warning !default;
$o-portfolio-assignment-color : $brand-danger !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-xs : $padding-xs-vertical !default;
......
src/main/webapp/static/themes/light/modules/_portfolio_v2.scss
+ 20
− 6
View file @ 2e437977
......@@ -42,13 +42,27 @@ div#o_main_toolbar.o_toolbar.o_portfolio {
}
}
.o_binder {
&.o_assignment {
.panel-heading,
.panel-body {
border-left: 3px solid $o-portfolio-assignment-color;
/* binder with assignments (binders created from course element */
.o_binder.o_portfolio_assignments {
.panel-heading,
.panel-body {
border-left: 3px solid $o-portfolio-assignment-color;
}
}
/* an assignment in template edit mode*/
.panel-default.o_portfolio_assignments {
.panel-heading,
.panel-body {
border-left: 3px solid $o-portfolio-assignment-color;
}
}
/* an assignment entry */
.o_portfolio_page .o_portfolio_assignments {
border-left: 3px solid $o-portfolio-assignment-color;
.o_portfolio_page_meta_wrapper,
.o_portfolio_page_summary {
padding-left: 10px;
}
}
}
.o_rendertype_classic {
......
src/main/webapp/static/themes/light/theme.css
+ 1
− 1
View file @ 2e437977
This diff is collapsed.
src/main/webapp/static/themes/light/theme.css.map
+ 1
− 1
View file @ 2e437977
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 @ 2e437977
source diff could not be displayed: it is too large. Options to address this: view the blob.
src/main/webapp/static/themes/openolat/theme.css
+ 1
− 1
View file @ 2e437977
This diff is collapsed.
src/main/webapp/static/themes/openolat/theme.css.map
+ 1
− 1
View file @ 2e437977
source diff could not be displayed: it is too large. Options to address this: view the blob.
src/main/webapp/static/themes/openolat/theme_ie_completions.css
+ 1
− 1
View file @ 2e437977
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