From 536c14840116891cf415d185bace2ef01d2145e0 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sat, 9 Mar 2013 03:54:05 -0800
Subject: [PATCH] Tinymce bootstrap dialog tweaks. Contact page template.

---
 contact.php                                        | 13 ++++++++++---
 e107_core/templates/contact_template.php           |  8 ++++----
 e107_handlers/media_class.php                      |  4 ++--
 e107_plugins/tinymce/plugins/e107bbcode/dialog.php |  8 ++++----
 e107_plugins/tinymce/wysiwyg.php                   |  4 ++--
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/contact.php b/contact.php
index 0d3e2cc2e..2096986b6 100644
--- a/contact.php
+++ b/contact.php
@@ -21,8 +21,15 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 require_once(HEADERF);
 
-if (!vartrue($CONTACT_FORM)) {
-	if (file_exists(THEME."contact_template.php")) {
+
+
+
+
+
+if (!vartrue($CONTACT_FORM))
+ {
+	if (file_exists(THEME."contact_template.php")) 
+	{
 		require_once(THEME."contact_template.php");
 	}
 	else
@@ -34,7 +41,7 @@ if (!vartrue($CONTACT_FORM)) {
 			exit;
 		}
 		
-		require_once(e_THEME."templates/contact_template.php");
+		$CONTACT_FORM = e107::getCoreTemplate('contact','form'); // require_once(e_THEME."templates/contact_template.php");
 	}
 }
 
diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index 89acc0a4c..f59f9ac85 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -52,9 +52,7 @@ $CONTACT_TEMPLATE['menu'] =  '
  
 
 
-if(!isset($CONTACT_FORM))
-{
-  $CONTACT_FORM = "
+  $CONTACT_TEMPLATE['form'] = "
 	<form action='".e_SELF."' method='post' id='contactForm' >
 	<table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
 	{CONTACT_PERSON}
@@ -80,7 +78,9 @@ if(!isset($CONTACT_FORM))
 	</td></tr>
 	</table>
 	</form>";
-}
 
+			
+		
+	
 
 ?>
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index b07951452..c18c5f78e 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -639,8 +639,8 @@ class e_media
 		 	
 		 	$img_url = ($cat !='_icon') ? e107::getParser()->thumbUrl($im['media_url'], $att) : $media_path;
 			
-			$text .= "<a class='{$class} e-tip' data-id='{$im['media_id']}' data-width='{$w}' data-height='{$h}' data-src='{$media_path}' data-bbcode='{$data_bb}' data-target='{$tagid}' data-path='{$im['media_url']}' data-preview='{$realPath}' title=\"".$diz."\" style='float:left' href='#' onclick=\"{$onclicki}\" >";
-			$text .= "<img src='".$img_url."' alt=\"".$im['media_title']."\" title=\"{$diz}\" />";
+			$text .= "<a data-toggle='context' class='{$class} e-tip' data-id='{$im['media_id']}' data-width='{$w}' data-height='{$h}' data-src='{$media_path}' data-bbcode='{$data_bb}' data-target='{$tagid}' data-path='{$im['media_url']}' data-preview='{$realPath}' title=\"".$diz."\" style='float:left' href='#' onclick=\"{$onclicki}\" >";
+			$text .= "<img class='image-rounded' src='".$img_url."' alt=\"".$im['media_title']."\" title=\"{$diz}\" />";
 			$text .= "</a>\n\n";
 		}	
 		
diff --git a/e107_plugins/tinymce/plugins/e107bbcode/dialog.php b/e107_plugins/tinymce/plugins/e107bbcode/dialog.php
index bc259f872..4078931c7 100644
--- a/e107_plugins/tinymce/plugins/e107bbcode/dialog.php
+++ b/e107_plugins/tinymce/plugins/e107bbcode/dialog.php
@@ -16,13 +16,13 @@ e107::css('inline',"
 	.selectEmote 		{ display:inline-block; cursor:pointer;margin:3px }
 	body				{ text-align:center }
 	.area				{ border-left: 1px solid rgb(221, 221, 221); border-bottom: 1px solid rgb(221, 221, 221);
-					 	 background-color: rgb(246, 246, 246); margin-top:-1px 
+					 	 background-color: rgb(246, 246, 246); margin-top:-1px; padding:20px; 
 						}
 	span.badge			{ cursor: pointer }
 	span.label			{ cursor: pointer }
 	ul.glyphicons		{ list-style:none; margin-left:0px; font-size:120%}
 	ul.glyphicons  li	{ float:left; border-bottom:1px solid silver; cursor:pointer; width:190px; padding:5px; }
-	
+	a, li					{  outline: 0; }    
 
 ");
 
@@ -195,7 +195,7 @@ class e_bootstrap
 			$classLabel = ($key != '') ? " label-".$key : "";
 			$classBadge = ($key != '') ? " badge-".$key : "";	
 			
-			$text .= '<div style="padding:10px"><span class="label'.$classLabel.'">'.$type.'</span>&nbsp;';
+			$text .= '<div class="area"><span class="label'.$classLabel.'">'.$type.'</span>&nbsp;';
 			$text .= '<span class="badge'.$classBadge.'">'.$type.'</span>';
 			$text .= "</div>";
 		} 
@@ -359,7 +359,7 @@ class e_bootstrap
 		$frm = e107::getForm();
 		$sel = array(''=>'Dark Gray','icon-white'=>'White');	
 			
-		$text .= "<div style='padding:10px'>";
+		$text .= "<div  class='area'>";
 		$text .= "<div class='inline-form'>Color: ".$frm->selectbox('glyph-color',$sel)."     Custom: ".$frm->text('glyph-custom','').$frm->button('glyph-save','Go')."</div>";	
 					
 		$text .= "<ul class='glyphicons clearfix'>";
diff --git a/e107_plugins/tinymce/wysiwyg.php b/e107_plugins/tinymce/wysiwyg.php
index 62fb9093a..4cb6081fd 100644
--- a/e107_plugins/tinymce/wysiwyg.php
+++ b/e107_plugins/tinymce/wysiwyg.php
@@ -255,12 +255,12 @@ class wysiwyg
 	
 		$cssFiles = $fl->get_files(THEME,"\.css",'',2);
 		
-		$css[] = "{e_WEB_ABS}js/bootstrap/css/bootstrap.min.css";
+		
 		foreach($cssFiles as $val)
 		{
 			$css[] = str_replace(THEME,THEME_ABS,$val['path'].$val['fname']);	
 		}
-
+		$css[] = "{e_WEB_ABS}js/bootstrap/css/bootstrap.min.css";
 		$content_css = vartrue($config['content_css'], implode(",",$css)); 
 		
 		$content_styles = array('Bootstrap Button' => 'btn btn-primary', 'Bootstrap Table' => 'table');