[TASK] Make Content Element Wizard to use Bootstrap 93/36693/2
authorBenjamin Kott <benjamin.kott@outlook.com>
Thu, 5 Feb 2015 21:52:41 +0000 (22:52 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 5 Feb 2015 22:32:04 +0000 (23:32 +0100)
This patch removes the custom styling from the
content element wizard.

Releases: master
Resolves: #64892
Change-Id: I721a896efedcbb8c67274be85e84d434eda53806
Reviewed-on: http://review.typo3.org/36693
Reviewed-by: Alexander Stehlik <alexander.stehlik@gmail.com>
Tested-by: Alexander Stehlik <alexander.stehlik@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_element_panel.less
typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_web_new_element.less [deleted file]
typo3/sysext/t3skin/Resources/Private/Styles/t3skin.less
typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css

index d60ffee..71134e8 100644 (file)
@@ -163,7 +163,7 @@ class NewContentElementController {
                        $code = '';
                        $wizardItems = $this->getWizardItems();
                        // Wrapper for wizards
-                       $this->elementWrapper['section'] = array('<ul class="contentelement-wizard list-unstyled">', '</ul>');
+                       $this->elementWrapper['section'] = array('<div class="panel panel-tab"><div class="panel-body">', '</div></div>');
                        // Copy wrapper for tabs
                        $this->elementWrapperForTabs = $this->elementWrapper;
                        // Hook for manipulating wizardItems, wrapper, onClickEvent etc.
@@ -216,23 +216,21 @@ class NewContentElementController {
                                                $aOnClick = "document.editForm.defValues.value=unescape('" . rawurlencode($wInfo['params']) . "');goToalt_doc();" . (!$this->onClickEvent?"window.location.hash='#sel2';":'');
                                        }
 
-                                       $menuItems[$key]['content'] .=
-                                               '<li>
-                                                       <div class="contentelement-wizard-item">
-                                                               ' . $content . '
-                                                               <div class="contentelement-wizard-item-icon">
-                                                                       <a href="#" onclick="' . htmlspecialchars($aOnClick) . '">
-                                                                               <img' . IconUtility::skinImg($this->doc->backPath, $wInfo['icon'], '') . ' alt="" />
-                                                                       </a>
-                                                               </div>
-                                                               <div class="contentelement-wizard-item-text">
-                                                                       <a href="#" onclick="' . htmlspecialchars($aOnClick) . '">
-                                                                               <strong>' . htmlspecialchars($wInfo['title']) . '</strong>
-                                                                               <br />' . nl2br(htmlspecialchars(trim($wInfo['description']))) .
-                                                                       '</a>
-                                                               </div>
+                                       $menuItems[$key]['content'] .= '
+                                               <div class="media">
+                                                       ' . $content . '
+                                                       <div class="media-left">
+                                                               <a href="#" onclick="' . htmlspecialchars($aOnClick) . '">
+                                                                       <img' . IconUtility::skinImg($this->doc->backPath, $wInfo['icon'], '') . ' alt="" />
+                                                               </a>
                                                        </div>
-                                               </li>';
+                                                       <div class="media-body">
+                                                               <a href="#" onclick="' . htmlspecialchars($aOnClick) . '">
+                                                                       <strong>' . htmlspecialchars($wInfo['title']) . '</strong>
+                                                                       <br />' . nl2br(htmlspecialchars(trim($wInfo['description']))) .
+                                                               '</a>
+                                                       </div>
+                                               </div>';
                                        $cc++;
                                }
                        }
index 3adaf06..fa80a8e 100644 (file)
 .panel-space {
        margin: 3em 0;
 }
+
+//
+// Panel Tab
+//
+.panel-tab {
+       border-radius: 0;
+       border: 1px solid @nav-tabs-active-link-hover-border-color;
+       background-color: @nav-tabs-active-link-bg;
+}
+.panel-tab + .panel-tab {
+       margin-top: -19px;
+}
+.tab-pane {
+       > .panel-tab:first-child {
+               border-top: none;
+       }
+}
diff --git a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_web_new_element.less b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_web_new_element.less
deleted file mode 100644 (file)
index 0bacb25..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// New Record Wizard
-//
-
-// Should be added by NewContentElementController only when necessary
-.contentelement-wizard {
-       li {
-               margin-bottom: 10px;
-
-               .contentelement-wizard-item-input,
-               .contentelement-wizard-item-icon {
-                       float: left;
-                       margin-right: 5px;
-               }
-
-       }
-       li:last-child {
-               margin-bottom: 0px;
-       }
-       a {
-               display: inline-block;
-       }
-}
\ No newline at end of file
index c9fd06e..e479282 100644 (file)
 @import "TYPO3/_topbar.less";
 
 @import "TYPO3/_module_web_list_sysnote.less";
-@import "TYPO3/_module_web_new_element.less";
 @import "TYPO3/_module_extensionmanager.less";
 @import "TYPO3/_module_lang.less";
 @import "TYPO3/_module_beuser.less";
index 3e1c911..7475877 100644 (file)
@@ -9033,6 +9033,17 @@ fieldset[disabled] .table .btn-checkbox-holder input[type=checkbox]:checked + .b
 .panel-space {
   margin: 3em 0;
 }
+.panel-tab {
+  border-radius: 0;
+  border: 1px solid #cccccc;
+  background-color: #fafafa;
+}
+.panel-tab + .panel-tab {
+  margin-top: -19px;
+}
+.tab-pane > .panel-tab:first-child {
+  border-top: none;
+}
 img.t3-TCEforms-reqImg {
   display: block;
   position: absolute;
@@ -10971,20 +10982,6 @@ fieldset[disabled] .live-search-list .x-btn button.active {
 #typo3-dblist-sysnotes .single-note:hover .header span {
   color: #d7d7d7;
 }
-.contentelement-wizard li {
-  margin-bottom: 10px;
-}
-.contentelement-wizard li .contentelement-wizard-item-input,
-.contentelement-wizard li .contentelement-wizard-item-icon {
-  float: left;
-  margin-right: 5px;
-}
-.contentelement-wizard li:last-child {
-  margin-bottom: 0px;
-}
-.contentelement-wizard a {
-  display: inline-block;
-}
 .typo3-extension-list .ext-icon {
   max-height: 16px;
   width: auto;