jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject [3/3] jspwiki git commit: 2.10.3-git-37 / JSPWIKI-1055
Date Sat, 18 Mar 2017 16:42:48 GMT
2.10.3-git-37 / JSPWIKI-1055

JSPWIKI-1055:  Haddock Special Block Marker.
Added a few icons to improve rendering of contextual blocks in B/W.


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/9919c6e2
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/9919c6e2
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/9919c6e2

Branch: refs/heads/master
Commit: 9919c6e2344035702e0e75c3b2be63cd35eb38dc
Parents: d1aac58
Author: brushed <dirk.frederickx@gmail.com>
Authored: Sat Mar 18 17:42:36 2017 +0100
Committer: brushed <dirk.frederickx@gmail.com>
Committed: Sat Mar 18 17:42:36 2017 +0100

----------------------------------------------------------------------
 ChangeLog                                       |    8 +
 .../src/main/java/org/apache/wiki/Release.java  |    2 +-
 .../styles/haddock/default/Viewer.Slimbox.less  |    2 +-
 .../src/main/styles/haddock/default/print.less  |   19 +
 .../src/main/styles/haddock/default/type.less   |   12 +-
 .../haddock/fontjspwiki/FontJspwiki/Read Me.txt |    4 +-
 .../fontjspwiki/FontJspwiki/demo-files/demo.css |  150 -
 .../fontjspwiki/FontJspwiki/demo-files/demo.js  |   30 -
 .../haddock/fontjspwiki/FontJspwiki/demo.html   |  919 ------
 .../FontJspwiki/fonts/FontJspwiki.eot           |  Bin 13388 -> 15732 bytes
 .../FontJspwiki/fonts/FontJspwiki.svg           |   12 +-
 .../FontJspwiki/fonts/FontJspwiki.ttf           |  Bin 13224 -> 15552 bytes
 .../FontJspwiki/fonts/FontJspwiki.woff          |  Bin 13300 -> 15628 bytes
 .../fontjspwiki/FontJspwiki/selection.json      | 3081 ++++++++++--------
 .../haddock/fontjspwiki/FontJspwiki/style.css   |  256 +-
 .../haddock/fontjspwiki/FontJspwiki/style.less  |  354 ++
 .../fontjspwiki/FontJspwiki/variables.less      |   68 +
 .../main/styles/haddock/fontjspwiki/icons.less  |  555 ++--
 .../main/styles/haddock/fontjspwiki/path.less   |    2 +-
 .../templates/haddock/fonts/FontJspwiki.eot     |  Bin 13388 -> 15732 bytes
 .../templates/haddock/fonts/FontJspwiki.svg     |   12 +-
 .../templates/haddock/fonts/FontJspwiki.ttf     |  Bin 13224 -> 15552 bytes
 .../templates/haddock/fonts/FontJspwiki.woff    |  Bin 13300 -> 15628 bytes
 23 files changed, 2690 insertions(+), 2796 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 853d0e0..f5a1c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-18  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.3-git-37  Haddock Template
+
+       * JSPWIKI-1055:  Haddock Special Block Marker
+         Added a few icons to improve rendering of contextual blocks in B/W.
+
+
 2017-03-14  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.3-git-36  Haddock Template

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 49965b4..0a6b763 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "36";
+    public static final String     BUILD         = "37";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less b/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
index 2d7165d..2a7268a 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
@@ -59,7 +59,7 @@ DOM Structure:
     color:@link-color;
     margin-left:.25em;
 
-	content: "\e617"; //.icon-slimbox
+	content: @icon-expand;
     overflow:hidden;
 }
 

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/default/print.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/print.less b/jspwiki-war/src/main/styles/haddock/default/print.less
index 257590f..02d89ff 100644
--- a/jspwiki-war/src/main/styles/haddock/default/print.less
+++ b/jspwiki-war/src/main/styles/haddock/default/print.less
@@ -225,4 +225,23 @@ a.feed[href], .editsection, .hashlink, .filter-input, .slmbx,
 }
 
 
+//make the special block markers print friendly by adding an icon in the left margin
+div.info, div.information, div.warning, div.danger, div.error {
+    position:relative;
+    padding-left:3em;
+}
+div.info::before, div.information::before,
+div.warning::before,
+div.danger::before, div.error::before {
+    position:absolute;
+    font-family: 'FontJspwiki';
+    left:0.75em;
+    top:0.5em;
+    font-size:1.5em;
+}
+div.info, div.information { .icon-info; }
+div.warning { .icon-warning; }
+div.danger, div.error { .icon-error; }
+
+
 } /* end of @media print */

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/default/type.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/type.less b/jspwiki-war/src/main/styles/haddock/default/type.less
index 7e60719..b194269 100644
--- a/jspwiki-war/src/main/styles/haddock/default/type.less
+++ b/jspwiki-war/src/main/styles/haddock/default/type.less
@@ -144,6 +144,8 @@ dl dd { margin-left: 2em; }   //reset flat style of bootstrap/type
 .rounded, .rounded > img {
     border-radius: @border-radius-base;
 }
+[class^=label].rounded { border-radius: 10em;}
+
 .circle, .circle > img {
     border-radius: 50%;
 }
@@ -400,7 +402,7 @@ button + a.infolink {
    .icon--all;
    &:after {
         margin-left:.1em;
-        content:"\e614"; //.icon-paper-clip
+        content:@icon-paper-clip;
     }
     > img { display:none; }
 }
