misc

diff --git a/ipf/admin/media/css/forms.css b/ipf/admin/media/css/forms.css
index fb8a1ae9e0126ff433a5cbb322ddbca2408dcd12..0687c11699c1aacf11699e3b94a5f54ad6db5b41 100644 (file)
--- 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 64921d116fa37aade56caf7f2c8d3d7d329528ba..9717e9c13bd2f93d02f56d405a8764a6da9e0a1b 100644 (file)
--- 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 e1bc8d88425f8493506e824fe241e78d99e862ea..4ca160ee947d3a7e990e4e0c2340c6b758c20322 100644 (file)
--- 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 3e890c6cbf65970c24545a4afc333dd9f50c9323..d035e0d6c1ba653388646866ca0b4f6fab903c84 100644 (file)
--- 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 6d80ef9c67927f6a83402506fbf71b55a491101a..b9f0b84a28888e7299eca83bd2f25746c7542ea0 100644 (file)
--- 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