diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c65f31b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,41 @@
+# Package #
+###################
+placeholders/
+
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/attributes/page_selector/controller.php b/attributes/page_selector/controller.php
new file mode 100644
index 0000000..d1afaa7
--- /dev/null
+++ b/attributes/page_selector/controller.php
@@ -0,0 +1,77 @@
+<?php
+namespace Concrete\Package\EasyImageGallery\Attribute\PageSelector;
+
+use Page;
+use Loader;
+defined('C5_EXECUTE') or die("Access Denied.");
+
+class Controller extends \Concrete\Core\Attribute\Controller  {
+
+  protected $searchIndexFieldDefinition = array('type' => 'integer', 'options' => array('default' => 0, 'notnull' => false));
+
+	public function getValue() {
+		$db = Loader::db();
+		$value = $db->GetOne("select value from atPageSelector where avID = ?", array($this->getAttributeValueID()));
+		return $value;
+	}
+  public function getDisplayValue()
+  {
+      $c = Page::getByID($this->getValue());
+      if (is_object($c)) {
+          return '<a href="' . $c->getCollectionLink() . '">' . $c->getCollectionName() . '</a>';
+      }
+  }
+  public function getDisplaySanitizedValue()
+  {
+      return $this->getDisplayValue();
+  }
+	public function searchForm($list) {
+		$PagecID = $this->request('value');
+		$list->filterByAttribute($this->attributeKey->getAttributeKeyHandle(), $PagecID, '=');
+		return $list;
+	}
+
+	public function search() {
+		$form_selector = Loader::helper('form/page_selector');
+		print $form_selector->selectPage($this->field('value'), $this->request('value'), false);
+	}
+
+	public function form() {
+		if (is_object($this->attributeValue)) {
+			$value = $this->getAttributeValue()->getValue();
+		}
+		$form_selector = Loader::helper('form/page_selector');
+		print $form_selector->selectPage($this->field('value'), $value);
+	}
+
+	public function validateForm($p) {
+		return $p['value'] != 0;
+	}
+
+	public function saveValue($value) {
+		$db = Loader::db();
+        if(!intval($value)) {
+            $value = 0;
+        }
+		$db->Replace('atPageSelector', array('avID' => $this->getAttributeValueID(), 'value' => $value), 'avID', true);
+	}
+
+	public function deleteKey() {
+		$db = Loader::db();
+		$arr = $this->attributeKey->getAttributeValueIDList();
+		foreach($arr as $id) {
+			$db->Execute('delete from atPageSelector where avID = ?', array($id));
+		}
+	}
+
+	public function saveForm($data) {
+		$db = Loader::db();
+		$this->saveValue($data['value']);
+	}
+
+	public function deleteValue() {
+		$db = Loader::db();
+		$db->Execute('delete from atPageSelector where avID = ?', array($this->getAttributeValueID()));
+	}
+
+}
diff --git a/attributes/page_selector/db.xml b/attributes/page_selector/db.xml
new file mode 100644
index 0000000..a039c2f
--- /dev/null
+++ b/attributes/page_selector/db.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<schema version="0.3">
+<table name="atPageSelector">
+    <field name="avID" type="I" size="10">
+      <KEY/>
+      <DEFAULT value="0"/>
+      <UNSIGNED/>
+    </field>
+   <field name="value" type="I">
+      <NOTNULL/>
+      <DEFAULT value="0"/>
+    </field>
+  </table>
+</schema>
\ No newline at end of file
diff --git a/attributes/page_selector/icon.png b/attributes/page_selector/icon.png
new file mode 100755
index 0000000..063dcf0
Binary files /dev/null and b/attributes/page_selector/icon.png differ
diff --git a/blocks/easy_image_gallery/composer.php b/blocks/easy_image_gallery/composer.php
index 17760d9..ba799a4 100644
--- a/blocks/easy_image_gallery/composer.php
+++ b/blocks/easy_image_gallery/composer.php
@@ -2,9 +2,9 @@
 defined('C5_EXECUTE') or die("Access Denied.");
 
 $this->inc('form_setup_html.php', array('view' => $view,
-										'fIDs' => $controller->getFilesIds(),
-										'fDetails' => $controller->getFilesDetails($controller->getFilesIds()),
+										'fDetails' => $controller->getFilesDetails(false, true),
 										'fileSets' => $controller->getFileSetList(),
+										'selectedFilesets' => $controller->getSelectedFilesets(),
 										'isComposer' => true
 										));
 ?>
@@ -17,4 +17,4 @@
 	.easy-image-toolbar .ccm-inline-toolbar-button-cancel {
 		display: none;
 	}
-</style>										
\ No newline at end of file
+</style>
diff --git a/blocks/easy_image_gallery/controller.php b/blocks/easy_image_gallery/controller.php
index b921f18..6b70536 100644
--- a/blocks/easy_image_gallery/controller.php
+++ b/blocks/easy_image_gallery/controller.php
@@ -9,6 +9,7 @@
 use Concrete\Core\Asset\AssetList;
 use \Concrete\Core\Http\ResponseAssetGroup;
 use Permissions;
+use Page;
 
 use File;
 use FileSet;
@@ -32,7 +33,7 @@ class Controller extends BlockController
     protected $btCacheBlockOutputForRegisteredUsers = false;
     protected $btSupportsInlineEdit = true;
     protected $btSupportsInlineAdd = true;
-    protected $btDefaultSet = 'multimedia';    
+    protected $btDefaultSet = 'multimedia';
 
     public function getBlockTypeDescription()
     {
@@ -44,29 +45,29 @@ public function getBlockTypeName()
         return t("Easy Images Gallery");
     }
 
-
     public function add() {
         $this->setAssetEdit();
-
         $this->set('fileSets', $this->getFileSetList());
-        $this->set('options', $this->getOptionsJson());        
+        $this->set('options', $this->getOptionsJson());
+        $this->set('selectedFilesets',array());
     }
 
     public function edit()
     {
         $this->setAssetEdit();
 
-        $fIDs =  $this->getFilesIds();
-
         $this->set('fileSets', $this->getFileSetList());
+        $this->set('selectedFilesets', $this->getSelectedFilesets());
         $this->set('options', $this->getOptionsJson());
-        $this->set('fIDs', $fIDs);
-        $this->set('fDetails',$this->getFilesDetails($fIDs));
+        $this->set('fDetails',$this->getFilesDetails());
     }
 
