Fix draggables for Wolf jQuery UI version. Fix uploading and thumbnai…

…ls for Wolf.
dajare · Aug 24, 2010 · 4046d84 · 4046d84
1 parent cc87c06
commit 4046d84
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/AssetsController.php b/AssetsController.php
@@ -98,7 +98,7 @@ function folder($command, $id) {
     function file() {
         $args    = func_get_args();
         $command = array_shift($args);
-        $asset   = $_SERVER['DOCUMENT_ROOT'] . '/' . implode('/', $args);
+        $asset   = assets_document_root() . '/' . implode('/', $args);
         $asset   = urldecode($asset);
         $info    = pathinfo($asset);
         switch ($command) {
@@ -149,7 +149,7 @@ function save() {
 
         $folder_created = false;
         foreach ($_POST['assets_folder_list'] as $folder) {
-            $check_folder = FROG_ROOT . '/' . $folder;
+            $check_folder = CMS_ROOT . '/' . $folder;
             if (! file_exists($check_folder)) {
                 if (@mkdir($check_folder)) {
                     $folder_created = true;
@@ -188,7 +188,7 @@ function upload() {
         /* Use later for remembering the pulldown value. */
         $_SESSION['assets_folder'] = $_POST['assets_folder'];
 
-        $upload_dir  = FROG_ROOT . '/' . $_POST['assets_folder'] . '/';
+        $upload_dir  = CMS_ROOT . '/' . $_POST['assets_folder'] . '/';
         $upload_dir  = str_replace('//', '/', $upload_dir);
         $upload_file = $upload_dir . basename($_FILES['user_file']['name']);
 
@@ -249,7 +249,7 @@ function assets_latest($limit = 0, $folder='assets') {
     $file_array  = array();
 
     foreach ($folder_list as $folder) {
-        $assets_folder = FROG_ROOT . '/' .  $folder . '/';
+        $assets_folder = CMS_ROOT . '/' .  $folder . '/';
         $assets_folder = str_replace('//', '/', $assets_folder);
         $file_array = array_merge($file_array, glob($assets_folder . '*.*'));
     }
@@ -276,7 +276,7 @@ function assets_latest($limit = 0, $folder='assets') {
                 $path_parts['filename'] = basename($file, '.' . $path_parts['extension']);                                
             }
 
-            $folder   = '/' . str_replace($_SERVER['DOCUMENT_ROOT'], '', $path_parts['dirname']) . '/';
+            $folder   = '/' . str_replace(assets_document_root(), '', $path_parts['dirname']) . '/';
             $folder   = str_replace('//', '/', $folder);
             $original = $folder . $path_parts['basename'];
 
@@ -348,8 +348,9 @@ function assets_default_folder() {
 function assets_check_gd_support() {
     $provided = gd_info();
     $needed   = array('GIF Read Support', 'JPG Support', 'PNG Support');
-    if(isset($provided['JPEG Support']))
+    if(isset($provided['JPEG Support'])) {
         $needed = array('GIF Read Support', 'JPEG Support', 'PNG Support');
+    }
 
     foreach ($needed as $item) {
         if (!$provided[$item]) {

diff --git a/assets.js b/assets.js
@@ -49,8 +49,11 @@ jQuery(function($) {
     });
 
     /* Make assets draggable in assets tab. */
+    console.log( $("#assets_list a"));
     $("#assets_list a").draggable({
-        revert: 'invalid'
+        revert: 'invalid',
+        helper: 'clone',
+        cursorAt: { top: 32, right: 32 }
     });
     $("#trash_can").droppable({
         tolerance: 'touch',

diff --git a/index.php b/index.php
@@ -15,14 +15,14 @@
 
 Plugin::setInfos(array(
     'id'          => 'assets',
-    'title'       => 'Asset Manager',
-    'description' => 'Mephisto style asset management.',
-    'version'     => '0.4.9',
+    'title'       => __('Asset Manager'),
+    'description' => __('Mephisto style asset management.'),
+    'version'     => '0.5.0-dev',
     'license'     => 'MIT',
     'author'      => 'Mika Tuupola',
-    'require_frog_version' => '0.9.4',
     'update_url'  => 'http://www.appelsiini.net/download/frog-plugins.xml',
-    'website'     => 'http://www.appelsiini.net/projects/frog_assets'
+    'website'     => 'http://www.appelsiini.net/projects/frog_assets',
+    'require_wolf_version' => '0.6.0',
 ));
 
 /* Stuff for backend. */
@@ -40,5 +40,10 @@ function assets_inject_javascript($plugin_name, $plugin) {
 }
 
 function assets_frog_root() {
-    return str_replace(realpath($_SERVER['DOCUMENT_ROOT']), '', realpath(FROG_ROOT));
+    return str_replace(realpath(assets_document_root()), '', realpath(CMS_ROOT));
+}
+
+/* Since we cannot trust $_SERVER['DOCUMENT_ROOT'] */
+function assets_document_root() {
+    return str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['SCRIPT_FILENAME']);
 }
diff --git a/views/sidebar.php b/views/sidebar.php
@@ -1,5 +1 @@
 <p class="button"><a href="<?php echo get_url('plugin/assets/settings'); ?>"><img src="/wolf/plugins/assets/images/advanced_drf.png" align="middle" alt="page icon" /> <?php echo __('Settings'); ?></a></p>
-<!--
-<p class="button"><a href="<?php echo get_url('plugin/funky_cache/documentation/'); ?>"><img src="../frog/plugins/funky_cache/images/help.png" align="middle" alt="page icon" /> <?php echo __('Your .htaccess file'); ?></a></p>
-<p class="button"><a href="<?php echo get_url('plugin/funky_cache/'); ?>"><img src="../frog/plugins/funky_cache/images/page_copy.png" align="middle" alt="page icon" /> <?php echo __('Cached pages'); ?></a></p>
--->