@@ -415,7 +417,7 @@ a.interwiki[href$="skin=reader"] {
         color:@link-color;
         .icon--all;
         .sup;
-        content:"\f212";  //icon-leanpub
+        content:@icon-leanpub;
     }
     &:hover::after {
         //text-decoraction:none;  //FIXME: doesnt work ...
@@ -440,7 +442,7 @@ a.interwiki[href*="Edit.jsp?page="] {
         //color:@link-color;
         //.icon--all;
         //.sup;
-        //content:"\f040";  //icon-pencil
+        //content:@icon-pencil;
     }
     &:hover::after {
         //text-decoraction:none;
@@ -455,7 +457,7 @@ a.interwiki[href*="Group.jsp?group="] {
         //color:@link-color;
         //.icon--all;
         //.sup;
-        //content:"\f0c0";  //icon-group
+        //content:@icon-group;
     }
     &:hover::after {
         //text-decoraction:none;
@@ -484,7 +486,7 @@ img {
 .img-error {
     &::before {
         .icon--all;
-        content: "\e607 ";  //icon-picture
+        content: @icon-picture;
         padding-right:.5em;
     }
     > span { padding-left:.5em;}

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/Read Me.txt
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/Read Me.txt b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/Read Me.txt
index cd97d24..8491652 100755
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/Read Me.txt	
+++ b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/Read Me.txt	
@@ -1,5 +1,7 @@
 Open *demo.html* to see a list of all the glyphs in your font along with their codes/ligatures.
 
+To use the generated font in desktop programs, you can install the TTF font. In order to copy the character associated with each icon, refer to the text box at the bottom right corner of each glyph in demo.html. The character inside this text box may be invisible; but it can still be copied. See this guide for more info: https://icomoon.io/#docs/local-fonts
+
 You won't need any of the files located under the *demo-files* directory when including the generated font in your own projects.
 
-You can import *selection.json* back to the IcoMoon app using the *Import Icons* button (or via Main Menu > Manage Projects) to retrieve your icon selection.
+You can import *selection.json* back to the IcoMoon app using the *Import Icons* button (or via Main Menu → Manage Projects) to retrieve your icon selection.

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.css
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.css b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.css
deleted file mode 100755
index e4e3316..0000000
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.css
+++ /dev/null
@@ -1,150 +0,0 @@
-body {
-	padding: 0;
-	margin: 0;
-	font-family: sans-serif;
-	font-size: 1em;
-	line-height: 1.5;
-	color: #555;
-	background: #fff;
-}
-h1 {
-	font-size: 1.5em;
-	font-weight: normal;
-}
-small {
-	font-size: .66666667em;
-}
-a {
-	color: #e74c3c;
-	text-decoration: none;
-}
-a:hover, a:focus {
-	box-shadow: 0 1px #e74c3c;
-}
-.bshadow0, input {
-	box-shadow: inset 0 -2px #e7e7e7;
-}
-input:hover {
-	box-shadow: inset 0 -2px #ccc;
-}
-input, fieldset {
-	font-size: 1em;
-	margin: 0;
-	padding: 0;
-	border: 0;
-}
-input {
-	color: inherit;
-	line-height: 1.5;
-	height: 1.5em;
-	padding: .25em 0;
-}
-input:focus {
-	outline: none;
-	box-shadow: inset 0 -2px #449fdb;
-}
-.glyph {
-	font-size: 16px;
-	width: 15em;
-	padding-bottom: 1em;
-	margin-right: 4em;
-	margin-bottom: 1em;
-	float: left;
-	overflow: hidden;
-}
-.liga {
-	width: 80%;
-	width: calc(100% - 2.5em);
-}
-.talign-right {
-	text-align: right;
-}
-.talign-center {
-	text-align: center;
-}
-.bgc1 {
-	background: #f1f1f1;
-}
-.fgc1 {
-	color: #999;
-}
-.fgc0 {
-	color: #000;
-}
-p {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-.mvm {
-	margin-top: .75em;
-	margin-bottom: .75em;
-}
-.mtn {
-	margin-top: 0;
-}
-.mtl, .mal {
-	margin-top: 1.5em;
-}
-.mbl, .mal {
-	margin-bottom: 1.5em;
-}
-.mal, .mhl {
-	margin-left: 1.5em;
-	margin-right: 1.5em;
-}
-.mhmm {
-	margin-left: 1em;
-	margin-right: 1em;
-}
-.mls {
-	margin-left: .25em;
-}
-.ptl {
-	padding-top: 1.5em;
-}
-.pbs, .pvs {
-	padding-bottom: .25em;
-}
-.pvs, .pts {
-	padding-top: .25em;
-}
-.unit {
-	float: left;
-}
-.unitRight {
-	float: right;
-}
-.size1of2 {
-	width: 50%;
-}
-.size1of1 {
-	width: 100%;
-}
-.clearfix:before, .clearfix:after {
-	content: " ";
-	display: table;
-}
-.clearfix:after {
-	clear: both;
-}
-.hidden-true {
-	display: none;
-}
-.textbox0 {
-	width: 3em;
-	background: #f1f1f1;
-	padding: .25em .5em;
-	line-height: 1.5;
-	height: 1.5em;
-}
-#testDrive {
-	display: block;
-	padding-top: 24px;
-	line-height: 1.5;
-}
-.fs0 {
-	font-size: 16px;
-}
-.fs1 {
-	font-size: 28px;
-}

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.js
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.js b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.js
deleted file mode 100755
index e72f449..0000000
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo-files/demo.js
+++ /dev/null
@@ -1,30 +0,0 @@
-if (!('boxShadow' in document.body.style)) {
-	document.body.setAttribute('class', 'noBoxShadow');
-}
-
-document.body.addEventListener("click", function(e) {
-	var target = e.target;
-	if (target.tagName === "INPUT" &&
-		target.getAttribute('class').indexOf('liga') === -1) {
-		target.select();
-	}
-});
-
-(function() {
-	var fontSize = document.getElementById('fontSize'),
-		testDrive = document.getElementById('testDrive'),
-		testText = document.getElementById('testText');
-	function updateTest() {
-		testDrive.innerHTML = testText.value || String.fromCharCode(160);
-		if (window.icomoonLiga) {
-			window.icomoonLiga(testDrive);
-		}
-	}
-	function updateSize() {
-		testDrive.style.fontSize = fontSize.value + 'px';
-	}
-	fontSize.addEventListener('change', updateSize, false);
-	testText.addEventListener('input', updateTest, false);
-	testText.addEventListener('change', updateTest, false);
-	updateSize();
-}());

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo.html
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo.html b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo.html
deleted file mode 100755
index cd9788b..0000000
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/demo.html
+++ /dev/null
@@ -1,919 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>IcoMoon Demo</title>
-	<meta name="description" content="An Icon Font Generated By IcoMoon.io">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" href="demo-files/demo.css">
-	<link rel="stylesheet" href="style.css"></head>
-<body>
-	<div class="bgc1 clearfix">
-		<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;49)</small></h1>
-	</div>
-	<div class="clearfix mhl ptl">
-		<h1 class="mvm mtn fgc1">Grid Size: 14</h1>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-home">
-				
-				</span>
-				<span class="mls"> icon-home</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e603" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe603;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-search">
-				
-				</span>
-				<span class="mls"> icon-search</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f002" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf002;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-user">
-				
-				</span>
-				<span class="mls"> icon-user</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e602" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe602;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-group">
-				
-				</span>
-				<span class="mls"> icon-group</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f0c0" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf0c0;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-users">
-				
-				</span>
-				<span class="mls"> icon-users</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f0c0" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf0c0;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-bookmark">
-				
-				</span>
-				<span class="mls"> icon-bookmark</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e605" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe605;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-refresh">
-				
-				</span>
-				<span class="mls"> icon-refresh</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e604" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe604;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-repeat">
-				
-				</span>
-				<span class="mls"> icon-repeat</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e606" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe606;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-undo">
-				
-				</span>
-				<span class="mls"> icon-undo</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e615" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe615;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-picture">
-				
-				</span>
-				<span class="mls"> icon-picture</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e607" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe607;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-tint">
-				
-				</span>
-				<span class="mls"> icon-tint</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e60b" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe60b;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-plus">
-				
-				</span>
-				<span class="mls"> icon-plus</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e60c" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe60c;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-external-link">
-				
-				</span>
-				<span class="mls"> icon-external-link</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e60d" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe60d;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-signout">
-				
-				</span>
-				<span class="mls"> icon-signout</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e60e" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe60e;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-signin">
-				
-				</span>
-				<span class="mls"> icon-signin</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e60f" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe60f;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-rss">
-				
-				</span>
-				<span class="mls"> icon-rss</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e610" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe610;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-wrench">
-				
-				</span>
-				<span class="mls"> icon-wrench</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e611" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe611;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-filter">
-				
-				</span>
-				<span class="mls"> icon-filter</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e612" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe612;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-link">
-				
-				</span>
-				<span class="mls"> icon-link</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e613" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe613;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-paper-clip">
-				
-				</span>
-				<span class="mls"> icon-paper-clip</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e614" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe614;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-euro">
-				
-				</span>
-				<span class="mls"> icon-euro</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e616" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe616;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-expand">
-				
-				</span>
-				<span class="mls"> icon-expand</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e617" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe617;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-columns">
-				
-				</span>
-				<span class="mls"> icon-columns</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="e600" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xe600;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-leanpub">
-				
-				</span>
-				<span class="mls"> icon-leanpub</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f212" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf212;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-unlock-alt">
-				
-				</span>
-				<span class="mls"> icon-unlock-alt</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f13e" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf13e;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-o">
-				
-				</span>
-				<span class="mls"> icon-file-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f016" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf016;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-text-o">
-				
-				</span>
-				<span class="mls"> icon-file-text-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f0f6" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf0f6;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-pdf-o">
-				
-				</span>
-				<span class="mls"> icon-file-pdf-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c1" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c1;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-word-o">
-				
-				</span>
-				<span class="mls"> icon-file-word-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c2" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c2;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-excel-o">
-				
-				</span>
-				<span class="mls"> icon-file-excel-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c3" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c3;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-powerpoint-o">
-				
-				</span>
-				<span class="mls"> icon-file-powerpoint-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c4" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c4;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-archive-o">
-				
-				</span>
-				<span class="mls"> icon-file-archive-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c6" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c6;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-zip-o">
-				
-				</span>
-				<span class="mls"> icon-file-zip-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c6" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c6;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-image-o">
-				
-				</span>
-				<span class="mls"> icon-file-image-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c5" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c5;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-photo-o">
-				
-				</span>
-				<span class="mls"> icon-file-photo-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c5" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c5;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-picture-o">
-				
-				</span>
-				<span class="mls"> icon-file-picture-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c5" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c5;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-audio-o">
-				
-				</span>
-				<span class="mls"> icon-file-audio-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c7" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c7;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-sound-o">
-				
-				</span>
-				<span class="mls"> icon-file-sound-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c7" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c7;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-movie-o">
-				
-				</span>
-				<span class="mls"> icon-file-movie-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c8" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c8;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-file-video-o">
-				
-				</span>
-				<span class="mls"> icon-file-video-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f1c8" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf1c8;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-puzzle-piece">
-				
-				</span>
-				<span class="mls"> icon-puzzle-piece</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f12e" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf12e;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-pencil">
-				
-				</span>
-				<span class="mls"> icon-pencil</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f040" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf040;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-ellipsis-v">
-				
-				</span>
-				<span class="mls"> icon-ellipsis-v</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f142" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf142;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-heart">
-				
-				</span>
-				<span class="mls"> icon-heart</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f004" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf004;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-star">
-				
-				</span>
-				<span class="mls"> icon-star</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f005" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf005;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-star-o">
-				
-				</span>
-				<span class="mls"> icon-star-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f006" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf006;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-trash-o">
-				
-				</span>
-				<span class="mls"> icon-trash-o</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f014" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf014;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-align-left">
-				
-				</span>
-				<span class="mls"> icon-align-left</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f036" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf036;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-align-center">
-				
-				</span>
-				<span class="mls"> icon-align-center</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f037" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf037;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-align-right">
-				
-				</span>
-				<span class="mls"> icon-align-right</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f038" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf038;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-align-justify">
-				
-				</span>
-				<span class="mls"> icon-align-justify</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f039" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf039;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-dedent">
-				
-				</span>
-				<span class="mls"> icon-dedent</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f03b" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf03b;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-indent">
-				
-				</span>
-				<span class="mls"> icon-indent</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f03c" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf03c;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-list-ul">
-				
-				</span>
-				<span class="mls"> icon-list-ul</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f0ca" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf0ca;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-		<div class="glyph fs1">
-			<div class="clearfix bshadow0 pbs">
-				<span class="icon-list-ol">
-				
-				</span>
-				<span class="mls"> icon-list-ol</span>
-			</div>
-			<fieldset class="fs0 size1of1 clearfix hidden-true">
-				<input type="text" readonly value="f0cb" class="unit size1of2" />
-				<input type="text" maxlength="1" readonly value="&#xf0cb;" class="unitRight size1of2 talign-right" />
-			</fieldset>
-			<div class="fs0 bshadow0 clearfix hidden-true">
-				<span class="unit pvs fgc1">liga: </span>
-				<input type="text" readonly value="" class="liga unitRight" />
-			</div>
-		</div>
-	</div>
-
-	<!--[if gt IE 8]><!-->
-	<div class="mhl clearfix mbl">
-		<h1>Font Test Drive</h1>
-		<label>
-			Font Size: <input id="fontSize" type="number" class="textbox0 mbm"
-			min="8" value="48" />
-			px
-		</label>
-		<input id="testText" type="text" class="phl size1of1 mvl"
-		placeholder="Type some text to test..." value=""/>
-		</label>
-		<div id="testDrive" class="icon-">&nbsp;
-		</div>
-	</div>
-	<!--<![endif]-->
-	<div class="bgc1 clearfix">
-		<p class="mhl">Generated by <a href="https://icomoon.io/app">IcoMoon</a></p>
-	</div>
-
-	<script src="demo-files/demo.js"></script>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.eot
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.eot b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.eot
index d7e8f48..88e62f9 100755
Binary files a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.eot and b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.eot differ

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.svg
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.svg b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.svg
index 2cd3480..47abffd 100755
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.svg
+++ b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.svg
@@ -3,7 +3,7 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
 <defs>
-<font id="icomoon" horiz-adv-x="1024">
+<font id="FontJspwiki" horiz-adv-x="1024">
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
@@ -33,6 +33,7 @@
 <glyph unicode="&#xf006;" glyph-name="star-o" horiz-adv-x="951" d="M649.714 377.143l174.857 169.714-241.143 35.429-108 218.286-108-218.286-241.143-35.429 174.857-169.714-41.714-240.571 216 113.714 215.429-113.714zM950.857 581.143q0-12.571-14.857-27.429l-207.429-202.286 49.143-285.714q0.571-4 0.571-11.429 0-28.571-23.429-28.571-10.857 0-22.857 6.857l-256.571 134.857-256.571-134.857q-12.571-6.857-22.857-6.857-12 0-18 8.286t-6 20.286q0 3.429 1.143 11.429l49.143 285.714-208 202.286q-14.286 15.429-14.286 27.429 0 21.143 32 26.286l286.857 41.714 128.571 260q10.857 23.429 28 23.429t28-23.429l128.571-260 286.857-41.714q32-5.143 32-26.286z" />
 <glyph unicode="&#xf014;" glyph-name="trash-o" horiz-adv-x="805" d="M292.571 530.286v-329.143q0-8-5.143-13.143t-13.143-5.143h-36.571q-8 0-13.143 5.143t-5.143 13.143v329.143q0 8 5.143 13.143t13.143 5.143h36.571q8 0 13.143-5.143t5.143-13.143zM438.857 530.286v-329.143q0-8-5.143-13.143t-13.143-5.143h-36.571q-8 0-13.143 5.143t-5.143 13.143v329.143q0 8 5.143 13.143t13.143 5.143h36.571q8 0 13.143-5.143t5.143-13.143zM585.143 530.286v-329.143q0-8-5.143-13.143t-13.143-5.143h-36.571q-8 0-13.143 5.143t-5.143 13.143v329.143q0 8 5.143 13.143t13.143 5.143h36.571q8 0 13.143-5.143t5.143-13.143zM658.286 116.571v541.714h-512v-541.714q0-12.571 4-23.143t8.286-15.429 6-4.857h475.429q1.714 0 6 4.857t8.286 15.429 4 23.143zM274.286 731.428h256l-27.429 66.857q-4 5.143-9.714 6.286h-181.143q-5.714-1.143-9.714-6.286zM804.571 713.143v-36.571q0-8-5.143-13.143t-13.143-5.143h-54.857v-541.714q0-47.429-26.857-82t-64.571-34.571h-475.429q-37.714 0-64.571 33.429t-26.857 80.857v544h-54.857q-8 0-13.143 5.143t-5.143 13.143
 v36.571q0 8 5.143 13.143t13.143 5.143h176.571l40 95.429q8.571 21.143 30.857 36t45.143 14.857h182.857q22.857 0 45.143-14.857t30.857-36l40-95.429h176.571q8 0 13.143-5.143t5.143-13.143z" />
 <glyph unicode="&#xf016;" glyph-name="file-o" d="M838.857 733.714q16-16 27.429-43.429t11.429-50.286v-658.286q0-22.857-16-38.857t-38.857-16h-768q-22.857 0-38.857 16t-16 38.857v914.286q0 22.857 16 38.857t38.857 16h512q22.857 0 50.286-11.429t43.429-27.429zM585.143 873.143v-214.857h214.857q-5.714 16.571-12.571 23.429l-178.857 178.857q-6.857 6.857-23.429 12.571zM804.571 0v585.143h-237.714q-22.857 0-38.857 16t-16 38.857v237.714h-438.857v-877.714h731.429z" />
+<glyph unicode="&#xf02b;" glyph-name="tag" d="M256 694.857q0 30.286-21.429 51.714t-51.714 21.429-51.714-21.429-21.429-51.714 21.429-51.714 51.714-21.429 51.714 21.429 21.429 51.714zM865.714 365.714q0-30.286-21.143-51.429l-280.571-281.143q-22.286-21.143-52-21.143-30.286 0-51.429 21.143l-408.571 409.143q-21.714 21.143-36.857 57.714t-15.143 66.857v237.714q0 29.714 21.714 51.429t51.429 21.714h237.714q30.286 0 66.857-15.143t58.286-36.857l408.571-408q21.143-22.286 21.143-52z" />
 <glyph unicode="&#xf036;" glyph-name="align-left" d="M1024 182.857v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM804.571 402.286v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-731.429q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h731.429q14.857 0 25.714-10.857t10.857-25.714zM950.857 621.714v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-877.714q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h877.714q14.857 0 25.714-10.857t10.857-25.714zM731.429 841.143v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-658.286q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h658.286q14.857 0 25.714-10.857t10.857-25.714z" />
 <glyph unicode="&#xf037;" glyph-name="align-center" d="M1024 182.857v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM804.571 402.286v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-512q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h512q14.857 0 25.714-10.857t10.857-25.714zM950.857 621.714v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-804.571q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h804.571q14.857 0 25.714-10.857t10.857-25.714zM731.429 841.143v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-365.714q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h365.714q14.857 0 25.714-10.857t10.857-25.714z" />
 <glyph unicode="&#xf038;" glyph-name="align-right" d="M1024 182.857v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 402.286v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-731.429q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h731.429q14.857 0 25.714-10.857t10.857-25.714zM1024 621.714v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-877.714q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h877.714q14.857 0 25.714-10.857t10.857-25.714zM1024 841.143v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-658.286q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h658.286q14.857 0 25.714-10.857t10.857-25.714z" />
@@ -40,10 +41,17 @@
 <glyph unicode="&#xf03b;" glyph-name="dedent" d="M219.429 640v-329.143q0-7.429-5.429-12.857t-12.857-5.429q-8 0-13.143 5.143l-164.571 164.571q-5.143 5.143-5.143 13.143t5.143 13.143l164.571 164.571q5.143 5.143 13.143 5.143 7.429 0 12.857-5.429t5.429-12.857zM1024 201.143v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-987.429q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h987.429q7.429 0 12.857-5.429t5.429-12.857zM1024 420.571v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-621.714q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h621.714q7.429 0 12.857-5.429t5.429-12.857zM1024 640v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-621.714q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h621.714q7.429 0 12.857-5.429t5.429-12.857zM1024 859.428v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-987.429q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h987.429q7.429 0 12.857-5.429t5.429-12.85
 7z" />
 <glyph unicode="&#xf03c;" glyph-name="indent" d="M201.143 475.428q0-8-5.143-13.143l-164.571-164.571q-5.143-5.143-13.143-5.143-7.429 0-12.857 5.429t-5.429 12.857v329.143q0 7.429 5.429 12.857t12.857 5.429q8 0 13.143-5.143l164.571-164.571q5.143-5.143 5.143-13.143zM1024 201.143v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-987.429q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h987.429q7.429 0 12.857-5.429t5.429-12.857zM1024 420.571v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-621.714q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h621.714q7.429 0 12.857-5.429t5.429-12.857zM1024 640v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-621.714q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h621.714q7.429 0 12.857-5.429t5.429-12.857zM1024 859.428v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-987.429q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h987.429q7.429 0 12.857-5.429t5.429
 -12.857z" />
 <glyph unicode="&#xf040;" glyph-name="pencil" d="M207.429 73.143l52 52-134.286 134.286-52-52v-61.143h73.143v-73.143h61.143zM506.286 603.428q0 12.571-12.571 12.571-5.714 0-9.714-4l-309.714-309.714q-4-4-4-9.714 0-12.571 12.571-12.571 5.714 0 9.714 4l309.714 309.714q4 4 4 9.714zM475.429 713.143l237.714-237.714-475.429-475.429h-237.714v237.714zM865.714 658.286q0-30.286-21.143-51.429l-94.857-94.857-237.714 237.714 94.857 94.286q20.571 21.714 51.429 21.714 30.286 0 52-21.714l134.286-133.714q21.143-22.286 21.143-52z" />
+<glyph unicode="&#xf041;" glyph-name="map-marker" horiz-adv-x="585" d="M438.857 585.143q0 60.571-42.857 103.429t-103.429 42.857-103.429-42.857-42.857-103.429 42.857-103.429 103.429-42.857 103.429 42.857 42.857 103.429zM585.143 585.143q0-62.286-18.857-102.286l-208-442.286q-9.143-18.857-27.143-29.714t-38.571-10.857-38.571 10.857-26.571 29.714l-208.571 442.286q-18.857 40-18.857 102.286 0 121.143 85.714 206.857t206.857 85.714 206.857-85.714 85.714-206.857z" />
+<glyph unicode="&#xf0a1;" glyph-name="bullhorn" d="M950.857 585.143q30.286 0 51.714-21.429t21.429-51.714-21.429-51.714-51.714-21.429v-219.429q0-29.714-21.714-51.429t-51.429-21.714q-238.286 198.286-464 217.143-33.143-10.857-52-37.714t-17.714-57.429 22.857-52.857q-11.429-18.857-13.143-37.429t3.429-33.143 19.143-31.429 27.429-28.571 35.143-28.857q-16.571-33.143-63.714-47.429t-96.286-6.571-75.429 31.714q-4 13.143-16.857 50t-18.286 54-13.143 50.857-8.571 57.714 2 56.286 12.571 63.143h-69.714q-37.714 0-64.571 26.857t-26.857 64.571v109.714q0 37.714 26.857 64.571t64.571 26.857h274.286q248.571 0 512 219.429 29.714 0 51.429-21.714t21.714-51.429v-219.429zM877.714 240v545.143q-225.143-172.571-438.857-196v-154.286q215.429-24 438.857-194.857z" />
 <glyph unicode="&#xf0c0;" glyph-name="group, users" horiz-adv-x="1097" d="M338.857 438.857q-92.571-2.857-151.429-73.143h-76.571q-46.857 0-78.857 23.143t-32 67.714q0 201.714 70.857 201.714 3.429 0 24.857-12t55.714-24.286 68-12.286q38.286 0 76 13.143-2.857-21.143-2.857-37.714 0-79.429 46.286-146.286zM950.857 74.857q0-68.571-41.714-108.286t-110.857-39.714h-499.429q-69.143 0-110.857 39.714t-41.714 108.286q0 30.286 2 59.143t8 62.286 15.143 62 24.571 55.714 35.429 46.286 48.857 30.571 63.714 11.429q5.714 0 24.571-12.286t41.714-27.429 61.143-27.429 77.143-12.286 77.143 12.286 61.143 27.429 41.714 27.429 24.571 12.286q34.857 0 63.714-11.429t48.857-30.571 35.429-46.286 24.571-55.714 15.143-62 8-62.286 2-59.143zM365.714 804.571q0-60.571-42.857-103.429t-103.429-42.857-103.429 42.857-42.857 103.429 42.857 103.429 103.429 42.857 103.429-42.857 42.857-103.429zM768 585.143q0-90.857-64.286-155.143t-155.143-64.286-155.143 64.286-64.286 155.143 64.286 155.143 155.143 64.286 155.143-64.286 64.286-155.
 143zM1097.143 456.571q0-44.571-32-67.714t-78.857-23.143h-76.571q-58.857 70.286-151.429 73.143 46.286 66.857 46.286 146.286 0 16.571-2.857 37.714 37.714-13.143 76-13.143 33.714 0 68 12.286t55.714 24.286 24.857 12q70.857 0 70.857-201.714zM1024 804.571q0-60.571-42.857-103.429t-103.429-42.857-103.429 42.857-42.857 103.429 42.857 103.429 103.429 42.857 103.429-42.857 42.857-103.429z" />
 <glyph unicode="&#xf0ca;" glyph-name="list-ul" d="M219.429 146.286q0-45.714-32-77.714t-77.714-32-77.714 32-32 77.714 32 77.714 77.714 32 77.714-32 32-77.714zM219.429 438.857q0-45.714-32-77.714t-77.714-32-77.714 32-32 77.714 32 77.714 77.714 32 77.714-32 32-77.714zM1024 201.143v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h694.857q7.429 0 12.857-5.429t5.429-12.857zM219.429 731.428q0-45.714-32-77.714t-77.714-32-77.714 32-32 77.714 32 77.714 77.714 32 77.714-32 32-77.714zM1024 493.714v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h694.857q7.429 0 12.857-5.429t5.429-12.857zM1024 786.286v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h694.857q7.429 0 12.857-5.429t5.429-12.857z" />
 <glyph unicode="&#xf0cb;" glyph-name="list-ol" d="M217.714 25.143q0-45.714-31.143-72t-77.429-26.286q-60.571 0-98.286 37.714l32.571 50.286q28-25.714 60.571-25.714 16.571 0 28.857 8.286t12.286 24.286q0 36.571-60 32l-14.857 32q4.571 5.714 18.571 24.857t24.286 30.857 21.143 22v0.571q-9.143 0-27.714-0.571t-27.714-0.571v-30.286h-60.571v86.857h190.286v-50.286l-54.286-65.714q29.143-6.857 46.286-28t17.143-50.286zM218.857 383.428v-90.857h-206.857q-3.429 20.571-3.429 30.857 0 29.143 13.429 53.143t32.286 38.857 37.714 27.143 32.286 24.857 13.429 25.714q0 14.286-8.286 22t-22.571 7.714q-26.286 0-46.286-33.143l-48.571 33.714q13.714 29.143 40.857 45.429t60.286 16.286q41.714 0 70.286-23.714t28.571-64.286q0-28.571-19.429-52.286t-42.857-36.857-43.143-28.857-20.286-30h72.571v34.286h60zM1024 201.143v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 8 5.143 13.143t13.143 5.143h694.857q7.429 0 12.857-5.429t5.429-12.857zM219.429 714.857v-56.571h-191.429v56.5
 71h61.143q0 23.429 0.286 69.714t0.286 69.143v6.857h-1.143q-4.571-9.714-28.571-30.857l-40.571 43.429 77.714 72.571h60.571v-230.857h61.714zM1024 493.714v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 8 5.143 13.143t13.143 5.143h694.857q7.429 0 12.857-5.429t5.429-12.857zM1024 786.286v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h694.857q7.429 0 12.857-5.429t5.429-12.857z" />
+<glyph unicode="&#xf0e7;" glyph-name="bolt" horiz-adv-x="512" d="M505.714 627.428q10.286-11.429 4-25.143l-308.571-661.143q-7.429-14.286-24-14.286-2.286 0-8 1.143-9.714 2.857-14.571 10.857t-2.571 17.143l112.571 461.714-232-57.714q-2.286-0.571-6.857-0.571-10.286 0-17.714 6.286-10.286 8.571-7.429 22.286l114.857 471.429q2.286 8 9.143 13.143t16 5.143h187.429q10.857 0 18.286-7.143t7.429-16.857q0-4.571-2.857-10.286l-97.714-264.571 226.286 56q4.571 1.143 6.857 1.143 10.857 0 19.429-8.571z" />
+<glyph unicode="&#xf0eb;" glyph-name="lightbulb-o" horiz-adv-x="585" d="M420.571 621.714q0-7.429-5.429-12.857t-12.857-5.429-12.857 5.429-5.429 12.857q0 26.286-30.857 40.571t-60.571 14.286q-7.429 0-12.857 5.429t-5.429 12.857 5.429 12.857 12.857 5.429q28.571 0 56.857-9.143t49.714-30.857 21.429-51.429zM512 621.714q0 41.143-19.714 76.571t-51.429 58-70.286 35.429-78 12.857-78-12.857-70.286-35.429-51.429-58-19.714-76.571q0-57.714 38.857-102.857 5.714-6.286 17.429-18.857t17.429-18.857q73.143-87.429 80.571-170.286h130.286q7.429 82.857 80.571 170.286 5.714 6.286 17.429 18.857t17.429 18.857q38.857 45.143 38.857 102.857zM585.143 621.714q0-88.571-58.857-153.143-25.714-28-42.571-49.714t-34-54.571-19.429-61.429q26.857-16 26.857-46.857 0-21.143-14.286-36.571 14.286-15.429 14.286-36.571 0-29.714-25.714-46.286 7.429-13.143 7.429-26.857 0-26.286-18-40.571t-44.286-14.286q-11.429-25.143-34.286-40t-49.714-14.857-49.714 14.857-34.286 40q-26.286 0-44.286 14.286t-18 40.571q0 13.714 7.429 26.857-25.714 16.5
 71-25.714 46.286 0 21.143 14.286 36.571-14.286 15.429-14.286 36.571 0 30.857 26.857 46.857-2.286 28.571-19.429 61.429t-34 54.571-42.571 49.714q-58.857 64.571-58.857 153.143 0 56.571 25.429 105.429t66.857 81.143 93.714 50.857 106.571 18.571 106.571-18.571 93.714-50.857 66.857-81.143 25.429-105.429z" />
 <glyph unicode="&#xf0f6;" glyph-name="file-text-o" d="M838.857 733.714q16-16 27.429-43.429t11.429-50.286v-658.286q0-22.857-16-38.857t-38.857-16h-768q-22.857 0-38.857 16t-16 38.857v914.286q0 22.857 16 38.857t38.857 16h512q22.857 0 50.286-11.429t43.429-27.429zM585.143 873.143v-214.857h214.857q-5.714 16.571-12.571 23.429l-178.857 178.857q-6.857 6.857-23.429 12.571zM804.571 0v585.143h-237.714q-22.857 0-38.857 16t-16 38.857v237.714h-438.857v-877.714h731.429zM219.429 493.714q0 8 5.143 13.143t13.143 5.143h402.286q8 0 13.143-5.143t5.143-13.143v-36.571q0-8-5.143-13.143t-13.143-5.143h-402.286q-8 0-13.143 5.143t-5.143 13.143v36.571zM640 365.714q8 0 13.143-5.143t5.143-13.143v-36.571q0-8-5.143-13.143t-13.143-5.143h-402.286q-8 0-13.143 5.143t-5.143 13.143v36.571q0 8 5.143 13.143t13.143 5.143h402.286zM640 219.428q8 0 13.143-5.143t5.143-13.143v-36.571q0-8-5.143-13.143t-13.143-5.143h-402.286q-8 0-13.143 5.143t-5.143 13.143v36.571q0 8 5.143 13.143t13.143 5.143h402.286z" />
+<glyph unicode="&#xf118;" glyph-name="smile-o" horiz-adv-x="878" d="M648 336.571c-28.571-92-112.571-153.714-209.143-153.714s-180.571 61.714-209.143 153.714c-6.286 19.429 4.571 39.429 24 45.714 18.857 6.286 39.429-4.571 45.714-24 18.857-61.143 75.429-102.286 139.429-102.286s120.571 41.143 139.429 102.286c6.286 19.429 26.857 30.286 46.286 24 18.857-6.286 29.714-26.286 23.429-45.714zM365.714 585.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM658.286 585.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM804.571 438.857c0 201.714-164 365.714-365.714 365.714s-365.714-164-365.714-365.714 164-365.714 365.714-365.714 365.714 164 365.714 365.714zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
+<glyph unicode="&#xf119;" glyph-name="frown-o" horiz-adv-x="878" d="M648 248.571c6.286-19.429-4.571-39.429-23.429-45.714-19.429-6.286-40 4.571-46.286 24-18.857 61.143-75.429 102.286-139.429 102.286s-120.571-41.143-139.429-102.286c-6.286-19.429-26.857-30.286-45.714-24-19.429 6.286-30.286 26.286-24 45.714 28.571 92 112.571 153.714 209.143 153.714s180.571-61.714 209.143-153.714zM365.714 585.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM658.286 585.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM804.571 438.857c0 201.714-164 365.714-365.714 365.714s-365.714-164-365.714-365.714 164-365.714 365.714-365.714 365.714 164 365.714 365.714zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
+<glyph unicode="&#xf11a;" glyph-name="meh-o" horiz-adv-x="878" d="M658.286 329.143c0-20-16.571-36.571-36.571-36.571h-365.714c-20 0-36.571 16.571-36.571 36.571s16.571 36.571 36.571 36.571h365.714c20 0 36.571-16.571 36.571-36.571zM365.714 585.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM658.286 585.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM804.571 438.857c0 201.714-164 365.714-365.714 365.714s-365.714-164-365.714-365.714 164-365.714 365.714-365.714 365.714 164 365.714 365.714zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
 <glyph unicode="&#xf12e;" glyph-name="puzzle-piece" horiz-adv-x="951" d="M950.857 323.428q0-46.286-25.429-77.143t-70.571-30.857q-23.429 0-44.286 10t-33.714 21.714-32.286 21.714-40.571 10q-62.857 0-62.857-70.857 0-22.286 9.143-65.714t8.571-65.714v-2.857q-12.571 0-18.857-0.571-19.429-1.714-55.714-6.571t-66-7.714-56-2.857q-34.857 0-58.857 15.143t-24 47.714q0 21.143 10 40.571t21.714 32.286 21.714 33.714 10 44.286q0 45.143-30.857 70.571t-77.143 25.429q-48 0-81.714-26t-33.714-72.857q0-24.571 8.571-47.429t19.143-36.857 19.143-30.286 8.571-28.857q0-25.714-26.286-50.857-21.143-20-66.857-20-54.286 0-140 13.714-5.143 1.143-15.714 2.286t-15.714 2.286l-7.429 1.143q-0.571 0-1.714 0.571-1.143 0-1.143 0.571v585.143q1.143-0.571 10-2t19.429-2.857 12.286-2q85.714-13.714 140-13.714 45.714 0 66.857 20 26.286 25.143 26.286 50.857 0 12.571-8.571 28.857t-19.143 30.286-19.143 36.857-8.571 47.429q0 46.857 33.714 72.857t82.286 26q45.714 0 76.571-25.429t30.857-70.571q0-23.429-10-44.286t-21.714-33.714-21.714-32
 .286-10-40.571q0-32.571 24-47.714t58.857-15.143q36.571 0 102.857 8.571t93.143 9.714v-1.143q-0.571-1.143-2-10t-2.857-19.429-2-12.286q-13.714-85.714-13.714-140 0-45.714 20-66.857 25.143-26.286 50.857-26.286 12.571 0 28.857 8.571t30.286 19.143 36.857 19.143 47.429 8.571q46.857 0 72.857-33.714t26-81.714z" />
 <glyph unicode="&#xf13e;" glyph-name="unlock-alt" horiz-adv-x="658" d="M603.429 512q22.857 0 38.857-16t16-38.857v-329.143q0-22.857-16-38.857t-38.857-16h-548.571q-22.857 0-38.857 16t-16 38.857v329.143q0 22.857 16 38.857t38.857 16h18.286v182.857q0 105.714 75.143 180.857t180.857 75.143 180.857-75.143 75.143-180.857q0-14.857-10.857-25.714t-25.714-10.857h-36.571q-14.857 0-25.714 10.857t-10.857 25.714q0 60.571-42.857 103.429t-103.429 42.857-103.429-42.857-42.857-103.429v-182.857h420.571z" />
 <glyph unicode="&#xf142;" glyph-name="ellipsis-v" horiz-adv-x="219" d="M219.429 237.714v-109.714q0-22.857-16-38.857t-38.857-16h-109.714q-22.857 0-38.857 16t-16 38.857v109.714q0 22.857 16 38.857t38.857 16h109.714q22.857 0 38.857-16t16-38.857zM219.429 530.286v-109.714q0-22.857-16-38.857t-38.857-16h-109.714q-22.857 0-38.857 16t-16 38.857v109.714q0 22.857 16 38.857t38.857 16h109.714q22.857 0 38.857-16t16-38.857zM219.429 822.857v-109.714q0-22.857-16-38.857t-38.857-16h-109.714q-22.857 0-38.857 16t-16 38.857v109.714q0 22.857 16 38.857t38.857 16h109.714q22.857 0 38.857-16t16-38.857z" />
@@ -55,5 +63,7 @@
 <glyph unicode="&#xf1c6;" glyph-name="file-archive-o, file-zip-o" d="M365.714 731.428v73.143h-73.143v-73.143h73.143zM438.857 658.286v73.143h-73.143v-73.143h73.143zM365.714 585.143v73.143h-73.143v-73.143h73.143zM438.857 512v73.143h-73.143v-73.143h73.143zM838.857 733.714q16-16 27.429-43.429t11.429-50.286v-658.286q0-22.857-16-38.857t-38.857-16h-768q-22.857 0-38.857 16t-16 38.857v914.286q0 22.857 16 38.857t38.857 16h512q22.857 0 50.286-11.429t43.429-27.429zM585.143 873.143v-214.857h214.857q-5.714 16.571-12.571 23.429l-178.857 178.857q-6.857 6.857-23.429 12.571zM804.571 0v585.143h-237.714q-22.857 0-38.857 16t-16 38.857v237.714h-73.143v-73.143h-73.143v73.143h-292.571v-877.714h731.429zM446.286 412l61.143-199.429q4.571-15.429 4.571-29.714 0-47.429-41.429-78.571t-104.857-31.143-104.857 31.143-41.429 78.571q0 14.286 4.571 29.714 12 36 68.571 226.286v73.143h73.143v-73.143h45.143q12.571 0 22.286-7.429t13.143-19.429zM365.714 146.286q30.286 0 51.714 10.857t21.429 25.714-21.429 25.714-51.714 10.85
 7-51.714-10.857-21.429-25.714 21.429-25.714 51.714-10.857z" />
 <glyph unicode="&#xf1c7;" glyph-name="file-audio-o, file-sound-o" d="M838.857 733.714q16-16 27.429-43.429t11.429-50.286v-658.286q0-22.857-16-38.857t-38.857-16h-768q-22.857 0-38.857 16t-16 38.857v914.286q0 22.857 16 38.857t38.857 16h512q22.857 0 50.286-11.429t43.429-27.429zM585.143 873.143v-214.857h214.857q-5.714 16.571-12.571 23.429l-178.857 178.857q-6.857 6.857-23.429 12.571zM804.571 0v585.143h-237.714q-22.857 0-38.857 16t-16 38.857v237.714h-438.857v-877.714h731.429zM354.286 465.143q11.429-4.571 11.429-17.143v-310.857q0-12.571-11.429-17.143-4.571-1.143-6.857-1.143-6.857 0-13.143 5.143l-94.857 95.429h-74.857q-8 0-13.143 5.143t-5.143 13.143v109.714q0 8 5.143 13.143t13.143 5.143h74.857l94.857 95.429q9.143 8.571 20 4zM592.571 71.428q17.714 0 28.571 13.714 73.714 90.857 73.714 207.429t-73.714 207.429q-9.143 12-24.571 13.714t-26.857-8q-12-9.714-13.429-24.857t8.286-27.143q57.143-70.286 57.143-161.143t-57.143-161.143q-9.714-12-8.286-27.143t13.429-24.286q10.286-8.571 22.857-8.571zM472 156q1
 5.429 0 26.857 11.429 49.714 53.143 49.714 125.143t-49.714 125.143q-10.286 10.857-25.714 11.429t-26.286-9.714-11.429-25.429 10.286-26.571q29.714-32.571 29.714-74.857t-29.714-74.857q-10.857-11.429-10.286-26.571t11.429-25.429q11.429-9.714 25.143-9.714z" />
 <glyph unicode="&#xf1c8;" glyph-name="file-movie-o, file-video-o" d="M838.857 733.714q16-16 27.429-43.429t11.429-50.286v-658.286q0-22.857-16-38.857t-38.857-16h-768q-22.857 0-38.857 16t-16 38.857v914.286q0 22.857 16 38.857t38.857 16h512q22.857 0 50.286-11.429t43.429-27.429zM585.143 873.143v-214.857h214.857q-5.714 16.571-12.571 23.429l-178.857 178.857q-6.857 6.857-23.429 12.571zM804.571 0v585.143h-237.714q-22.857 0-38.857 16t-16 38.857v237.714h-438.857v-877.714h731.429zM438.857 512q29.714 0 51.429-21.714t21.714-51.429v-219.429q0-29.714-21.714-51.429t-51.429-21.714h-219.429q-29.714 0-51.429 21.714t-21.714 51.429v219.429q0 29.714 21.714 51.429t51.429 21.714h219.429zM720 510.857q11.429-4.571 11.429-17.143v-329.143q0-12.571-11.429-17.143-4.571-1.143-6.857-1.143-8 0-13.143 5.143l-151.429 152v51.429l151.429 152q5.143 5.143 13.143 5.143 2.286 0 6.857-1.143z" />
+<glyph unicode="&#xf1e2;" glyph-name="bomb" d="M326.286 614.286q-5.714 14.286-19.429 20t-28 0q-61.714-25.143-109.143-72.571t-72.571-109.143q-5.714-14.286 0-28t20-19.429q7.429-2.857 13.714-2.857 24 0 34.286 22.857 19.429 48 56.286 84.857t84.857 56.286q14.286 6.286 20 20t0 28zM864.571 817.714l26.286-26.286-139.429-138.857 38.857-38.857q10.857-10.857 10.857-26t-10.857-26l-36.571-36.571q50.857-92 50.857-196 0-81.714-31.714-156.286t-85.714-128.571-128.571-85.714-156.286-31.714-156.286 31.714-128.571 85.714-85.714 128.571-31.714 156.286 31.714 156.286 85.714 128.571 128.571 85.714 156.286 31.714q104 0 196-50.857l36.571 36.571q10.857 10.857 26 10.857t26-10.857l38.857-38.857zM869.143 849.714q-5.714-5.714-12.571-5.714-7.429 0-13.143 5.714l-52 51.429q-5.143 5.714-5.143 13.143t5.143 13.143q5.714 5.143 13.143 5.143t13.143-5.143l51.429-52q5.714-5.143 5.714-12.857t-5.714-12.857zM1000.571 718.286q-6.286-5.143-13.143-5.143t-13.143 5.143l-51.429 52q-5.714 5.143-5.714 12.857t5.714 12.857q5.143 5.714 
 12.857 5.714t12.857-5.714l52-51.429q5.143-5.714 5.143-13.143t-5.143-13.143zM1024 822.857q0-8-5.143-13.143t-13.143-5.143h-54.857q-8 0-13.143 5.143t-5.143 13.143 5.143 13.143 13.143 5.143h54.857q8 0 13.143-5.143t5.143-13.143zM914.286 932.571v-54.857q0-8-5.143-13.143t-13.143-5.143-13.143 5.143-5.143 13.143v54.857q0 8 5.143 13.143t13.143 5.143 13.143-5.143 5.143-13.143zM1000.571 901.143l-52-51.429q-5.714-5.714-12.571-5.714-7.429 0-13.143 5.714-5.714 5.143-5.714 12.857t5.714 12.857l51.429 52q5.714 5.143 13.143 5.143t13.143-5.143q5.143-5.714 5.143-13.143t-5.143-13.143z" />
+<glyph unicode="&#xf200;" glyph-name="pie-chart" d="M438.857 442.286l312-312q-60.571-61.714-141.429-96t-170.571-34.286q-119.429 0-220.286 58.857t-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857v-435.429zM545.714 438.857h441.714q0-89.714-34.286-170.571t-96-141.429zM950.857 512h-438.857v438.857q119.429 0 220.286-58.857t159.714-159.714 58.857-220.286z" />
 <glyph unicode="&#xf212;" glyph-name="leanpub" horiz-adv-x="1170" d="M1081.714 726.857l88.571-726.857q-74.857 0-146.857 32.571-114.286 52-224.571 52-129.143 0-213.714-84.571-84.571 84.571-213.714 84.571-110.286 0-224.571-52-73.143-32.571-144-32.571h-2.857l88.571 726.857q128 72.571 275.429 72.571 133.143 0 221.143-60.571 88 60.571 221.143 60.571 147.429 0 275.429-72.571zM798.857 162.857q73.714 0 132.571-16.286t148.571-53.429l-70.857 583.429q-97.714 44.571-210.286 44.571-128 0-213.714-80.571-85.714 80.571-213.714 80.571-112.571 0-210.286-44.571l-70.857-583.429q60 24.571 94.571 37.143t84.857 22.571 101.714 10q115.429 0 213.714-61.714 98.286 61.714 213.714 61.714zM821.714 182.286l-31.429 518.286q-120.571-2.286-205.143-88.571-86.857 88.571-213.714 88.571-100.571 0-192-37.714l-65.143-537.714q70.857 29.143 130.571 43.429t126.571 14.286q119.429 0 213.714-58.286 98.286 61.143 213.714 58.286z" />
 </font></defs></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.ttf
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.ttf b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.ttf
index f5e846c..a7619f0 100755
Binary files a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.ttf and b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.ttf differ

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/9919c6e2/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.woff
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.woff b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.woff
index e869b7d..ff35a4e 100755
Binary files a/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.woff and b/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki/fonts/FontJspwiki.woff differ


Mime
View raw message