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

More CustomPage fixes.

Browse Source
This commit is contained in:
CaMer0n
2012-08-11 11:15:05 +00:00
parent 7e0ccc3c7a
commit 7ef1ea179a
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_admin/cpage.php
View File

@@ -27,6 +27,11 @@ require_once('../class2.php');
if (!getperms("5|J")) { header('location:'.e_ADMIN.'admin.php'); exit; } if (!getperms("5|J")) { header('location:'.e_ADMIN.'admin.php'); exit; }
e107::css('inline',"
.e-wysiwyg { height: 400px }
");
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
$e_sub_cat = 'custom'; $e_sub_cat = 'custom';
@@ -603,7 +608,7 @@ class page_admin_ui extends e_admin_ui
$id = "#page_".$c; $id = "#page_".$c;
$pageCap = "Page ".($c); $pageCap = "Page ".($c);
$text .= "<li><a href='{$id}'>{$pageCap}</a></li>"; $text .= "<li><a href='{$id}' >{$pageCap}</a></li>";
$c++; $c++;
} }
$text .= "</ul>"; $text .= "</ul>";
@@ -616,14 +621,17 @@ class page_admin_ui extends e_admin_ui
$text .= "<fieldset id='{$id}'>\n"; $text .= "<fieldset id='{$id}'>\n";
$text .= "<div>Title: ".$frm->text('page_subtitle['.$c.']', $titles[($c)], 250)."</div>\n"; $text .= "<div>Title: ".$frm->text('page_subtitle['.$c.']', $titles[($c)], 250)."</div>\n";
$text .= $frm->bbarea($nm, $curval, $help_mod,$help_tagid,$size,$counter); $text .= $frm->bbarea($nm, $curval, $help_mod,$help_tagid,$size,$counter);
$text .= "</fieldset>"; $text .= "</fieldset>";
// $text .= 'name='.$nm."<br />page=".$page."<br />help_mode=". $help_mod."<br />htlp_tagid=".$help_tagid."<br />size=".$size; // $text .= 'name='.$nm."<br />page=".$page."<br />help_mode=". $help_mod."<br />htlp_tagid=".$help_tagid."<br />size=".$size;
$c++; $c++;
} }
$text .= "<button class='e-bb e-tabs-add' data-target='$name' data-url='".e_SELF."?mode=dialog&action=dialog&iframe=1' data-function='add' href='#' data-bbcode=''><span>New Page</span></button>";
$text .= "<input type='hidden' id='e-tab-count' value='".count($pages)."' />"; $text .= "<input type='hidden' id='e-tab-count' value='".count($pages)."' />";
$text .= "<button class='e-bb e-tabs-add e-wysiwyg-add' data-url='".e_SELF."?mode=dialog&action=dialog&iframe=1' data-function='add' href='#' data-bbcode=''><span>New Page</span></button>";
return $text; return $text;
} }

6
e107_files/jslib/core/all.jquery.js
View File

@@ -136,14 +136,16 @@ $(document).ready(function()
$( ".e-tabs" ).tabs(); $( ".e-tabs" ).tabs();
}); });
$('.e-tabs-add').on("click", function(){ $('.e-tabs-add').on("click", function(){
var url = $(this).attr('data-url'); var url = $(this).attr('data-url');
var count = parseInt($("#e-tab-count").val()) + 1; var ct = parseInt($("#e-tab-count").val());
var count = ct + 1;
// alert(count); // alert(count);
//return false; //return false;
if($("#tab-container").tabs("add",url +'&count='+count,"Page "+count)) if($("#tab-container").tabs("add",url +'&count='+count,"Page "+count))
{ {
$("#tab-container").tabs('select', ct);
$("#e-tab-count").val(count); $("#e-tab-count").val(count);
} }

13
e107_handlers/form_handler.php
View File

@@ -707,18 +707,21 @@ class e_form
//width should be explicit set by current admin theme //width should be explicit set by current admin theme
switch($size) switch($size)
{ {
case 'medium':
$rows = '10';
break;
case 'small': case 'small':
$rows = '7'; $rows = '7';
$height = "style='height:250px'"; // inline required for wysiwyg
break;
case 'medium':
$rows = '10';
$height = "style='height:375px'"; // inline required for wysiwyg
break; break;
case 'large': case 'large':
default: default:
$rows = '15'; $rows = '15';
$size = 'large'; $size = 'large';
$height = "style='height:500px'"; // inline required for wysiwyg
break; break;
} }
@@ -728,7 +731,7 @@ class e_form
$help_tagid = $this->name2id($name)."--preview"; $help_tagid = $this->name2id($name)."--preview";
$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'"; $options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);' {$height}";
$counter = vartrue($options['counter'],false); $counter = vartrue($options['counter'],false);