Merge branch 'master' of https://git.freakaria.com:3000/dom/freaCMS

sync between two dev folders 2

README.md

@@ -1,29 +1,49 @@
-# freaCMS
-
+# freaCMS
+
 mostly filebased Content Presentation System
-
-
-## installation
-
-### download sources
-
-    git clone https://git.freakaria.com:3000/dom/freaCMS.git
-    cd freaCMS
-    
-### configure
-
-edit main.cfg and deploy
-
-main.cgf:
-
-    SITE_URL = public URL where website is reachable (used in links, etc...)
-    title = give your site a title
-    
-
-deploy:
-    
-    USER = ssh user on server
-    SERVER = server address for ssh login
-    LIVE_DIR = relative path (from ssh login) to live site
-    DEV_DIR = relative path to development site (so you can try out without breaking stuff)
-
+
+
+## installation
+
+### download 
+
+get the source code
+
+    git clone https://git.freakaria.com:3000/dom/freaCMS.git
+    cd freaCMS
+    
+install dependencies
+
+    composer install
+
+
+    
+### configure
+
+create and edit main.cfg and deploy:
+
+    for i in {deploy,main.cfg}; do cp $i.sample $i; done;
+
+
+main.cgf:
+
+    SITE_URL = public URL where website is reachable (used in links, etc...)
+    title = give your site a title
+    
+
+deploy:
+    
+    USER = ssh user on server
+    SERVER = server address for ssh login
+    LIVE_DIR = relative path (from ssh login) to live site
+    DEV_DIR = relative path to development site (so you can try out without breaking stuff)
+
+
+## Template variables
+
+LANG
+default_lang
+RESOURCES
+hideFromSearchEngines
+title
+bodyClass

main.cfg.sample

@@ -36,13 +36,9 @@ languages=de,en
 
 ; content directories for different languages
 content.de=content/DE/
-content.en=content/NO/
-content.no=content/NO/
+content.en=content/EN/
+
 
-; include a link to the Homepage above the menu
-; [dev: translates to menuAddHome in Template (index.php)]
-nav.main.config.addHome=false
-nav.footer.config.addHome=false
 
 ;; HTML Template related:
 ;; ----------------------