-    function getFilesIds () { return explode(',', $this->fIDs); }
-    
-    function getOptionsJson ()  { 
+    function getSelectedFilesets() {
+      $options = json_decode($this->options,true);
+      return (is_array($options['fsIDs']) && count($options['fsIDs'])) ? $options['fsIDs'] : array();
+    }
+
+    function getOptionsJson ()  {
         // Cette fonction retourne un objet option
         // SI le block n'existe pas encore, ces options sont préréglées
         // Si il existe on transfome la chaine de charactère en json
@@ -92,20 +93,52 @@ function getOptionsJson ()  {
             if(!$options->hoverTitleColor) $options->hoverTitleColor = '#333333';
             if(!$options->dateFormat) $options->dateFormat = 'm - Y';
             // end legacy
-            return $options ; 
+            return $options ;
         endif;
 
     }
-    // For Edit / ADD
-    function getFilesDetails ($fIDs) {
-        $tools = new EasyImageGalleryTools();        
-        $fDetails = array();
-        foreach ($fIDs as $key => $fID) {
-            $f = File::getByID($fID);
-            if (is_object($f)) $fDetails[] = $tools->getFileDetails($f);            
-        }
+
+
+    function getFilesDetails ($fIDs = false, $details = true) {
+      $tools = new EasyImageGalleryTools();
+      $db = Loader::db();
+
+      if (!$fIDs)
+        $fIDs = explode(',', $this->fIDs);
+      $_fIDs = array();
+      $fDetails = array();
+
+      foreach ($fIDs as $key => $value) :
+        if(strpos($value,'fsID') === 0 ): // Le fID commence par "fsID" DOnc on va extraire les images
+          $fsID = substr($value,4);
+          $r = $db->query('SELECT fID FROM FileSetFiles WHERE fsID = ? ORDER BY fsDisplayOrder ASC', array($fsID));
+          while ($row = $r->FetchRow()) {
+              $_fIDs[$row['fID']] = 'fsID' . $fsID;
+          }
+        else:
+          $_fIDs[$value] = 'file';
+        endif;
+      endforeach;
+      $fIDs = $_fIDs;
+
+      // Si on ne veut pas de details,
+      // On retourne un tableau avec les fID
+      if (!$details) return array_keys($fIDs);
+
+      // Maintenant on extriait les details de chaque images
+      foreach ($fIDs as $fID => $type) {
+          $f = File::getByID($fID);
+          if (is_object($f)):
+            $origin = "file";
+            // Si le fichier fait partie d'un FS, son origine sera numerique
+            // Et représentera le fsID
+            if(strpos($type,'fsID') === 0 ) $origin = substr($type,4);
+             $fDetails[] = $tools->getFileDetails($f,$origin);
+          endif;
+      }
         return $fDetails;
     }
+
     // For view
     function getFileFromFileID ($fID) {
         if ($fID) :
@@ -116,25 +149,27 @@ function getFileFromFileID ($fID) {
 
     public function registerViewAssets()
     {
-        $this->requireAsset('css','easy-gallery-view');        
+        $this->requireAsset('css','easy-gallery-view');
         $this->requireAsset('javascript', 'jquery');
         $this->requireAsset('javascript', 'imagesloaded');
         $this->requireAsset('javascript', 'masonry');
         $this->requireAsset('javascript', 'isotope');
         $this->requireAsset('javascript', 'lazyload');
-        
+
     }
 
     public function view() {
-        $time_start = microtime(true);         
+        $time_start = microtime(true);
         $options =  $this->getOptionsJson();
 
         // Files
-        $files = array_filter(array_map(array($this,'getFileFromFileID') , explode(',', $this->fIDs)));
-        $this->set('fIDs', explode(',', $this->fIDs));
+        $fIDs = $this->getFilesDetails(false,false);
+        $files = array_filter(array_map(array($this,'getFileFromFileID') , $fIDs));
+        $this->set('fIDs', $fIDs);
+        $this->set('selectedFilesets', $this->getSelectedFilesets());
         $this->set('files',$files );
         $this->set('options', $options );
-
+        // print_r($files); exit();
         $this->generatePlaceHolderFromArray($files);
 
         // Lightbox
@@ -160,10 +195,10 @@ public function view() {
                 if (!$avID) continue;
 
                 $query = $db->GetAll("
-                    SELECT opt.value  
-                    FROM atSelectOptions opt, 
+                    SELECT opt.value
+                    FROM atSelectOptions opt,
                     atSelectOptionsSelected sel
-                         
+
                     WHERE sel.avID = ?
                     AND sel.atSelectOptionID = opt.ID",$avID);
 
@@ -182,7 +217,6 @@ public function view() {
 
     }
 
-
     public function getFileSetList () {
         $fs = new FileSetList();
         return $fs->get();
@@ -195,7 +229,7 @@ public function composer() {
     public function isValueEmpty() {
         if ($this->fIDs)
             return false;
-        else 
+        else
             return true;
     }
 
@@ -210,6 +244,9 @@ public function setAssetEdit () {
         $this->requireAsset('javascript', 'bootstrap/popover');
         $this->requireAsset('javascript', 'jquery/ui');
         $this->requireAsset('javascript', 'core/events');
+        $this->requireAsset('core/file-manager');
+        $this->requireAsset('core/sitemap');
+        $this->requireAsset('select2');
         $this->requireAsset('javascript', 'underscore');
         $this->requireAsset('javascript', 'core/app');
         $this->requireAsset('javascript', 'bootstrap-editable');
@@ -224,15 +261,67 @@ public function save($args)
     {
         $options = $args;
         unset($options['fID']);
+        unset($options['internal_link_cid']);
+
+        // Vu que je n'arrive pas encore a sauver en ajax l'attribut cID du lien
+        // (meme si dans le filemanager la fenetre attribut y arrive)
+        // je boucle et sauve pour chaque fichier
+        // var_dump($args['fsIDs']);die();
+        if(is_array($args['internal_link_cid'])) :
+          $ak = FileAttributeKey::getByHandle('internal_link_cid');
+          if (is_object($ak)) :
+            foreach ($args['internal_link_cid'] as $fID => $valueArray) :
+              $f = File::getByID($fID);
+              if(is_object($f)) :
+                $fv = $f->getVersionToModify();
+                $ak->setAttribute($fv,$valueArray[0]);
+              endif;
+            endforeach;
+          endif;
+        endif;
+
+
+        $fsIDs = array();
+        if (is_array($args['fID'])):
+          $args['fIDs'] = implode(',', array_unique($args['fID']));
+          // Now extract Filset ID and save it in Options
+          foreach ($args['fID'] as $value) :
+            if(strpos($value,'fsID') === 0 ):
+              $fsIDs[] = (int)substr($value,4);
+            endif;
+          endforeach;
+          $options['fsIDs'] =  array_values(array_unique($fsIDs));
+        endif;
+
         if (!is_numeric($options['fancyOverlayAlpha']) || $options['fancyOverlayAlpha'] > 1 || $options['fancyOverlayAlpha'] < 0) $options['fancyOverlayAlpha'] = .9;
         $args['options'] = json_encode($options);
-        if(is_array($args['fID'])) : 
-            $args['fIDs'] = implode(',', $args['fID']);
-            $this->generatePlaceHolderFromArray ($args['fID']);
-        endif;
         parent::save($args);
     }
 
+    function getImageLink($f,$options) {
+      if (!$options->lightbox) :
+        if ($f->getAttribute('link_type')):
+          $link_type = str_replace('<br/>', '', $f->getAttribute('link_type','display'));
+          switch ($link_type) {
+            case 'Page':
+              $internal_link = Page::getByID($f->getAttribute('internal_link_cid'), 'ACTIVE');
+              $fullUrl = (is_object($internal_link) && $internal_link->getCollectionID()) ? $internal_link->getCollectionLink() : false;
+              break;
+            case 'URL':
+              $external_link_url = $f->getAttribute('external_link_url');
+              $fullUrl = $external_link_url ? $external_link_url : false;
+              break;
+            default:
+              $fullUrl = false;
+          }
+        endif;
+      else :
+        $fullUrl = $f->getRelativePath();
+      endif;
+
+      return $fullUrl;
+    }
+
     function hex2rgb($hex) {
        $hex = str_replace("#", "", $hex);
 
@@ -248,17 +337,17 @@ function hex2rgb($hex) {
        $rgb = array($r, $g, $b);
        return implode(",", $rgb); // returns the rgb values separated by commas
        // return $rgb; // returns an array with the rgb values
-    } 
+    }
 
     function generatePlaceHolderFromArray ($array) {
 
         $placeholderMaxSize = 600;
 
         if (!is_object($array[0])) :
-            $files = array_map(array($this,'getFileFromFileID') ,$array);
+            $files = $this->getFilesDetails($array);
         else :
             $files = $array;
-        endif; 
+        endif;
 
         foreach ($files as $key => $f) :
             if(!is_object($f)) continue;
@@ -269,18 +358,18 @@ function generatePlaceHolderFromArray ($array) {
 
             $placeholderFile =  __DIR__ . "/images/placeholders/placeholder-$w-$h.png";
             if (file_exists($placeholderFile)) continue;
-            $img = imagecreatetruecolor($new_width,$new_height); 
-            imagesavealpha($img, true); 
+            $img = imagecreatetruecolor($new_width,$new_height);
+            imagesavealpha($img, true);
 
-            // Fill the image with transparent color 
-            $color = imagecolorallocatealpha($img,0x00,0x00,0x00,110); 
-            imagefill($img, 0, 0, $color); 
+            // Fill the image with transparent color
+            $color = imagecolorallocatealpha($img,0x00,0x00,0x00,110);
+            imagefill($img, 0, 0, $color);
 
-            // Save the image to file.png 
-            imagepng($img,$placeholderFile); 
+            // Save the image to file.png
+            imagepng($img,$placeholderFile);
 
-            // Destroy image 
+            // Destroy image
             imagedestroy($img);
         endforeach;
     }
-}
\ No newline at end of file
+}
diff --git a/blocks/easy_image_gallery/form_setup_html.php b/blocks/easy_image_gallery/form_setup_html.php
index fec48e4..412230d 100644
--- a/blocks/easy_image_gallery/form_setup_html.php
+++ b/blocks/easy_image_gallery/form_setup_html.php
@@ -2,15 +2,13 @@
 $fp = FilePermissions::getGlobal();
 $tp = new TaskPermission();
 ?>
-
 <ul id="" class="ccm-inline-toolbar ccm-ui easy-image-toolbar">
     <li class="ccm-sub-toolbar-text-cell">
         <?php if(count($fileSets)) : ?>
         <label for="fsID"><?php echo t("Add a Filset:")?></label>
-        <select name="fsID" id="fsID" style="width: auto !important">
-            <option value="0"><?php echo t('Choose') ?></option>
+        <select name="fsID" multiple id="fsID" style="width:300px" data-placeholder="<?php echo t('Choose') ?>">
             <?php foreach ($fileSets as $key => $fs) :?>
-            <option value="<?php echo $fs->getFileSetID() ?>"><?php echo $fs->getFileSetName() ?></option>
+            <option value="<?php echo $fs->getFileSetID() ?>" <?php echo in_array($fs->getFileSetID(),$selectedFilesets) ? 'selected' : '' ?>><?php echo $fs->getFileSetName() ?></option>
             <?php endforeach; ?>
         </select>
         <?php else: ?>
@@ -40,20 +38,30 @@
 </div>
 
 <script type="text/template" id="imageTemplate">
-    <div class="image-item <% if (image_url.length > 0) { %>filled<% } %> ccm-ui">
+    <div class="image-item <% if (image_url.length > 0) { %>filled fid-<%= fID %> <% } %> ccm-ui <%= classes %>" <% if (originType == 'fileset') { %>rel="<%=filesetName%>" <% } %>>
         <div id="manage-file" class="manage-file">
             <% if (image_url.length > 0) { %>
             <div class="img" style="background-image:url(<%= image_url %>)"></div>
             <div class="item-toolbar">
                 <h4 data-type="textarea" data-name="fvTitle"  class="editable editable-click" title="<?php echo t('Title') ?>"><%= title %></h4>
-                <p class="description editable editable-click" data-placeholder="<?php echo t('Write your description') ?>" data-name="fvDescription" data-type="textarea" <% if (!description) { %> editable-empty <% } %>><%= description %></p>
+                <p><strong><?php echo t('Description : ') ?></strong><span class="description editable editable-click" data-placeholder="<?php echo t('Write your description') ?>" data-name="fvDescription" data-type="textarea" <% if (!description) { %> editable-empty <% } %>><%= description %></span></p>
+
+                <hr class="separator">
+
+                <p><strong><?php echo t('Link type') ?> : </strong><span class="link_type editable editable-click" data-placeholder="<?php echo t('Link type') ?>" data-value="<%= link_type %>" data-name="link_type" data-type="select" data-source='{"None": "None", "URL":"External URL", "Page": "Link to page"}' <% if (!link_type) { %> editable-empty <% } %>><%= link_type %></span></p>
+                <p class="entry-link-url" style="<% if (link_type != 'URL') { %> display: none;<% } %>"><strong><?php echo t('External URL') ?> : </strong><span data-field="entry-link-url"  data-type="textarea" data-name="external_link_url"  class="editable editable-click" data-placeholder="<?php echo t('http://') ?>" title="<?php echo t('External URL') ?>"><%=external_link_url%></span></p>
+                <div style="<% if (link_type != 'Page') { %> display: none;<% } %>" data-field="entry-link-page-selector" class="form-group">
+                   <label><?php echo t('Choose Page:') ?></label>
+                    <div data-field="entry-link-page-selector-select"></div>
+                </div>
+
                 <a href="javascript:;" class="remove-item"><i class="fa fa-remove"></i></a>
                 <div class="item-controls">
                     <a class="dialog-launch item-properties" dialog-modal="true" dialog-width="600" dialog-height="400" dialog-title="Properties" href="<?php echo URL::to('/ccm/system/dialogs/file/properties') ?>?fID=<%= fID %>"><i class="fa fa-gear"></i></a>
                     <a class="handle"><i class="fa fa-arrows"></i></a>
                 </div>
             </div>
-            <input type="hidden" name="<?php echo $view->field('fID')?>[]" class="image-fID" value="<%=fID%>" />
+            <input type="hidden" name="<?php echo $view->field('fID')?>[]" class="image-fID" value="<%=inputValue%>" />
             <% } else { %>
             <div class="add-file-control">
                 <a href="#" class="upload-file"><i class="fa fa-upload"></i></a><a href="#" class="add-file"><i class="fa fa-th-list"></i></a>
@@ -71,16 +79,23 @@
     var getFileDetailDetailJson = '<?php echo URL::to("/easyimagegallery/tools/getfiledetailsjson")?>';
     var saveFieldURL = '<?php echo URL::to("/easyimagegallery/tools/savefield")?>';
     var getFilesetImagesURL = '<?php echo URL::to("/easyimagegallery/tools/getfilesetimages")?>';
+    var selectedFilesets = <?php echo $selectedFilesets ? json_encode($selectedFilesets) : 'new Array()'  ?>;
 
     easy_image_manager ($('.easy_image-items'));
 
 
     ccmi18n.filesetAlreadyPicked = "<?php echo t('This Fileset have been already picked, are you sure to add images again ?') ?>";
+    ccmi18n.filesetNotFound = "<?php echo t('Ouups the fileset has not been found here..') ?>";
     ccmi18n.confirmDeleteImage = "<?php echo t('Are you sure to delete this image?') ?>";
     ccmi18n.imageOnly = "<?php echo t('You must select an image file only'); ?>";
     ccmi18n.imageSize = "<?php echo t('Please upload a smaller image, max size is 6 MB') ?>";
 
+
     $(document).ready(function(){
+      $('#fsID').select2({
+        width:'copy'
+      });
+
         <?php if (is_array($fDetails) && count($fDetails)) : ?>
             <?php foreach ($fDetails as $key => $f) : ?>
         fillTemplate(<?php echo json_encode($f) ?>);
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-1000-1500.png b/blocks/easy_image_gallery/images/placeholders/placeholder-1000-1500.png
deleted file mode 100644
index 4471fee..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-1000-1500.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-1280-853.png b/blocks/easy_image_gallery/images/placeholders/placeholder-1280-853.png
deleted file mode 100644
index bdb0c01..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-1280-853.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-1280-960.png b/blocks/easy_image_gallery/images/placeholders/placeholder-1280-960.png
deleted file mode 100644
index f851bfb..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-1280-960.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-1750-1141.png b/blocks/easy_image_gallery/images/placeholders/placeholder-1750-1141.png
deleted file mode 100644
index cc56de8..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-1750-1141.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-2560-1440.png b/blocks/easy_image_gallery/images/placeholders/placeholder-2560-1440.png
deleted file mode 100644
index 86beed9..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-2560-1440.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-366-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-366-550.png
deleted file mode 100644
index bd02483..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-366-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-374-366.png b/blocks/easy_image_gallery/images/placeholders/placeholder-374-366.png
deleted file mode 100644
index 6470692..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-374-366.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-412-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-412-550.png
deleted file mode 100644
index 08b927e..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-412-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-425-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-425-550.png
deleted file mode 100644
index 2566cf7..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-425-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-429-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-429-550.png
deleted file mode 100644
index c5aa028..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-429-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-435-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-435-550.png
deleted file mode 100644
index a4063b1..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-435-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-543-434.png b/blocks/easy_image_gallery/images/placeholders/placeholder-543-434.png
deleted file mode 100644
index 5226392..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-543-434.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-547-374.png b/blocks/easy_image_gallery/images/placeholders/placeholder-547-374.png
deleted file mode 100644
index bc6e893..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-547-374.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-563-602.png b/blocks/easy_image_gallery/images/placeholders/placeholder-563-602.png
deleted file mode 100644
index 20194ae..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-563-602.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-689-72.png b/blocks/easy_image_gallery/images/placeholders/placeholder-689-72.png
deleted file mode 100644
index ea0adc2..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-689-72.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-821-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-821-550.png
deleted file mode 100644
index efebb5b..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-821-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/images/placeholders/placeholder-824-550.png b/blocks/easy_image_gallery/images/placeholders/placeholder-824-550.png
deleted file mode 100644
index 7d70061..0000000
Binary files a/blocks/easy_image_gallery/images/placeholders/placeholder-824-550.png and /dev/null differ
diff --git a/blocks/easy_image_gallery/javascript/build/block-edit.js b/blocks/easy_image_gallery/javascript/build/block-edit.js
index 45d044b..1d41601 100644
--- a/blocks/easy_image_gallery/javascript/build/block-edit.js
+++ b/blocks/easy_image_gallery/javascript/build/block-edit.js
@@ -1,12 +1,10 @@
    debug = true;
-
    function easy_image_manager (sliderEntriesContainer) {
 
         // sliderEntriesContainer = $('.image-items');
         // Le template
         var _templateSlide = _.template($('#imageTemplate').html());
         var is_first_file = true;
-        filesetAlreadyChoosed = new Array();
         // Les options du FileUpload
         var args = {
             url: CCM_DISPATCHER_FILENAME + '/ccm/system/file/upload',
@@ -42,11 +40,11 @@
                     initUploadActionOnItem(newItem);
                 }
                 is_first_file = false;
-          
+
             },
             progress: function(e, data) {
                 var progress = parseInt(data.loaded / data.total * 100, 10);
-                
+
                 var target = data.newItem ? data.newItem : $(e.target);
                 if (progress < 95) {
                     target.find('.knob').val(progress).change();
@@ -62,7 +60,7 @@
                 var target = data.newItem ? data.newItem : $(e.target);
                 $.get(getFileDetailDetailJson,{fID:data.result[0].fID}, function(file) {
                     fillTemplate(file,target);
-                },'json');                 
+                },'json');
             },
             fail: function(r,data) {
                 //jQuery.fn.dialog.closeTop();
@@ -84,7 +82,7 @@
         // Quand on clique sur le cadre on déclenche l'ouverture du navigateur de fichier Navigateur
         var attachUploadEvent = function ($obj) {
             // On lance le fileupload
-            $obj.fileupload(args);    
+            $obj.fileupload(args);
             $inputfile = $obj.find('input.browse-file');
             $obj.find('.upload-file').on('click',function(e){
                 e.preventDefault();
@@ -116,7 +114,7 @@
                 ConcreteFileManager.launchDialog(function (data) {
                     // data : Object {fID: "1"}
                     $.get(getFileDetailDetailJson,{fID:data.fID}, function(file) {
-                        if(file.generic_type == '1'){ // if(file.type == "Image"){
+                        if(file.generic_type == "1"){ // if(file.type == "Image"){
                             jQuery.fn.dialog.hideLoader();
                             fillTemplate(file,Launcher);
                            // On ajoute un nouvel element vide a coté
@@ -126,13 +124,14 @@
                         jQuery.fn.dialog.hideLoader();
                         alert('You must select an image file only')
 
-                    },'json');                    
+                    },'json');
                 });
             });
         }
 
         var initImageEdit = function ($obj,file) {
             $obj.find(".dialog-launch").dialog();
+
             $obj.find('.editable-click').editable({
                 ajaxOptions: {dataType: 'json'},
                 emptytext: ccmi18n.none,
@@ -140,30 +139,56 @@
                 url: saveFieldURL,
                 params:{fID:file.fID},
                 pk: '_x',
-
+                success:function(data) {
+                  // On doit tester la valeur du type et afficher le juste input correspndant au type
+                  var container = $(this).closest('.image-item');
+                  if(data.name == 'link_type'){
+                    displayLinkChooser(container,data.value);
+                  };
+                }
             });
+            if (file.link_type) displayLinkChooser($obj,file.link_type);
             // Faire en sorte que les infos restent visibles quand on edite le titre ou la description
             $obj.find('.editable-click').on('shown', function (data) {
-                    $(data.target).closest('.item-toolbar').addClass('active');
+                $(data.target).closest('.item-toolbar').addClass('active');
             });
             $obj.find('.editable-click').on('hidden', function (data) {
-                    $(data.target).closest('.item-toolbar').removeClass('active');
+                $(data.target).closest('.item-toolbar').removeClass('active');
             });
 
         }
 
+
+
         fillTemplate = function (file,$element) {
 
-            var defaults = { fID: '', title: '', link_url: '', cID: '', description: '', sort_order: '', image_url: ''};
-            if (file) $.extend(defaults, {fID: file.fID, title: file.title, description: file.description, sort_order: '', image_url: file.urlInline});
+            var defaults = { fID: '',fsID:'', title: '', link_url: '',internal_link_cid:undefined, link_type:'', cID: '', description: '', sort_order: '', image_url: '',originType:'file'};
+            if (file) $.extend(defaults, {fID: file.fID,
+                                          fsID: file.fsID,
+                                          title: file.title,
+                                          description: file.description,
+                                          sort_order: '',
+                                          image_url: file.urlInline,
+                                          internal_link_cid:file.internal_link_cid,
+                                          external_link_url: file.external_link_url,
+                                          link_type:file.link_type,
+                                          originType:file.originType,
+                                          filesetName : file.filesetName
+                                        });
+            if (defaults.originType == 'fileset') {
+              defaults.classes = 'fileset fsid' + defaults.fsID + " fileset-" + selectedFilesets.indexOf(parseInt(defaults.fsID)) ;
+              defaults.inputValue = 'fsID' + defaults.fsID;
+            } else {
+              defaults.classes = '';
+              defaults.inputValue = defaults.fID;
+            }
 
             if ($element) {
-                //  on est dans le cas ou l'utilisateur a uploadé ou choisi un fichier
-                // dans ce cas on replace le carré vide par un element rempli avec image et tout le toutim
-               var newSlide = $element.replaceWithPush(_templateSlide(defaults));
+              //  on est dans le cas ou l'utilisateur a uploadé ou choisi un fichier
+              // dans ce cas on replace le carré vide par un element rempli avec image et tout le toutim
+              var newSlide = $element.replaceWithPush(_templateSlide(defaults));
 
             } else {
-
                 // On ajoute un nouveau avec ou sans infos
                 sliderEntriesContainer.append(_templateSlide(defaults));
                 var newSlide = $('.image-item').last();
@@ -180,9 +205,13 @@
                 // Et qui n'ont servi qu'a uploder un fichier
                 newSlide.find('.browse-file').remove();
                 // Mettre à jour le fID
-                newSlide.find('.image-fID').val(file.fID);
+                newSlide.find('.image-fID').val(defaults.inputValue);
             }
-            
+            newSlide.find('[data-field=entry-link-page-selector]').concretePageSelector({
+                'inputName': 'internal_link_cid[' + defaults.fID + '][]',
+                'cID':defaults.internal_link_cid
+            })
+
             refreshManager ();
 
             return newSlide;
@@ -195,50 +224,76 @@
             sliderEntriesContainer.sortable({handle: ".handle"});
             // On regarde si on desactive ou pas le bouton submit
             // en comptant les carré rempli d'image
-            var b = $('#easy_image_save'); 
+            var b = $('#easy_image_save');
             if(!$('.image-item.filled').size()) {
                 b.addClass('disabled');
             } else if (b.is('.disabled')) {
                 b.removeClass('disabled');
             };
+        }
+
+        var addFileset = function (fsID) {
+          if ($.inArray(fsID, selectedFilesets) > -1) {
+              var addImages = confirm(ccmi18n.filesetAlreadyPicked );
+              if(addImages == false) return;
+          } else {
+              selectedFilesets.push(parseInt(fsID));
+          }
+          var unique=selectedFilesets.filter(function(itm,i,a){
+              return i==a.indexOf(itm);
+          });
+          selectedFilesets = unique;
 
+          $.get(getFilesetImagesURL,{fsID:fsID}, function(data) {
+              if(data.length) {
+                  $.each(data,function(i,f){
+                      fillTemplate(f);
+                      refreshManager ();
+                  });
+              }
+          },'json');
+        }
+
+        var removeFileset = function (fsID) {
+          fsID = parseInt(fsID);
+          if ($.inArray(parseInt(fsID), selectedFilesets) === -1) {
+              var addImages = confirm(ccmi18n.filesetNotFound );
+              return;
+          } else {
+            // On recrée un tableau sans le fileset selectionne
+            var index;
+            var _selectedFileset = new Array();
+            for (index = 0; index < selectedFilesets.length; ++index) {
+                if(selectedFilesets[index] != fsID) _selectedFileset.push(selectedFilesets[index]);
+            }
+            selectedFilesets = _selectedFileset;
+          };
+          $('.fsid' + fsID).remove();
         }
 
         // -- Quand on choisi un Fileset -- \\
 
-        $('#fsID').change(function(){
-            var t = $(this);
-            var v = t.val();
-            if ($.inArray(v, filesetAlreadyChoosed) > -1) {
-                var addImages = confirm(ccmi18n.filesetAlreadyPicked );
-                if(addImages == false) {
-                    return;
-                }
-            }
-            filesetAlreadyChoosed.push(v);
-            $.get(getFilesetImagesURL,{fsID:v}, function(data) {
-                if(data.length) {
-                    $.each(data,function(i,f){
-                        fillTemplate(f);
-                        refreshManager ();        
-
-                    });
-                    t.val(0);
-                }
-            },'json');
-            
+        $('#fsID').change(function(e){
+            var r = e.removed;
+            var a = e.added;
+            if (typeof r === 'object') removeFileset(r.id);
+            if (typeof a === 'object') addFileset(a.id);
+            // selectedFilesets = e.val;
+
         });
-        // Simpel option open
-        $('#options-button').on('click',function(e){          
+
+
+        // Simple option open
+        $('#options-button').on('click',function(e){
             $('#advanced-options-content').slideUp();
             $('#options-content').slideToggle();
         });
         // Advanced options open
-        $('#advanced-options-button').on('click',function(e){      
+        $('#advanced-options-button').on('click',function(e){
             $('#options-content').slideUp();
             $('#advanced-options-content').slideToggle();
-            
-        });        
+
+        });
         // Closes buttons
         $('.easy_image_options_close').on('click',function(e){
             $('.options-content').slideUp();
@@ -248,21 +303,38 @@
         fillTemplate();
 };
 
+var displayLinkChooser = function (container,type) {
+  switch(type) {
+      case 'URL':
+          container.find('div[data-field=entry-link-page-selector]').hide();
+          container.find('.entry-link-url').show();
+          break;
+      case 'Page':
+          container.find('.entry-link-url').hide();
+          container.find('div[data-field=entry-link-page-selector]').show();
+          break;
+      default:
+          container.find('div[data-field=entry-link-page-selector]').hide();
+          container.find('.entry-link-url').hide();
+          break;
+  }
+}
+
 function l() {
     if(debug==true) {
         for (var i=0; i < arguments.length; i++) {
             console.log(arguments[i]);
         }
-    } 
+    }
 }
-        
+
 var submitBlockForm = function () {
     $('#ccm-block-form').submit();
     ConcreteEvent.fire('EditModeExitInlineSaved');
     ConcreteEvent.fire('EditModeExitInline', {
         action: 'save_inline'
-    });    
-} 
+    });
+}
 
 function cancelBlockForm () {
     ConcreteEvent.fire('EditModeExitInline');
diff --git a/blocks/easy_image_gallery/stylesheet/block-edit.css b/blocks/easy_image_gallery/stylesheet/block-edit.css
index ce11f03..a489939 100644
--- a/blocks/easy_image_gallery/stylesheet/block-edit.css
+++ b/blocks/easy_image_gallery/stylesheet/block-edit.css
@@ -1,3 +1,6 @@
+.ccm-inline-toolbar>li.ccm-inline-toolbar-button button {
+  height:40px;
+}
 .basic-image-form-wrapper .redactor_editor {
     padding: 20px;
 }
@@ -9,7 +12,7 @@
 .image-item {
     display: inline-block;
     position: relative;
-    height: 200px;
+    height: 250px;
     width: 200px;
     border: 2px dotted #e0e0e0;
     outline: none;
@@ -29,7 +32,7 @@
 .image-item canvas {/* Le knob actif */
     position: absolute;
     top: 25px;
-    left: 25px;        
+    left: 25px;
     transition:all .3s cubic-bezier(1,-1.21,0,1.33);
 }
 .image-item canvas.out {
@@ -51,13 +54,13 @@
     color: #bbb;
 }
 .image-item .process.in {
-    transform:translateX(0);   
+    transform:translateX(0);
     opacity: 1;
 }
 
 .image-item input[type="file" ], .image-item .knob {
     display: none;
-}    
+}
 
 /* Le layer qui permet d'editer la photo une fois chargée */
 
@@ -75,7 +78,7 @@
 .item-toolbar h4 {
     font-size: 12px;
     text-transform: none;
-    margin: 50px 10px 0 10px;
+    margin: 30px 10px 0 10px;
     padding-bottom: 5px;
     border-bottom: 1px solid #ddd;
 }
@@ -86,7 +89,7 @@
     margin: 5px 10px;
 
 }
-.image-item:hover .item-toolbar, 
+.image-item:hover .item-toolbar,
 .item-toolbar.active {
     opacity: 1
 }
@@ -99,8 +102,27 @@
     left: 5px;
     background-size: cover;
 }
-
-
+/* Le page seector doit etre plus petit */
+.item-toolbar div.ccm-page-selector {
+  padding: 5px;
+  margin: 3px 8px;
+}
+.item-toolbar div.ccm-page-selector a.ccm-page-selector-clear {
+  line-height: 0;
+}
+.item-toolbar div.ccm-page-selector a.ccm-page-selector-clear i {
+  font-size: 10px;
+}
+.item-toolbar div.ccm-page-selector div.ccm-page-selector-page-selected-title,
+div.item-toolbar div.ccm-page-selector a {
+  font-size: 11px;
+}
+div[data-field="entry-link-page-selector"] label {
+  display: none;
+}
+.item-toolbar hr.separator {
+  margin: 7px 0;
+}
 /* -- Le bloc qui contient les deux boutons (ajout et filemanager) -- */
 
 .add-file-control {
@@ -117,7 +139,7 @@
     text-align: center;
     width: 50%;
     background: #eee;
-    
+
 }
 .add-file-control a:first-child {
     width: 49%;
@@ -129,7 +151,7 @@
     background: #eee;
     position: absolute;
     width: 100%;
-    bottom: 0;        
+    bottom: 0;
 }
 .item-controls i {
     line-height: 35px;
@@ -142,7 +164,7 @@
 .remove-item {
     position: absolute;
     right: 10px;
-    top: 10px;        
+    top: 10px;
 }
 .basic-image-form-wrapper i.fa-sort-asc {
     position: absolute;
@@ -167,11 +189,62 @@
     z-index: 1;
     position: relative;
     background-color: #eee;
-    padding: 20px;    
+    padding: 20px;
 }
 .options-content label {
     margin-right: 10px;
 }
+
+/* -- Les fileset -- */
+div.image-item.fileset-0 {
+  border: 5px solid #0197F6;
+}
+div.image-item.fileset-1 {
+  border: 5px solid #FF958C;
+}
+div.image-item.fileset-2 {
+  border: 5px solid #9EA93F;
+}
+div.image-item.fileset-3 {
+  border: 5px solid #CA61C3;
+}
+div.image-item.fileset-4 {
+  border: 5px solid #315C2B;
+}
+
+div.image-item.fileset-0:after {
+  background: #0197F6;
+  color:#fff;
+}
+div.image-item.fileset-1:after {
+  background: #FF958C;
+  color:#000;
+}
+div.image-item.fileset-2:after {
+  background: #9EA93F;
+  color:#fff;
+}
+div.image-item.fileset-3:after {
+  background: #CA61C3;
+  color:#fff;
+}
+div.image-item.fileset-4:after {
+  background: #315C2B;
+  color:#fff;
+}
+div.image-item.fileset .img {
+  left:0; top: 0; right: 0; bottom: 0;
+}
+.fileset:after {
+    content: " " attr(rel) " ";
+    position: absolute;
+    display: inline-block;
+    top:-5px; right: 0;
+    padding: 2px 7px;
+    font-size: 10px;
+}
+
+
 /* -- ccm-ui -- */
 .ccm-ui .popover.top {
 z-index: 9999; /* To go up of the tool bar */
diff --git a/blocks/easy_image_gallery/templates/basic/view.php b/blocks/easy_image_gallery/templates/basic/view.php
index 1914bb7..804d07b 100644
--- a/blocks/easy_image_gallery/templates/basic/view.php
+++ b/blocks/easy_image_gallery/templates/basic/view.php
@@ -14,7 +14,8 @@
         $thumbnailUrl = $f->getThumbnailURL($type->getBaseVersion());
         $imageColumn = $f->getAttribute('gallery_columns') ? $f->getAttribute('gallery_columns') : $options->galleryColumns;
         $retinaThumbnailUrl = $f->getThumbnailURL($type->getDoubledVersion());
-        $fullUrl = $f->getRelativePath();
+        $fullUrl = $view->controller->getImageLink($f,$options);
+        $tag = ($fullUrl || $options->lightbox) ? 'a' : 'span';
         $ratio = $f->getAttribute('image_ratio');
         $w = intval($f->getAttribute('width'));
         $h = intval($f->getAttribute('height'));
@@ -22,15 +23,19 @@
         ?>
         <?php if ($key%$options->galleryColumns == 0) : ?><div class="row"><?php endif ?>
         <div class="box-wrap b-col-<?php echo $options->galleryColumns?> gutter">
-            <a class="img <?php echo $ratio ?>" 
-                style="background-image:url(<?php echo $retinaThumbnailUrl ?>); background-image: -webkit-image-set(url(<?php echo $thumbnailUrl ?>) 1x, url(<?php echo $retinaThumbnailUrl ?>) 2x);" 
+            <<?php echo $tag ?> class="img <?php echo $ratio ?>"
+                style="background-image:url(<?php echo $retinaThumbnailUrl ?>); background-image: -webkit-image-set(url(<?php echo $thumbnailUrl ?>) 1x, url(<?php echo $retinaThumbnailUrl ?>) 2x);"
+                <?php if($fullUrl) : ?>
                 href="<?php echo $fullUrl ?>"
+                <?php endif ?>
+                 <?php if($options->lightbox) : ?>
                 data-image="<?php echo $fullUrl ?>"
                 data-fancybox-group="gallery-<?php echo $bID ?>"
-                <?php if($options->lightboxTitle) : ?> title="<?php echo $f->getTitle() ?> <?php if($options->lightboxDescription &&  $f->getDescription()) echo " - " . $f->getDescription(); ?>" <?php endif ?> 
+                <?php if($options->lightboxTitle) : ?> title="<?php echo $f->getTitle() ?> <?php if($options->lightboxDescription &&  $f->getDescription()) echo " - " . $f->getDescription(); ?>" <?php endif ?>
+                <?php endif ?>
                 >
 
-            </a>
+            </<?php echo $tag ?>>
             <div class="loader"><i class="fa fa-circle-o-notch fa-spin"></i></div>
 
             <div class="info">
@@ -48,4 +53,4 @@
     <?php $this->inc('elements/javascript.php') ?>
     <?php $this->inc('elements/css.php') ?>
     <?php endif ?>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/blocks/easy_image_gallery/templates/masonry/view.php b/blocks/easy_image_gallery/templates/masonry/view.php
index cc99ec0..db32f5d 100644
--- a/blocks/easy_image_gallery/templates/masonry/view.php
+++ b/blocks/easy_image_gallery/templates/masonry/view.php
@@ -17,25 +17,26 @@
     <div class="e-col-<?php echo $options->galleryColumns?> grid-sizer"></div>
 <?php foreach ($files as $key => $f) :
     $galleryHasImage = true;
-    // $thumbnailUrl = $f->getThumbnailURL($type->getBaseVersion());
     $placeHolderUrl = $this->getBlockURL() . "/images/placeholders/placeholder-{$f->getAttribute('width')}-{$f->getAttribute('height')}.png";
     $imageColumn = $f->getAttribute('gallery_columns') ? $f->getAttribute('gallery_columns') : $options->galleryColumns;
-    $retinaThumbnailUrl = $f->getThumbnailURL($type->getDoubledVersion());    
-    $fullUrl = $f->getRelativePath();     
+    $retinaThumbnailUrl = $f->getThumbnailURL($type->getDoubledVersion());
+    $fullUrl = $view->controller->getImageLink($f,$options);
     ?>
     <div class="img masonry-item-collapsed masonry-item e-col-<?php echo $imageColumn ?> <?php echo $fileTags[$f->getFileID()]['handle'] ?>">
-        <?php if($options->lightbox) : ?><a href="<?php echo $fullUrl ?>" data-image="<?php echo $fullUrl ?>" data-fancybox-group="gallery-<?php echo $bID ?>" <?php if($options->lightboxTitle) : ?> title="<?php echo $f->getTitle() ?><?php if($options->lightboxDescription) : ?> <?php echo $f->getDescription() ?><?php endif ?>"<?php endif ?> ><?php endif ?>      
-            <img src="<?php echo $placeHolderUrl ?>" data-fancybox-group="easy-gallery-<?php  echo $bID?>" data-original="<?php echo $retinaThumbnailUrl ?>" alt="<?php echo $f->getTitle() ?>">
+        <?php if($fullUrl) : ?>
+          <a href="<?php echo $fullUrl ?>"
+            <?php if($options->lightbox) : ?>data-image="<?php echo $fullUrl ?>" data-fancybox-group="gallery-<?php echo $bID ?>" <?php if($options->lightboxTitle) : ?> title="<?php echo $f->getTitle() ?><?php if($options->lightboxDescription) : ?> <?php echo $f->getDescription() ?><?php endif ?>"<?php endif ?><?php endif ?>><?php endif ?>
+            <img src="<?php echo $placeHolderUrl ?>" data-original="<?php echo $retinaThumbnailUrl ?>" alt="<?php echo $f->getTitle() ?>">
             <div class="info-wrap">
                 <div class="info">
                     <div>
-                        <?php if($options->displayDate) : ?><p class="date"><?php echo date($options->dateFormat,$f->getDateAdded()->getTimestamp() )?></p><?php endif ?>                        
+                        <?php if($options->displayDate) : ?><p class="date"><?php echo date($options->dateFormat,$f->getDateAdded()->getTimestamp() )?></p><?php endif ?>
                         <?php if($options->galleryTitle && $f->getTitle()) : ?><h5><?php echo $f->getTitle() ?></h5><?php endif ?>
                         <?php if($options->galleryDescription && $f->getDescription()) : ?><p><small><?php echo $f->getDescription() ?></small></p><?php endif ?>
                     </div>
                 </div>
             </div>
-        <?php if($options->lightbox) : ?></a><?php endif ?>
+        <?php if($fullUrl) : ?></a><?php endif ?>
     </div>
 <?php endforeach ?>
     <div class="clear" style="clear:both"></div>
@@ -48,4 +49,4 @@
 <?php $this->inc('elements/css.php') ?>
 
 <?php endif // galleryHasImage ?>
-<?php endif // isEditMode & is_array ?>
\ No newline at end of file
+<?php endif // isEditMode & is_array ?>
diff --git a/blocks/easy_image_gallery/view.php b/blocks/easy_image_gallery/view.php
index dcab08a..8df881e 100644
--- a/blocks/easy_image_gallery/view.php
+++ b/blocks/easy_image_gallery/view.php
@@ -1,14 +1,13 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
 $c = Page::getCurrentPage();
 $galleryHasImage = false;
-
 if ($c->isEditMode()) : ?>
     <div class="ccm-edit-mode-disabled-item" style="width: <?php echo $width; ?>; height: <?php echo $height; ?>">
         <div style="padding: 40px 0px 40px 0px"><?php echo t('Easy Gallery disabled in edit mode.')?></div>
     </div>
 <?php
 elseif (is_array($files) && count($files)) :
-    $type = \Concrete\Core\File\Image\Thumbnail\Type\Type::getByHandle('file_manager_detail');    
+    $type = \Concrete\Core\File\Image\Thumbnail\Type\Type::getByHandle('file_manager_detail');
 ?>
     <div class="filtering">
     <?php $this->inc('elements/search.php') ?>
@@ -23,12 +22,12 @@
         $imageColumn = $f->getAttribute('gallery_columns') ? $f->getAttribute('gallery_columns') : $options->galleryColumns;
         $placeHolderUrl = $this->getBlockURL() . "/images/placeholders/placeholder-{$f->getAttribute('width')}-{$f->getAttribute('height')}.png";
         $retinaThumbnailUrl = $f->getThumbnailURL($type->getDoubledVersion());
-        $fullUrl = $f->getRelativePath();
+        $fullUrl = $view->controller->getImageLink($f,$options);
         ?>
         <div class="box-wrap masonry-item b-col-<?php echo $imageColumn ?> <?php echo $fileTags[$f->getFileID()]['handle'] ?>">
-            <?php if($options->lightbox) : ?><a href="<?php echo $fullUrl ?>" data-fancybox-group="easy-gallery-<?php echo $bID?>" data-image="<?php echo $fullUrl ?>" <?php if($options->lightboxTitle) : ?> title="<?php echo $f->getTitle() ?><?php if($options->lightboxDescription) : ?> <?php echo $f->getDescription() ?><?php endif ?>"<?php endif ?> ><?php endif ?>       
+            <?php if($fullUrl) : ?><a href="<?php echo $fullUrl ?>" <?php if ($options->lightbox) : ?> data-fancybox-group="easy-gallery-<?php echo $bID?>" data-image="<?php echo $fullUrl ?>" <?php if($options->lightboxTitle) : ?> title="<?php echo $f->getTitle() ?><?php if($options->lightboxDescription) : ?> <?php echo $f->getDescription() ?><?php endif ?>"<?php endif ?> <?php endif ?>><?php endif ?>
                 <img src="<?php echo $placeHolderUrl ?>" data-original="<?php echo $retinaThumbnailUrl ?>" alt="<?php echo $f->getTitle() ?>">
-            <?php if($options->lightbox) : ?></a><?php endif ?>
+            <?php if($fullUrl) : ?></a><?php endif ?>
             <div class="info">
                 <?php if($options->displayDate) : ?><p class="date"><?php echo date($options->dateFormat,$f->getDateAdded()->getTimestamp() )?></p><?php endif ?>
                 <?php if($options->galleryTitle) : ?><p class="title"><?php echo $f->getTitle() ?></p><?php endif ?>
@@ -44,4 +43,4 @@
     <?php $this->inc('elements/masonry.php') ?>
     <?php $this->inc('elements/css.php') ?>
     <?php endif ?>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/config/install/base/attributes.xml b/config/install/base/attributes.xml
index 2f1039c..45beeb3 100644
--- a/config/install/base/attributes.xml
+++ b/config/install/base/attributes.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
 <concrete5-cif version="1.0">
+  <attributetypes>
+      <attributetype handle="page_selector" name="Page Selector" package="easy_image_gallery">
+          <categories>
+              <category handle="collection"/>
+              <category handle="user"/>
+              <category handle="file"/>
+          </categories>
+      </attributetype>
+    </attributetypes>
     <attributekeys>
         <attributekey handle="image_tag" name="Image Tags" package="easy_image_gallery" searchable="1" indexed="1" type="select" category="file">
             <type allow-multiple-values="1" display-order="display_asc" allow-other-values="1">
@@ -21,11 +30,25 @@
                 </options>
             </type>
         </attributekey>
+        <attributekey handle="internal_link_cid" name="Link to page" package="easy_image_gallery" searchable="1" indexed="1" type="page_selector" category="file"/>
+        <attributekey handle="external_link_url" name="External Link URL" package="easy_image_gallery" searchable="1" indexed="1" type="text" category="file"/>
+        <attributekey handle="link_type" name="Link Type" package="easy_image_gallery" searchable="1" indexed="1" type="select" category="file">
+            <type allow-multiple-values="0" display-order="display_asc" allow-other-values="0">
+                <options>
+                    <option value="None" is-end-user-added="0"/>
+                    <option value="URL" is-end-user-added="0"/>
+                    <option value="Page" is-end-user-added="0"/>
+                </options>
+            </type>
+        </attributekey>
     </attributekeys>
     <attributesets>
         <attributeset handle="easy_image_gallery" name="Easy Image Gallery" package="easy_image_gallery" locked="0" category="file">
             <attributekey handle="image_tag"/>
             <attributekey handle="gallery_columns"/>
+            <attributekey handle="internal_link_cid"/>
+            <attributekey handle="external_link_url"/>
+            <attributekey handle="link_type"/>            
         </attributeset>
     </attributesets>
 </concrete5-cif>
diff --git a/controller.php b/controller.php
index 4767e91..51cf242 100644
--- a/controller.php
+++ b/controller.php
@@ -8,6 +8,7 @@
 use Concrete\Core\Asset\AssetList;
 use Route;
 use Events;
+use Loader;
 
 use Concrete\Package\EasyImageGallery\Src\Helper\MclInstaller;
 
@@ -15,18 +16,18 @@ class Controller extends \Concrete\Core\Package\Package {
 
     protected $pkgHandle = 'easy_image_gallery';
     protected $appVersionRequired = '5.7.3';
-    protected $pkgVersion = '1.2';
+    protected $pkgVersion = '1.2.1.2';
     protected $pkg;
-    
+
     public function getPackageDescription() {
         return t("Easy Image made gallery easy for your client");
     }
-    
+
     public function getPackageName() {
         return t("Easy Image Gallery");
-    }   
+    }
 
-    public function on_start() { 
+    public function on_start() {
 
         $this->registerRoutes();
         $this->registerAssets();
@@ -34,21 +35,21 @@ public function on_start() {
 
     public function registerAssets()
     {
-        $al = AssetList::getInstance(); 
-        $al->register( 'javascript', 'knob', 'blocks/easy_image_gallery/javascript/build/jquery.knob.js', array('version' => '1.2.11', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
-        $al->register( 'javascript', 'easy-gallery-edit', 'blocks/easy_image_gallery/javascript/build/block-edit.js', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
-        $al->register( 'css', 'easy-gallery-edit', 'blocks/easy_image_gallery/stylesheet/block-edit.css', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
-        $al->register( 'css', 'easy-gallery-view', 'blocks/easy_image_gallery/stylesheet/block-view.css', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
+        $al = AssetList::getInstance();
+        $al->register( 'javascript', 'knob', 'blocks/easy_image_gallery/javascript/build/jquery.knob.js', array('version' => '1.2.11', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'javascript', 'easy-gallery-edit', 'blocks/easy_image_gallery/javascript/build/block-edit.js', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'css', 'easy-gallery-edit', 'blocks/easy_image_gallery/stylesheet/block-edit.css', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'css', 'easy-gallery-view', 'blocks/easy_image_gallery/stylesheet/block-view.css', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
 
         // View items
-        $al->register( 'javascript', 'intense', 'blocks/easy_image_gallery/javascript/build/intense.js', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
-        $al->register( 'javascript', 'fancybox', 'blocks/easy_image_gallery/javascript/build/jquery.fancybox.pack.js', array('version' => '2.1.5', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
-        $al->register( 'javascript', 'masonry', 'blocks/easy_image_gallery/javascript/build/masonry.pkgd.min.js', array('version' => '3.1.4', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this ); 
-        $al->register( 'javascript', 'imagesloaded', 'blocks/easy_image_gallery/javascript/build/imagesloaded.pkgd.min.js', array('version' => '3.1.4', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this ); 
-        $al->register( 'javascript', 'isotope', 'blocks/easy_image_gallery/javascript/build/isotope.pkgd.min.js', array('version' => '3.1.4', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this ); 
-        $al->register( 'javascript', 'lazyload', 'blocks/easy_image_gallery/javascript/build/jquery.lazyload.min.js', array('version' => '1.9.1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this ); 
+        $al->register( 'javascript', 'intense', 'blocks/easy_image_gallery/javascript/build/intense.js', array('version' => '1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'javascript', 'fancybox', 'blocks/easy_image_gallery/javascript/build/jquery.fancybox.pack.js', array('version' => '2.1.5', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'javascript', 'masonry', 'blocks/easy_image_gallery/javascript/build/masonry.pkgd.min.js', array('version' => '3.1.4', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'javascript', 'imagesloaded', 'blocks/easy_image_gallery/javascript/build/imagesloaded.pkgd.min.js', array('version' => '3.1.4', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'javascript', 'isotope', 'blocks/easy_image_gallery/javascript/build/isotope.pkgd.min.js', array('version' => '3.1.4', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
+        $al->register( 'javascript', 'lazyload', 'blocks/easy_image_gallery/javascript/build/jquery.lazyload.min.js', array('version' => '1.9.1', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
 
-        $al->register( 'css', 'fancybox', 'blocks/easy_image_gallery/stylesheet/jquery.fancybox.css', array('version' => '2.1.5', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );       
+        $al->register( 'css', 'fancybox', 'blocks/easy_image_gallery/stylesheet/jquery.fancybox.css', array('version' => '2.1.5', 'position' => Asset::ASSET_POSITION_FOOTER, 'minify' => true, 'combine' => true), $this );
 
     }
     public function registerRoutes()
@@ -58,14 +59,14 @@ public function registerRoutes()
         Route::register('/easyimagegallery/tools/getfiledetailsjson','\Concrete\Package\EasyImageGallery\Controller\Tools\EasyImageGalleryTools::getFileDetailsJson');
 
 
-    }  
+    }
 
     public function install() {
-    
+
     // Get the package object
         $this->pkg = parent::install();
 
-    // Installing                   
+    // Installing
         $this->installOrUpgrade();
 
     }
@@ -73,15 +74,15 @@ public function install() {
 
     private function installOrUpgrade() {
         $ci = new MclInstaller($this->pkg);
-        $ci->importContentFile($this->getPackagePath() . '/config/install/base/blocktypes.xml');        
-        $ci->importContentFile($this->getPackagePath() . '/config/install/base/attributes.xml');    
-    }    
+        $ci->importContentFile($this->getPackagePath() . '/config/install/base/blocktypes.xml');
+        $ci->importContentFile($this->getPackagePath() . '/config/install/base/attributes.xml');
+    }
 
     public function upgrade () {
         $this->pkg = $this;
 
         $this->installOrUpgrade();
-        parent::upgrade();        
+        parent::upgrade();
     }
 
-}
\ No newline at end of file
+}
diff --git a/controllers/tools/easy_image_gallery_tools.php b/controllers/tools/easy_image_gallery_tools.php
index 4dcc641..8774305 100644
--- a/controllers/tools/easy_image_gallery_tools.php
+++ b/controllers/tools/easy_image_gallery_tools.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace Concrete\Package\EasyImageGallery\Controller\Tools;
 
 use URL;
@@ -7,7 +7,7 @@
 use Permissions;
 use \Concrete\Core\File\EditResponse as FileEditResponse;
 use \Concrete\Core\Controller\Controller as RouteController;
-
+use FileAttributeKey;
 use Loader;
 use Core;
 use stdClass;
@@ -31,12 +31,19 @@ public function save()
                 case 'fvTags':
                     $fv->updateTags($value);
                     break;
+                default:
+                    $ak = FileAttributeKey::getByHandle($_REQUEST['name']);
+                    if (is_object($ak)) :
+                      $ak->setAttribute($fv,$value);
+                    endif;
+                  break;
             }
 
             $sr = new FileEditResponse();
             $sr->setFile($this->file);
             $sr->setMessage(t('File updated successfully.'));
             $sr->setAdditionalDataAttribute('value', $value);
+            $sr->setAdditionalDataAttribute('name', $_REQUEST['name']);
             $sr->outputJSON();
 
 
@@ -55,16 +62,16 @@ public function getFileSetImage () {
         // print_r($fsf);
         if (count($fsf)) :
             foreach ($fsf as $key => $f) :
-                $fd = $this->getFileDetails($f); 
+                $fd = $this->getFileDetails($f,$_REQUEST['fsID']);
                 if ($fd) $files[] = $fd;
             endforeach;
             Loader::helper('ajax')->sendResult($files);
         endif;
-        
+
     }
 
     public function getFileThumbnailUrl ($f = NULL) {
-        if(!$f && $_REQUEST['fID']) 
+        if(!$f && $_REQUEST['fID'])
             $f = File::getByID($_REQUEST['fID']);
 
         $type = \Concrete\Core\File\Image\Thumbnail\Type\Type::getByHandle('file_manager_detail');
@@ -74,17 +81,42 @@ public function getFileThumbnailUrl ($f = NULL) {
         return false;
     }
 
-    public function getFileDetails ($f = NULL) {
-        if(!$f && $_REQUEST['fID']) 
+    public function getFileDetails ($f = NULL, $origin = 'file') {
+      // origin peut être "file" pour une simpleimage
+      // ou numérique si l'image est extraite d'un FS
+        if(!$f && $_REQUEST['fID'])
             $f = File::getByID($_REQUEST['fID']);
 
-        $o = new stdClass;
         if(!is_object($f)) return false;
-        $o->urlInline = $this->getFileThumbnailUrl($f);
-        $o->title = $f->getTitle();
-        $o->description = $f->getDescription();
-        $o->fID = $f->getFileID();
-        $o->type = $f->getVersionToModify()->getGenericTypeText();
+        $fv = $f->getVersionToModify();
+        $to = $fv->getTypeObject();
+        $o  = $fv->getJSONObject();
+        // We add the Generic type as number to avoid translating issues
+        $o->generic_type = $to->getGenericType();
+        // Value fro the image link
+        $o->internal_link_cid = $f->getAttribute('internal_link_cid') ? $f->getAttribute('internal_link_cid') : false;
+        $o->external_link_url = $f->getAttribute('external_link_url') ? $f->getAttribute('external_link_url') : false;
+        $o->link_type = str_replace('<br/>', '', $f->getAttribute('link_type','display'));
+
+        if (is_numeric($origin)) {
+          $fs = FileSet::getByID($origin);
+          if (!is_object($fs)) :
+            $o->originType = 'file';
+            $o->fsID = false;
+          endif;
+          $o->originType = 'fileset';
+          $o->fsID = $origin;
+          $o->filesetName = $fs->getFileSetName();
+        } else {
+          $o->originType = 'file';
+          $o->fsID = false;
+        }
+        // $o->urlInline = $this->getFileThumbnailUrl($f);
+        // $o->title = $f->getTitle();
+        // $o->description = $f->getDescription();
+        // $o->fID = $f->getFileID();
+        // $o->type = $fv->getGenericTypeText();
+        // $o->generic_type = $fv->getGenericType();
 
         return $o;
     }