[Fusionforge-commits] FusionForge branch master updated. af3161e6165f5c68116c4bb1f91ec488a9e2696e

Marc-Etienne VARGENAU vargenau at fusionforge.org
Thu Jun 19 17:55:47 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  af3161e6165f5c68116c4bb1f91ec488a9e2696e (commit)
      from  e1195d2d9477429e3c58094b579a483487aac7c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit af3161e6165f5c68116c4bb1f91ec488a9e2696e
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Thu Jun 19 17:55:17 2014 +0200

    wiki: use span with class for <big>, <strike> and <tt>

diff --git a/src/plugins/wiki/www/lib/InlineParser.php b/src/plugins/wiki/www/lib/InlineParser.php
index 34e4d0c..2724273 100644
--- a/src/plugins/wiki/www/lib/InlineParser.php
+++ b/src/plugins/wiki/www/lib/InlineParser.php
@@ -860,6 +860,9 @@ class Markup_html_emphasis extends BalancedMarkup
     function markup($match, $body)
     {
         $tag = substr($match, 1, -1);
+        if (($tag == 'big') || ($tag == 'strike') || ($tag == 'tt')) {
+            return new HtmlElement('span', array('class' => $tag), $body);
+        }
         return new HtmlElement($tag, $body);
     }
 }
diff --git a/src/plugins/wiki/www/themes/Crao/crao.css b/src/plugins/wiki/www/themes/Crao/crao.css
index c63d9da..28eb9d8 100644
--- a/src/plugins/wiki/www/themes/Crao/crao.css
+++ b/src/plugins/wiki/www/themes/Crao/crao.css
@@ -84,6 +84,10 @@ p {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css b/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css
index b33093f..460a497 100644
--- a/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css
+++ b/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css
@@ -51,6 +51,10 @@ caption {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/MacOSX/MacOSX.css b/src/plugins/wiki/www/themes/MacOSX/MacOSX.css
index 007377c..7692021 100644
--- a/src/plugins/wiki/www/themes/MacOSX/MacOSX.css
+++ b/src/plugins/wiki/www/themes/MacOSX/MacOSX.css
@@ -82,6 +82,10 @@ form.wikiadmin input[type=file] {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/MonoBook/main.css b/src/plugins/wiki/www/themes/MonoBook/main.css
index 9f9434d..9d749e1 100644
--- a/src/plugins/wiki/www/themes/MonoBook/main.css
+++ b/src/plugins/wiki/www/themes/MonoBook/main.css
@@ -272,6 +272,10 @@ pre {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/Portland/portland.css b/src/plugins/wiki/www/themes/Portland/portland.css
index 5853656..0b93e17 100644
--- a/src/plugins/wiki/www/themes/Portland/portland.css
+++ b/src/plugins/wiki/www/themes/Portland/portland.css
@@ -35,6 +35,10 @@ input.numeric {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/Sidebar/sidebar.css b/src/plugins/wiki/www/themes/Sidebar/sidebar.css
index b652069..f16e526 100644
--- a/src/plugins/wiki/www/themes/Sidebar/sidebar.css
+++ b/src/plugins/wiki/www/themes/Sidebar/sidebar.css
@@ -271,6 +271,10 @@ pre {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css b/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css
index 903caac..866a905 100644
--- a/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css
+++ b/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css
@@ -82,6 +82,10 @@ a:hover {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/Wordpress/Wordpress.css b/src/plugins/wiki/www/themes/Wordpress/Wordpress.css
index 832d021..9a945dd 100644
--- a/src/plugins/wiki/www/themes/Wordpress/Wordpress.css
+++ b/src/plugins/wiki/www/themes/Wordpress/Wordpress.css
@@ -23,6 +23,10 @@
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/blog/Kubrick.css b/src/plugins/wiki/www/themes/blog/Kubrick.css
index 3977ff5..65810e3 100644
--- a/src/plugins/wiki/www/themes/blog/Kubrick.css
+++ b/src/plugins/wiki/www/themes/blog/Kubrick.css
@@ -234,6 +234,10 @@ div.comments {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/default/phpwiki.css b/src/plugins/wiki/www/themes/default/phpwiki.css
index 4a780f8..437c302 100644
--- a/src/plugins/wiki/www/themes/default/phpwiki.css
+++ b/src/plugins/wiki/www/themes/default/phpwiki.css
@@ -43,6 +43,10 @@ caption {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/plugins/wiki/www/themes/shamino_com/shamino_com.css b/src/plugins/wiki/www/themes/shamino_com/shamino_com.css
index 89e91f5..50ac301 100644
--- a/src/plugins/wiki/www/themes/shamino_com/shamino_com.css
+++ b/src/plugins/wiki/www/themes/shamino_com/shamino_com.css
@@ -159,6 +159,10 @@ a:focus {
     text-decoration: line-through;
 }
 
+.big {
+    font-size: larger;
+}
+
 .align-left {
     text-align: left;
 }
diff --git a/src/www/themes/css/fusionforge.css b/src/www/themes/css/fusionforge.css
index 5671c60..e7bbb19 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -128,6 +128,7 @@ figcaption {
 	color: #fff;
 	font-size: 13px;
 	text-decoration: none;
+	border-bottom: 2px solid #bcbcad;
 }
 
 .up {
@@ -177,52 +178,6 @@ td.toptab {
 	background-color: #e0e0e0;
 }
 
-ul.tabbernav {
-	border-bottom: 1px solid #778;
-	margin: 0;
-	padding: 3px 0;
-}
-
-ul.tabbernav li {
-	display: inline;
-	list-style: none;
-	margin: 0;
-}
-
-ul.tabbernav li a {
-	background: #D0D0D0;
-	border: 1px solid #778;
-	border-bottom: none;
-	margin-left: 3px;
-	padding: 3px 0.5em;
-	text-decoration: none;
-}
-
-ul.tabbernav li a:hover {
-	background: #AAE;
-	border-color: #227;
-	color: #000;
-}
-
-ul.tabbernav li a:link {
-	color: #333333;
-}
-
-ul.tabbernav li a:visited {
-	color: #667;
-}
-
-ul.tabbernav li.tabberactive a {
-	background-color: #fff;
-	border-bottom: 1px solid #fff;
-}
-
-ul.tabbernav li.tabberactive a:hover {
-	background: white;
-	border-bottom: 1px solid white;
-	color: #000;
-}
-
 .up {
 	font-family: arial,helvetica, sans-serif;
 	font-size: small;
@@ -246,10 +201,11 @@ ul.tabbernav li.tabberactive a:hover {
 
 .strike {text-decoration:line-through;}
 
+.big {font-size: larger;}
+
 .bgcolor-grey {background-color: #e5e5e5;}
 .bgcolor-white {background-color: white;}
 
-.width-100p100 {width: 100%;}
 .fullwidth {width: 100%;}
 .halfwidth {width: 50%;}
 .onethirdwidth {width: 33.33333%;}
@@ -406,23 +362,21 @@ p.information {
 }
 .widget_preferences {
 	background: #e0ddd2;
-	border-bottom: 1px solid #bcbcad;
+	border-bottom: 2px solid #bcbcad;
 }
 .widget_preferences form {
 	margin:0;
 }
 .widget_titlebar {
-	background: #E0DDD2 url(../../images/widget/widget-header.png) left top repeat-x;
 	font-weight: bold;
 	text-align: center;
 	color: #555;
 	height: 1.2em;
-	padding-left: 40px;
-	padding-right: 4px;
 }
 
 .widget_titlebar_handle {
 	cursor: move;
+	border-bottom: 2px solid #bcbcad;
 }
 
 .widget_titlebar_title {
@@ -489,12 +443,12 @@ p.information {
 
 #widget-categories li.selected {
 	font-weight: bold;
-	margin-top: 1em;
-	margin-bottom: 1em;
+	margin-top: 0.2em;
+	margin-bottom: 0.2em;
 }
 
 #widget-categories li.selected a:after {
-	content: ' »';
+/* content: ' »'; */
 }
 
 #widget-categories li a span {
@@ -661,87 +615,6 @@ p.information {
 .widget-preview-projectsvnstats-fr_FR {
 	background-image: url('../../images/widget/widget-preview-project_svn-stats.png');
 }
-
-.widget-preview-projectdocumentsactivity-en_US {
-	background-image: url('../../images/widget/widget-preview-project_documentsactivity-en_US.png');
-}
-
-/* }}} */
-
-/* {{{ Layout Manager */
-#layout-manager {
-	border:1px solid #666;
-	padding:0 5px;
-	background:white;
-	margin:10px;
-}
-#layout-manager table {
-	border-collapse: separate;
-	border-spacing: 5px;
-}
-#layout-manager input {
-	font-size: 100%;
-	font-family: arial,helvetica, sans-serif;
-}
-table.layout-manager-row {
-	width:100%;
-	text-align:center;
-	margin-bottom: 0;
-}
-td.layout-manager-column {
-	border:1px solid #9b9;
-	height:100px;
-	vertical-align:top;
-	background:white;
-	position:relative;
-}
-div.layout-manager-row-add,
-td.layout-manager-column-add {
-	background:#f6f6f6;
-	color:#c6c6c6;
-	font-size:0.8em;
-	text-align:center;
-}
-div.layout-manager-row-add {
-	margin:5px 5px;
-}
-div.layout-manager-row-add_hover,
-td.layout-manager-column-add_hover {
-	background:#dde;
-	cursor:pointer;
-	color:black;
-}
-td.layout-manager-column-add_hover {
-	background:#ded;
-}
-td.layout-manager-column-add {
-	vertical-align:middle;
-	width:8px;
-}
-div.layout-manager-column-remove {
-	padding:0 0.5em 0.5em 0.5em;
-	font-size:0.8em;
-	color:#ccc;
-	float:right;
-}
-div.layout-manager-column-remove_hover {
-	color:red;
-	cursor:pointer;
-}
-.layout-manager-column-width {
-	padding-top:2.5em;
-}
-
-.layout-manager-chooser {
-	 vertical-align:top
-}
-.layout-manager-chooser td {
-	 padding:10px 4px;
-}
-.layout-manager-chooser_selected {
-	 background:#f0f0f0;
-}
-
 /* }}} */
 
 #ffErrors {
@@ -847,6 +720,10 @@ legend {
 	padding: 4px;
 }
 
+#frs_admin_help_button {
+	display: none;
+}
+
 .good_value {
 	color: green;
 }
@@ -875,6 +752,18 @@ fieldset {
 	padding: 5px;
 }
 
+.current-cat {
+	font-weight:bold;
+}
+
+.tracker-submitter {
+	background: #eee;
+}
+
+.width-stat-col1 {
+	text-align: right;
+	white-space: nowrap;
+}
 
 #ff-mw-wrapper {
 	position: relative;	/* so MW can position absolutely */
@@ -988,6 +877,8 @@ fieldset {
 	background:#ccc;
 	border:1px solid #666;
 	height:10px;
+	width: 100px;
+	display: inline-block;
 }
 
 .percentbar div {

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/wiki/www/lib/InlineParser.php          |    3 +
 src/plugins/wiki/www/themes/Crao/crao.css          |    4 +
 src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css  |    4 +
 src/plugins/wiki/www/themes/MacOSX/MacOSX.css      |    4 +
 src/plugins/wiki/www/themes/MonoBook/main.css      |    4 +
 src/plugins/wiki/www/themes/Portland/portland.css  |    4 +
 src/plugins/wiki/www/themes/Sidebar/sidebar.css    |    4 +
 .../wiki/www/themes/SpaceWiki/SpaceWiki.css        |    4 +
 .../wiki/www/themes/Wordpress/Wordpress.css        |    4 +
 src/plugins/wiki/www/themes/blog/Kubrick.css       |    4 +
 src/plugins/wiki/www/themes/default/phpwiki.css    |    4 +
 .../wiki/www/themes/shamino_com/shamino_com.css    |    4 +
 src/www/themes/css/fusionforge.css                 |  161 ++++----------------
 13 files changed, 73 insertions(+), 135 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list