Make bootstrap_package compatible with themes (part 1)

benjaminkott · Jun 9, 2014 · 77414e6 · 77414e6
1 parent a8879cd
commit 77414e6
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 43 deletions.
diff --git a/Configuration/PageTS/mod_themes.txt b/Configuration/PageTS/mod_themes.txt
@@ -0,0 +1,3 @@
+mod.tx_themes {
+    constantCategoriesToShow = bootstrap package: basic,bootstrap package: advanced
+}
diff --git a/Configuration/PageTS/ModWizards.ts → Configuration/PageTS/mod_wizards.txt b/Configuration/PageTS/ModWizards.ts → Configuration/PageTS/mod_wizards.txt
diff --git a/Configuration/PageTS/TSConfig.ts → Configuration/PageTS/tsconfig.txt b/Configuration/PageTS/TSConfig.ts → Configuration/PageTS/tsconfig.txt
diff --git a/Meta/Screens/screenshot.png b/Meta/Screens/screenshot.png
diff --git a/Meta/theme.yaml b/Meta/theme.yaml
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -23,16 +23,16 @@
     'lockType' => '',
     'author' => 'Benjamin Kott',
     'author_email' => '[email protected]',
-    'author_company' => '',
+    'author_company' => 'private',
     'CGLcompliance' => NULL,
     'CGLcompliance_note' => NULL,
     'constraints' => array(
-		'depends' => array(
-			'typo3' => '6.2.0-6.2.99',
+        'depends' => array(
+            'typo3' => '6.2.0-6.2.99',
             'css_styled_content' => '6.2.0-6.2.99',
             'realurl' => '1.12.8-1.12.99',
-		),
-		'conflicts' => array(),
-		'suggests' => array()
-	),
+        ),
+        'conflicts' => array(),
+        'suggests' => array()
+    ),
 );
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -7,8 +7,16 @@
 /***************
  * Default TsConfig
  */
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:'.$_EXTKEY.'/Configuration/PageTS/ModWizards.ts">');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:'.$_EXTKEY.'/Configuration/PageTS/TSConfig.ts">');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:'.$_EXTKEY.'/Configuration/PageTS/mod_wizards.txt">');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:'.$_EXTKEY.'/Configuration/PageTS/tsconfig.txt">');
+
+
+/***************
+ * Configure Themes Constant Editor
+ */
+if(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('themes')) {
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:'.$_EXTKEY.'/Configuration/PageTS/mod_themes.txt">');
+}
 
 
 /***************
@@ -24,7 +32,7 @@
  */
 $settings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY]);
 if($settings['UseRealUrlConfig'] == 1){
-    @include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY,'Configuration/RealURL/Default.php'));    
+    @include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY,'Configuration/RealURL/Default.php'));
 }
 
 
@@ -40,4 +48,4 @@
         'BK2K\\BootstrapPackage\\Service\\InstallService',
         'generateApacheHtaccess'
     );
