Fix HTML Editor Multiple Instance

diff --git a/ipf/admin/media/css/changelists.css b/ipf/admin/media/css/changelists.css
index e8e51faaeacd9041b334952451a6c9115f86ef27..8d57e556f2e04141ea98130bd3d4c1a7363c9fc1 100644 (file)
--- a/ipf/admin/media/css/changelists.css
+++ b/ipf/admin/media/css/changelists.css
@@ -1,5 +1,4 @@
-#changelist { position:relative; width:100%;}
-#changelist table { width:100%; }
+#changelist { position:relative;}
 .change-list .filtered table { border-right:1px solid #ddd;  }
 .change-list .filtered { min-height:400px; _height:400px; }
 .change-list .filtered { background:white url(../img/changelist-bg.gif) top right repeat-y !important; }

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index c4c7db88df98f56bfa46ee8269e4ff382de708af..a2f0b145b76d26be6aad57561d11c1be42e2c8e6 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -256,7 +256,7 @@ class IPF_Admin_Model{
         $this->ListItemsQuery();
         $this->ListItemsHeader();
         
-        $currentPage = (int)$request->GET['page'];
+        $currentPage = (int)@$request->GET['page'];
         
         $pager = new IPF_ORM_Pager_LayoutArrows(
             new IPF_ORM_Pager($this->q, $currentPage, $this->perPage),

diff --git a/ipf/admin/templates/admin/items.html b/ipf/admin/templates/admin/items.html
index e46722f3b678493f3bb5014423ed37bf4ec997cf..718b8c1b7c816dec8a7e655e9344f652311c26da 100644 (file)
--- a/ipf/admin/templates/admin/items.html
+++ b/ipf/admin/templates/admin/items.html
@@ -8,7 +8,24 @@
 <div id="ipfcontent">
     <h1>{$page_title}</h1>
     <ul class="object-tools">{if array_search('add',$perms)!==false}<li><a href="add/" class="addlink">Add {$classname}</a></li>{/if}</ul>
-    <div id="changelist">
+    <div id="changelist" class="module filtered">
+
+        <!--div id="changelist-filter">
+        <h2>Filter</h2>
+        <h3> By Credit Class </h3>
+        <ul>
+            <li class="selected">
+            <a href="?">All</a></li>
+            <li>
+            <a href="?credit_class__exact=1">Class A: Good Credit &amp; Good Income</a></li>
+            <li>
+            <a href="?credit_class__exact=2">Class B: Bad Credit &amp; Good Income</a></li>
+            <li>
+            <a href="?credit_class__exact=3">Class C: Bad Credit &amp; Bad Income</a></li>
+        </ul>
+        </div-->
+
+        <div>
         <table>
             <thead>
                 <tr>
@@ -30,8 +47,21 @@
         <p class="paginator">
             {$pager->display()|safe} {$pager->getPager()->getNumResults()} {$classname}
         </p>
+        </div>
+
     </div>
+
+
+
+
+
+
+
 </div>
 
+
+
+
+
 {/block}
 

diff --git a/ipf/form/widget/htmlinput.php b/ipf/form/widget/htmlinput.php
index 1dffabaa2fea90527b64872f98a17acde18fc0b9..10958c1da2e8d823ca7e98ce3bc2442750ba98a8 100644 (file)
--- a/ipf/form/widget/htmlinput.php
+++ b/ipf/form/widget/htmlinput.php
@@ -5,6 +5,8 @@ class IPF_Form_Widget_HTMLInput extends IPF_Form_Widget
     public $mode = 'textareas';
     public $theme = 'simple';
     public $include_tinymce = true;
+    
+    static $js_include = False;
 
     public function __construct($attrs=array())
     {
@@ -46,31 +48,37 @@ class IPF_Form_Widget_HTMLInput extends IPF_Form_Widget
         $final_attrs = $this->buildAttrs(array('name' => $name),
                                          $extra_attrs);
         // The special include for tinyMCE
+        
         $out = '';
-        if ($this->include_tinymce) {
-            $out .= '<script language="javascript" type="text/javascript" src="'.IPF::get('admin_media_url').'tiny_mce/tiny_mce.js"></script>'."\n";
+        
+        if (!IPF_Form_Widget_HTMLInput::$js_include){
+            IPF_Form_Widget_HTMLInput::$js_include = true;
+                    $out .= '<script language="javascript" type="text/javascript" src="'.IPF::get('admin_media_url').'tiny_mce/tiny_mce.js"></script>'."\n";
+                    $out .='<script language="javascript" type="text/javascript">
+               tinyMCE.init({
+                    mode : "specific_textareas",
+                    editor_selector : "htmlEditor",
+                       theme : "advanced",
+                   theme_advanced_toolbar_location : "top",
+                       theme_advanced_toolbar_align: "left",
+                    theme_advanced_buttons1 : "bold, italic, separator, undo, redo, separator, bullist, numlist, outdent, indent, separator, justifyleft, justifycenter, justifyright, separator, link, unlink, separator, selectall, removeformat, separator,sub,sup,separator, forecolor, backcolor",
+                    theme_advanced_buttons2 : "", 
+                    theme_advanced_buttons3 : "",
+                       convert_urls:"false",
+                    plugins : "paste, table",
+                    button_tile_map : true,
+                    fix_list_elements : true,
+                    gecko_spellcheck : true,
+                    verify_html : true,
+                    dialog_type : "modal",
+                    height : "800",
+                    height : "300"
+               });
+            </script>';
+
+
         }
-        $out .='<script language="javascript" type="text/javascript">
-       tinyMCE.init({
-        mode : "specific_textareas",
-        editor_selector : "htmlEditor",
-       theme : "advanced",
-           theme_advanced_toolbar_location : "top",
-       theme_advanced_toolbar_align: "left",
-        theme_advanced_buttons1 : "bold, italic, separator, undo, redo, separator, bullist, numlist, outdent, indent, separator, justifyleft, justifycenter, justifyright, separator, link, unlink, separator, selectall, removeformat, separator,sub,sup,separator, forecolor, backcolor",
-        theme_advanced_buttons2 : "", 
-        theme_advanced_buttons3 : "",
-       convert_urls:"false",
-        plugins : "paste, table",
-        button_tile_map : true,
-        fix_list_elements : true,
-        gecko_spellcheck : true,
-        verify_html : true,
-        dialog_type : "modal",
-        height : "800",
-        height : "300"
-       });
-</script>';
+        
 
 // buttons: code, separator pastetext, pasteword, 
 //plugins : "inlinepopups, paste, table, fullscreen, preview, print, charmap, separator, ",