Fixing #367

concretecms · Jul 7, 2014 · 34a3563 · 34a3563
1 parent caa67ad
commit 34a3563
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/web/application/themes/elemental/default.php b/web/application/themes/elemental/default.php
@@ -5,7 +5,7 @@
 <main>
 <?
 $a = new Area('Main');
-$a->setAreaGridColumnSpan(12);
+$a->enableGridContainer();
 $a->display($c);
 ?>
 </main>

diff --git a/web/concrete/config/install/base/blocktypes.xml b/web/concrete/config/install/base/blocktypes.xml
@@ -28,6 +28,7 @@
         <blocktype handle="form" package=""/>
         <blocktype handle="google_map" package=""/>
         <blocktype handle="html" package=""/>
+        <blocktype handle="horizontal_rule" package=""/>
         <blocktype handle="discussion" package=""/>
         <blocktype handle="image" package=""/>
         <blocktype handle="next_previous" package=""/>
@@ -52,6 +53,7 @@
             <blocktype handle="html"/>
             <blocktype handle="image"/>
             <blocktype handle="file"/>
+            <blocktype handle="horizontal_rule"/>
         </blocktypeset>
         <blocktypeset handle="navigation" name="Navigation" package="">
             <blocktype handle="autonav"/>

diff --git a/web/concrete/core/Area/Area.php b/web/concrete/core/Area/Area.php
@@ -56,6 +56,7 @@ class Area extends Object implements \Concrete\Core\Permission\ObjectInterface
     public $areaBlocksArray = array();
 
     protected $arIsLoaded = false;
+    protected $arUseGridContainer = false;
     protected $arDisplayName;
     protected $arGridColumnSpan;
 
@@ -76,7 +77,7 @@ public function getAreaGridColumnSpan()
 
     final public function enableGridContainer()
     {
-
+        $this->arUseGridContainer = true;
     }
 
 	public function getAreaDisplayName()

diff --git a/web/concrete/core/Block/BlockType/BlockType.php b/web/concrete/core/Block/BlockType/BlockType.php
@@ -23,6 +23,14 @@ class BlockType
 {
 
     public $controller;
+
+    /**
+     * If a grid container is enabled at the area level, all blocks added will be individually
+     * wrapped inside it on each add. If this is set to true, this block type will NOT be wrapped
+     * @var bool
+     */
+    protected $btIgnorePageThemeGridFrameworkContainer = false;
+
     /**
      * @Id @Column(type="integer")
      * @GeneratedValue

diff --git a/web/concrete/themes/concrete/view.php b/web/concrete/themes/concrete/view.php
@@ -5,7 +5,7 @@
     <link rel="stylesheet" type="text/css" href="<?=$this->getThemePath()?>/main.css" />
     <?
 $view->requireAsset('css', 'bootstrap');
-$view->requireAsset('css', 'fontawesome');
+$view->requireAsset('css', 'font-awesome');
 $view->requireAsset('javascript', 'jquery');
 $view->requireAsset('javascript', 'bootstrap/alert');
 $view->requireAsset('javascript', 'bootstrap/transition');