<?=$this->conf("site-title")?>

diff --git a/Conjuro/Config.php b/Conjuro/Config.php index 8af977d..0720ce9 100644 --- a/Conjuro/Config.php +++ b/Conjuro/Config.php @@ -16,9 +16,6 @@ // Site defaults "site-title"=>"Conjuro", - "default-layout"=>"default", - "default-header"=>"#header", - "default-footer"=>"#footer", "bootusers"=>[["Admin","Admin3"]], // Comment on production "debug"=>true ]; diff --git a/Conjuro/Conjuro.php b/Conjuro/Conjuro.php index b9d2439..c999a6d 100644 --- a/Conjuro/Conjuro.php +++ b/Conjuro/Conjuro.php @@ -267,9 +267,7 @@ } public function render($meta=null,$data=null){ - echo "

"; $this->renderControl($meta,$data); - echo "

"; } abstract protected function renderControl($meta,$data); diff --git a/admin/index.php b/admin/index.php new file mode 100644 index 0000000..2a1d7b5 --- /dev/null +++ b/admin/index.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/content/controls/common.php b/content/controls/common.php index 9dd05bc..b595a53 100644 --- a/content/controls/common.php +++ b/content/controls/common.php @@ -8,6 +8,11 @@ echo $meta["html"]; } }, + new class("img") extends Control{ + protected function renderControl($meta,$data) { + echo '

'; + } + }, new class("builder") extends Control{ protected function renderControl($meta,$data) { include "Conjuro/Builder.php"; diff --git a/content/fragment/layout-admin.php b/content/fragment/layout-admin.php new file mode 100644 index 0000000..2160a96 --- /dev/null +++ b/content/fragment/layout-admin.php @@ -0,0 +1,14 @@ + + + + <?=$this->conf("site-title")?> + + + +

showContent("header");?>

showContent("body");?>

+ + + \ No newline at end of file diff --git a/content/fragment/layout.php b/content/fragment/layout.php index 3198fd1..ea032f1 100644 --- a/content/fragment/layout.php +++ b/content/fragment/layout.php @@ -1,13 +1,13 @@ - - <?=$this->value("title")?> - + + <?=$this->conf("site-title")?> + - -

showContent("body");?>

showContent("header");?>

showContent("body");?>

