From: avl <alex.litovchenko@gmail.com>
Date: Mon, 29 Dec 2008 02:33:59 +0000 (+0200)
Subject: misc
X-Git-Tag: 0.5~430
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=4b9de783a94131728680198d043266c3263e20aa;p=ipf.git

misc
---

diff --git a/ipf/admin/media/css/forms.css b/ipf/admin/media/css/forms.css
index fb8a1ae..0687c11 100644
--- a/ipf/admin/media/css/forms.css
+++ b/ipf/admin/media/css/forms.css
@@ -21,6 +21,7 @@ form ul.inline li { float:left; padding-right:7px; }
 /* ALIGNED FIELDSETS */
 .aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }
 .aligned label.inline { display:inline; float:none; }
+label.file_remove{display:inline; float:none; padding:0; margin:0 20px 0 0; }
 .colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; }
 form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }
 form .aligned table p { margin-left:0; padding-left:0; }
diff --git a/ipf/admin/media/tiny_mce/plugins/kfm/includes/files.php b/ipf/admin/media/tiny_mce/plugins/kfm/includes/files.php
index 64921d1..9717e9c 100644
--- a/ipf/admin/media/tiny_mce/plugins/kfm/includes/files.php
+++ b/ipf/admin/media/tiny_mce/plugins/kfm/includes/files.php
@@ -129,7 +129,7 @@ function _loadFiles($rootid=1,$setParent=false){
 	foreach($oFiles as $file)$files[]=_getFileDetails($file);
 	$root='/'.str_replace($GLOBALS['rootdir'],'',$dir->path);
 	$kfm_session->set('cwd_id',$rootid);
-	$ret=array('reqdir'=>$root,'files'=>$files,'uploads_allowed'=>$GLOBALS['kfm_allow_file_upload']); 
+	$ret=array('reqdir'=>$root,'files'=>$files,'uploads_allowed'=>$GLOBALS['kfm_allow_file_upload']);
 	if($setParent)$ret['parent']=$rootid;
 	return $ret;
 }
diff --git a/ipf/admin/media/tiny_mce/plugins/kfm/j/files.js b/ipf/admin/media/tiny_mce/plugins/kfm/j/files.js
index e1bc8d8..4ca160e 100644
--- a/ipf/admin/media/tiny_mce/plugins/kfm/j/files.js
+++ b/ipf/admin/media/tiny_mce/plugins/kfm/j/files.js
@@ -352,6 +352,7 @@ function kfm_refreshFiles(res){
 	document.title='File Manager: '+res.reqdir;
 	kfm_lastClicked=null;
 	kfm_log(kfm.lang.FilesRefreshed);
+	kfm_addPanel('kfm_left_column','kfm_file_upload_panel');
 	if(res.uploads_allowed)kfm_addPanel('kfm_left_column','kfm_file_upload_panel');
 	else kfm_removePanel('kfm_left_column','kfm_file_upload_panel');
 	kfm_refreshPanels('kfm_left_column');
diff --git a/ipf/form/db/manytomany.php b/ipf/form/db/manytomany.php
index 3e890c6..d035e0d 100644
--- a/ipf/form/db/manytomany.php
+++ b/ipf/form/db/manytomany.php
@@ -6,7 +6,6 @@ class IPF_Form_DB_Manytomany extends IPF_Form_DB
 
     function formField($def, $form_field='IPF_Form_Field_ModelMultipleChoice')
     {
-        //print_r($def);
         $list_objects = IPF_ORM::getTable($def['model'])->findAll();
         $pk = IPF_ORM::getTable($def['model'])->getIdentifier();
         $choices = array();
diff --git a/ipf/form/widget/fileinput.php b/ipf/form/widget/fileinput.php
index 6d80ef9..b9f0b84 100644
--- a/ipf/form/widget/fileinput.php
+++ b/ipf/form/widget/fileinput.php
@@ -11,13 +11,13 @@ class IPF_Form_Widget_FileInput extends IPF_Form_Widget_Input
         if (isset($value['data'])){
             $value = $value['data'];
             if (is_string($value) && $value!=''){
-                $sim = '<nobr>Currently: <a target="_blank" href="'.IPF::get('upload_url').$value.'">'.$value.'</a>&nbsp;|&nbsp;<input name="'.$name.'_remove" value="1" id="id_'.$name.'_remove" type="checkbox" />&nbsp;<label for="id_'.$name.'_remove">Remove</label></nobr><br />Change:';
+                $sim = '<nobr>Currently: <a target="_blank" href="'.IPF::get('upload_url').$value.'">'.$value.'</a>&nbsp;|&nbsp;<input name="'.$name.'_remove" value="1" id="id_'.$name.'_remove" type="checkbox" />&nbsp;<label class="file_remove" for="id_'.$name.'_remove">Remove</label></nobr>Change:';
             }
         }
         $value = '';
         return $sim.parent::render($name, $value, $extra_attrs);
     }
-    
+
     public function valueFromFormData($name, $data)
     {
         if (isset($data[$name])) {
@@ -44,6 +44,6 @@ class IPF_Form_Widget_FileInput extends IPF_Form_Widget_Input
         return null;
     }
 
-    
+
 
 }
\ No newline at end of file