Bug fixes and theme/heading update

- Fixed issue with default button sizes - Added ability to create h1,h2,h3,h4 headings - Only dark theme remains - Fixed styling bugs in dark theme
havok89 · Nov 14, 2016 · 4848875 · 4848875
1 parent fdf5f7d
commit 4848875
Show file tree

Hide file tree

Showing 154 changed files with 8,366 additions and 5,534 deletions.
diff --git a/hoosk/hoosk0/controllers/Hoosk_default.php b/hoosk/hoosk0/controllers/Hoosk_default.php
@@ -12,8 +12,8 @@ function __construct()
 		define ('THEME_FOLDER', BASE_URL.'/theme/'.THEME);
 		$this->data['settings']=$this->Hoosk_page_model->getSettings();
 	}
-	
-	
+
+
 	public function index()
 	{
 		$totSegments = $this->uri->total_segments();
@@ -32,7 +32,7 @@ public function index()
 			$this->error();
 		}
 	}
-	
+
 		public function category()
 	{
 		$catSlug = $this->uri->segment(2);
@@ -45,7 +45,7 @@ public function category()
 			$this->error();
 		}
 	}
-	
+
 		public function article()
 	{
 		$articleURL = $this->uri->segment(2);
@@ -58,16 +58,16 @@ public function article()
 			$this->error();
 		}
 	}
-	
+
 	public function error()
 	{
 		$this->data['page']['pageTitle']="Oops, Error";
 		$this->data['page']['pageDescription']="Oops, Error";
 		$this->data['page']['pageKeywords']="Oops, Error";
 		$this->data['page']['pageID']="0";
+		$this->data['page']['pageTemplate']="error";
 		$this->data['header'] = $this->load->view('templates/header', $this->data, true);
 		$this->data['footer'] = $this->load->view('templates/footer', '', true);
-		$this->load->view('templates/error', $this->data);
+		$this->load->view('templates/'.$this->data['page']['pageTemplate'], $this->data);
 	}
 }
-
diff --git a/hoosk/hoosk0/third_party/Sioen/Types/ButtonConverter.php b/hoosk/hoosk0/third_party/Sioen/Types/ButtonConverter.php
@@ -17,9 +17,11 @@ public function toJson(\DOMElement $node)
 
     public function toHtml(array $data)
     {
-		// echo "<pre>";
-      // print_r($data);
-       //die();
-        return '<a href="' . $data['url'] . '" class="' . $data['style'] . ' ' . $data['size'] . '">' . $data['html'] . '</a>' . "\n";
+      if ($data['is_block']==1){
+        $block=" btn-block";
+      } else {
+        $block = "";
+      }
+      return '<a href="' . $data['url'] . '" class="btn ' . $data['style'] . ' ' . $data['size'] . $block .'">' . $data['html'] . '</a>' . "\n";
     }
 }
diff --git a/hoosk/hoosk0/third_party/Sioen/Types/HeadingConverter.php b/hoosk/hoosk0/third_party/Sioen/Types/HeadingConverter.php
@@ -19,6 +19,6 @@ public function toJson(\DOMElement $node)
 
     public function toHtml(array $data)
     {
-        return Markdown::defaultTransform('## ' . $data['text']);
+      return "<".$data['heading'].">".$data['text'] . "</".$data['heading'].">";
     }
 }