Slight UI fixes; Fix concretecms#3814

Former-commit-id: 97dc42e Former-commit-id: 9f212f4bff97a78c7fad1d2a563c1f4ffaf2da1e
martbase · May 18, 2016 · a129d9a · a129d9a
1 parent 92bddb8
commit a129d9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/concrete/src/Block/BlockType/BlockTypeList.php b/concrete/src/Block/BlockType/BlockTypeList.php
@@ -1,10 +1,11 @@
 <?php
 namespace Concrete\Core\Block\BlockType;
 
+use Concrete\Core\Entity\Block\BlockType\BlockType as BlockTypeEntity;
 use Core;
 use Loader;
-use BlockType as ConcreteBlockType;
 use Package;
+
 use Concrete\Core\Legacy\DatabaseItemList;
 
 class BlockTypeList extends DatabaseItemList
@@ -30,7 +31,7 @@ public function get($itemsToGet = 100, $offset = 0)
         $r = parent::get($itemsToGet, intval($offset));
         $blocktypes = array();
         foreach ($r as $row) {
-            $bt = ConcreteBlockType::getByID($row['btID']);
+            $bt = BlockType::getByID($row['btID']);
             if (is_object($bt)) {
                 $blocktypes[] = $bt;
             }
@@ -84,7 +85,7 @@ public static function getAvailableList()
                     if (is_dir($fdir) && !in_array($file, $btHandles) && file_exists($fdir . '/' . FILENAME_BLOCK_CONTROLLER)) {
                         $bt = BlockType::getByHandle($file);
                         if (!is_object($bt)) {
-                            $bt = new BlockType();
+                            $bt = new BlockTypeEntity();
                             $bt->setBlockTypeHandle($file);
                             $class = $bt->getBlockTypeClass();
                             $bta = new $class();

diff --git a/concrete/themes/concrete/elements/header.php b/concrete/themes/concrete/elements/header.php
@@ -42,7 +42,7 @@
 ?>
 </head>
 <body>
-<div class="ccm-ui ccm-ui-fieldless">
+<div class="ccm-ui">
 
 <?php if ($showLogo) {
     ?>

diff --git a/concrete/views/frontend/install.php b/concrete/views/frontend/install.php
@@ -7,6 +7,8 @@
 }
 ?>
 
+<div class="ccm-ui-fieldless">
+
 <style type="text/css">@import "<?=ASSETS_URL_CSS?>/views/install.css";</style>
 <script type="text/javascript" src="<?=ASSETS_URL_JAVASCRIPT?>/bootstrap/tooltip.js"></script>
 <script type="text/javascript" src="<?=ASSETS_URL_JAVASCRIPT?>/jquery-cookie.js"></script>
@@ -663,3 +665,5 @@
 
 <?php
 } ?>
+
+</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ @@
     ?>
     </head>
     <body>
-    <div class="ccm-ui ccm-ui-fieldless">
+    <div class="ccm-ui">
     <?php if ($showLogo) {
         ?>
@@ Expand Down @@