mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 08:06:38 +02:00
Code Issues Releases Wiki Activity

Tinymce bootstrap dialog tweaks. Contact page template.

Browse Source
This commit is contained in:
Cameron
2013-03-09 03:54:05 -08:00
parent 72ae2c6fe8
commit 536c148401
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contact.php
View File

@@ -21,8 +21,15 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
require_once(HEADERF); 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"); require_once(THEME."contact_template.php");
} }
else else
@@ -34,7 +41,7 @@ if (!vartrue($CONTACT_FORM)) {
exit; exit;
} }
require_once(e_THEME."templates/contact_template.php"); $CONTACT_FORM = e107::getCoreTemplate('contact','form'); // require_once(e_THEME."templates/contact_template.php");
} }
} }

8
e107_core/templates/contact_template.php
View File

@@ -52,9 +52,7 @@ $CONTACT_TEMPLATE['menu'] = '
if(!isset($CONTACT_FORM)) $CONTACT_TEMPLATE['form'] = "
{
$CONTACT_FORM = "
<form action='".e_SELF."' method='post' id='contactForm' > <form action='".e_SELF."' method='post' id='contactForm' >
<table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'> <table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
{CONTACT_PERSON} {CONTACT_PERSON}
@@ -80,7 +78,9 @@ if(!isset($CONTACT_FORM))
</td></tr> </td></tr>
</table> </table>
</form>"; </form>";
}
?> ?>

4
e107_handlers/media_class.php
View File

@@ -639,8 +639,8 @@ class e_media
$img_url = ($cat !='_icon') ? e107::getParser()->thumbUrl($im['media_url'], $att) : $media_path; $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 .= "<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 src='".$img_url."' alt=\"".$im['media_title']."\" title=\"{$diz}\" />"; $text .= "<img class='image-rounded' src='".$img_url."' alt=\"".$im['media_title']."\" title=\"{$diz}\" />";
$text .= "</a>\n\n"; $text .= "</a>\n\n";
} }

8
e107_plugins/tinymce/plugins/e107bbcode/dialog.php
View File

@@ -16,13 +16,13 @@ e107::css('inline',"
.selectEmote { display:inline-block; cursor:pointer;margin:3px } .selectEmote { display:inline-block; cursor:pointer;margin:3px }
body { text-align:center } body { text-align:center }
.area { border-left: 1px solid rgb(221, 221, 221); border-bottom: 1px solid rgb(221, 221, 221); .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.badge { cursor: pointer }
span.label { cursor: pointer } span.label { cursor: pointer }
ul.glyphicons { list-style:none; margin-left:0px; font-size:120%} 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; } 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 : ""; $classLabel = ($key != '') ? " label-".$key : "";
$classBadge = ($key != '') ? " badge-".$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 .= '<span class="badge'.$classBadge.'">'.$type.'</span>';
$text .= "</div>"; $text .= "</div>";
} }
@@ -359,7 +359,7 @@ class e_bootstrap
$frm = e107::getForm(); $frm = e107::getForm();
$sel = array(''=>'Dark Gray','icon-white'=>'White'); $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 .= "<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'>"; $text .= "<ul class='glyphicons clearfix'>";

4
e107_plugins/tinymce/wysiwyg.php
View File

@@ -255,12 +255,12 @@ class wysiwyg
$cssFiles = $fl->get_files(THEME,"\.css",'',2); $cssFiles = $fl->get_files(THEME,"\.css",'',2);
$css[] = "{e_WEB_ABS}js/bootstrap/css/bootstrap.min.css";
foreach($cssFiles as $val) foreach($cssFiles as $val)
{ {
$css[] = str_replace(THEME,THEME_ABS,$val['path'].$val['fname']); $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_css = vartrue($config['content_css'], implode(",",$css));
$content_styles = array('Bootstrap Button' => 'btn btn-primary', 'Bootstrap Table' => 'table'); $content_styles = array('Bootstrap Button' => 'btn btn-primary', 'Bootstrap Table' => 'table');