Eywa update

diff --git a/app/config.ini b/app/config.ini
index c452544..81dcaf3 100755 (executable)
--- a/app/config.ini
+++ b/app/config.ini
@@ -32,6 +32,8 @@ service.Eywa-CMS-Repository.factory = 'Eywa\CMS\Repository'
 service.Eywa-CMS-Repository-IStorage.factory = 'Eywa\CMS\Repository\Storage\CouchDB'\r
 service.Eywa-CMS-Repository-IStorage.option.database = empty\r
 \r
+service.Eywa-Application-IFileLoaderFactory = 'Eywa\CMS\Application\FileLoaderFactory'\r
+\r
 \r
 [production < common]\r
 ; common database connection\r

diff --git a/app/presenters/Base.php b/app/presenters/Base.php
index 1ba1f29..bc7c7cb 100644 (file)
--- a/app/presenters/Base.php
+++ b/app/presenters/Base.php
@@ -19,8 +19,8 @@ abstract class Base extends Presenter
     protected function createComponentNavigation()
     {
         $navigation = new Navigation;
-        $navigation->setRoot('');
-        $navigation->add('/');
+        $navigation->setRoot('//www');
+        $navigation->add('//www');
         $navigation->setOrder('position');
         return $navigation;
     }

diff --git a/app/presenters/Overview.php b/app/presenters/Overview.php
index 63bbebe..b2f064e 100644 (file)
--- a/app/presenters/Overview.php
+++ b/app/presenters/Overview.php
@@ -11,7 +11,7 @@ use Eywa\CMS\Navigation;
 class Overview extends Base
 {
 
-    public function renderDefault($path = '')
+    public function renderDefault($path)
     {
         $this->template->list = $this['overview']->getDocuments();
     }

diff --git a/app/templates/@layout.phtml b/app/templates/@layout.phtml
index 3361d60..4bd224b 100644 (file)
--- a/app/templates/@layout.phtml
+++ b/app/templates/@layout.phtml
@@ -26,7 +26,7 @@
         </div>
 
         <div id="header">
-            <a id="logo" href="{dlink ''}" title="">Název</a>
+            <a id="logo" href="{dlink '//www'}" title="">Název</a>
 
             <div id="navcontainer">
                 {control navigation}

diff --git a/libs/eywa b/libs/eywa
index b4e7e48..eb2bf32 160000 (submodule)
--- a/libs/eywa
+++ b/libs/eywa
@@ -1 +1 @@
-Subproject commit b4e7e4810ff0c0c8cef4a626805f6a50dab5a9c1
+Subproject commit eb2bf32f37c6f09c983b6bdc882342e357324c8d

diff --git a/web/css/screen-tinymce.css b/web/css/screen-tinymce.css
new file mode 100644 (file)
index 0000000..23fa6eb
--- /dev/null
+++ b/web/css/screen-tinymce.css
@@ -0,0 +1,7 @@
+body {}
+
+p, ol, ul {padding-bottom: 10px;}
+ol, ul {font-size: 1.5em; margin-left: 30px; line-height: 1.5em;}
+ol>li, ul>li {list-style-type: circle;}
+ol ol, ol ul, ul ol, ul ul {padding-bottom: 0px; margin-left: 15px;}
+li li {list-style-type: square;}
\ No newline at end of file

diff --git a/web/css/screen.scss b/web/css/screen.scss
index 4e994dc..7ebe197 100644 (file)
--- a/web/css/screen.scss
+++ b/web/css/screen.scss
@@ -7,7 +7,6 @@ $nav-height: 40px;
 * {margin: 0; padding: 0; list-style:none;}\r
 html {font-size: 62.5%;        font-family: Arial, Helvetica, sans-serif; height: 100%;}\r
 body {height: 100%;}\r
-body#tinymce {}\r
 \r
 \r
 /* BASIC */\r
@@ -42,7 +41,7 @@ label {display: block; float: left; width: 60px;}
 \r
 \r
 /*  CONTENT */\r
-#container, body#tinymce {\r
+#container {\r
     p, ol, ul {padding-bottom: 10px;}\r
     ol, ul {font-size: 1.5em; margin-left: 30px; line-height: 1.5em;\r
         &>li {list-style-type: circle;}\r

diff --git a/web/i/.gitignore b/web/i/.gitignore
new file mode 100644 (file)
index 0000000..d6b7ef3
--- /dev/null
+++ b/web/i/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore