From 50462edd9c72156d841991245a4ef34624f9a3c7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 4 Jul 2009 17:14:21 -0700
Subject: Change the BBCode Transformation to use the <span class=""> where
 possible

---
 themes/default/css/screen.css | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'themes/default/css')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 7a41e970..750639f1 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -13,6 +13,7 @@
  *  7)  Browser hacks
  *  8)  jQuery and jQuery UI
  *  9)  Right-to-left language styles
+ * 10)  BBCode Styles
  */
 
 /** *******************************************************************
@@ -1064,3 +1065,21 @@ form .gError,
 .rtl .ui-icon-left .ui-icon {
   float: right;
 }
+
+/* BBCode ~~~~~~~~~~~~~~~~~~~~ */
+.gBBCodeBold {
+  font-weight: bold;
+}
+
+.gBBCodeItalic {
+  font-style: italic;
+}
+
+.gBBCodeUnderline {
+  text-decoration: underline;
+}
+
+.gBBCodeStrike {
+  font-decoration: line-through;
+}
+
-- 
cgit v1.2.3


From 85de2088798e2b5eac7cb26bf48e17b8034f3fb7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 4 Jul 2009 20:30:13 -0700
Subject: Lets try the BBCode conversion again... go with basic tags even if
 some are deprecated.

---
 modules/g2_import/helpers/g2_import.php | 12 ++++++------
 themes/default/css/screen.css           | 18 ------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'themes/default/css')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index cba1d429..2e40eb7f 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -756,17 +756,17 @@ class g2_import_Core {
   }
 
   static $bbcode_mappings = array(
-    "#\\[b\\](.*?)\\[/b\\]#" => "<span class=\"gBBCodeBold\">$1</span>",
-    "#\\[i\\](.*?)\\[/i\\]#" => "<span class=\"gBBCodeItalic\">$1</span>",
-    "#\\[u\\](.*?)\\[/u\\]#" => "<span class=\"gBBCodeUnderline\">$1</span>",
-    "#\\[s\\](.*?)\\[/s\\]#" => "<span class=\"gBBCodeStrike\">$1</span>",
+    "#\\[b\\](.*?)\\[/b\\]#" => "<b>$1</b>",
+    "#\\[i\\](.*?)\\[/i\\]#" => "<i>$1</i>",
+    "#\\[u\\](.*?)\\[/u\\]#" => "<u>$1</u>",
+    "#\\[s\\](.*?)\\[/s\\]#" => "<s>$1</s>",
     "#\\[url\\](.*?)\[/url\\]#" => "<a href=\"$1\">$1</a>",
     "#\\[url=(.*?)\\](.*?)\[/url\\]#" => "<a href=\"$1\">$2</a>",
     "#\\[img\\](.*?)\\[/img\\]#" => "<img src=\"$1\"/>",
     "#\\[quote\\](.*?)\\[/quote\\]#" => "<blockquote><p>$1</p></blockquote>",
     "#\\[code\\](.*?)\\[/code\\]#" => "<pre>$1</pre>",
-    "#\\[size=([^\\[]*)\\]([^\\[]*)\\[/size\\]#" => "<span style=\"font-size: $1;\">$2</span>",
-    "#\\[color=([^\\[]*)\\]([^\\[]*)\\[/color\\]#" => "<span style=\"font-color: $1;\">$2/span>",
+    "#\\[size=([^\\[]*)\\]([^\\[]*)\\[/size\\]#" => "<font size=\"$1\">$2</font>",
+    "#\\[color=([^\\[]*)\\]([^\\[]*)\\[/color\\]#" => "<font color=\"$1\">$2/font>",
     "#\\[ul\\](.*?)\\/ul\\]#" => "<ul>$1</ul>",
     "#\\[li\\](.*?)\\[/li\\]#" => "<li>$1</li>",
   );
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 750639f1..41e51623 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -13,7 +13,6 @@
  *  7)  Browser hacks
  *  8)  jQuery and jQuery UI
  *  9)  Right-to-left language styles
- * 10)  BBCode Styles
  */
 
 /** *******************************************************************
@@ -1066,20 +1065,3 @@ form .gError,
   float: right;
 }
 
-/* BBCode ~~~~~~~~~~~~~~~~~~~~ */
-.gBBCodeBold {
-  font-weight: bold;
-}
-
-.gBBCodeItalic {
-  font-style: italic;
-}
-
-.gBBCodeUnderline {
-  text-decoration: underline;
-}
-
-.gBBCodeStrike {
-  font-decoration: line-through;
-}
-
-- 
cgit v1.2.3