Merge with 03975922272c6b4671c4da0d56fe2b0454688f9a

src/main/java/org/olat/core/commons/modules/glossary/GlossaryMainController.java

@@ -113,6 +113,7 @@ public class GlossaryMainController extends BasicController implements Activatea
 		glistVC.contextPut("userAllowToEditEnabled", new Boolean(glossarySecCallback.isUserAllowToEditEnabled()));
 		
 		addButton = LinkFactory.createButtonSmall("cmd.add", glistVC, this);
+		addButton.setIconLeftCSS("o_icon o_icon_add o_icon-fw");
 		initEditView(ureq, glossarySecCallback.canAdd());
 
 		updateRegisterAndGlossaryItems();
@@ -295,12 +296,14 @@ public class GlossaryMainController extends BasicController implements Activatea
 		for (GlossaryItem gi : gIList) {
 			boolean canEdit = glossarySecCallback.canEdit(gi);
 			if(canEdit) {
-				Link tmpEditButton = LinkFactory.createCustomLink(CMD_EDIT + linkNum, CMD_EDIT + linkNum, "cmd.edit", Link.BUTTON_SMALL, glistVC,
+				Link tmpEditButton = LinkFactory.createCustomLink(CMD_EDIT + linkNum, CMD_EDIT + linkNum, "cmd.edit", Link.BUTTON_XSMALL, glistVC,
 					this);
+				tmpEditButton.setIconLeftCSS("o_icon o_icon_edit o_icon-fw");
 				tmpEditButton.setUserObject(gi);
-				Link tmpDelButton = LinkFactory.createCustomLink(CMD_DELETE + linkNum, CMD_DELETE + linkNum, "cmd.delete", Link.BUTTON_SMALL,
+				Link tmpDelButton = LinkFactory.createCustomLink(CMD_DELETE + linkNum, CMD_DELETE + linkNum, "cmd.delete", Link.BUTTON_XSMALL,
 					glistVC, this);
 				tmpDelButton.setUserObject(gi);
+				tmpDelButton.setIconLeftCSS("o_icon o_icon_delete_item o_icon-fw");
 			}
 			
 			GlossaryItemWrapper wrapper = new GlossaryItemWrapper(gi, linkNum);

src/main/java/org/olat/core/commons/modules/glossary/_content/glossarylist.html

-#if ($editModeEnabled)
-	<div class="o_glossary_addcommand">
-		#if($r.available("cmd.add"))
-			$r.render("cmd.add")
+<div class="o_glossary">
+	<div class="o_header_with_buttons">
+		<h3>$r.translate("glossary.title")</h3>
+		#if ($editModeEnabled)
+			<div class="o_button_group">
+				#if($r.available("cmd.add"))
+					$r.render("cmd.add")
+				#end
+			</div>
 		#end
 	</div>
-#end
-<div class="o_glossary">
-	<h3>$r.translate("glossary.title")</h3><br/>
+	
 	#if ($registerEnabled)
-		<div class="o_glossary_register">
+		<div class="o_register o_block">
 		#foreach( $registerLink in $registerLinkList )
 			#set ( $indexChar = $registerLink.getI18n() )
 			$r.render("register.link.$indexChar")
@@ -18,24 +21,35 @@
 	#end
 	<dl>
 	#foreach($glossaryItem in $editAndDelButtonList )
+		<div class="o_entry o_block clearfix">
 		#set ($glossaryItemIndex = $glossaryItem.getIndex())
 		#if ( $filterIndex == $glossaryItemIndex || $filterIndex == "all" )
-##		<div class="o_glossary_entry">
 			#if ($editModeEnabled)
-				<div class="o_glossary_commands">
-					#if($r.available("cmd.edit.$velocityCount"))
-						$r.render("cmd.edit.$velocityCount")
-					#end
-					#if($r.available("cmd.delete.$velocityCount"))
-						$r.render("cmd.delete.$velocityCount")
-					#end
+				<div class="pull-right">
+					<div class="btn-group">
+						#if($r.available("cmd.edit.$velocityCount"))
+							$r.render("cmd.edit.$velocityCount")
+						#end
+						#if($r.available("cmd.delete.$velocityCount"))
+							$r.render("cmd.delete.$velocityCount")
+						#end
+					</div>
 				</div>
 			#end
 			<dt>
 				$r.escapeHtml($glossaryItem.glossTerm)
-				#if($userAllowToEditEnabled)
+				#if ( $glossaryItem.getGlossSynonyms().size() > 0)
+					#foreach ( $glossSynonym in $glossaryItem.getGlossSynonyms() )  
+				    	<small>
+				    		$r.escapeHtml($glossSynonym)
+				    	</small>
+					#end
+				#end  
+			</dt>
+				#if($userAllowToEditEnabled && ($glossaryItem.hasAuthor() || $glossaryItem.hasModifier()))
+					<div class="o_meta">
 					#if($glossaryItem.hasAuthor())
-						<span class="o_glossary_author">$r.translate("glossary.item.published.by")
+						<span class="o_author">$r.translate("glossary.item.published.by")
 						#if($glossaryItem.authorCmd)
 							<a href="$r.commandURI($glossaryItem.authorCmd)" target="o_glossary_profil" onclick="return o2cl()">$r.escapeHtml($glossaryItem.authorName)</a>
 						#else
@@ -44,7 +58,7 @@
 							#if($glossaryItem.hasModifier()), #end</span>
 					#end
 					#if($glossaryItem.hasModifier())
-						<span class="o_glossary_modifier">$r.translate("glossary.item.modified.by.on")
+						<span class="o_modifier">$r.translate("glossary.item.modified.by.on")
 						#if($glossaryItem.modifierCmd)
 							<a href="$r.commandURI($glossaryItem.modifierCmd)" target="o_glossary_profil" onclick="return o2cl()" >$r.escapeHtml($glossaryItem.modifierName)</a>
 						#else
@@ -52,26 +66,19 @@
 						#end
 						$glossaryItem.lastModificationDate</span>
 					#end
+					</div>
 				#end
-				#if ( $glossaryItem.getGlossSynonyms().size() > 0)
-				  <div class="o_glossary_synonym">
-					#foreach ( $glossSynonym in $glossaryItem.getGlossSynonyms() )  
-				    	$r.escapeHtml($glossSynonym)
-					#end
-				  </div>
-				#end  
-			</dt>
 			<dd>
 				$r.xssScan($glossaryItem.getGlossDef())
 			</dd>
-##		</div>
 		#end
+		</div>
 	#end
 	</dl>
 </div>
 #if ($editModeEnabled)
 	<p />
-	<div class="o_glossary_addcommand">
+	<div class="o_button_group">
 		#if($r.available("cmd.add"))
 			$r.render("cmd.add")
 		#end

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

@@ -332,6 +332,28 @@ a.o_chelp {
 	}
 }
 
+/* Glossary */
+.o_glossary {
+	.o_register {
+		text-align: center;
+	}
+	.o_meta {
+		font-size: 90%;
+		color: $text-muted;
+		font-style: italic;
+	}
+	dl {
+		dt {
+			&:first-letter { 
+    			font-size: ceil(($font-size-base * 1.5));;
+    		}
+			small {
+				color: $text-muted;
+			}
+		}
+	}
+}
+
 /* Segmented view wrapper */
 .o_segments_content {
 	margin-top: $line-height-computed;