-}
+}
diff --git a/ext_tables.php b/ext_tables.php
@@ -5,9 +5,18 @@
 
 
 /***************
- * Default TypoScript
+ * Load functions only if themes extension is not installed
+ *
+ * - let themes handle the includion of the needed static files
  */
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript', 'Bootstrap Package');
+if(!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('themes')) {
+
+    /***************
+     * Default TypoScript
+     */
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript', 'Bootstrap Package');
+
+}
 
 
 /***************
@@ -483,20 +492,20 @@
     'ctrl' => array(
         'label' => 'header',
         'sortby' => 'sorting',
-		'tstamp' => 'tstamp',
-		'crdate' => 'crdate',
-		'cruser_id' => 'cruser_id',
+        'tstamp' => 'tstamp',
+        'crdate' => 'crdate',
+        'cruser_id' => 'cruser_id',
         'title'	=> 'LLL:EXT:'.$_EXTKEY.'/Resources/Private/Language/Backend.xlf:carousel_item',
         'type' => 'item_type',
-		'delete' => 'deleted',
-		'versioningWS' => 2,
-		'versioning_followPages' => TRUE,
-		'origUid' => 't3_origuid',
-		'hideAtCopy' => FALSE,
-		'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
-		'transOrigPointerField' => 'l10n_parent',
-		'transOrigDiffSourceField' => 'l10n_diffsource',
-		'languageField' => 'sys_language_uid',
+        'delete' => 'deleted',
+        'versioningWS' => 2,
+        'versioning_followPages' => TRUE,
+        'origUid' => 't3_origuid',
+        'hideAtCopy' => FALSE,
+        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'transOrigPointerField' => 'l10n_parent',
+        'transOrigDiffSourceField' => 'l10n_diffsource',
+        'languageField' => 'sys_language_uid',
         'dividers2tabs' => TRUE,
         'requestUpdate' => 'background_style',
         'enablecolumns' => array(
@@ -566,21 +575,21 @@
 $TCA['tx_bootstrappackage_accordion_item'] = array(
     'ctrl' => array(
         'label' => 'header',
-		'label_alt' => 'bodytext',
-		'sortby' => 'sorting',
-		'tstamp' => 'tstamp',
-		'crdate' => 'crdate',
-		'cruser_id' => 'cruser_id',
-		'title' => 'LLL:EXT:'.$_EXTKEY.'/Resources/Private/Language/Backend.xlf:accordion_item',
-		'delete' => 'deleted',
-		'versioningWS' => 2,
-		'versioning_followPages' => TRUE,
-		'origUid' => 't3_origuid',
-		'hideAtCopy' => FALSE,
-		'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
-		'transOrigPointerField' => 'l10n_parent',
-		'transOrigDiffSourceField' => 'l10n_diffsource',
-		'languageField' => 'sys_language_uid',
+        'label_alt' => 'bodytext',
+        'sortby' => 'sorting',
+        'tstamp' => 'tstamp',
+        'crdate' => 'crdate',
+        'cruser_id' => 'cruser_id',
+        'title' => 'LLL:EXT:'.$_EXTKEY.'/Resources/Private/Language/Backend.xlf:accordion_item',
+        'delete' => 'deleted',
+        'versioningWS' => 2,
+        'versioning_followPages' => TRUE,
+        'origUid' => 't3_origuid',
+        'hideAtCopy' => FALSE,
+        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'transOrigPointerField' => 'l10n_parent',
+        'transOrigDiffSourceField' => 'l10n_diffsource',
+        'languageField' => 'sys_language_uid',
         'dividers2tabs' => TRUE,
         'enablecolumns' => array(
             'disabled' => 'hidden',
@@ -689,4 +698,4 @@
     $GLOBALS['TBE_STYLES']['logo_login'] = $settings['LoginLogo'];
     $GLOBALS['TBE_STYLES']['htmlTemplates']['EXT:backend/Resources/Private/Templates/login.html'] = 'EXT:bootstrap_package/Resources/Private/Templates/Backend/Login.html';
     unset($settings);
-}
+}
diff --git a/ext_tables.sql b/ext_tables.sql
@@ -64,7 +64,7 @@ CREATE TABLE tx_bootstrappackage_carousel_item (
     t3_origuid int(11) DEFAULT '0' NOT NULL,
     sys_language_uid int(11) DEFAULT '0' NOT NULL,
     l10n_parent int(11) DEFAULT '0' NOT NULL,
-	l10n_diffsource mediumblob NOT NULL,
+    l10n_diffsource mediumblob NOT NULL,
 
     PRIMARY KEY (uid),
     KEY parent (pid),
@@ -106,7 +106,7 @@ CREATE TABLE tx_bootstrappackage_accordion_item (
     t3_origuid int(11) DEFAULT '0' NOT NULL,
     sys_language_uid int(11) DEFAULT '0' NOT NULL,
     l10n_parent int(11) DEFAULT '0' NOT NULL,
-	l10n_diffsource mediumblob NOT NULL,
+    l10n_diffsource mediumblob NOT NULL,
 
     PRIMARY KEY (uid),
     KEY parent (pid),