Remove SITCON DEMO

david50407 · Dec 31, 2013 · eafde61 · eafde61
1 parent 27ff772
commit eafde61
Show file tree

Hide file tree

Showing 48 changed files with 18 additions and 3,061 deletions.
diff --git a/.htaccess b/.htaccess
@@ -1,8 +1,8 @@
 RewriteEngine On
-RewriteBase /
+RewriteBase /Theogony/
 
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_URI} ^/(.+)$
+RewriteCond %{REQUEST_URI} ^/Theogony/(.+)$
 RewriteCond %{DOCUMENT_ROOT}/public/%1 -f
 RewriteRule ^(.*)$ public/%1 [L]
 

diff --git a/app/views/layouts/homepage.html.php b/app/views/layouts/homepage.html.php
@@ -2,7 +2,7 @@
 <html lang="zh_TW">
 <head>
 	<meta charset="UTF-8">
-	<title><?=$config->site->title?></title>
+	<title><?= $config->site->title; ?></title>
 	<meta name="apple-mobile-web-app-capable" content="yes" />
 	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -20,23 +20,23 @@
 <body>
 	<div class="reveal">
 		<div class="slides">
-<? if (count($_->slides) == 0): ?>
+<?php if (count($_->slides) == 0): ?>
 			<section data-markdown='\no-slides.md' data-separator="^\n\n\n" data-vertical="^\n\n"></section>
-<? else: ?>
-<? 	foreach ($_->slides as $slide): ?>
-<? 		if ($slide->markdown): ?>
+<?php else: ?>
+<?php 	foreach ($_->slides as $slide): ?>
+<?php 		if ($slide->markdown): ?>
 			<section data-markdown>
 				<script type="text/template">
-<?=$slide->content?>
+<?= $slide->content; ?>
 				</script>
 			</section>
-<? 		else: ?>
+<?php 		else: ?>
 			<section>
-<?=$slide->content?>
+<?= $slide->content; ?>
 			</section>
-<? 		endif; ?>
-<? 	endforeach; ?>
-<? endif; ?>
+<?php 		endif; ?>
+<?php 	endforeach; ?>
+<?php endif; ?>
 		</div>
 	</div>
 	<div class='timer'>	</div>

diff --git a/config/config.inc.php b/config/config.inc.php
@@ -3,8 +3,8 @@
 	$config->database = new \Theogony\Database\Mysql(function(&$config) {
 		$config->host = '127.0.0.1';
 		$config->username = 'root';
-		$config->password = 'toor';
-		$config->database = 'hexameter';
+		$config->password = 'free1116';
+		$config->database = 'Theogony';
 	});
 
 	$config->site = new ArrayObject();

diff --git a/config/routes.php b/config/routes.php
@@ -5,7 +5,7 @@
 Theogony\RoutesCore::draw(function($router) {
 	# You can set prefix directory for this site.
 	#		$router->predir = '/';
-	$router->predir = '/';
+	$router->predir = '/Theogony/';
 
   # Sample of regular route:
   #   $router->match(array('products/:id' => 'catalog#view'));

diff --git a/lib/controller_base.php b/lib/controller_base.php
@@ -62,9 +62,9 @@ public function import($file)
 		else
 			throw new \Theogony\Exceptions\NoAvailableLayoutException($this->cache->controller . '\_' . $file . '.' . $this->format);
 	}
-	public function yield()
+	public function mixin()
 	{
-		if ($this->usedLayout) return;
+		if (!$this->cache->usedLayout) return;
 
 		$_ = &$this->data; # sugar
 		$config = \Theogony\ConfigCore::getInstance();

diff --git a/public/css/highlight/tomorrow-night-bright.css b/public/css/highlight/tomorrow-night-bright.css
diff --git a/public/css/highlight/zenburn.css b/public/css/highlight/zenburn.css