Merge pull request #46 from sanderha/fix-to-work-with-translatable-js

Fixes to be more compatible with Translatable module's javascript
isobar-nz · Feb 23, 2016 · d7927a3 · d7927a3
2 parents 76e2b65 + 97862f7
commit d7927a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/code/Extensions/TranslatableCatalogExtension.php b/code/Extensions/TranslatableCatalogExtension.php
@@ -6,13 +6,6 @@
 class TranslatableCatalogExtension extends Extension
 {
 
-    /**
-     * @var array
-     */
-    private static $allowed_actions = [
-        'language'
-    ];
-
     /**
      * @return mixed
      */
@@ -72,7 +65,7 @@ public function getLanguageSelectorForm()
         $fields = FieldList::create($this->getLanguageField());
         return Form::create(
             $this->owner,
-            'language',
+            'LangForm',
             $fields,
             FieldList::create(FormAction::create(
                 'language',

diff --git a/code/templates/ModelAdmin_Tools.ss b/code/templates/ModelAdmin_Tools.ss
@@ -11,7 +11,9 @@
         <% end_if %>
         <% if $LanguageSelectorForm %>
             <h3 class="cms-panel-header"><% _t('ModelAdmin_Tools_ss.LANGUAGE', 'Language') %></h3>
-            $LanguageSelectorForm
+			<div class="CMSMain">
+				$LanguageSelectorForm
+			</div>
         <% end_if %>
     </div>
     <div class="cms-panel-content-collapsed">