@@ -33,7 +33,7 @@ $GLOBALS['TL_DCA']['tl_article']['fields']['es_type'] = array

   'exclude'                 => true,

   'inputType'               => 'select',

   'options_callback'        => array('tl_article_eSM_artLayout','getArticleLayouts'),

-  'eval'                    => array('tl_class'=>'w50', 'includeBlankOption'=>true, 'submitOnChange'=>true),

+  'eval'                    => array('chosen'=>true, 'tl_class'=>'w50', 'includeBlankOption'=>true, 'submitOnChange'=>true),

   'sql'                     => "int(10) unsigned NOT NULL default '0'"

 );

@@ -86,29 +86,12 @@ class tl_article_eSM_artLayout extends Backend

   public function getArticleLayouts(\DataContainer $dc)

   {

-    $arrLayoutIds = array();

-    $PageModel = \PageModel::findWithDetails($dc->activeRecord->pid);

-    if ($PageModel->layout)

-    {

-      $arrLayoutIds[] = $PageModel->layout;

-    }

-    if ($PageModel->mobileLayout)

-    {

-      $arrLayoutIds[] = $PageModel->mobileLayout;

-    }

-

-    $Themes = \ThemeModel::findMultipleByIds($arrLayoutIds);

-    if ($Themes === null)

-    {

-      return array();

-    }

-

     $arrArticleLayouts = array();

-    $ArticleLayouts = \Database::getInstance()->execute("SELECT id, title FROM tl_article_layouts WHERE ".\Database::getInstance()->findInSet('pid',$Themes->fetchEach('id'))." ORDER BY sorting");

+    $ArticleLayouts = \Database::getInstance()->execute("SELECT al.id, al.title, al.alias, t.name FROM tl_article_layouts al, tl_theme t WHERE t.id = al.pid ORDER BY t.name, al.sorting");

     while ($ArticleLayouts->next())

     {

-      $arrArticleLayouts[$ArticleLayouts->id] = $ArticleLayouts->title;

+      $arrArticleLayouts[$ArticleLayouts->name][$ArticleLayouts->id] = $ArticleLayouts->title;

     }

     return $arrArticleLayouts;