+ diff --git a/content/modules/Page.php b/content/modules/Page.php index 68e1b14..58185a0 100644 --- a/content/modules/Page.php +++ b/content/modules/Page.php @@ -26,14 +26,14 @@ abstract class PageBase{ private $meta; private $name; + private $conf; function __construct($name,$conf) { - $this->name=$name; $this->meta=Conjuro::loadJson("content/pages/$name.json"); - if(!isset($this->meta["title"])) - $this->meta["title"]=$conf["site-title"]; - if(!isset($this->meta["layout"])) - $this->meta["layout"]=$conf["default-layout"]; + if($this->meta===null) + throw new Exception("Page '$name' does not exists."); + $this->name=$name; + $this->conf=$conf; } // META:LAYOUT @@ -51,6 +51,13 @@ /** * Return the value defined for a page meta key */ + public function conf($name){ + return $this->conf[$name]; + } + + /** + * Return the value defined for a page meta key + */ public function value($name){ return $this->meta[$name]; } @@ -61,7 +68,9 @@ public function showContent($name){ if (isset($this->meta[$name])){ foreach($this->meta[$name] as $ci){//ControlInfo + echo"

"; c()->control($ci["@"])->render($ci["meta"]); //TODO: Data here when implemented + echo"

"; } } } diff --git a/content/pages/admin/dashboard.json b/content/pages/admin/dashboard.json new file mode 100644 index 0000000..5434376 --- /dev/null +++ b/content/pages/admin/dashboard.json @@ -0,0 +1,21 @@ +{ + "title": "Bienvenido a Conjuro", + "layout": "layout-admin", + "custom-css": ".conj{font-family:sans-serif;font-size:50px;font-weight:bold;color:#009900}", + "header":[ + { + "@": "html", + "meta": { + "html": "Welcome to Conjuro!!" + } + } + ], + "body": [ + { + "@": "html", + "meta": { + "html": "Welcome to Conjuro!!" + } + } + ] +} \ No newline at end of file diff --git a/content/pages/admin/style.css b/content/pages/admin/style.css new file mode 100644 index 0000000..ad02542 --- /dev/null +++ b/content/pages/admin/style.css @@ -0,0 +1,97 @@ +/* Common */ +.clear{ + clear: both; +} + +/* Layout */ +html, body{ + margin:0; + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + width:100%; + height:100%; +} +html{ + background-color: #e9edf1; + font-size: 16px; +} +body{ + max-width: 900px; + margin: 0 auto; + position:relative; + overflow: hidden; +} + +form{ + margin:0; +} + +#header{ + background-color: #4e6d8a; + color:white; + overflow: hidden; + text-align: center; + width: 100%; + font-size: 32px; + font-weight: bold; + line-height: 60px; +} + +#footer{ + position: absolute; + bottom:0; + background-color: #8fa5b9; + text-align: right; + font-size:16px; + font-weight: bold; + width: 100%; + line-height: 24px; + color:white; +} + +#content{ + background-color: white; + width:100%; + height:100%; + margin-bottom:84px; + border-bottom:1px sold tomato; +} + +/* Sections */ + +div.section{ + padding:4px 32px; +} +div.section>h2{ + text-align:center; + text-decoration: underline; + padding-top:16px; + padding-bottom:5px; + font-size: 24px; + margin:0; +} +div.section>div{ + margin:0 auto; +} + +table.form{ + margin:0 auto; + border-collapse: collapse; +} +table.form td{ + padding:2px 5px; + border-bottom: 1px solid #f5f5f5; + font-size: 16px; +} +/* Common */ + +.right{ + text-align:right; +} + +.center{ + text-align:center; +} + +.small{ + font-size: 12px !important; +} diff --git a/content/pages/index.json b/content/pages/index.json index cbd8a62..af0dc0c 100644 --- a/content/pages/index.json +++ b/content/pages/index.json @@ -1,20 +1,22 @@ { - "title": "Bienvenido a Conjuro", "layout": "layout", - "custom-css": ".conj{font-family:sans-serif;font-size:50px;font-weight:bold;color:#009900}", + "css": ".conj{font-family:sans-serif;font-size:20px;font-weight:bold;color:#009900}.title-panel{padding-top:1rem;}.center:{text-align:center}.conjuro-content{position:relative;background-image:url(media/megumin-bg.gif);background-position: center;background-repeat: no-repeat;background-size: cover;}", "header":[ { "@": "html", "meta": { - "html": "Welcome to Conjuro!!" + "html": "Bienvenido a Conjuro" } } ], "body": [ { "@": "html", + "css":"", + "class":"title-panel center", + "id":"title-panel", "meta": { - "html": "Welcome to Conjuro!!" + "html": "

Hola, Bienvenido a Conjuro!!

Tu sitio ya está en línea.
Entra en el panel de administración para empezar a editarlo.

" } } ] diff --git a/media/megumin-bg.gif b/media/megumin-bg.gif new file mode 100644 index 0000000..dbab54b --- /dev/null +++ b/media/megumin-bg.gif Binary files differ diff --git a/media/style.css b/media/style.css new file mode 100644 index 0000000..ad02542 --- /dev/null +++ b/media/style.css @@ -0,0 +1,97 @@ +/* Common */ +.clear{ + clear: both; +} + +/* Layout */ +html, body{ + margin:0; + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + width:100%; + height:100%; +} +html{ + background-color: #e9edf1; + font-size: 16px; +} +body{ + max-width: 900px; + margin: 0 auto; + position:relative; + overflow: hidden; +} + +form{ + margin:0; +} + +#header{ + background-color: #4e6d8a; + color:white; + overflow: hidden; + text-align: center; + width: 100%; + font-size: 32px; + font-weight: bold; + line-height: 60px; +} + +#footer{ + position: absolute; + bottom:0; + background-color: #8fa5b9; + text-align: right; + font-size:16px; + font-weight: bold; + width: 100%; + line-height: 24px; + color:white; +} + +#content{ + background-color: white; + width:100%; + height:100%; + margin-bottom:84px; + border-bottom:1px sold tomato; +} + +/* Sections */ + +div.section{ + padding:4px 32px; +} +div.section>h2{ + text-align:center; + text-decoration: underline; + padding-top:16px; + padding-bottom:5px; + font-size: 24px; + margin:0; +} +div.section>div{ + margin:0 auto; +} + +table.form{ + margin:0 auto; + border-collapse: collapse; +} +table.form td{ + padding:2px 5px; + border-bottom: 1px solid #f5f5f5; + font-size: 16px; +} +/* Common */ + +.right{ + text-align:right; +} + +.center{ + text-align:center; +} + +.small{ + font-size: 12px !important; +}