moved skins/icon to assets/common/images/icons

lib/Alchemy/Phrasea/Controller/Admin/DataboxesController.php

@@ -37,7 +37,7 @@ class DataboxesController extends Controller
         foreach ($sbasIds as $sbasId) {
             $sbas[$sbasId] = [
                 'version'     => 'unknown',
-                'image'       => '/skins/icons/db-remove.png',
+                'image'       => '/assets/common/images/icons/db-remove.png',
                 'server_info' => '',
                 'name'        => $this->app->trans('Unreachable server')
             ];
@@ -49,7 +49,7 @@ class DataboxesController extends Controller
                 $pdoConnection = $databox->get_connection()->getWrappedConnection();
                 $sbas[$sbasId] = [
                     'version'     => $databox->get_version(),
-                    'image'       => '/skins/icons/foldph20close_0.gif',
+                    'image'       => '/assets/common/images/icons/foldph20close_0.gif',
                     'server_info' => $pdoConnection->getAttribute(\PDO::ATTR_SERVER_VERSION),
                     'name'        => \phrasea::sbas_labels($sbasId, $this->app)
                 ];

lib/Alchemy/Phrasea/Controller/Prod/QueryController.php

@@ -138,7 +138,7 @@ class QueryController extends Controller
 
             $explain = "<div id=\"explainResults\" class=\"myexplain\">";
 
-            $explain .= "<img src=\"/skins/icons/answers.gif\" /><span><b>";
+            $explain .= "<img src=\"/assets/common/images/icons/answers.gif\" /><span><b>";
 
             if ($result->getTotal() != $result->getAvailable()) {
                 $explain .= $this->app->trans('reponses:: %available% Resultats rappatries sur un total de %total% trouves', ['available' => $result->getAvailable(), '%total%' => $result->getTotal()]);

lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php

@@ -843,7 +843,7 @@ class ArchiveJob extends AbstractJob
             if (!($rep = $node->getAttribute('grp_representation'))) {
 
                 try {
-                    $app['filesystem']->copy($app['root.path'] . '/www/skins/icons/substitution/regroup_doc.png', $genericdoc = ($path . '/group.jpg'), true);
+                    $app['filesystem']->copy($app['root.path'] . '/www/assets/common/images/icons/substitution/regroup_doc.png', $genericdoc = ($path . '/group.jpg'), true);
                 } catch (IOException $e) {
                     $this->log('debug', $e->getMessage());
                 }

lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php

@@ -187,7 +187,7 @@ class PhraseanetExtension extends \Twig_Extension
     {
         $src = $title = '';
         if ($record->isStory()) {
-            $src = '/skins/icons/icon_story.gif';
+            $src = '/assets/common/images/icons/icon_story.gif';
             $title = $this->app['translator']->trans('reportage');
 
             return sprintf('<img src="%s" title="%s" />', $src, $title);
@@ -195,23 +195,23 @@ class PhraseanetExtension extends \Twig_Extension
 
         switch ($record->getType()) {
             case 'image':
-                $src = '/skins/icons/icon_image.png';
+                $src = '/assets/common/images/icons/icon_image.png';
                 $title = $this->app['translator']->trans('image');
                 break;
             case 'document':
-                $src = '/skins/icons/icon_document.png';
+                $src = '/assets/common/images/icons/icon_document.png';
                 $title = $this->app['translator']->trans('document');
                 break;
             case 'video':
-                $src = '/skins/icons/icon_video.png';
+                $src = '/assets/common/images/icons/icon_video.png';
                 $title = $this->app['translator']->trans('reportage');
                 break;
             case 'audio':
-                $src = '/skins/icons/icon_audio.png';
+                $src = '/assets/common/images/icons/icon_audio.png';
                 $title = $this->app['translator']->trans('audio');
                 break;
             case 'flash':
-                $src = '/skins/icons/icon_flash.png';
+                $src = '/assets/common/images/icons/icon_flash.png';
                 $title = $this->app['translator']->trans('flash');
                 break;
         }
@@ -249,7 +249,7 @@ class PhraseanetExtension extends \Twig_Extension
             }
         }
 
-        $path = sprintf('/skins/icons/substitution/%s.png',
+        $path = sprintf('/assets/common/images/icons/substitution/%s.png',
             str_replace('/', '_', $record->getMimeType())
         );
 

lib/classes/Bridge/Api/Dailymotion.php

@@ -108,7 +108,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
      */
     public function get_icon_url()
     {
-        return '/skins/icons/dailymotion-small.gif';
+        return '/assets/common/images/icons/dailymotion-small.gif';
     }
 
     /**
@@ -117,7 +117,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
      */
     public function get_image_url()
     {
-        return '/skins/icons/dailymotion-logo.png';
+        return '/assets/common/images/icons/dailymotion-logo.png';
     }
 
     /**

lib/classes/Bridge/Api/Flickr.php

@@ -90,7 +90,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
      */
     public function get_icon_url()
     {
-        return '/skins/icons/flickr-small.gif';
+        return '/assets/common/images/icons/flickr-small.gif';
     }
 
     /**
@@ -99,7 +99,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
      */
     public function get_image_url()
     {
-        return '/skins/icons/flickr.gif';
+        return '/assets/common/images/icons/flickr.gif';
     }
 
     /**

lib/classes/Bridge/Api/Youtube.php

@@ -93,7 +93,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
      */
     public function get_icon_url()
     {
-        return '/skins/icons/youtube-small.gif';
+        return '/assets/common/images/icons/youtube-small.gif';
     }
 
     /**
@@ -102,7 +102,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
      */
     public function get_image_url()
     {
-        return '/skins/icons/youtube-white.gif';
+        return '/assets/common/images/icons/youtube-white.gif';
     }
 
     /**

lib/classes/eventsmanager/notify/autoregister.php

@@ -19,7 +19,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/user.png';
+        return '/assets/common/images/icons/user.png';
     }
 
     /**

lib/classes/eventsmanager/notify/bridgeuploadfail.php

@@ -19,7 +19,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/user.png';
+        return '/assets/common/images/icons/user.png';
     }
 
     /**

lib/classes/eventsmanager/notify/downloadmailfail.php

@@ -22,7 +22,7 @@ class eventsmanager_notify_downloadmailfail extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/user.png';
+        return '/assets/common/images/icons/user.png';
     }
 
     /**

lib/classes/eventsmanager/notify/feed.php

@@ -19,7 +19,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/rss16.png';
+        return '/assets/common/images/icons/rss16.png';
     }
 
     /**

lib/classes/eventsmanager/notify/order.php

@@ -19,7 +19,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/user.png';
+        return '/assets/common/images/icons/user.png';
     }
 
     /**

lib/classes/eventsmanager/notify/push.php

@@ -19,7 +19,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/push16.png';
+        return '/assets/common/images/icons/push16.png';
     }
 
     /**

lib/classes/eventsmanager/notify/register.php

@@ -19,7 +19,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/user.png';
+        return '/assets/common/images/icons/user.png';
     }
 
     /**

lib/classes/eventsmanager/notify/validate.php

@@ -26,7 +26,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/push16.png';
+        return '/assets/common/images/icons/push16.png';
     }
 
     /**

lib/classes/eventsmanager/notify/validationdone.php

@@ -26,7 +26,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/icons/push16.png';
+        return '/assets/common/images/icons/push16.png';
     }
 
     /**

lib/classes/eventsmanager/notify/validationreminder.php

@@ -26,7 +26,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
      */
     public function icon_url()
     {
-        return '/skins/icons/push16.png';
+        return '/assets/common/images/icons/push16.png';
     }
 
     /**

lib/classes/media/subdef.php

@@ -280,9 +280,9 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
             $this->mime = 'image/png';
             $this->width = 256;
             $this->height = 256;
-            $this->path = $this->app['root.path'] . '/www/skins/icons/substitution/';
+            $this->path = $this->app['root.path'] . '/www/assets/common/images/icons/substitution/';
             $this->file = 'regroup_thumb.png';
-            $this->url = Url::factory('/skins/icons/substitution/regroup_thumb.png');
+            $this->url = Url::factory('/assets/common/images/icons/substitution/regroup_thumb.png');
         } else {
             $mime = $this->record->get_mime();
             $mime = trim($mime) != '' ? str_replace('/', '_', $mime) : 'application_octet-stream';
@@ -290,17 +290,17 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
             $this->mime = 'image/png';
             $this->width = 256;
             $this->height = 256;
-            $this->path = $this->app['root.path'] . '/www/skins/icons/substitution/';
+            $this->path = $this->app['root.path'] . '/www/assets/common/images/icons/substitution/';
             $this->file = str_replace('+', '%20', $mime) . '.png';
-            $this->url = Url::factory('/skins/icons/substitution/' . $this->file);
+            $this->url = Url::factory('/assets/common/images/icons/substitution/' . $this->file);
         }
 
         $this->is_physically_present = false;
 
         if ( ! file_exists($this->path . $this->file)) {
-            $this->path = $this->app['root.path'] . '/www/skins/icons/';
+            $this->path = $this->app['root.path'] . '/www/assets/common/images/icons/';
             $this->file = 'substitution.png';
-            $this->url = Url::factory('/skins/icons/' . $this->file);
+            $this->url = Url::factory('/assets/common/images/icons/' . $this->file);
         }
 
         return $this;

resources/www/account/styles/_skin.scss

@@ -835,7 +835,7 @@ form[name=registerForm] .multiselect-group {
 }
 
 .geocompleter-input.input-loading {
-    background: url('/skins/icons/loader-black.gif') $black center right no-repeat;
+    background: url('/assets/common/images/icons/loader-black.gif') $black center right no-repeat;
 }
 
 /** IE Fixes */

resources/www/account/styles/main.scss

@@ -1,5 +1,5 @@
 $fontAwesomePath:   "../../common/font"; // dist path
-$iconsPath: '../../../skins/icons/';
+$iconsPath: '../../../assets/common/images/icons/';
 @import '../../../../www/bower_components/normalize-css/normalize'; // not extension for inline import
 @import '../../vendors/bootstrap/bootstrap';
 // @TODO enable importation of: @import "../../../../plugins/login.less";

resources/www/admin/styles/main.scss

@@ -1,5 +1,5 @@
 $skinsPath: '../../../skins/';
-$iconsPath: '../../../skins/icons/';
+$iconsPath: '../../../assets/common/images/icons/';
 
 @import '../../vendors/jquery.treeview/jquery.treeview'; // to inline import css file, don't put extension
 @import '../../../../www/bower_components/jquery-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension