OO-1068 bootstrapify notifications

src/main/java/org/olat/core/commons/services/notifications/SubscriptionInfo.java

@@ -78,7 +78,7 @@ public class SubscriptionInfo {
 		if (!hasNews()) return "";
 		StringBuilder sb = new StringBuilder();
 		boolean firstDone = false;
-		if (mimeType.equals(SubscriptionInfo.MIME_HTML)) sb.append("<ul>");
+		if (mimeType.equals(SubscriptionInfo.MIME_HTML)) sb.append("<ul class='list-unstyled'>");
 		for (SubscriptionListItem subListItem : subsList) {
 			if (firstDone && mimeType.equals(SubscriptionInfo.MIME_PLAIN)) {
 				sb.append("\n");

src/main/java/org/olat/core/commons/services/notifications/model/SubscriptionListItem.java

@@ -126,12 +126,11 @@ public class SubscriptionListItem {
 		Translator trans = Util.createPackageTranslator(ContextualSubscriptionController.class, locale);
 		Formatter form = Formatter.getInstance(locale);
 		String datePart = trans.translate("subscription.listitem.dateprefix", new String [] { form.formatDateAndTime(date) } ) ; 
+		sb.append("<li>");			
 		if (iconCssClass != null) {
-			sb.append("<li class=\"b_with_small_icon_left ");
+			sb.append("<i class=\"o_icon o_icon-fw ");
 			sb.append(iconCssClass);
-			sb.append("\">");
-		} else {
-			sb.append("<li>");			
+			sb.append("\"></i>");
 		}
 		if (StringHelper.containsNonWhitespace(link)) {
 			sb.append("<a href=\""); 
@@ -142,7 +141,7 @@ public class SubscriptionListItem {
 			sb.append(new OWASPAntiSamyXSSFilter().filter(description.trim()));
 		}
 		if (StringHelper.containsNonWhitespace(link)) sb.append("</a>");
-		sb.append(" ").append(datePart.trim());
+		sb.append(" <span class='o_nowrap o_date'>").append(datePart.trim()).append("</span>");
 		sb.append("</li>");
 		return sb.toString();
 	}

src/main/java/org/olat/core/commons/services/notifications/model/TitleItem.java

@@ -42,9 +42,9 @@ public class TitleItem extends SubscriptionInfoItem {
 			return "<h4>" + content + "</h4>";
 		} else {
 			StringBuffer sb = new StringBuffer();
-			sb.append("<h4 class=\"b_with_small_icon_left ");
+			sb.append("<h4><i class=\"o_icon o_icon-fw ");
 			sb.append(iconCssClass);
-			sb.append("\">");
+			sb.append("\"> </i>"); // space required by antisamy
 			sb.append(content);
 			sb.append("</h4>");
 			return sb.toString();

src/main/java/org/olat/core/commons/services/notifications/ui/_content/notificationsNews.html

 <div class="o_notifications_news_wrapper">
-	<h4>$r.translate("news.title")</h4>
+	<h3>$r.translate("news.title")</h3>
 	<p>
 		$r.translate("news.desc")
 	</p>
-	<div class="o_notifications_news_datechooser">
-		<div class="b_float_right">
-			$r.render("emailLink")
+	<div class="o_notifications_news_datechooser o_block_large row">
+		<div class="col-xs-12 col-sm-6">
+			$r.render("dateChooserCtr")
+		</div>
+		<div class="col-xs-12 col-sm-6">
+			<div class="pull-right">
+				$r.render("emailLink")
+			</div>
 		</div>
-		$r.render("dateChooserCtr")
-		
 	</div>
+	
 #foreach($sub in $subs)
 	#if($subsFormatter.hasNews($sub))
 	<div class="o_notifications_news_subscription">
@@ -36,6 +40,7 @@
 			#if($subscrItem) 
 			<a href="$subscrItem.getLink()" onkeypress="return o2cl();" onclick="return o2cl();">
 				$r.translate("resource.open", $subsFormatter.getType($sub))
+				<i class="o_icon o_icon_start"></i>
 			</a>
 			#end
 		#end

src/main/java/org/olat/core/commons/services/notifications/ui/_content/notificationsRSS.html

-<div class="b_float_right">
-	$r.contextHelp("org.olat.home","home-rss.html","help.hover.rss")
-</div>
-<h4>$r.translate("notifcations.rss.title")</h4>
+<h3>
+	$r.translate("notifcations.rss.title")
+	$r.contextHelpWithWrapper("org.olat.home","home-rss.html","help.hover.rss")
+</h3>
 <p>
 	$r.translate("notifcations.rss.desc")
 </p>
 <p>
-	<a class="b_with_small_icon_left o_rss_icon" href="$rssLink" target="_blank">$r.translate("rss.title", $fullName)</a>
+	<a href="$rssLink" target="_blank">
+		<i class='o_icon o_icon_rss'></i> 
+		$r.translate("rss.title", $fullName)
+	</a>
 </p>
 

src/main/java/org/olat/core/commons/services/notifications/ui/_content/notificationsSubscriptions.html

-<div class="b_float_right">
-	$r.contextHelp("org.olat.core.commons.services.notifications.ui","home-notifications.html","help.hover.notif")
-</div>
-<h4>$r.translate("subscriptions.title")</h4>
+<h3>
+	$r.translate("subscriptions.title")
+	$r.contextHelpWithWrapper("org.olat.core.commons.services.notifications.ui","home-notifications.html","help.hover.notif")	
+</h3>
 <p>
 	$r.translate("subscriptions.desc")
 </p>

src/main/java/org/olat/core/gui/components/table/TableRenderer.java

@@ -116,7 +116,7 @@ public class TableRenderer implements ComponentRenderer {
 		// starting real table table
 		target.append("<div class=\"o_table_wrapper table-responsive\" id=\"b_overflowscrollbox_").append(table.hashCode()).append("\">");
 
-		target.append("<table id=\"b_table").append(table.hashCode()).append("\" class=\"o_table table table-bordered table-hover").append(CLOSE_HTML_BRACE);
+		target.append("<table id=\"b_table").append(table.hashCode()).append("\" class=\"o_table table table-striped table-condensed table-hover").append(CLOSE_HTML_BRACE);
 		appendHeaderLinks(target, translator, table, formName, cols, asc);
 		appendDataRows(renderer, target, ubu, table, iframePostEnabled, cols, selRowUnSelectable, selRowId, startRowId, endRowId);
 		target.append("</table><div class='o_table_footer'>");

src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml

@@ -386,7 +386,11 @@
 		<tag name="span" action="validate">
 			<attribute name="class" />
 		</tag>
-		<tag name="i" action="validate" />
+		<!-- necessary for font-awesome icons -->
+		<tag name="i" action="validate" >
+			<attribute name="class" />
+		</tag>
+		
 		<tag name="b" action="validate" />
 		<tag name="strong" action="validate" />
 		<tag name="s" action="validate" />

src/main/webapp/static/themes/light/modules/_icons.scss

@@ -88,6 +88,7 @@ $fa-css-prefix: "o_icon" !default;
 .o_icon_readwrite { @extend .o_icon-edit; }
 .o_icon_recycle { @extend .o_icon-recycle; }
 .o_icon_refresh { @extend .o_icon-refresh; } 
+.o_icon_rss { @extend .o_icon-rss;}
 .o_icon_search {@extend .o_icon-search;}
 .o_icon_settings{ @extend .o_icon-gears;}
 .o_icon_show_more { @extend .o_icon-toggle-down; }
@@ -129,6 +130,12 @@ a.o_icon {
 .o_FileResource-TEST_icon{ @extend .o_icon-pencil-square-o; }
 .o_FileResource-WIKI_icon{ @extend .o_icon-globe; }
 
+/* notification icons */
+.o_forum_message_icon {@extend .o_icon-comment-o; }
+.o_calendar_icon {@extend .o_icon-calendar; }
+
+
+
 /* Access control icons */
 .o_ac_token_icon { @extend .o_icon-key;}
 .o_ac_free_icon { @extend .o_icon-gift;}

src/main/webapp/static/themes/light/modules/_various_modules.scss

@@ -50,6 +50,36 @@
 	.o_author {}
 }
 
+/* notifications and subscription */
+.o_notifications_news_wrapper {
+	.o_notifications_news_datechooser {}
+	.o_notifications_news_subscription {
+		margin: $padding-large-vertical 0;
+		h4 i {
+			display: none;
+		}
+		.o_notifications_news_context {
+			@extend .text-muted;	
+		}
+		.o_notifications_news_content {
+			margin-left: 1.5em;
+			position: relative;
+			.o_icon {
+				position: absolute;
+				left: -1.5em;
+				line-height: 1.5em;
+				top: 0;
+			}
+			.o_date {
+				@extend .text-muted;
+			}
+		}
+		.o_notifications_news_url {
+			margin-left: 1.5em;			
+		}
+	}
+}
+
 /* toogle box */
 .o_togglebox_wrapper {
 	a.o_togglebox_closed i {

src/test/java/org/olat/core/util/filter/impl/XSSFilterTest.java

@@ -250,6 +250,12 @@ public class XSSFilterTest {
 //		t("<span title=\"a>b\">&nbsp;</span>", "<span title=\"a&gt;b\">&nbsp;</span>");
 	}
 	
+	@Test
+	public void test_font_awesome() {
+		// for now i tags must have at least a space to not b removed
+		t("<i class=\"o_icon o_icon_dev\"> </i> ", "<i class=\"o_icon o_icon_dev\"> </i> ");
+	}
+	
 	@Test
 	public void test_big_tiny_output(){
 		testsToRun = 1;